dos2unix

1 files changed, 111 insertions, 111 deletions

diff --git a/forum_modules/openidauth/consumer.py b/forum_modules/openidauth/consumer.py
index 17d1378f..68035968 100755
--- a/forum_modules/openidauth/consumer.py
+++ b/forum_modules/openidauth/consumer.py
@@ -1,112 +1,112 @@
-from django.utils.html import escape

-from django.http import get_host

-

-from forum.authentication.base import AuthenticationConsumer, InvalidAuthentication

-import settings

-

-from openid.yadis import xri

-from openid.consumer.consumer import Consumer, SUCCESS, CANCEL, FAILURE, SETUP_NEEDED

-from openid.consumer.discover import DiscoveryFailure

-from openid.extensions.sreg import SRegRequest, SRegResponse

-from openid.extensions.ax import FetchRequest as AXFetchRequest, AttrInfo, FetchResponse as AXFetchResponse

-from django.utils.translation import ugettext as _

-

-from store import OsqaOpenIDStore

-

-class OpenIdAbstractAuthConsumer(AuthenticationConsumer):

-

-    def get_user_url(self, request):

-        try:

-            return request.POST['openid_identifier']

-        except:

-            raise NotImplementedError()

-

-    def prepare_authentication_request(self, request, redirect_to):

-        if not redirect_to.startswith('http://') or redirect_to.startswith('https://'):

-		    redirect_to =  get_url_host(request) + redirect_to

-

-        user_url = self.get_user_url(request)

-

-        if xri.identifierScheme(user_url) == 'XRI' and getattr(

-            settings, 'OPENID_DISALLOW_INAMES', False

-        ):

-            raise InvalidAuthentication('i-names are not supported')

-

-        consumer = Consumer(request.session, OsqaOpenIDStore())

-

-        try:

-            auth_request = consumer.begin(user_url)

-        except DiscoveryFailure:

-            raise InvalidAuthentication(_('Sorry, but your input is not a valid OpenId'))

-

-        #sreg = getattr(settings, 'OPENID_SREG', False)

-

-        #if sreg:

-        #    s = SRegRequest()

-        #    for sarg in sreg:

-        #        if sarg.lower().lstrip() == "policy_url":

-        #            s.policy_url = sreg[sarg]

-        #        else:

-        #            for v in sreg[sarg].split(','):

-        #                s.requestField(field_name=v.lower().lstrip(), required=(sarg.lower().lstrip() == "required"))

-        #    auth_request.addExtension(s)

-

-        #auth_request.addExtension(SRegRequest(required=['email']))

-

-        if request.session.get('force_email_request', True):

-            axr = AXFetchRequest()

-            axr.add(AttrInfo("http://axschema.org/contact/email", 1, True, "email"))

-            auth_request.addExtension(axr)

-

-        trust_root = getattr(

-            settings, 'OPENID_TRUST_ROOT', get_url_host(request) + '/'

-        )

-

-

-        return auth_request.redirectURL(trust_root, redirect_to)

-

-    def process_authentication_request(self, request):

-        consumer = Consumer(request.session, OsqaOpenIDStore())

-

-        query_dict = dict([

-            (k.encode('utf8'), v.encode('utf8')) for k, v in request.GET.items()

-        ])

-

-        #for i in query_dict.items():

-        #    print "%s : %s" % i

-

-        url = get_url_host(request) + request.path

-        openid_response = consumer.complete(query_dict, url)

-

-        if openid_response.status == SUCCESS:

-            if request.session.get('force_email_request', True):

-                try:

-                    ax = AXFetchResponse.fromSuccessResponse(openid_response)

-                    email = ax.getExtensionArgs()['value.ext0.1']

-                    request.session['auth_email_request'] = email

-                except Exception, e:

-                    pass

-

-            return request.GET['openid.identity']

-        elif openid_response.status == CANCEL:

-            raise InvalidAuthentication(_('The OpenId authentication request was canceled'))

-        elif openid_response.status == FAILURE:

-            raise InvalidAuthentication(_('The OpenId authentication failed: ') + openid_response.message)

-        elif openid_response.status == SETUP_NEEDED:

-            raise InvalidAuthentication(_('Setup needed'))

-        else:

-            raise InvalidAuthentication(_('The OpenId authentication failed with an unknown status: ') + openid_response.status)

-

-    def get_user_data(self, key):

-        return {}

-

-def get_url_host(request):

-    if request.is_secure():

-        protocol = 'https'

-    else:

