merge fixes

- Legacy-Id: 5174

ietf/secr/middleware/secauth.py

@@ -39,13 +39,20 @@ class SecAuthMiddleware(object):
 
     def process_view(self, request, view_func, view_args, view_kwargs):
         # need to initialize user, it doesn't get set when running tests for example
-        user = ''
-        request.user_is_secretariat = False
 
-        if 'REMOTE_USER' in request.META:
-            # do custom auth
-            if has_role(request.user,'Secretariat'):
-                request.user_is_secretariat = True
-                
+        if request.path.startswith('/secr/'):
+            user = ''
+            request.user_is_secretariat = False
+            
+            if request.user.is_anonymous(): 
+                return render_to_response('401.html', {'user':user})
+            
+            if 'REMOTE_USER' in request.META:
+                # do custom auth
+                if has_role(request.user,'Secretariat'):
+                    request.user_is_secretariat = True
+                    
+            return None
+
         return None
-
+        

ietf/secr/sreq/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('sec.sreq.views',
+urlpatterns = patterns('ietf.secr.sreq.views',
     url(r'^$', 'main', name='sessions'),
     url(r'^status/$', 'tool_status', name='sessions_tool_status'),
     url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/$', 'view', name='sessions_view'),

ietf/secr/urls.py

@@ -5,5 +5,5 @@ from django.views.generic.simple import direct_to_template
 
 urlpatterns = patterns('',
     url(r'^$', direct_to_template, {'template': 'main.html'}, name="home"),
-    (r'^sreq/', include('sec.sreq.urls')),
+    (r'^sreq/', include('ietf.secr.sreq.urls')),
 )