oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Option to accept unknown certs

Browse source
This commit is contained in:
ZeroNet 2016-08-10 12:18:22 +02:00
parent d6fdf8af9c
commit c23c397764
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Ui/UiWebsocket.py
View file

@ -511,7 +511,7 @@ class UiWebsocket(object):
self.response(to, "ok") self.response(to, "ok")
# Select certificate for site # Select certificate for site
def actionCertSelect(self, to, accepted_domains=[]): def actionCertSelect(self, to, accepted_domains=[], accept_any=False):
accounts = [] accounts = []
accounts.append(["", "Unique to site", ""]) # Default option accounts.append(["", "Unique to site", ""]) # Default option
active = "" # Make it active if no other option found active = "" # Make it active if no other option found
@ -522,7 +522,7 @@ class UiWebsocket(object):
if auth_address == cert["auth_address"]: if auth_address == cert["auth_address"]:
active = domain active = domain
title = cert["auth_user_name"] + "@" + domain title = cert["auth_user_name"] + "@" + domain
if domain in accepted_domains or not accepted_domains: if domain in accepted_domains or not accepted_domains or accept_any:
accounts.append([domain, title, ""]) accounts.append([domain, title, ""])
else: else:
accounts.append([domain, title, "disabled"]) accounts.append([domain, title, "disabled"])
@ -607,6 +607,9 @@ class UiWebsocket(object):
self.response(to, "Updated") self.response(to, "Updated")
site = self.server.sites.get(address) site = self.server.sites.get(address)
if not site.settings["serving"]:
site.settings["serving"] = True
site.saveSettings()
if site and (site.address == self.site.address or "ADMIN" in self.site.settings["permissions"]): if site and (site.address == self.site.address or "ADMIN" in self.site.settings["permissions"]):
gevent.spawn(updateThread) gevent.spawn(updateThread)
else: else: