Remove secauth middleware. Replace with role_required decorators. Commit ready for merge

 - Legacy-Id: 8624

Author: rpcross

ietf/secr/announcement/views.py

@@ -1,4 +1,5 @@
 from django.contrib import messages
+from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseForbidden
 from django.shortcuts import render_to_response, redirect
 from django.template import RequestContext
@@ -45,6 +46,7 @@ def check_access(user):
 # --------------------------------------------------
 # this seems to cause some kind of circular problem
 # @check_for_cancel(reverse('home'))
+@login_required
 @check_for_cancel('../')
 def main(request):
     '''
@@ -70,6 +72,7 @@ def main(request):
         RequestContext(request, {}),
     )
 
+@login_required
 @check_for_cancel('../')
 def confirm(request):
 

ietf/secr/areas/views.py

@@ -10,6 +10,7 @@
 
 from ietf.group.models import Group, GroupEvent, GroupURL, Role, ChangeStateGroupEvent
 from ietf.group.utils import save_group_in_history
+from ietf.ietfauth.utils import role_required
 from ietf.person.models import Person
 from ietf.secr.areas.forms import AWPAddModelForm, AWPForm, AddAreaModelForm, AreaDirectorForm, AreaForm
 
@@ -49,7 +50,7 @@ def getemails(request):
 # --------------------------------------------------
 # STANDARD VIEW FUNCTIONS
 # --------------------------------------------------
-
+@role_required('Secretariat')
 def add(request):
     """ 
     Add a new IETF Area
@@ -95,6 +96,7 @@ def add(request):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def edit(request, name):
     """ 
     Edit IETF Areas 
@@ -159,6 +161,7 @@ def edit(request, name):
         RequestContext(request,{}),
     )
 
+@role_required('Secretariat')
 def list_areas(request):
     """ 
     List IETF Areas 
@@ -180,6 +183,7 @@ def list_areas(request):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def people(request, name):
     """ 
     Edit People associated with Areas, Area Directors.
@@ -229,6 +233,7 @@ def people(request, name):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def modify(request, name):
     """ 
     Handle state changes of Area Directors (enable voting, retire)
@@ -285,6 +290,7 @@ def modify(request, name):
 
         return redirect('areas_view', name=name)
 
+@role_required('Secretariat')
 def view(request, name):
     """ 
     View Area information.

ietf/secr/console/views.py

@@ -3,7 +3,9 @@
 from django.template import RequestContext
 
 from ietf.doc.models import DocEvent
+from ietf.ietfauth.utils import role_required
 
+@role_required('Secretariat')
 def main(request):
     '''
     Main view for the Console

ietf/secr/drafts/views.py

@@ -15,6 +15,7 @@
 from ietf.doc.models import Document, DocumentAuthor, DocAlias, DocRelationshipName, RelatedDocument, State
 from ietf.doc.models import DocEvent, NewRevisionDocEvent
 from ietf.doc.models import save_document_in_history
+from ietf.ietfauth.utils import role_required
 from ietf.meeting.models import Meeting
 from ietf.meeting.helpers import get_meeting
 from ietf.name.models import StreamName
@@ -484,6 +485,7 @@ def report_progress_report(start_date,end_date):
 # -------------------------------------------------
 # Standard View Functions
 # -------------------------------------------------
+@role_required('Secretariat')
 def abstract(request, id):
     '''
     View Internet Draft Abstract
@@ -503,6 +505,7 @@ def abstract(request, id):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def add(request):
     '''
     Add Internet Draft
@@ -594,6 +597,7 @@ def add(request):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def announce(request, id):
     '''
     Schedule announcement of new Internet-Draft to I-D Announce list
@@ -618,6 +622,7 @@ def announce(request, id):
     messages.success(request, 'Announcement scheduled successfully!')
     return redirect('drafts_view', id=id)
 
+@role_required('Secretariat')
 def approvals(request):
     '''
     This view handles setting Initial Approval for drafts
@@ -632,6 +637,7 @@ def approvals(request):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def author_delete(request, id, oid):
     '''
     This view deletes the specified author(email) from the draft
@@ -640,6 +646,7 @@ def author_delete(request, id, oid):
     messages.success(request, 'The author was deleted successfully')
     return redirect('drafts_authors', id=id)
 
+@role_required('Secretariat')
 def authors(request, id):
     ''' 
     Edit Internet Draft Authors