-        protocol = 'http'

-    host = escape(get_host(request))

-    return '%s://%s' % (protocol, host)

-

-def get_full_url(request):

+from django.utils.html import escape
+from django.http import get_host
+
+from forum.authentication.base import AuthenticationConsumer, InvalidAuthentication
+import settings
+
+from openid.yadis import xri
+from openid.consumer.consumer import Consumer, SUCCESS, CANCEL, FAILURE, SETUP_NEEDED
+from openid.consumer.discover import DiscoveryFailure
+from openid.extensions.sreg import SRegRequest, SRegResponse
+from openid.extensions.ax import FetchRequest as AXFetchRequest, AttrInfo, FetchResponse as AXFetchResponse
+from django.utils.translation import ugettext as _
+
+from store import OsqaOpenIDStore
+
+class OpenIdAbstractAuthConsumer(AuthenticationConsumer):
+
+    def get_user_url(self, request):
+        try:
+            return request.POST['openid_identifier']
+        except:
+            raise NotImplementedError()
+
+    def prepare_authentication_request(self, request, redirect_to):
+        if not redirect_to.startswith('http://') or redirect_to.startswith('https://'):
+		    redirect_to =  get_url_host(request) + redirect_to
+
+        user_url = self.get_user_url(request)
+
+        if xri.identifierScheme(user_url) == 'XRI' and getattr(
+            settings, 'OPENID_DISALLOW_INAMES', False
+        ):
+            raise InvalidAuthentication('i-names are not supported')
+
+        consumer = Consumer(request.session, OsqaOpenIDStore())
+
+        try:
+            auth_request = consumer.begin(user_url)
+        except DiscoveryFailure:
+            raise InvalidAuthentication(_('Sorry, but your input is not a valid OpenId'))
+
+        #sreg = getattr(settings, 'OPENID_SREG', False)
+
+        #if sreg:
+        #    s = SRegRequest()
+        #    for sarg in sreg:
+        #        if sarg.lower().lstrip() == "policy_url":
+        #            s.policy_url = sreg[sarg]
+        #        else:
+        #            for v in sreg[sarg].split(','):
+        #                s.requestField(field_name=v.lower().lstrip(), required=(sarg.lower().lstrip() == "required"))
+        #    auth_request.addExtension(s)
+
+        #auth_request.addExtension(SRegRequest(required=['email']))
+
+        if request.session.get('force_email_request', True):
+            axr = AXFetchRequest()
+            axr.add(AttrInfo("http://axschema.org/contact/email", 1, True, "email"))
+            auth_request.addExtension(axr)
+
+        trust_root = getattr(
+            settings, 'OPENID_TRUST_ROOT', get_url_host(request) + '/'
+        )
+
+
+        return auth_request.redirectURL(trust_root, redirect_to)
+
+    def process_authentication_request(self, request):
+        consumer = Consumer(request.session, OsqaOpenIDStore())
+
+        query_dict = dict([
+            (k.encode('utf8'), v.encode('utf8')) for k, v in request.GET.items()
+        ])
+
+        #for i in query_dict.items():
+        #    print "%s : %s" % i
+
+        url = get_url_host(request) + request.path
+        openid_response = consumer.complete(query_dict, url)
+
+        if openid_response.status == SUCCESS:
+            if request.session.get('force_email_request', True):
+                try:
+                    ax = AXFetchResponse.fromSuccessResponse(openid_response)
+                    email = ax.getExtensionArgs()['value.ext0.1']
+                    request.session['auth_email_request'] = email
+                except Exception, e:
+                    pass
+
+            return request.GET['openid.identity']
+        elif openid_response.status == CANCEL:
+            raise InvalidAuthentication(_('The OpenId authentication request was canceled'))
+        elif openid_response.status == FAILURE:
+            raise InvalidAuthentication(_('The OpenId authentication failed: ') + openid_response.message)
+        elif openid_response.status == SETUP_NEEDED:
+            raise InvalidAuthentication(_('Setup needed'))
+        else:
+            raise InvalidAuthentication(_('The OpenId authentication failed with an unknown status: ') + openid_response.status)
+
+    def get_user_data(self, key):
+        return {}
+
+def get_url_host(request):
+    if request.is_secure():
+        protocol = 'https'
+    else:
+        protocol = 'http'
+    host = escape(get_host(request))
+    return '%s://%s' % (protocol, host)
+
+def get_full_url(request):
     return get_url_host(request) + request.get_full_path()
\ No newline at end of file