Rev3735, certList admin command

This commit is contained in:
shortcutme 2018-11-30 15:56:20 +01:00
parent fe52cc7797
commit 5b50a113d1
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 16 additions and 2 deletions

View file

@ -13,7 +13,7 @@ class Config(object):
def __init__(self, argv):
self.version = "0.6.4"
self.rev = 3734
self.rev = 3735
self.argv = argv
self.action = None
self.pending_changes = {}

View file

@ -24,7 +24,7 @@ class UiWebsocket(object):
admin_commands = set([
"sitePause", "siteResume", "siteDelete", "siteList", "siteSetLimit", "siteAdd",
"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"])
@ -850,6 +850,20 @@ class UiWebsocket(object):
self.site.updateWebsocket(cert_changed=domain)
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
def actionSiteList(self, to, connecting_sites=False):
ret = []