summaryrefslogtreecommitdiff
path: root/src/launcher.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/launcher.py')
-rw-r--r--src/launcher.py137
1 files changed, 100 insertions, 37 deletions
diff --git a/src/launcher.py b/src/launcher.py
index b62bd23..bbd4f42 100644
--- a/src/launcher.py
+++ b/src/launcher.py
@@ -1,46 +1,118 @@
import os
+import shutil
import platform
import time
import threading
import ConfigParser
-from leap.bitmask.app import main as leap_client
-from leap.common.events import server
-
-from thandy.ClientCLI import update as thandy_update
+from leap.bitmask.app import start_app as bitmask_client
+from leap.common.events import server, signal
+from leap.common.events import events_pb2 as proto
+import tuf.client.updater
bundles_per_platform = {
- "Windows" : "/bundleinfo/LEAPClient-win/",
- "Darwin" : "",
- "Linux" : "/bundleinfo/LEAPClient/",
+ "Linux-i386": "linux-i368",
+ "Linux-i686": "linux-i368",
+ "Linux-x86_64": "linux-x86_64",
}
GENERAL_SECTION = "General"
-UPDATES_KEY = "Updates"
+DELAY_KEY = "updater_delay"
+
+
+class TUF(threading.Thread):
+ def __init__(self, config):
+ """
+ Initialize the list of mirrors, paths and other TUF dependencies from
+ the config file
+ """
+ if config.has_section(GENERAL_SECTION) and \
+ config.has_option(GENERAL_SECTION, DELAY_KEY):
+ self.delay = config.getint(GENERAL_SECTION, DELAY_KEY)
+ else:
+ self.delay = 60
+
+ self._load_mirrors(config)
+ if not self.mirrors:
+ print("ERROR: No updater mirrors found (missing or not well "
+ "formed launcher.conf)")
+
+ self.bundle_path = os.getcwd()
+ self.source_path = self.bundle_path
+ self.dest_path = os.path.join(self.bundle_path, 'tmp')
+ self.update_path = os.path.join(self.bundle_path, 'updates')
+
+ threading.Thread.__init__(self)
-class Thandy(threading.Thread):
def run(self):
+ """
+ Check for updates periodically
+ """
+ if not self.mirrors:
+ return
+
while True:
try:
- os.environ["THANDY_HOME"] = os.path.join(os.getcwd(),
- "config",
- "thandy")
- os.environ["THP_DB_ROOT"] = os.path.join(os.getcwd(),
- "packages")
- os.environ["THP_INSTALL_ROOT"] = os.path.join(os.getcwd(),
- "updates")
- args = [
- "--repo=repo/",
- "--install",
- bundles_per_platform[platform.system()]
- ]
- thandy_update(args)
+ tuf.conf.repository_directory = os.path.join(self.bundle_path,
+ 'repo')
+
+ updater = tuf.client.updater.Updater('leap-updater',
+ self.mirrors)
+ updater.refresh()
+
+ targets = updater.all_targets()
+ updated_targets = updater.updated_targets(targets,
+ self.source_path)
+ if updated_targets:
+ print "There is updates needed. Start downloading updates."
+ for target in updated_targets:
+ updater.download_target(target, self.dest_path)
+ self._set_permissions(target)
+ if os.path.isdir(self.dest_path):
+ if os.path.isdir(self.update_path):
+ shutil.rmtree(self.update_path)
+ shutil.move(self.dest_path, self.update_path)
+ filepath = sorted([f['filepath'] for f in updated_targets])
+ signal(proto.UPDATER_NEW_UPDATES,
+ content=", ".join(filepath))
+ print "Updates ready: ", filepath
+ return
+ except NotImplemented as e:
+ print "NotImplemented: ", e
+ return
except Exception as e:
print "ERROR:", e
finally:
- # TODO: Make this delay configurable
- time.sleep(60)
+ time.sleep(self.delay)
+
+ def _load_mirrors(self, config):
+ self.mirrors = {}
+ for section in config.sections():
+ if section[:6] != 'Mirror':
+ continue
+ url_prefix = config.get(section, 'url_prefix')
+ metadata_path = self._repo_path() + '/metadata'
+ targets_path = self._repo_path() + '/targets'
+ self.mirrors[section[7:]] = {'url_prefix': url_prefix,
+ 'metadata_path': metadata_path,
+ 'targets_path': targets_path,
+ 'confined_target_dirs': ['']}
+
+ def _set_permissions(self, target):
+ file_permissions_str = target["fileinfo"]["custom"]["file_permissions"]
+ file_permissions = int(file_permissions_str, 8)
+ filepath = target['filepath']
+ if filepath[0] == '/':
+ filepath = filepath[1:]
+ file_path = os.path.join(self.dest_path, filepath)
+ os.chmod(file_path, file_permissions)
+
+ def _repo_path(self):
+ system = platform.system() + "-" + platform.machine()
+ if system not in bundles_per_platform:
+ raise NotImplementedError("Platform %s not supported" % (system,))
+ return bundles_per_platform[system]
if __name__ == "__main__":
@@ -49,17 +121,8 @@ if __name__ == "__main__":
config = ConfigParser.ConfigParser()
config.read("launcher.conf")
- launch_thandy = False
- try:
- launch_thandy = config.getboolean(GENERAL_SECTION, UPDATES_KEY)
- except ConfigParser.NoSectionError as ns:
- pass
- except ConfigParser.NoOptionError as no:
- pass
-
- if launch_thandy:
- thandy_thread = Thandy()
- thandy_thread.daemon = True
- thandy_thread.start()
+ tuf_thread = TUF(config)
+ tuf_thread.daemon = True
+ tuf_thread.start()
- leap_client()
+ bitmask_client()