Explicitly allow only POST and GET requests

[astakos] / snf-astakos-app / astakos / im / target / shibboleth.py

diff --git a/snf-astakos-app/astakos/im/target/shibboleth.py b/snf-astakos-app/astakos/im/target/shibboleth.py
index 8b576fb..2f139d0 100644 (file)
--- a/snf-astakos-app/astakos/im/target/shibboleth.py
+++ b/snf-astakos-app/astakos/im/target/shibboleth.py
@@ -32,12 +32,18 @@
 # or implied, of GRNET S.A.
 
 from django.http import HttpResponseBadRequest
+from django.utils.translation import ugettext as _
+from django.contrib import messages
+from django.template import RequestContext
+from django.forms.models import inlineformset_factory
+from django.views.decorators.http import require_http_methods
 
-from astakos.im.util import get_or_create_user, prepare_response, get_context, get_invitation
+from astakos.im.util import prepare_response, get_context, get_invitation
 from astakos.im.views import requires_anonymous, render_response
 from astakos.im.settings import DEFAULT_USER_LEVEL
-from astakos.im.models import AstakosUser
-from astakos.im.forms import ThirdPartyUserCreationForm
+from astakos.im.models import AstakosUser, Invitation, AdditionalMail
+from astakos.im.forms import LoginForm
+from astakos.im.activation_backends import get_backend, SimpleBackend
 
 class Tokens:
     # these are mapped by the Shibboleth SP software
@@ -48,44 +54,55 @@ class Tokens:
     SHIB_DISPLAYNAME = "HTTP_SHIB_INETORGPERSON_DISPLAYNAME"
     SHIB_EP_AFFILIATION = "HTTP_SHIB_EP_AFFILIATION"
     SHIB_SESSION_ID = "HTTP_SHIB_SESSION_ID"
+    SHIB_MAIL = "HTTP_SHIB_MAIL"
 
+@require_http_methods(["GET", "POST"])
 @requires_anonymous
-def login(request,  backend=None, on_creation_template='im/signup_complete.html', extra_context={}):
-    #tokens = request.META
-    #
-    #try:
-    #    eppn = tokens[Tokens.SHIB_EPPN]
-    #except KeyError:
-    #    return HttpResponseBadRequest("Missing unique token in request")
-    #
-    #if Tokens.SHIB_DISPLAYNAME in tokens:
-    #    realname = tokens[Tokens.SHIB_DISPLAYNAME]
-    #elif Tokens.SHIB_CN in tokens:
-    #    realname = tokens[Tokens.SHIB_CN]
-    #elif Tokens.SHIB_NAME in tokens and Tokens.SHIB_SURNAME in tokens:
-    #    realname = tokens[Tokens.SHIB_NAME] + ' ' + tokens[Tokens.SHIB_SURNAME]
-    #else:
-    #    return HttpResponseBadRequest("Missing user name in request")
-    #
-    #affiliation = tokens.get(Tokens.SHIB_EP_AFFILIATION, '')
+def login(request,  backend=None, on_login_template='im/login.html', on_creation_template='im/third_party_registration.html', extra_context={}):
+    tokens = request.META
+    
+    try:
+        eppn = tokens[Tokens.SHIB_EPPN]
+    except KeyError:
+        return HttpResponseBadRequest("Missing unique token in request")
+    
+    if Tokens.SHIB_DISPLAYNAME in tokens:
+        realname = tokens[Tokens.SHIB_DISPLAYNAME]
+    elif Tokens.SHIB_CN in tokens:
+        realname = tokens[Tokens.SHIB_CN]
+    elif Tokens.SHIB_NAME in tokens and Tokens.SHIB_SURNAME in tokens:
+        realname = tokens[Tokens.SHIB_NAME] + ' ' + tokens[Tokens.SHIB_SURNAME]
+    else:
+        return HttpResponseBadRequest("Missing user name in request")
+    
+    affiliation = tokens.get(Tokens.SHIB_EP_AFFILIATION, '')
+    email = tokens.get(Tokens.SHIB_MAIL, None)
     
-    eppn, realname, affiliation = 'papagian', 'Sofia Papagiannaki', 'grnet'
     try:
         user = AstakosUser.objects.get(provider='shibboleth', third_party_identifier=eppn)
-        return prepare_response(request,
-                                user,
-                                request.GET.get('next'),
-                                'renew' in request.GET)
+        if user.is_active:
+            return prepare_response(request,
+                                    user,
+                                    request.GET.get('next'),
+                                    'renew' in request.GET)
+        else:
+            message = _('Inactive account')
+            messages.add_message(request, messages.ERROR, message)
+            return render_response(on_login_template,
+                                   login_form = LoginForm(request=request),
+                                   context_instance=RequestContext(request))
     except AstakosUser.DoesNotExist, e:
-        invitation = get_invitation(request)
         user = AstakosUser(third_party_identifier=eppn, realname=realname,
-                           affiliation=affiliation,
-                           provider='shibboleth')
-        if not invitation:
-            return render_response(on_creation_template,
-                                   thirdparty_signup_form = ThirdPartyUserCreationForm(instance=user),
-                                   provider = 'shibboleth',
-                                   context_instance=get_context(request, extra_context))
-        else:
-            user.email = invitation.username
-            return
\ No newline at end of file
+                           affiliation=affiliation, provider='shibboleth',
+                           email=email)
+        try:
+            if not backend:
+                backend = get_backend(request)
+            form = backend.get_signup_form(provider='shibboleth', instance=user)
+        except Exception, e:
+            form = SimpleBackend(request).get_signup_form(provider='shibboleth', instance=user)
+            messages.add_message(request, messages.ERROR, e)
+        return render_response(on_creation_template,
+                               signup_form = form,
+                               provider = 'shibboleth',
+                               context_instance=get_context(request, extra_context))