Update ssl

Allow to disable verification for self signed cert.
This commit is contained in:
angelblue05 2018-06-10 16:43:23 -05:00
parent 83ea76d7eb
commit bec267bfe4
2 changed files with 3 additions and 8 deletions

View file

@ -70,7 +70,6 @@ class UserClient(threading.Thread):
return True return True
except Exception as error: except Exception as error:
# Server connection failed # Server connection failed
log.error(error)
return False return False
@classmethod @classmethod
@ -80,11 +79,7 @@ class UserClient(threading.Thread):
True: Verify ssl True: Verify ssl
False: Don't verify connection False: Don't verify connection
""" """
certificate = settings('sslcert') return settings('sslverify') == "true"
if certificate != "None":
return certificate
return True if settings('sslverify') == "true" else False
def get_access(self): def get_access(self):

View file

@ -11,8 +11,8 @@
<!-- User settings --> <!-- User settings -->
<setting id="serverName" label="30001" type="text" default="" /> <setting id="serverName" label="30001" type="text" default="" />
<setting id="server" label="30000" type="text" default="" visible="!eq(-1,)" /> <setting id="server" label="30000" type="text" default="" visible="!eq(-1,)" />
<setting id="sslverify" label="30500" type="bool" default="false" visible="!eq(-1,)" subsetting="true" /> <setting id="sslverify" label="30500" type="bool" default="true" visible="!eq(-1,)" subsetting="true" />
<setting id="sslcert" label="30501" type="file" default="None" visible="eq(-1,true)" subsetting="true" /> <!--<setting id="sslcert" label="30501" type="file" default="None" visible="eq(-1,true)" subsetting="true" />==>
<setting id="accessToken" type="text" default="" visible="false" /> <setting id="accessToken" type="text" default="" visible="false" />
<setting id="userId" type="text" default="" visible="false" /> <setting id="userId" type="text" default="" visible="false" />
<!-- Device settings --> <!-- Device settings -->