From 8b0e4f05b142b73a5ca13f4706fcb6ececbb6911 Mon Sep 17 00:00:00 2001 From: rafael lisboa Date: Mon, 8 Jun 2015 13:59:55 -0300 Subject: move leap certs initialization to the certs module --- service/pixelated/bitmask_libraries/certs.py | 9 +++++++++ service/pixelated/config/leap.py | 13 ++----------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'service') diff --git a/service/pixelated/bitmask_libraries/certs.py b/service/pixelated/bitmask_libraries/certs.py index a321e00e..3ca55469 100644 --- a/service/pixelated/bitmask_libraries/certs.py +++ b/service/pixelated/bitmask_libraries/certs.py @@ -25,6 +25,15 @@ LEAP_FINGERPRINT = None PACKAGED_CERTS_HOME = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "certificates")) +def init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint): + if leap_provider_cert_fingerprint is None: + LEAP_CERT = leap_provider_cert or True + LEAP_FINGERPRINT = None + else: + LEAP_FINGERPRINT = leap_provider_cert_fingerprint + LEAP_CERT = False + + def which_api_CA_bundle(provider): return str(LeapCertificate(provider).api_ca_bundle()) diff --git a/service/pixelated/config/leap.py b/service/pixelated/config/leap.py index f13a3fc7..0248a46f 100644 --- a/service/pixelated/config/leap.py +++ b/service/pixelated/config/leap.py @@ -2,7 +2,7 @@ from __future__ import absolute_import import random from pixelated.config import credentials from leap.common.events import server as events_server -import pixelated.bitmask_libraries.certs as certs +from pixelated.bitmask_libraries import certs from pixelated.bitmask_libraries.session import open_leap_session @@ -13,7 +13,7 @@ def initialize_leap(leap_provider_cert, leap_home): init_monkeypatches() provider, user, password = credentials.read(organization_mode, credentials_file) - init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint) + certs.init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint) events_server.ensure_server(random.randrange(8000, 11999)) leap_session = create_leap_session(provider, user, password, leap_home) leap_session.start_background_jobs() @@ -30,15 +30,6 @@ def create_leap_session(provider, username, password, leap_home): 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 - certs.LEAP_FINGERPRINT = None - else: - certs.LEAP_FINGERPRINT = leap_provider_cert_fingerprint - certs.LEAP_CERT = False - - def init_monkeypatches(): import pixelated.extensions.protobuf_socket import pixelated.extensions.sqlcipher_wal -- cgit v1.2.3