jcholast's pull request #44: "rpcserver: fix crash in XML-RPC system commands" was opened
PR body: """ Fix an AttributeError in XML-RPC methodSignature and methodHelp commands caused by incorrect mangled name usage. https://fedorahosted.org/freeipa/ticket/6217 """ See the full pull-request at https://github.com/freeipa/freeipa/pull/44 ... or pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/44/head:pr44 git checkout pr44
From bb4a0bd9b76b003a33f9c1136cc595e9b2923c07 Mon Sep 17 00:00:00 2001 From: Jan Cholasta <jchol...@redhat.com> Date: Thu, 1 Sep 2016 09:59:37 +0200 Subject: [PATCH] rpcserver: fix crash in XML-RPC system commands Fix an AttributeError in XML-RPC methodSignature and methodHelp commands caused by incorrect mangled name usage. https://fedorahosted.org/freeipa/ticket/6217 --- ipaserver/rpcserver.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index dd446ae..f1d5a40 100644 --- a/ipaserver/rpcserver.py +++ b/ipaserver/rpcserver.py @@ -311,7 +311,7 @@ def _on_finalize(self): if 'wsgi_dispatch' in self.api.Backend: self.api.Backend.wsgi_dispatch.mount(self, self.key) - def __get_command(self, name): + def _get_command(self, name): try: # assume version 1 for unversioned command calls command = self.api.Command[name, '1'] @@ -362,7 +362,7 @@ def wsgi_execute(self, environ): if name in self._system_commands: result = self._system_commands[name](self, *args, **options) else: - command = self.__get_command(name) + command = self._get_command(name) result = command(*args, **options) except PublicError as e: if self.api.env.debug: @@ -713,7 +713,7 @@ def methodSignature(self, *params): # for now let's not go out of our way to document standard XML-RPC return u'undef' else: - self.__get_command(method_name) + self._get_command(method_name) # All IPA commands return a dict (struct), # and take a params, options - list and dict (array, struct) @@ -725,7 +725,7 @@ def methodHelp(self, *params): if method_name in self._system_commands: return u'' else: - command = self.__get_command(method_name) + command = self._get_command(method_name) return unicode(command.doc or '') _system_commands = {
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
