From cfc7122f07a3b16f2d9cb5421b739dae252604cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 6 Jun 2014 12:59:11 -0300
Subject: Improve how pinned providers are handled

---
 src/leap/bitmask/provider/pinned.py | 73 +++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 src/leap/bitmask/provider/pinned.py

(limited to 'src/leap/bitmask/provider/pinned.py')

diff --git a/src/leap/bitmask/provider/pinned.py b/src/leap/bitmask/provider/pinned.py
new file mode 100644
index 00000000..d9b74c3d
--- /dev/null
+++ b/src/leap/bitmask/provider/pinned.py
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+# pinned.py
+# Copyright (C) 2013-2014 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+Pinned Providers
+"""
+import logging
+
+from leap.bitmask.provider import pinned_demobitmask
+
+logger = logging.getLogger(__name__)
+
+
+class PinnedProviders(object):
+    """
+    Represents the providers that are pinned in Bitmask
+    """
+
+    CONFIG_KEY = "config"
+    CACERT_KEY = "cacert"
+
+    PROVIDERS = {
+        pinned_demobitmask.DOMAIN: {
+            CONFIG_KEY: pinned_demobitmask.PROVIDER_JSON,
+            CACERT_KEY: pinned_demobitmask.CACERT_PEM,
+        }
+    }
+
+    def __init__(self):
+        pass
+
+    @classmethod
+    def domains(self):
+        """
+        Return the domains that are pinned in here
+
+        :rtype: list of str
+        """
+        return self.PROVIDERS.keys()
+
+    @classmethod
+    def save_hardcoded(self, domain, provider_path, cacert_path):
+        """
+        Save the pinned content for provider.json and cacert.pem to
+        the specified paths
+
+        :param domain: domain of the pinned provider
+        :type domain: str
+        :param provider_path: path where the pinned provider.json will
+                              be saved
+        :type provider_path: str
+        :param cacert_path: path where the pinned cacert.pem will be
+                            saved
+        :type cacert_path: str
+        """
+        with open(provider_path, "w") as f:
+            f.write(self.PROVIDERS[domain][self.CONFIG_KEY])
+
+        with open(cacert_path, "w") as f:
+            f.write(self.PROVIDERS[domain][self.CACERT_KEY])
-- 
cgit v1.2.3


From 3406150b9e3e6bfce198f3b3a9716c510f3c7022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Thu, 19 Jun 2014 15:12:06 -0300
Subject: Pin Riseup

---
 src/leap/bitmask/provider/pinned.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/leap/bitmask/provider/pinned.py')

diff --git a/src/leap/bitmask/provider/pinned.py b/src/leap/bitmask/provider/pinned.py
index d9b74c3d..38851621 100644
--- a/src/leap/bitmask/provider/pinned.py
+++ b/src/leap/bitmask/provider/pinned.py
@@ -20,6 +20,7 @@ Pinned Providers
 import logging
 
 from leap.bitmask.provider import pinned_demobitmask
+from leap.bitmask.provider import pinned_riseup
 
 logger = logging.getLogger(__name__)
 
@@ -36,6 +37,10 @@ class PinnedProviders(object):
         pinned_demobitmask.DOMAIN: {
             CONFIG_KEY: pinned_demobitmask.PROVIDER_JSON,
             CACERT_KEY: pinned_demobitmask.CACERT_PEM,
+        },
+        pinned_riseup.DOMAIN: {
+            CONFIG_KEY: pinned_riseup.PROVIDER_JSON,
+            CACERT_KEY: pinned_riseup.CACERT_PEM,
         }
     }
 
-- 
cgit v1.2.3