@@ -687,6 +694,7 @@ def authors(request, id):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def confirm(request, id):
     '''
     This view displays changes that will be made and calls appropriate
@@ -737,6 +745,7 @@ def confirm(request, id):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def dates(request):
     ''' 
     Manage ID Submission Dates
@@ -756,6 +765,7 @@ def dates(request):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def edit(request, id):
     '''
     Since there's a lot going on in this function we are summarizing in the docstring.
@@ -804,6 +814,7 @@ def edit(request, id):
         'draft': draft},
     )
 
+@role_required('Secretariat')
 def email(request, id):
     '''
     This function displays the notification message and allows the
@@ -849,6 +860,7 @@ def email(request, id):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def extend(request, id):
     '''
     This view handles extending the expiration date for an Internet-Draft
@@ -880,6 +892,7 @@ def extend(request, id):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def makerfc(request, id):
     ''' 
     Make RFC out of Internet Draft
@@ -954,6 +967,7 @@ def makerfc(request, id):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def nudge_report(request):
     '''
     This view produces the Nudge Report, basically a list of documents that are in the IESG
@@ -967,6 +981,7 @@ def nudge_report(request):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def replace(request, id):
     '''
     This view handles replacing one Internet-Draft with another 
@@ -998,6 +1013,7 @@ def replace(request, id):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def resurrect(request, id):
     '''
     This view handles resurrection of an Internet-Draft
@@ -1008,6 +1024,7 @@ def resurrect(request, id):
     request.session['action'] = 'resurrect'
     return redirect('drafts_email', id=id)
 
+@role_required('Secretariat')
 def revision(request, id):
     '''
     This function presents the input form for the New Revision action.  If submitted
@@ -1047,6 +1064,7 @@ def revision(request, id):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def search(request):
     ''' 
     Search Internet Drafts
@@ -1118,6 +1136,7 @@ def search(request):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def update(request, id):
     '''
     This view handles the Update action for an Internet-Draft
@@ -1159,6 +1178,7 @@ def update(request, id):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def view(request, id):
     ''' 
     View Internet Draft
@@ -1219,6 +1239,7 @@ def view(request, id):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def withdraw(request, id):
     '''
     This view handles withdrawing an Internet-Draft

ietf/secr/groups/views.py

@@ -5,6 +5,7 @@
 
 from ietf.group.models import Group, GroupMilestone, ChangeStateGroupEvent, GroupEvent, GroupURL, Role
 from ietf.group.utils import save_group_in_history, get_charter_text
+from ietf.ietfauth.utils import role_required
 from ietf.person.models import Person
 from ietf.secr.groups.forms import GroupModelForm, GroupMilestoneForm, RoleForm, SearchForm
 from ietf.secr.areas.forms import AWPForm
@@ -69,6 +70,7 @@ def get_ads(request):
 # Standard View Functions
 # -------------------------------------------------
 
+@role_required('Secretariat')
 def add(request):
     '''
     Add a new IETF or IRTF Group
@@ -119,6 +121,7 @@ def add(request):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def blue_dot(request):
     '''
     This is a report view.  It returns a text/plain listing of chairs for active and bof groups.
@@ -144,6 +147,7 @@ def blue_dot(request):
         RequestContext(request, {}), content_type="text/plain",
     )
 
+@role_required('Secretariat')
 def charter(request, acronym):
     """
     View Group Charter
@@ -171,6 +175,7 @@ def charter(request, acronym):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def delete_role(request, acronym, id):
     """
     Handle deleting roles for groups (chair, editor, advisor, secretary)
@@ -193,6 +198,7 @@ def delete_role(request, acronym, id):
     messages.success(request, 'The entry was deleted successfully')
     return redirect('groups_people', acronym=acronym)
 
+@role_required('Secretariat')
 def edit(request, acronym):
     """
     Edit Group details
@@ -269,6 +275,7 @@ def edit(request, acronym):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def edit_gm(request, acronym):
     """
     Edit IETF Group Goal and Milestone details
@@ -305,6 +312,7 @@ def edit_gm(request, acronym):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def people(request, acronym):
     """
     Edit Group Roles (Chairs, Secretary, etc)
@@ -348,6 +356,7 @@ def people(request, acronym):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def search(request):
     """
     Search IETF Groups
@@ -426,6 +435,7 @@ def search(request):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def view(request, acronym):
     """
     View IETF Group details
@@ -449,6 +459,7 @@ def view(request, acronym):
         RequestContext(request, {}),
     )
 
+@role_required('Secretariat')
 def view_gm(request, acronym):
     """
     View IETF Group Goals and Milestones details