summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/config/baseconfig.py6
-rw-r--r--src/leap/services/eip/eipbootstrapper.py5
-rw-r--r--src/leap/services/eip/providerbootstrapper.py5
-rw-r--r--src/leap/util/request_helpers.py55
4 files changed, 64 insertions, 7 deletions
diff --git a/src/leap/config/baseconfig.py b/src/leap/config/baseconfig.py
index b6890d09..f04d8b35 100644
--- a/src/leap/config/baseconfig.py
+++ b/src/leap/config/baseconfig.py
@@ -107,7 +107,7 @@ class BaseConfig:
raise
return True
- def load(self, path="", data=None):
+ def load(self, path="", data=None, mtime=None):
"""
Loads the configuration from disk
@@ -127,9 +127,9 @@ class BaseConfig:
try:
if data is None:
- self._config_checker.load(fromfile=config_path)
+ self._config_checker.load(fromfile=config_path, mtime=mtime)
else:
- self._config_checker.load(data)
+ self._config_checker.load(data, mtime=mtime)
except Exception as e:
logger.warning("Something went wrong while loading " +
"the config from %s\n%s" % (config_path, e))
diff --git a/src/leap/services/eip/eipbootstrapper.py b/src/leap/services/eip/eipbootstrapper.py
index fdf54bbb..84a309cb 100644
--- a/src/leap/services/eip/eipbootstrapper.py
+++ b/src/leap/services/eip/eipbootstrapper.py
@@ -32,6 +32,7 @@ from leap.services.eip.eipconfig import EIPConfig
from leap.util.check import leap_assert, leap_assert_type
from leap.util.checkerthread import CheckerThread
from leap.util.files import check_and_fix_urw_only, get_mtime
+from leap.util.request_helpers import get_content
logger = logging.getLogger(__name__)
@@ -114,9 +115,9 @@ class EIPBootstrapper(QtCore.QObject):
if res.status_code == 304:
logger.debug("EIP definition has not been modified")
else:
- eip_definition = res.content
+ eip_definition, mtime = get_content(res)
- self._eip_config.load(data=eip_definition)
+ self._eip_config.load(data=eip_definition, mtime=mtime)
self._eip_config.save(["leap",
"providers",
self._provider_config.get_domain(),
diff --git a/src/leap/services/eip/providerbootstrapper.py b/src/leap/services/eip/providerbootstrapper.py
index f1a917f0..4fdd9b8d 100644
--- a/src/leap/services/eip/providerbootstrapper.py
+++ b/src/leap/services/eip/providerbootstrapper.py
@@ -32,6 +32,7 @@ from leap.config.providerconfig import ProviderConfig
from leap.util.check import leap_assert, leap_assert_type
from leap.util.checkerthread import CheckerThread
from leap.util.files import check_and_fix_urw_only, get_mtime
+from leap.util.request_helpers import get_content
logger = logging.getLogger(__name__)
@@ -172,10 +173,10 @@ class ProviderBootstrapper(QtCore.QObject):
if res.status_code == 304:
logger.debug("Provider definition has not been modified")
else:
- provider_definition = res.content
+ provider_definition, mtime = get_content(res)
provider_config = ProviderConfig()
- provider_config.load(data=provider_definition)
+ provider_config.load(data=provider_definition, mtime=mtime)
provider_config.save(["leap",
"providers",
self._domain,
diff --git a/src/leap/util/request_helpers.py b/src/leap/util/request_helpers.py
new file mode 100644
index 00000000..c5d0f3f5
--- /dev/null
+++ b/src/leap/util/request_helpers.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+# request_helpers.py
+# Copyright (C) 2013 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/>.
+
+"""
+Request helpers for backward compatible "parsing" of requests
+"""
+
+import json
+
+from dateutil import parser as dateparser
+
+
+def get_content(request):
+ """
+ Returns the content by trying to get it from the json
+ property/function or from content, in that order.
+ Also returns the mtime for that content if available
+
+ @param request: request as it is given by requests
+ @type request: Response
+
+ @rtype: tuple (contents, mtime)
+ """
+
+ contents = ""
+ mtime = None
+
+ if request.json:
+ if callable(request.json):
+ contents = json.dumps(request.json())
+ else:
+ contents = json.dumps(request.json)
+ else:
+ contents = request.content
+
+ mtime = None
+ last_modified = request.headers.get('last-modified', None)
+ if last_modified:
+ mtime = int(dateparser.parse(last_modified).strftime("%s"))
+
+ return contents, mtime