X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=debd1f7a5cf7fe5c9f3ab298ee8c281a72b5726a;hp=3b3ba0fb9ddfa29684383d7b1213a8df07f84fb1;hb=a52c3773de8611def256d97dd699ba09d390b8fd;hpb=b709866ba93d98c32127ff4deae5b783e271e5b3

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index 3b3ba0fb..debd1f7a 100644
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -1,22 +1,33 @@
 import json
+import os.path
+
 # this is for django objects only
 #from django.core import serializers
-from django.http import HttpResponse, HttpResponseForbidden
+from django.http                import HttpResponse, HttpResponseForbidden
+
+#from manifold.manifoldquery import ManifoldQuery
+from manifold.core.query        import Query
+from manifold.core.result_value import ResultValue
+from manifold.manifoldapi       import ManifoldAPI
+from manifold.manifoldresult    import ManifoldException
+from manifold.util.log          import Log
+from myslice.config             import Config
 
-from manifold.manifoldquery import ManifoldQuery
-from manifold.manifoldapi import ManifoldAPI
+debug=False
+#debug=True
 
-# add artificial delay in s
-debug_spin=0
-#debug_spin=1
+# pretend the server only returns - empty lists to 'get' requests - this is to mimick 
+# misconfigurations or expired credentials or similar corner case situations
+debug_empty=False
+#debug_empty=True
 
 # this view is what the javascript talks to when it sends a query
 # see also
 # myslice/urls.py
 # as well as 
-# static/js/manifold-async.js
-def api (request,format):
-    """the view associated with /manifold/api/ 
+# static/js/manifold.js
+def proxy (request,format):
+    """the view associated with /manifold/proxy/ 
 with the query passed using POST"""
     
     # expecting a POST
@@ -28,23 +39,49 @@ with the query passed using POST"""
     # format_in : how is the query encoded in POST
     # format_out: how to serve the results
     if format != 'json':
-        print "manifoldproxy.api: unexpected format %s -- exiting"%format
+        print "manifoldproxy.proxy: unexpected format %s -- exiting"%format
         return
     try:
         # translate incoming POST request into a query object
-        manifold_query = ManifoldQuery()
-        manifold_query.fill_from_dict(request.POST)
+        if debug: print 'manifoldproxy.proxy: request.POST',request.POST
+        manifold_query = Query()
+        #manifold_query = ManifoldQuery()
+        manifold_query.fill_from_POST(request.POST)
         # retrieve session for request
-        manifold_api_session_auth = request.session['manifold']['auth']
+
+        # We allow some requests to use the ADMIN user account
+        if (manifold_query.get_from() == 'local:user' and manifold_query.get_action() == 'create') \
+                or (manifold_query.get_from() == 'local:platform' and manifold_query.get_action() == 'get'):
+            admin_user, admin_password = Config().manifold_admin_user_password()
+            manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
+        else:
+            print request.session['manifold']
+            manifold_api_session_auth = request.session['manifold']['auth']
+
+        if debug_empty and manifold_query.action.lower()=='get':
+            json_answer=json.dumps({'code':0,'value':[]})
+            print "By-passing : debug_empty & 'get' request : returning a fake empty list"
+            return HttpResponse (json_answer, mimetype="application/json")
+                
         # actually forward
         manifold_api= ManifoldAPI(auth=manifold_api_session_auth)
-        answer=manifold_api.send_manifold_query (manifold_query)
-        if debug_spin:
-            import time
-            time.sleep(debug_spin)
-        # return json-encoded answer
-        return HttpResponse (json.dumps(answer), mimetype="application/json")
-    except:
+        if debug: print '===> manifoldproxy.proxy: sending to backend', manifold_query
+        # for the benefit of the python code, manifoldAPI raises an exception if something is wrong
+        # however in this case we want to propagate the complete manifold result to the js world
+
+        result = manifold_api.forward(manifold_query.to_dict())
+
+        # XXX TEMP HACK
+        if 'description' in result and result['description'] \
+                and isinstance(result['description'], (tuple, list, set, frozenset)):
+            result [ 'description' ] = [ ResultValue.to_html (x) for x in result['description'] ]
+
+        json_answer=json.dumps(result)
+
+        return HttpResponse (json_answer, mimetype="application/json")
+
+    except Exception,e:
+        print "** PROXY ERROR **",e
         import traceback
         traceback.print_exc()