X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a9eef437702d5df7a2f97010e6798c689371808c..15eabbf86190e4bc8ae9dc747d853b0300976b12:/forum_modules/facebookauth/authentication.py

diff --git a/forum_modules/facebookauth/authentication.py b/forum_modules/facebookauth/authentication.py
old mode 100755
new mode 100644
index f2c5b6b..308c18c
--- a/forum_modules/facebookauth/authentication.py
+++ b/forum_modules/facebookauth/authentication.py
@@ -1,85 +1,64 @@
-import hashlib
-from time import time
-from datetime import datetime
-from urllib import urlopen,  urlencode
-from forum.authentication.base import AuthenticationConsumer, ConsumerTemplateContext, InvalidAuthentication
-from django.utils.translation import ugettext as _
-
-import settings
-
-try:
-    from json import load as load_json
-except:
-    from django.utils.simplejson import JSONDecoder
-
-    def load_json(json):
-        decoder = JSONDecoder()
-        return decoder.decode(json.read())
-
-class FacebookAuthConsumer(AuthenticationConsumer):
-    
-    def process_authentication_request(self, request):
-        API_KEY = settings.FB_API_KEY
-
-        if API_KEY in request.COOKIES:
-            if self.check_cookies_signature(request.COOKIES):
-                if self.check_session_expiry(request.COOKIES):
-                    return request.COOKIES[API_KEY + '_user']
-                else:
-                    raise InvalidAuthentication(_('Sorry, your Facebook session has expired, please try again'))
-            else:
-                raise InvalidAuthentication(_('The authentication with Facebook connect failed due to an invalid signature'))
-        else:
-            raise InvalidAuthentication(_('The authentication with Facebook connect failed, cannot find authentication tokens'))
-
-    def generate_signature(self, values):
-        keys = []
-
-        for key in sorted(values.keys()):
-            keys.append(key)
-
-        signature = ''.join(['%s=%s' % (key,  values[key]) for key in keys]) + settings.FB_APP_SECRET
-        return hashlib.md5(signature).hexdigest()
-
-    def check_session_expiry(self, cookies):
-        return datetime.fromtimestamp(float(cookies[settings.FB_API_KEY+'_expires'])) > datetime.now()
-
-    def check_cookies_signature(self, cookies):
-        API_KEY = settings.FB_API_KEY
-
-        values = {}
-
-        for key in cookies.keys():
-            if (key.startswith(API_KEY + '_')):
-                values[key.replace(API_KEY + '_',  '')] = cookies[key]
-
-        return self.generate_signature(values) == cookies[API_KEY]
-
-    def get_user_data(self, key):
-        request_data = {
-            'method': 'Users.getInfo',
-            'api_key': settings.FB_API_KEY,
-            'call_id': time(),
-            'v': '1.0',
-            'uids': key,
-            'fields': 'name,first_name,last_name,email',
-            'format': 'json',
-        }
-
-        request_data['sig'] = self.generate_signature(request_data)
-        fb_response = load_json(urlopen(settings.REST_SERVER, urlencode(request_data)))[0]
-
-        return {
-            'username': fb_response['first_name'] + ' ' + fb_response['last_name'],
-            'email': fb_response['email']
-        }
-
-class FacebookAuthContext(ConsumerTemplateContext):
-    mode = 'BIGICON'
-    type = 'CUSTOM'
-    weight = 100
-    human_name = 'Facebook'
-    code_template = 'modules/facebookauth/button.html'
-    extra_css = ["http://www.facebook.com/css/connect/connect_button.css"]
-
+import hashlib
+from time import time
+from datetime import datetime
+from urllib import urlopen,  urlencode
+from urlparse import parse_qs
+from forum.authentication.base import AuthenticationConsumer, ConsumerTemplateContext, InvalidAuthentication
+from django.utils.translation import ugettext as _
+from django.utils.encoding import smart_unicode
+
+import settings
+
+try:
+    from json import load as load_json
+except:
+    from django.utils.simplejson import JSONDecoder
+
+    def load_json(json):
+        decoder = JSONDecoder()
+        return decoder.decode(json.read())
+
+class FacebookAuthConsumer(AuthenticationConsumer):
+    
+    def process_authentication_request(self, request):
+        API_KEY = str(settings.FB_API_KEY)
+
+        # Check if the Facebook cookie has been received.
+        if 'fbs_%s' % API_KEY in request.COOKIES:
+            fbs_cookie = request.COOKIES['fbs_%s' % API_KEY]
+            parsed_fbs = parse_qs(smart_unicode(fbs_cookie))
+            self.parsed_fbs = parsed_fbs
+
+            # Check if the session hasn't expired.
+            if self.check_session_expiry(request.COOKIES):
+                return parsed_fbs['uid'][0]
+            else:
+                raise InvalidAuthentication(_('Sorry, your Facebook session has expired, please try again'))
+        else:
+            raise InvalidAuthentication(_('The authentication with Facebook connect failed, cannot find authentication tokens'))
+    def check_session_expiry(self, cookies):
+        return datetime.fromtimestamp(float(self.parsed_fbs['expires'][0])) > datetime.now()
+
+    def get_user_data(self, cookies):
+        API_KEY = str(settings.FB_API_KEY)
+        fbs_cookie = cookies['fbs_%s' % API_KEY]
+        parsed_fbs = parse_qs(smart_unicode(fbs_cookie))
+
+        # Communicate with the access token to the Facebook oauth interface.
+        json = load_json(urlopen('https://graph.facebook.com/me?access_token=%s' % parsed_fbs['access_token'][0]))
+
+        # Return the user data.
+        return {
+            'username': '%s %s' % (smart_unicode(json['first_name']), smart_unicode(json['last_name'])),
+            'email': smart_unicode(json['email']),
+        }
+
+class FacebookAuthContext(ConsumerTemplateContext):
+    mode = 'BIGICON'
+    type = 'CUSTOM'
+    weight = 100
+    human_name = 'Facebook'
+    code_template = 'modules/facebookauth/button.html'
+    extra_css = ["http://www.facebook.com/css/connect/connect_button.css"]
+
     API_KEY = settings.FB_API_KEY
\ No newline at end of file