Rev3735, certList admin command
This commit is contained in:
parent
fe52cc7797
commit
5b50a113d1
2 changed files with 16 additions and 2 deletions
|
@ -13,7 +13,7 @@ class Config(object):
|
||||||
|
|
||||||
def __init__(self, argv):
|
def __init__(self, argv):
|
||||||
self.version = "0.6.4"
|
self.version = "0.6.4"
|
||||||
self.rev = 3734
|
self.rev = 3735
|
||||||
self.argv = argv
|
self.argv = argv
|
||||||
self.action = None
|
self.action = None
|
||||||
self.pending_changes = {}
|
self.pending_changes = {}
|
||||||
|
|
|
@ -24,7 +24,7 @@ class UiWebsocket(object):
|
||||||
admin_commands = set([
|
admin_commands = set([
|
||||||
"sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "siteAdd",
|
"sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "siteAdd",
|
||||||
"channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "serverShowdirectory", "serverGetWrapperNonce",
|
"channelJoinAllsite", "serverUpdate", "serverPortcheck", "serverShutdown", "serverShowdirectory", "serverGetWrapperNonce",
|
||||||
"certSet", "configSet", "permissionAdd", "permissionRemove", "announcerStats", "userSetGlobalSettings"
|
"certSet", "certList", "configSet", "permissionAdd", "permissionRemove", "announcerStats", "userSetGlobalSettings"
|
||||||
])
|
])
|
||||||
async_commands = set(["fileGet", "fileList", "dirList", "fileNeed"])
|
async_commands = set(["fileGet", "fileList", "dirList", "fileNeed"])
|
||||||
|
|
||||||
|
@ -850,6 +850,20 @@ class UiWebsocket(object):
|
||||||
self.site.updateWebsocket(cert_changed=domain)
|
self.site.updateWebsocket(cert_changed=domain)
|
||||||
self.response(to, "ok")
|
self.response(to, "ok")
|
||||||
|
|
||||||
|
# List user1s certificates
|
||||||
|
def actionCertList(self, to):
|
||||||
|
back = []
|
||||||
|
auth_address = self.user.getAuthAddress(self.site.address)
|
||||||
|
for domain, cert in self.user.certs.items():
|
||||||
|
back.append({
|
||||||
|
"auth_address": cert["auth_address"],
|
||||||
|
"auth_type": cert["auth_type"],
|
||||||
|
"auth_user_name": cert["auth_user_name"],
|
||||||
|
"domain": domain,
|
||||||
|
"selected": cert["auth_address"] == auth_address
|
||||||
|
})
|
||||||
|
return back
|
||||||
|
|
||||||
# List all site info
|
# List all site info
|
||||||
def actionSiteList(self, to, connecting_sites=False):
|
def actionSiteList(self, to, connecting_sites=False):
|
||||||
ret = []
|
ret = []
|
||||||
|
|
Loading…
Reference in a new issue