Merge pull request #116 from anxdpanic/tw

allow user to force verification of ssl certificate
Kolifanes · Nov 21, 2016 · 8ec5a13 · 8ec5a13
2 parents 693b851 + d4390f1
commit 8ec5a13
Show file tree

Hide file tree

Showing 23 changed files with 96 additions and 2 deletions.
diff --git a/resources/language/Bulgarian/strings.po b/resources/language/Bulgarian/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Chinese (Traditional)/strings.po b/resources/language/Chinese (Traditional)/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Czech/strings.po b/resources/language/Czech/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Dutch/strings.po b/resources/language/Dutch/strings.po
@@ -586,3 +586,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
@@ -594,3 +594,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/French/strings.po b/resources/language/French/strings.po
@@ -586,3 +586,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Greek/strings.po b/resources/language/Greek/strings.po
@@ -592,3 +592,7 @@ msgstr "Αποτυχία"
 msgctxt "#30577"
 msgid "Settings"
 msgstr "Ρυθμίσεις"
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Hebrew/strings.po b/resources/language/Hebrew/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Hungarian/strings.po b/resources/language/Hungarian/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Korean/strings.po b/resources/language/Korean/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Norwegian/strings.po b/resources/language/Norwegian/strings.po
@@ -594,3 +594,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Polish/strings.po b/resources/language/Polish/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Portuguese (Brazil)/strings.po b/resources/language/Portuguese (Brazil)/strings.po
@@ -575,3 +575,7 @@ msgstr "Falhou"
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Portuguese/strings.po b/resources/language/Portuguese/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Romanian/strings.po b/resources/language/Romanian/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Russian/strings.po b/resources/language/Russian/strings.po
@@ -586,3 +586,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Slovak/strings.po b/resources/language/Slovak/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Spanish/strings.po b/resources/language/Spanish/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/language/Ukrainian/strings.po b/resources/language/Ukrainian/strings.po
@@ -577,3 +577,7 @@ msgstr ""
 msgctxt "#30577"
 msgid "Settings"
 msgstr ""
+
+msgctxt "#30578"
+msgid "Force SSL Certificate verification"
+msgstr ""
diff --git a/resources/lib/kodion/simple_requests/api.py b/resources/lib/kodion/simple_requests/api.py
@@ -7,6 +7,10 @@
 
 import json as real_json
 from ..utils import to_utf8
+from .. import Context as __Context
+
+__context = __Context()
+__settings = __context.get_settings()
 
 
 class ErrorHandler(urllib2.HTTPDefaultErrorHandler):
@@ -71,8 +75,13 @@ def _request(method, url,
     handlers = []
 
     import sys
+
+    _verify = __settings.get_bool('simple.requests.ssl.verify', False)
+    if _verify:
+        verify = _verify
+
     # starting with python 2.7.9 urllib verifies every https request
-    if False == verify and sys.version_info >= (2, 7, 9):
+    if verify is False and sys.version_info >= (2, 7, 9):
         import ssl
 
         ssl_context = ssl.create_default_context()
@@ -194,4 +203,4 @@ def delete(url, **kwargs):
 
 
 def head(url, **kwargs):
-    return _request('HEAD', url, **kwargs)
+    return _request('HEAD', url, **kwargs)
diff --git a/resources/settings.xml b/resources/settings.xml
@@ -40,6 +40,7 @@
     </category>
 
     <category label="30031">
+        <setting id="simple.requests.ssl.verify" type="bool" label="30578" default="false"/>
         <setting id="kodion.support.alternative_player" type="bool" label="30036" default="false"/>
         <setting id="youtube.view.description.show_channel_name" type="bool" label="30541" default="true"/>
         <setting type="sep" />