leap_home to be user home and reading certs (self signed) from within project

4 files changed, 8 insertions, 5 deletions

diff --git a/service/app/adapter/mail_service.py b/service/app/adapter/mail_service.py
index 1d6710af..0704f0bb 100644
--- a/service/app/adapter/mail_service.py
+++ b/service/app/adapter/mail_service.py
@@ -18,7 +18,7 @@ class MailService:
             self.password = 'testpassword'
             self.server_name = 'example.wazokazi.is'
             self.mailbox_name = 'INBOX'
-            self.leapdir = os.path.join(os.path.abspath("."), "leap")
+            self.certs_home = os.path.join(os.path.abspath("."), "leap")
             self.tags = Tags()
             self._open_leap_session()
         except:
@@ -26,7 +26,7 @@ class MailService:
             raise
 
     def _open_leap_session(self):
-        self.leap_config = LeapConfig(leap_home=self.leapdir)
+        self.leap_config = LeapConfig(certs_home=self.certs_home)
         self.provider = LeapProvider(self.server_name, self.leap_config)
         self.leap_session = LeapSessionFactory(self.provider).create(LeapCredentials(self.username, self.password))
         self.account = self.leap_session.account
diff --git a/service/app/bitmask_libraries/certs.py b/service/app/bitmask_libraries/certs.py
index a814ec82..22a95591 100644
--- a/service/app/bitmask_libraries/certs.py
+++ b/service/app/bitmask_libraries/certs.py
@@ -13,7 +13,7 @@ class LeapCertificate(object):
     def __init__(self, provider):
         self._config = provider.config
         self._server_name = provider.server_name
-        self._leap_home = self._config.leap_home
+        self._certs_home = self._config.certs_home
 
     def auto_detect_ca_bundle(self):
         if self._config.ca_cert_bundle == AUTO_DETECT_CA_BUNDLE:
@@ -26,7 +26,7 @@ class LeapCertificate(object):
             return self._config.ca_cert_bundle
 
     def _local_server_cert(self):
-        cert_file = os.path.join(self._leap_home, '%s.ca.crt' % self._server_name)
+        cert_file = os.path.join(self._certs_home, '%s.ca.crt' % self._server_name)
         if os.path.isfile(cert_file):
             return cert_file
         else:
diff --git a/service/app/bitmask_libraries/config.py b/service/app/bitmask_libraries/config.py
index 5baa7808..63524389 100644
--- a/service/app/bitmask_libraries/config.py
+++ b/service/app/bitmask_libraries/config.py
@@ -28,7 +28,7 @@ class LeapConfig(object):
 
     def __init__(self, leap_home=DEFAULT_LEAP_HOME, ca_cert_bundle=AUTO_DETECT_CA_BUNDLE, verify_ssl=True,
                  fetch_interval_in_s=30,
-                 timeout_in_s=15, start_background_jobs=True, gpg_binary=discover_gpg_binary()):
+                 timeout_in_s=15, start_background_jobs=True, gpg_binary=discover_gpg_binary(), certs_home=None):
         """
         Constructor.
 
@@ -58,6 +58,7 @@ class LeapConfig(object):
 
         """
         self.leap_home = leap_home
+        self.certs_home = certs_home
         self.ca_cert_bundle = ca_cert_bundle
         self.verify_ssl = verify_ssl
         self.timeout_in_s = timeout_in_s
diff --git a/service/stop b/service/stop
new file mode 100755
index 00000000..c4a8f11e
--- /dev/null
+++ b/service/stop
@@ -0,0 +1,2 @@
+#!/bin/bash
+pgrep -f 'python ./go' | xargs kill -9