IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

rpcserver: Consolidate __call__ in xmlclient and jsonclient_kerb

Browse Source 
The two classes had very similar __call__ methods, but the JSON
server lacked error handling.

Create a common class for the __call__ method.

https://fedorahosted.org/freeipa/ticket/4069
This commit is contained in:
Petr Viktorin 2013-12-10 17:36:32 +01:00
parent b7f1531262
commit 6a2b70946f
1 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
ipaserver/rpcserver.py
View File

@ -596,42 +596,39 @@ class KerberosSession(object):
return [''] return ['']
class xmlserver(WSGIExecutioner, HTTP_Status, KerberosSession): class KerberosWSGIExecutioner(WSGIExecutioner, HTTP_Status, KerberosSession):
"""Base class for xmlserver and jsonserver_kerb
""" """
Execution backend plugin for XML-RPC server.
Also see the `ipalib.rpc.xmlclient` plugin.
"""
content_type = 'text/xml'
key = '/xml'
def _on_finalize(self): def _on_finalize(self):
self.__system = { super(KerberosWSGIExecutioner, self)._on_finalize()
'system.listMethods': self.listMethods,
'system.methodSignature': self.methodSignature,
'system.methodHelp': self.methodHelp,
}
super(xmlserver, self)._on_finalize()
self.kerb_session_on_finalize() self.kerb_session_on_finalize()
def __call__(self, environ, start_response): def __call__(self, environ, start_response):
''' self.debug('KerberosWSGIExecutioner.__call__:')
'''
self.debug('WSGI xmlserver.__call__:')
user_ccache=environ.get('KRB5CCNAME') user_ccache=environ.get('KRB5CCNAME')
headers = [('Content-Type', 'text/xml; charset=utf-8')]
headers = [('Content-Type', '%s; charset=utf-8' % self.content_type)]
if user_ccache is None: if user_ccache is None:
self.internal_error(environ, start_response,
'xmlserver.__call__: KRB5CCNAME not defined in HTTP request environment') status = HTTP_STATUS_SERVER_ERROR
response_headers = [('Content-Type', 'text/html; charset=utf-8')]
self.log.error(
'%s: %s', status,
'KerberosWSGIExecutioner.__call__: '
'KRB5CCNAME not defined in HTTP request environment')
return self.marshal(None, CCacheError()) return self.marshal(None, CCacheError())
try: try:
self.create_context(ccache=user_ccache) self.create_context(ccache=user_ccache)
response = super(xmlserver, self).__call__(environ, start_response) response = super(KerberosWSGIExecutioner, self).__call__(
if getattr(context, 'session_data', None) is None and \ environ, start_response)
self.env.context != 'lite': session_data = getattr(context, 'session_data', None)
self.finalize_kerberos_acquisition('xmlserver', user_ccache, environ, start_response, headers) if (session_data is None and self.env.context != 'lite'):
self.finalize_kerberos_acquisition(
'xmlserver', user_ccache, environ, start_response, headers)
except PublicError, e: except PublicError, e:
status = HTTP_STATUS_SUCCESS status = HTTP_STATUS_SUCCESS
response = status response = status
@ -641,6 +638,17 @@ class xmlserver(WSGIExecutioner, HTTP_Status, KerberosSession):
destroy_context() destroy_context()
return response return response
class xmlserver(KerberosWSGIExecutioner):
"""
Execution backend plugin for XML-RPC server.
Also see the `ipalib.rpc.xmlclient` plugin.
"""
content_type = 'text/xml'
key = '/xml'
def listMethods(self, *params): def listMethods(self, *params):
return tuple(name.decode('UTF-8') for name in self.Command) return tuple(name.decode('UTF-8') for name in self.Command)
@ -769,41 +777,13 @@ class jsonserver_session(jsonserver, KerberosSession):
return response return response
class jsonserver_kerb(jsonserver, KerberosSession): class jsonserver_kerb(jsonserver, KerberosWSGIExecutioner):
""" """
JSON RPC server protected with kerberos auth. JSON RPC server protected with kerberos auth.
""" """
key = '/json' key = '/json'
def _on_finalize(self):
super(jsonserver_kerb, self)._on_finalize()
self.kerb_session_on_finalize()
def __call__(self, environ, start_response):
'''
'''
self.debug('WSGI jsonserver_kerb.__call__:')
user_ccache=environ.get('KRB5CCNAME')
if user_ccache is None:
self.internal_error(environ, start_response,
'jsonserver_kerb.__call__: KRB5CCNAME not defined in HTTP request environment')
return self.marshal(None, CCacheError())
self.create_context(ccache=user_ccache)
try:
response = super(jsonserver_kerb, self).__call__(environ, start_response)
if (getattr(context, 'session_data', None) is None and
self.env.context != 'lite'):
self.finalize_kerberos_acquisition('jsonserver', user_ccache,
environ, start_response)
finally:
destroy_context()
return response
class login_kerberos(Backend, KerberosSession, HTTP_Status): class login_kerberos(Backend, KerberosSession, HTTP_Status):
key = '/session/login_kerberos' key = '/session/login_kerberos'