X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifoldapi%2Fmanifoldapi.py;h=0fc403392bc24e279d928d4ba60db2653021b1cc;hb=b442e43f8880d48800717e6b33d3c79f23945a2d;hp=9a999910e604b3636e86d5df3b5aacfc5a5f86a8;hpb=8203b2f617faf5f0f36184952677fa1077172093;p=myslice.git diff --git a/manifoldapi/manifoldapi.py b/manifoldapi/manifoldapi.py index 9a999910..0fc40339 100644 --- a/manifoldapi/manifoldapi.py +++ b/manifoldapi/manifoldapi.py @@ -1,14 +1,17 @@ # Manifold API Python interface -import copy, xmlrpclib, ssl -from myslice.settings import config, logger, DEBUG +import copy +import xmlrpclib +import ssl from django.contrib import messages from django.shortcuts import redirect -from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException + from manifold.core.result_value import ResultValue +from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException, truncate_result + +# from unfold.sessioncache import SessionCache -debug_deep=False -#debug_deep=True +from myslice.settings import config, logger class ManifoldAPI: @@ -24,10 +27,10 @@ class ManifoldAPI: # Manifold uses a self signed certificate # https://www.python.org/dev/peps/pep-0476/ - if hasattr(ssl, '_create_unverified_context'): - self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True, context=ssl._create_unverified_context()) - else : - self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True) + try: turn_off_server_verify = { 'context' : ssl._create_unverified_context() } + except: turn_off_server_verify = {} + self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True, + **turn_off_server_verify) # xxx temporary code for scaffolding a ManifolResult on top of an API that does not expose error info # as of march 2013 we work with an API that essentially either returns the value, or raises @@ -39,52 +42,41 @@ class ManifoldAPI: def func(*args, **kwds): import time - start = time.time() + + # the message to display + auth_message = "".format(self.auth) if 'AuthMethod' not in self.auth \ + else "[session]" if self.auth['AuthMethod'] == 'session' \ + else "user:{}".format(self.auth['Username']) if self.auth['AuthMethod'] == 'password' \ + else "anonymous" if self.auth['AuthMethod'] == 'anonymous' \ + else "[???]" + "{}".format(self.auth) + end_message = "MANIFOLD <- {}( {}( {} ) ) with auth={} to {}"\ + .format(methodName, + args[0]['action'] or '', + args[0]['object'] or '', + auth_message, + self.url) try: - - #logger.debug("MANIFOLD %s( %s( %s ) ) to %s" % (methodName, args[0]['action'], args[0]['object'], self.url)) - - if ('Username' in self.auth) : - username = self.auth['Username'] - else : - username = "-" - args += ({ 'authentication': self.auth },) - result = getattr(self.server, methodName)(*args, **kwds) - - logger.debug("MANIFOLD %s( %s( %s ) ) as %s to %s executed in %s seconds -> %s" % - (methodName, - args[0]['action'] or '', - args[0]['object'] or '', - username, - self.url, - (time.time() - start), - args)) - + logger.debug("{} executed in {} seconds -> {}"\ + .format(end_message, time.time() - start, truncate_result(result))) return ResultValue(**result) - except Exception, error: - if True: - print "===== xmlrpc catch-all exception:", error - import traceback - traceback.print_exc(limit=3) + except Exception as error: + logger.error("===== xmlrpc catch-all exception: {}".format(error)) + import traceback + logger.error(traceback.format_exc(limit=3)) if "Connection refused" in error: raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE, - output="%s answered %s" % (self.url,error))) + output="{} answered {}".format(self.url, error))) # otherwise - logger.error("MANIFOLD %s( %s( %s ) ) as %s to %s executed in %s seconds -> %s" % - (methodName, - args[0]['action'] or '', - args[0]['object'] or '', - username, - self.url, - (time.time() - start), - args)) - logger.error("MANIFOLD %s", error) - raise ManifoldException ( ManifoldResult (code = ManifoldCode.SERVER_UNREACHABLE, output = "%s" % error) ) + logger.error("{} FAILED - executed in {} seconds"\ + .format(end_message, time.time() - start)) + logger.error("MANIFOLD {}".format(error)) + raise ManifoldException ( ManifoldResult (code = ManifoldCode.SERVER_UNREACHABLE, + output = "{}".format(error))) return func @@ -92,21 +84,22 @@ def _execute_query(request, query, manifold_api_session_auth): manifold_api = ManifoldAPI(auth = manifold_api_session_auth) - logger.debug("MANIFOLD QUERY : %s" % " ".join(str(query).split())) - #logger.debug("MANIFOLD DICT : %s" % query.to_dict()) + logger.debug("MANIFOLD -> QUERY : {}".format(" ".join(str(query).split()))) result = manifold_api.forward(query.to_dict()) if result['code'] == 2: # this is gross; at the very least we need to logout() # but most importantly there is a need to refine that test, since # code==2 does not necessarily mean an expired session # XXX only if we know it is the issue - del request.session['manifold'] + #SessionCache().end_session(request) # Flush django session + del request.session['manifold'] + request.session.flush() - #raise Exception, 'Error running query: %r' % result + #raise Exception, 'Error running query: {}'.format(result) if result['code'] == 1: - log.warning("MANIFOLD : %s" % result['description']) + logger.warning("MANIFOLD : {}".format(result['description'])) # XXX Handle errors #Error running query: {'origin': [0, 'XMLRPCAPI'], 'code': 2, 'description': 'No such session: No row was found for one()', 'traceback': 'Traceback (most recent call last):\n File "/usr/local/lib/python2.7/dist-packages/manifold/core/xmlrpc_api.py", line 68, in xmlrpc_forward\n user = Auth(auth).check()\n File "/usr/local/lib/python2.7/dist-packages/manifold/auth/__init__.py", line 245, in check\n return self.auth_method.check()\n File "/usr/local/lib/python2.7/dist-packages/manifold/auth/__init__.py", line 95, in check\n raise AuthenticationFailure, "No such session: %s" % e\nAuthenticationFailure: No such session: No row was found for one()\n', 'type': 2, 'ts': None, 'value': None} @@ -114,17 +107,25 @@ def _execute_query(request, query, manifold_api_session_auth): return result['value'] def execute_query(request, query): + + logger.debug("EXECUTE QUERY: request - {}".format(request.session.items())) + if not 'manifold' in request.session or not 'auth' in request.session['manifold']: + #manifold_api_session_auth = SessionCache().get_auth(request) + #if not manifold_api_session_auth: request.session.flush() #raise Exception, "User not authenticated" host = request.get_host() return redirect('/') manifold_api_session_auth = request.session['manifold']['auth'] - + return _execute_query(request, query, manifold_api_session_auth) def execute_admin_query(request, query): admin_user, admin_password = config.manifold_admin_user_password() + if not admin_user or not admin_password: + logger.error("""CONFIG: you need to setup admin_user and admin_password in myslice.ini +Some functions won't work properly until you do so""") admin_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password} return _execute_query(request, query, admin_auth)