erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: security limit in menus

Browse source
This commit is contained in:
Goffi 2014-02-04 18:32:39 +01:00
commit aad6251058
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/sat_main.py
View file

@ -893,7 +893,7 @@ class SAT(service.Service):
/!\ use D_() instead of _() for translations (e.g. (D_("File"), D_("Open")))
@param callback: method to be called when menuitem is selected, callable or a callback id (string) as returned by [registerCallback]
@param security_limit: %(doc_security_limit)s
/!\ security_limit MUST be added to data in launchCallback if used
/!\ security_limit MUST be added to data in launchCallback if used #TODO
@param help_string: string used to indicate what the menu do (can be show as a tooltip).
/!\ use D_() instead of _() for translations
@param type: one of:
@ -932,7 +932,7 @@ class SAT(service.Service):
return callback_id
def getMenus(self, language='', security_limit = NO_SECURITY_LIMIT):
def getMenus(self, language='', security_limit=NO_SECURITY_LIMIT):
"""Return all menus registered
@param language: language used for translation, or empty string for default
@param security_limit: %(doc_security_limit)s
@ -947,6 +947,9 @@ class SAT(service.Service):
for menu_id, menu_data in self._menus.iteritems():
type_ = menu_data['type']
path = menu_data['path']
menu_security_limit = menu_data['security_limit']
if security_limit!=NO_SECURITY_LIMIT and (menu_security_limit==NO_SECURITY_LIMIT or menu_security_limit>security_limit):
continue
languageSwitch(language)
path_i18n = [_(elt) for elt in path]
languageSwitch()

2
src/plugins/plugin_xep_0050.py
View file

@ -212,7 +212,7 @@ class XEP_0050(object):
method=self._requestCommandsList,
async=True)
self.__requesting_id = host.registerCallback(self._requestingEntity, with_data=True)
host.importMenu((D_("Service"), D_("commands")), self._commandsMenu, help_string=D_("Execute ad-hoc commands"))
host.importMenu((D_("Service"), D_("commands")), self._commandsMenu, security_limit=4, help_string=D_("Execute ad-hoc commands"))
def getHandler(self, profile):
return XEP_0050_handler(self)

2
src/plugins/plugin_xep_0055.py
View file

@ -53,7 +53,7 @@ class XEP_0055(object):
self._sessions = Sessions()
self.__menu_cb_id = host.registerCallback(self._menuCb, with_data=True)
self.__search_request_id = host.registerCallback(self._xmluiSearchRequest, with_data=True)
host.importMenu((D_("Communication"), D_("Search directory")), self._searchMenu, help_string=D_("Search use directory"))
host.importMenu((D_("Communication"), D_("Search directory")), self._searchMenu, security_limit=1, help_string=D_("Search use directory"))
def _menuCb(self, data, profile):
entity = jid.JID(data[xml_tools.SAT_FORM_PREFIX+'jid'])

2
src/plugins/plugin_xep_0100.py
View file

@ -62,7 +62,7 @@ class XEP_0100(object):
host.bridge.addMethod("gatewayRegister", ".plugin", in_sign='ss', out_sign='s', method=self._gatewayRegister)
self.__menu_id = host.registerCallback(self._gatewaysMenu, with_data=True)
self.__selected_id = host.registerCallback(self._gatewaySelectedCb, with_data=True)
host.importMenu((D_("Service"), D_("gateways")), self._gatewaysMenu, help_string=D_("Find gateways"))
host.importMenu((D_("Service"), D_("gateways")), self._gatewaysMenu, security_limit=2, help_string=D_("Find gateways"))
def _gatewaysMenu(self, data, profile):