proposal for improving the dont-verify-ssl hack

[myslice.git] / manifoldapi / manifoldapi.py

diff --git a/manifoldapi/manifoldapi.py b/manifoldapi/manifoldapi.py
index d2b8ae0..0fc4033 100644 (file)
--- a/manifoldapi/manifoldapi.py
+++ b/manifoldapi/manifoldapi.py
@@ -1,6 +1,4 @@
 # Manifold API Python interface
-from __future__ import print_function
-
 import copy
 import xmlrpclib
 import ssl
@@ -9,9 +7,10 @@ from django.contrib import messages
 from django.shortcuts import redirect
 
 from manifold.core.result_value import ResultValue
-
 from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException, truncate_result
 
+# from unfold.sessioncache import SessionCache
+
 from myslice.settings import config, logger
 
 class ManifoldAPI:
@@ -28,11 +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 
@@ -47,12 +45,12 @@ class ManifoldAPI:
             start = time.time()
             
             # the message to display
-            auth_message = "<AuthMethod not set in {}>".format(auth) if 'AuthMethod' not in self.auth \
+            auth_message = "<AuthMethod not set in {}>".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 {}"\
+            end_message = "MANIFOLD <- {}( {}( {} ) ) with auth={} to {}"\
                           .format(methodName,
                                   args[0]['action'] or '', 
                                   args[0]['object'] or '',
@@ -66,9 +64,9 @@ class ManifoldAPI:
                 return ResultValue(**result)
 
             except Exception as error:
-                print("===== xmlrpc catch-all exception:", error)
+                logger.error("===== xmlrpc catch-all exception: {}".format(error))
                 import traceback
-                traceback.print_exc(limit=3)
+                logger.error(traceback.format_exc(limit=3))
                 
                 if "Connection refused" in error:
                     raise ManifoldException ( ManifoldResult (code=ManifoldCode.SERVER_UNREACHABLE,
@@ -86,21 +84,22 @@ def _execute_query(request, query, manifold_api_session_auth):
     
     manifold_api = ManifoldAPI(auth = manifold_api_session_auth)
     
-    logger.debug("MANIFOLD QUERY : {}".format(" ".join(str(query).split())))
-    #logger.debug("MANIFOLD DICT : {}".format(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: {}'.format(result)
     
     if result['code'] == 1:
-        log.warning("MANIFOLD : {}".format(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}
@@ -108,14 +107,19 @@ 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):