From f4f2f0ff3e808bc2c85b914aa750ad68770ed334 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Wed, 3 Jun 2015 17:10:08 -0300 Subject: Creating a leap session is now part of leap init We've moved the init soledad method to the leap_initialization module and gave it a meaningful name, because it was initializing the whole leap session instead of only soledad, because of that we removed some of the uneeded config files and deduplicated some code on maintenance to use the same facilities. Some arguments had non-meaningful variable names and args was being passed everywhere (it was unclear who was using which variables in the args) We changed the initialization to pass those arguments explicitly, then we can factor them out sometime when it makes sense --- service/pixelated/config/initialize_leap.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'service/pixelated/config/initialize_leap.py') diff --git a/service/pixelated/config/initialize_leap.py b/service/pixelated/config/initialize_leap.py index df7b8412..a4610622 100644 --- a/service/pixelated/config/initialize_leap.py +++ b/service/pixelated/config/initialize_leap.py @@ -1,6 +1,7 @@ from pixelated.config.config import Config from pixelated.config.config_ua import config_user_agent from pixelated.config.dispatcher import config_dispatcher +from leap.common.events import server as events_server import pixelated.bitmask_libraries.certs as certs from pixelated.bitmask_libraries.session import open_leap_session @@ -9,7 +10,8 @@ def initialize_leap(leap_provider_cert, leap_provider_cert_fingerprint, config_file, dispatcher, - dispatcher_stdin): + dispatcher_stdin, + leap_home): init_monkeypatches() @@ -17,14 +19,13 @@ def initialize_leap(leap_provider_cert, dispatcher_stdin, config_file) - config = Config() - config.provider = provider - config.username = user - config.password = password - init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint) - return config + events_server.ensure_server(port=8090) + + leap_session = create_leap_session(provider, user, password, leap_home) + + return leap_session def gather_credentials(dispatcher, dispatcher_stdin, config_file): @@ -34,6 +35,17 @@ def gather_credentials(dispatcher, dispatcher_stdin, config_file): return config_user_agent(config_file) +def create_leap_session(provider, username, password, leap_home): + leap_session = open_leap_session(username, + password, + provider, + leap_home) + + leap_session.soledad_session.soledad.sync(defer_decryption=False) + leap_session.nicknym.generate_openpgp_key() + return leap_session + + def init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint): if leap_provider_cert_fingerprint is None: certs.LEAP_CERT = leap_provider_cert or True -- cgit v1.2.3