added the proper prepending of the helios prefix

benadida · Jan 6, 2009 · a515c97 · a515c97
1 parent f69cc7f
commit a515c97
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/base/session.py b/base/session.py
@@ -36,12 +36,7 @@ def get_api_client():
   # verify the OAuth request
   request = cherrypy.request
 
-  if request.META.has_key('SCRIPT_NAME'):
-    full_url = request.META['SCRIPT_NAME'] + request.path_info
-  else:
-    full_url = request.path_info
-
-  oauth_request = oauth.OAuthRequest.from_request(request.method, full_url, headers= request.headers,
+  oauth_request = oauth.OAuthRequest.from_request(request.method, request.path_info, headers= request.headers,
                                                   parameters=request.params, query_string=None)
 
   if not oauth_request:

diff --git a/helios/security.py b/helios/security.py
@@ -54,7 +54,13 @@ def lookup_nonce(self, oauth_consumer, oauth_token, nonce):
 def get_api_client(request):
   parameters = request.POST.copy()
   parameters.update(request.GET)
-  oauth_request = oauth.OAuthRequest.from_request(request.method, request.path_info, headers= request.META,
+
+  if request.META.has_key('SCRIPT_NAME'):
+    full_url = request.META['SCRIPT_NAME'] + request.path_info
+  else:
+    full_url = request.path_info
+
+  oauth_request = oauth.OAuthRequest.from_request(request.method, full_url, headers= request.META,
                                                   parameters=parameters, query_string=None)
 
   if not oauth_request: