fixes + cleanup

src/drozer/agent/builder.py

@@ -14,7 +14,7 @@ class Packager(command_wrapper.Wrapper):
     __java = Configuration.executable("java")
     __sign_apk = Configuration.library("apksigner.jar")
 
-    __endpoint = "startup_config.txt"
+    __endpoint = "config.txt"
     __manifest = "AndroidManifest.xml"
     __apktool_yml = "apktool.yml"
 
@@ -90,7 +90,7 @@ def source_dir(self):
     def unpack(self, name):
         apk_path = Configuration.library(name + ".apk")
         if apk_path is None:
-            raise RuntimeError("could not locate " + name + ".apk")
+            raise RuntimeError("could not locate " + name + ".apk in library")
 
         if self._execute([self.__java, "-jar", self.__apk_tool, "decode", apk_path,
                           "-o", self.source_dir()]) != 0:

src/drozer/agent/manager.py

@@ -1,5 +1,4 @@
 from WithSecure.common import cli
-import yaml
 from drozer import android, meta
 from drozer.agent import builder, manifest
 

src/drozer/agent/manifest.py

@@ -5,9 +5,12 @@ class Endpoint(object):
     def __init__(self, path):
         self.__path = path
 
-        with open(self.__path, 'w+') as file:
-            lines = file.readlines()
-        self.data = dict(map(lambda x: x.split(":"), filter(lambda p: p.find(":") > -1, lines)))
+        try:
+            with open(self.__path, 'r') as file:
+                lines = file.readlines()
+                self.data = dict(map(lambda x: x.split(":"), filter(lambda p: p.find(":") > -1, lines)))
+        except FileNotFoundError:
+            self.data = dict()
 
     def put_server(self, server):
         if isinstance(server, tuple):
@@ -27,6 +30,7 @@ def get(self, key):
     def write(self):
         with open(self.__path, 'w') as file:
             file.write("drozer Config\n")
+            file.write("-------------\n")
             for key, value in self.data.items():
                 file.write(f"{key}:{value}\n")