altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse source 
- Legacy-Id: 8624
This commit is contained in:
Ryan Cross 2014-11-09 02:32:41 +00:00
parent 882e0af92e
commit 097b936ca8
22 changed files with 139 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ietf/secr/announcement/views.py
View file

@ -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):

8
ietf/secr/areas/views.py
View file

@ -10,6 +10,7 @@ from django.template import RequestContext
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.

2
ietf/secr/console/views.py
View file

@ -3,7 +3,9 @@ from django.shortcuts import render_to_response
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

21
ietf/secr/drafts/views.py
View file

@ -15,6 +15,7 @@ from django.template.loader import render_to_string
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

11
ietf/secr/groups/views.py
View file

@ -5,6 +5,7 @@ from django.template import RequestContext
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

9
ietf/secr/ipradmin/views.py
View file

@ -15,12 +15,14 @@ from ietf.secr.ipradmin.managers import IprDetailManager
from ietf.secr.ipradmin.forms import IprDetailForm, IPRContactFormset
from ietf.secr.utils.document import get_rfc_num, is_draft
from ietf.ietfauth.utils import role_required
from ietf.ipr.models import IprDetail, IprUpdate, IprContact, LICENSE_CHOICES, STDONLY_CHOICES, IprNotification
from ietf.utils.mail import send_mail_text
from ietf.doc.models import DocAlias
from ietf.group.models import Role
@role_required('Secretariat')
@template('ipradmin/list.html')
def admin_list(request):
queue_ipr = IprDetailManager.queue_ipr()
@ -37,6 +39,7 @@ def admin_list(request):
third_party_notifications = third_party_notifications)
@role_required('Secretariat')
def admin_post(request, ipr_id, from_page, command):
ipr_dtl = IprDetail.objects.get(ipr_id=ipr_id)
ipr_dtl.status = 1
@ -108,6 +111,7 @@ def send_notifications(post_data, ipr_id, update=False):
return None
@role_required('Secretariat')
@template('ipradmin/notify.html')
def admin_notify(request, ipr_id):
if request.POST and 'command' in request.POST and 'do_send_notifications' == request.POST['command']:
@ -332,6 +336,7 @@ def get_wg_email_list(group):
return ', '.join(result)
@role_required('Secretariat')
@template('ipradmin/delete.html')
def admin_delete(request, ipr_id):
ipr_dtl = IprDetail.objects.get(ipr_id=ipr_id)
@ -339,6 +344,7 @@ def admin_delete(request, ipr_id):
ipr_dtl.save()
return redirect('ipradmin_admin_list')
@role_required('Secretariat')
@template('ipradmin/notify.html')
def old_submitter_notify(request, ipr_id):
if request.POST and 'command' in request.POST \
@ -401,6 +407,7 @@ def old_submitter_notify(request, ipr_id):
)
# end old_submitter_notify
@role_required('Secretariat')
@template('ipradmin/detail.html')
def admin_detail(request, ipr_id):
if request.POST and request.POST['command']:
@ -661,6 +668,7 @@ def admin_detail(request, ipr_id):
)
# end admin_detail
@role_required('Secretariat')
@template('ipradmin/create.html')
def admin_create(request):
if request.method == 'POST':
@ -686,6 +694,7 @@ def admin_create(request):
ipr_contact_formset = ipr_contact_formset)
# end admin_create
@role_required('Secretariat')
@template('ipradmin/update.html')
def admin_update(request, ipr_id):
if request.method == 'POST':

21
ietf/secr/meetings/views.py
View file

@ -12,6 +12,7 @@ from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.template import RequestContext
from django.utils.functional import curry
from ietf.ietfauth.utils import role_required
from ietf.utils.mail import send_mail
from ietf.meeting.helpers import get_meeting
from ietf.meeting.models import Meeting, Session, Room, TimeSlot, ScheduledSession, Schedule
@ -266,6 +267,7 @@ def ajax_get_times(request, meeting_id, day):
# --------------------------------------------------
# STANDARD VIEW FUNCTIONS
# --------------------------------------------------
@role_required('Secretariat')
def add(request):
'''
Add a new IETF Meeting. Creates Meeting and Proceeding objects.
@ -315,6 +317,7 @@ def add(request):
RequestContext(request, {}),
)
@role_required('Secretariat')
def blue_sheet(request, meeting_id):
'''
Blue Sheet view. The user can generate blue sheets or upload scanned bluesheets
@ -340,6 +343,7 @@ def blue_sheet(request, meeting_id):
RequestContext(request, {}),
)
@role_required('Secretariat')
def blue_sheet_generate(request, meeting_id):
'''
Generate bluesheets
@ -352,6 +356,7 @@ def blue_sheet_generate(request, meeting_id):
messages.success(request, 'Blue Sheets generated')
return redirect('meetings_blue_sheet', meeting_id=meeting.number)
@role_required('Secretariat')
def blue_sheet_redirect(request):
'''
This is the generic blue sheet URL. It gets the next IETF meeting and redirects
@ -365,6 +370,7 @@ def blue_sheet_redirect(request):
meeting = Meeting.objects.filter(type='ietf').order_by('-date')[0]
return redirect('meetings_blue_sheet', meeting_id=meeting.number)
@role_required('Secretariat')
def edit_meeting(request, meeting_id):
'''
Edit Meeting information.
@ -400,6 +406,7 @@ def edit_meeting(request, meeting_id):
RequestContext(request,{}),
)
@role_required('Secretariat')
def main(request):
'''
In this view the user can choose a meeting to manage or elect to create a new meeting.
@ -418,6 +425,7 @@ def main(request):
RequestContext(request, {}),
)
@role_required('Secretariat')
def non_session(request, meeting_id, schedule_name):
'''
Display and add "non-session" time slots, ie. registration, beverage and snack breaks
@ -483,6 +491,7 @@ def non_session(request, meeting_id, schedule_name):
RequestContext(request, {}),
)
@role_required('Secretariat')
def non_session_delete(request, meeting_id, schedule_name, slot_id):
'''
This function deletes the non-session TimeSlot. For "other" and "plenary" timeslot
@ -506,6 +515,7 @@ def non_session_delete(request, meeting_id, schedule_name, slot_id):
messages.success(request, 'Non-Session timeslot deleted successfully')
return redirect('meetings_non_session', meeting_id=meeting_id, schedule_name=schedule_name)
@role_required('Secretariat')
def non_session_edit(request, meeting_id, schedule_name, slot_id):
'''
Allows the user to assign a location to this non-session timeslot
@ -555,6 +565,7 @@ def non_session_edit(request, meeting_id, schedule_name, slot_id):
RequestContext(request, {}),
)
@role_required('Secretariat')
def notifications(request, meeting_id):
'''
Send scheduled session email notifications. Finds all groups with
@ -590,6 +601,7 @@ def notifications(request, meeting_id):
RequestContext(request, {}),
)
@role_required('Secretariat')
def remove_session(request, meeting_id, acronym):
'''
Remove session from agenda. Disassociate session from timeslot and set status.
@ -613,6 +625,7 @@ def remove_session(request, meeting_id, acronym):
messages.success(request, '%s Session removed from agenda' % (group.acronym))
return redirect('meetings_select_group', meeting_id=meeting.number)
@role_required('Secretariat')
def rooms(request, meeting_id, schedule_name):
'''
Display and edit MeetingRoom records for the specified meeting
@ -657,6 +670,7 @@ def rooms(request, meeting_id, schedule_name):
RequestContext(request, {}),
)
@role_required('Secretariat')
def schedule(request, meeting_id, schedule_name, acronym):
'''
This view handles scheduling session requests to TimeSlots
@ -770,6 +784,7 @@ def schedule(request, meeting_id, schedule_name, acronym):
RequestContext(request, {}),
)
@role_required('Secretariat')
def select(request, meeting_id, schedule_name):
'''
Options to edit Rooms & Times or schedule a session
@ -783,6 +798,7 @@ def select(request, meeting_id, schedule_name):
RequestContext(request, {}),
)
@role_required('Secretariat')
def select_group(request, meeting_id, schedule_name):
'''
In this view the user can select the group to schedule. Only those groups that have
@ -828,6 +844,7 @@ def select_group(request, meeting_id, schedule_name):
RequestContext(request, {}),
)
@role_required('Secretariat')
def times(request, meeting_id, schedule_name):
'''
Display and edit time slots (TimeSlots). It doesn't display every TimeSlot
@ -892,6 +909,7 @@ def times(request, meeting_id, schedule_name):
RequestContext(request, {}),
)
@role_required('Secretariat')
def times_edit(request, meeting_id, schedule_name, time):
'''
This view handles bulk edit of timeslot details.
@ -946,6 +964,7 @@ def times_edit(request, meeting_id, schedule_name, time):
RequestContext(request, {}),
)
@role_required('Secretariat')
def times_delete(request, meeting_id, schedule_name, time):
'''
This view handles bulk delete of all timeslots matching time (datetime) for the given
@ -961,6 +980,7 @@ def times_delete(request, meeting_id, schedule_name, time):
messages.success(request, 'Timeslot deleted')
return redirect('meetings_times', meeting_id=meeting_id,schedule_name=schedule_name)
@role_required('Secretariat')
def unschedule(request, meeting_id, schedule_name, session_id):
'''
Unschedule given session object
@ -975,6 +995,7 @@ def unschedule(request, meeting_id, schedule_name, session_id):
messages.success(request, 'Session unscheduled')
return redirect('meetings_select_group', meeting_id=meeting_id, schedule_name=schedule_name)
@role_required('Secretariat')
def view(request, meeting_id):
'''
View Meeting information.

57
ietf/secr/proceedings/views.py
View file

@ -24,7 +24,7 @@ from ietf.secr.utils.group import get_my_groups, groups_by_session
from ietf.secr.utils.meeting import get_upload_root, get_materials, get_timeslot
from ietf.doc.models import Document, DocAlias, DocEvent, State, NewRevisionDocEvent
from ietf.group.models import Group
from ietf.ietfauth.utils import has_role
from ietf.ietfauth.utils import has_role, role_required
from ietf.meeting.models import Meeting, Session, TimeSlot, ScheduledSession
from ietf.secr.proceedings.forms import EditSlideForm, InterimMeetingForm, RecordingForm, RecordingEditForm, ReplaceSlideForm, UnifiedUploadForm
from ietf.secr.proceedings.proc_utils import ( gen_acknowledgement, gen_agenda, gen_areas, gen_attendees,
@ -34,7 +34,10 @@ from ietf.secr.proceedings.proc_utils import ( gen_acknowledgement, gen_agenda,
from ietf.secr.proceedings.models import InterimMeeting # proxy model
# -------------------------------------------------
# Globals
# -------------------------------------------------
AUTHORIZED_ROLES=('WG Chair','WG Secretary','RG Chair','IAB Group Chair','Area Director','Secretariat','Team Chair')
# -------------------------------------------------
# Helper Functions
# -------------------------------------------------
@ -312,7 +315,7 @@ def ajax_order_slide(request):
# --------------------------------------------------
# STANDARD VIEW FUNCTIONS
# --------------------------------------------------
@sec_only
@role_required('Secretariat')
def build(request,meeting_num,acronym):
'''
This is a utility or test view. It simply rebuilds the proceedings html for the specified
@ -364,7 +367,7 @@ def delete_material(request,slide_id):
return HttpResponseRedirect(url)
@sec_only
@role_required('Secretariat')
def delete_interim_meeting(request, meeting_num):
'''
This view deletes the specified Interim Meeting and any material that has been
@ -430,6 +433,7 @@ def edit_slide(request, slide_id):
RequestContext(request, {}),
)
@role_required(*AUTHORIZED_ROLES)
def interim(request, acronym):
'''
This view presents the user with a list of interim meetings for the specified group.
@ -475,8 +479,8 @@ def interim(request, acronym):
RequestContext(request, {}),
)
@role_required(*AUTHORIZED_ROLES)
def interim_directory(request, sortby=None):
if sortby == 'group':
qs = InterimMeeting.objects.all()
meetings = sorted(qs, key=lambda a: a.group.acronym)
@ -487,6 +491,7 @@ def interim_directory(request, sortby=None):
'meetings': meetings},
)
@role_required(*AUTHORIZED_ROLES)
def main(request):
'''
List IETF Meetings. If the user is Secratariat list includes all meetings otherwise
@ -591,7 +596,7 @@ def process_pdfs(request, meeting_num):
url = reverse('proceedings_select', kwargs={'meeting_num':meeting_num})
return HttpResponseRedirect(url)
@sec_only
@role_required('Secretariat')
def progress_report(request, meeting_num):
'''
This function generates the proceedings progress report for use at the Plenary.
@ -602,7 +607,7 @@ def progress_report(request, meeting_num):
url = reverse('proceedings_select', kwargs={'meeting_num':meeting_num})
return HttpResponseRedirect(url)
@sec_only
@role_required('Secretariat')
def recording(request, meeting_num):
'''
Enter Session recording info. Creates Document and associates it with Session
@ -639,7 +644,7 @@ def recording(request, meeting_num):
RequestContext(request, {}),
)
@sec_only
@role_required('Secretariat')
def recording_edit(request, meeting_num, name):
'''
Edit recording Document
@ -719,6 +724,7 @@ def replace_slide(request, slide_id):
RequestContext(request, {}),
)
@role_required(*AUTHORIZED_ROLES)
def select(request, meeting_num):
'''
A screen to select which group you want to upload material for. Users of this view area
@ -810,6 +816,7 @@ def select(request, meeting_num):
RequestContext(request,{}),
)
@role_required(*AUTHORIZED_ROLES)
def select_interim(request):
'''
A screen to select which group you want to upload Interim material for. Works for Secretariat staff
@ -819,7 +826,7 @@ def select_interim(request):
redirect_url = reverse('proceedings_interim', kwargs={'acronym':request.POST['group']})
return HttpResponseRedirect(redirect_url)
if request.user_is_secretariat:
if has_role(request.user, "Secretariat"):
# initialize working groups form
choices = build_choices(Group.objects.active_wgs())
group_form = GroupSelectForm(choices=choices)
@ -981,35 +988,3 @@ def upload_unified(request, meeting_num, acronym=None, session_id=None):
'proceedings_url': proceedings_url},
RequestContext(request, {}),
)

3
ietf/secr/roles/views.py
View file

@ -6,6 +6,7 @@ from django.template import RequestContext
from ietf.group.models import Group, Role
from ietf.group.utils import save_group_in_history
from ietf.ietfauth.utils import role_required
from ietf.secr.groups.forms import RoleForm
from ietf.secr.sreq.forms import GroupSelectForm
@ -41,6 +42,7 @@ def ajax_get_roles(request, acronym):
# --------------------------------------------------
# STANDARD VIEW FUNCTIONS
# --------------------------------------------------
@role_required('Secretariat')
def delete_role(request, acronym, id):
"""
Handle deleting roles
@ -62,6 +64,7 @@ def delete_role(request, acronym, id):
url = reverse('roles') + '?group=%s' % group.acronym
return HttpResponseRedirect(url)
@role_required('Secretariat')
def main(request):
'''
Main view for generic Roles App

7
ietf/secr/rolodex/views.py
View file

@ -6,6 +6,7 @@ from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.template import RequestContext
from ietf.ietfauth.utils import role_required
from ietf.person.models import Person, Email, Alias
from ietf.secr.rolodex.forms import EditPersonForm, EmailForm, NameForm, NewPersonForm, SearchForm
@ -14,6 +15,7 @@ from ietf.secr.rolodex.forms import EditPersonForm, EmailForm, NameForm, NewPers
# Views
# ---------------------------------------
@role_required('Secretariat')
def add(request):
"""
Add contact information.
@ -52,6 +54,7 @@ def add(request):
RequestContext(request, {}),
)
@role_required('Secretariat')
def add_proceed(request):
"""
Add contact information. (2nd page, allows entry of address, phone and email records)
@ -111,6 +114,7 @@ def add_proceed(request):
RequestContext(request, {}),
)
@role_required('Secretariat')
def delete(request, id):
"""
Delete contact information.
@ -144,6 +148,7 @@ def delete(request, id):
RequestContext(request, {}),
)
@role_required('Secretariat')
def edit(request, id):
"""
Edit contact information. Address, Email and Phone records are provided as inlineformsets.
@ -199,6 +204,7 @@ def edit(request, id):
RequestContext(request, {}),
)
@role_required('Secretariat')
def search(request):
"""
Search Person by any combination of name, email or tag. email matches
@ -255,6 +261,7 @@ def search(request):
RequestContext(request, {}),
)
@role_required('Secretariat')
def view(request, id):
"""
View contact information.

10
ietf/secr/sreq/views.py
View file

@ -7,12 +7,12 @@ from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.template import RequestContext
from ietf.group.models import Group
from ietf.ietfauth.utils import has_role
from ietf.ietfauth.utils import has_role, role_required
from ietf.meeting.models import Meeting, Session, Constraint, ResourceAssociation
from ietf.meeting.helpers import get_meeting
from ietf.name.models import SessionStatusName, ConstraintName
from ietf.secr.sreq.forms import SessionForm, GroupSelectForm, ToolStatusForm
from ietf.secr.utils.decorators import check_permissions, sec_only
from ietf.secr.utils.decorators import check_permissions
from ietf.secr.utils.group import groups_by_session
from ietf.secr.utils.mail import get_ad_email_list, get_chair_email_list, get_cc_list
from ietf.utils.mail import send_mail
@ -22,6 +22,7 @@ from ietf.person.models import Person
# Globals
# -------------------------------------------------
SESSION_REQUEST_EMAIL = 'session-request@ietf.org'
AUTHORIZED_ROLES=('WG Chair','WG Secretary','RG Chair','IAB Group Chair','Area Director','Secretariat','Team Chair')
# -------------------------------------------------
# Helper Functions
@ -222,6 +223,7 @@ def cancel(request, acronym):
messages.success(request, 'The %s Session Request has been canceled' % group.acronym)
return redirect('sessions')
@role_required(*AUTHORIZED_ROLES)
def confirm(request, acronym):
'''
This view displays details of the new session that has been requested for the user
@ -466,6 +468,7 @@ def edit_mtg(request, num, acronym):
RequestContext(request, {}),
)
@role_required(*AUTHORIZED_ROLES)
def main(request):
'''
Display list of groups the user has access to.
@ -635,7 +638,7 @@ def no_session(request, acronym):
messages.success(request, 'A message was sent to notify not having a session at IETF %s' % meeting.number)
return redirect('sessions')
@sec_only
@role_required('Secretariat')
def tool_status(request):
'''
This view handles locking and unlocking of the tool to the public.
@ -677,6 +680,7 @@ def tool_status(request):
RequestContext(request, {}),
)
@role_required(*AUTHORIZED_ROLES)
def view(request, acronym, num = None):
'''
This view displays the session request info

11
ietf/secr/telechat/views.py
View file

@ -13,6 +13,7 @@ from ietf.doc.lastcall import request_last_call
from ietf.doc.mails import email_ad, email_state_changed
from ietf.iesg.models import TelechatDate, TelechatAgendaItem, Telechat
from ietf.iesg.agenda import agenda_data, get_doc_section
from ietf.ietfauth.utils import role_required
from ietf.secr.telechat.forms import BallotForm, ChangeStateForm, DateSelectForm, TELECHAT_TAGS
@ -119,6 +120,7 @@ def get_first_doc(agenda):
# -------------------------------------------------
# View Functions
# -------------------------------------------------
@role_required('Secretariat')
def bash(request, date):
agenda = agenda_data(date=date)
@ -129,6 +131,7 @@ def bash(request, date):
RequestContext(request, {}),
)
@role_required('Secretariat')
def doc(request, date):
'''
This view redirects to doc_detail using the first document in the agenda or
@ -147,6 +150,7 @@ def doc(request, date):
RequestContext(request, {}),
)
@role_required('Secretariat')
def doc_detail(request, date, name):
'''
This view displays the ballot information for the document, and lets the user make
@ -290,6 +294,7 @@ def doc_detail(request, date, name):
RequestContext(request, {}),
)
@role_required('Secretariat')
def doc_navigate(request, date, name, nav):
'''
This view takes three arguments:
@ -312,6 +317,7 @@ def doc_navigate(request, date, name, nav):
return redirect('telechat_doc_detail', date=date, name=target)
@role_required('Secretariat')
def main(request):
'''
The is the main view where the user selects an existing telechat or creates a new one.
@ -330,6 +336,7 @@ def main(request):
RequestContext(request, {}),
)
@role_required('Secretariat')
def management(request, date):
'''
This view displays management issues and lets the user update the status
@ -345,6 +352,7 @@ def management(request, date):
RequestContext(request, {}),
)
@role_required('Secretariat')
def minutes(request, date):
'''
This view shows a list of documents that were approved since the last telechat
@ -372,6 +380,7 @@ def minutes(request, date):
RequestContext(request, {}),
)
@role_required('Secretariat')
def new(request):
'''
This view creates a new telechat agenda and redirects to the default view
@ -384,8 +393,8 @@ def new(request):
messages.success(request,'New Telechat Agenda created')
return redirect('telechat_doc', date=date)
@role_required('Secretariat')
def roll_call(request, date):
agenda = agenda_data(date=date)
ads = Person.objects.filter(role__name='ad', role__group__state="active")
sorted_ads = sorted(ads, key = lambda a: a.name_parts()[3])

7
ietf/secr/templates/base_site.html
View file

@ -1,17 +1,18 @@
{% extends "base_secr.html" %}
{% load i18n %}
{% load ietf_filters %}
{% block title %}{{ title }}{% if request.user_is_secretariat %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}{% endblock %}
{% block title %}{{ title }}{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}{% endblock %}
{% block branding %}
<table width="100%">
<tr>
<td align="left">
<h1 id="site-name">{% if request.user_is_secretariat %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}</h1>
<h1 id="site-name">{% if user|has_role:"Secretariat" %} Secretariat Dashboard {% else %} WG Chair Dashboard {% endif %}</h1>
</td>
<td align="right">
<br>
<span class="login">{% if request.user_is_secretariat %}Secretariat {% endif %}Logged in: <a href="/accounts/profile/">{{ user }}</a> | <a href="/accounts/logout/">Log out</a></span>
<span class="login">{% if user|has_role:"Secretariat" %}Secretariat {% endif %}Logged in: <a href="/accounts/profile/">{{ user }}</a> | <a href="/accounts/logout/">Log out</a></span>
</td>
</tr>
</table>

3
ietf/secr/templates/main.html
View file

@ -1,9 +1,10 @@
{% extends "base_site.html" %}
{% load ietf_filters %}
{% block content %}
<div id="content-main">
{% if request.user_is_secretariat %}
{% if user|has_role:"Secretariat" %}
<table class="menu" width="100%" cellpadding="5" cellspacing="5" border="0">
<tr valign="top">

3
ietf/secr/templates/proceedings/interim_meeting.html
View file

@ -1,4 +1,5 @@
{% extends "base_site.html" %}
{% load ietf_filters %}
{% block title %}Interim Meetings{% endblock %}
@ -22,7 +23,7 @@
<ul>
{% for meeting in meetings %}
<li><a href="{% url "proceedings_upload_unified" meeting_num=meeting.number acronym=group.acronym %}">{{meeting.date}}</a>
{% if request.user_is_secretariat %}
{% if user|has_role:"Secretariat" %}
&nbsp;-&nbsp;<a href="{% url "proceedings_delete_interim_meeting" meeting_num=meeting.number %}" onClick="javascript:return confirm('Are you sure you want to delete this meeting? Any uploaded material will be removed.')">[Delete]</a>
{% endif %}
</li>

3
ietf/secr/templates/proceedings/interim_select.html
View file

@ -1,4 +1,5 @@
{% extends "base_site.html" %}
{% load ietf_filters %}
{% block title %}Proceedings{% endblock %}
@ -29,7 +30,7 @@
<input type="submit" name="submit" value="Select" />
</form>
{% comment %}
{% if request.user_is_secretariat %}
{% if user|has_role:"Secretariat" %}
<form class="internal-form" action="" method="post">{% csrf_token %}
<label for="id_group">IRTF Groups</label>
{{ irtf_form.group }}

9
ietf/secr/templates/proceedings/main.html
View file

@ -1,4 +1,5 @@
{% extends "base_site.html" %}
{% load ietf_filters %}
{% block title %}Proceeding manager{% endblock %}
@ -15,7 +16,7 @@
<div class="module" >
<h2>Proceedings</h2>
<div id="proceedings-left-col">
<table id="proceedings-list-table" class="full-width{% if request.user_is_secretariat %} secretariat{% endif %}">
<table id="proceedings-list-table" class="full-width{% if user|has_role:"Secretariat" %} secretariat{% endif %}">
<thead>
<tr>
<th>IETF Meeting</th>
@ -31,7 +32,7 @@
{% endfor %}
</tbody>
</table>
{% if request.user_is_secretariat %}
{% if user|has_role:"Secretariat" %}
<div class="button-group">
<ul id="proceedings-meeting-buttons">
<li><button onclick="window.location='{% url "meetings_add" %}'">Add</button></li>
@ -42,7 +43,7 @@
<div id="proceedings-right-col">
<div class="interim-scroll">
<table id="proceedings-interim-table" class="full-width{% if request.user_is_secretariat %} secretariat{% endif %}">
<table id="proceedings-interim-table" class="full-width{% if user|has_role:"Secretariat" %} secretariat{% endif %}">
<thead>
<tr>
<th>Interim Meeting</th>
@ -66,7 +67,7 @@
</div>
<br>
{% if not request.user_is_secretariat %}
{% if not user|has_role:"Secretariat" %}
<br>
<hr>
<p>The list(s) above includes those meetings which you can upload materials for. Click on the meeting number or interim meeting date to continue.</p>

3
ietf/secr/templates/proceedings/select.html
View file

@ -1,4 +1,5 @@
{% extends "base_site.html" %}
{% load ietf_filters %}
{% block title %}Proceedings{% endblock %}
@ -80,7 +81,7 @@
{% endif %}
</div> <!-- inline-related -->
{% if request.user_is_secretariat %}
{% if user|has_role:"Secretariat" %}
<div class="inline-related">
<h2>Secretariat Only Functions</h2>
<div id="private-functions">

3
ietf/secr/templates/sreq/main.1_2
View file

@ -1,4 +1,5 @@
{% extends "base_site.html" %}
{% load ietf_filters %}
{% block title %}Sessions{% endblock %}
@ -18,7 +19,7 @@
<div class="module interim-container">
<h2>
Sessions Request Tool: IETF {{ meeting.meeting_num }}
{% if request.user_is_secretariat %}
{% if user|has_role:"Secretariat" %}
{% if is_locked %}
<span class="locked"><a href="{% url "sessions_tool_status" %}">Tool Status: Locked</a></span>
{% else %}

3
ietf/secr/templates/sreq/main.html
View file

@ -1,4 +1,5 @@
{% extends "base_site.html" %}
{% load ietf_filters %}
{% block title %}Sessions{% endblock %}
@ -18,7 +19,7 @@
<div class="module interim-container">
<h2>
Sessions Request Tool: IETF {{ meeting.number }}
{% if request.user_is_secretariat %}
{% if user|has_role:"Secretariat" %}
{% if is_locked %}
<span class="locked"><a href="{% url "sessions_tool_status" %}">Tool Status: Locked</a></span>
{% else %}

3
ietf/secr/utils/decorators.py
View file

@ -83,11 +83,10 @@ def check_permissions(func):
def sec_only(func):
"""
This decorator checks that the user making the request is a secretariat user.
(Based on the cusotm user_is_secretariat request attribute)
"""
def wrapper(request, *args, **kwargs):
# short circuit. secretariat user has full access
if request.user_is_secretariat:
if has_role(request.user, "Secretariat"):
return func(request, *args, **kwargs)
return render_to_response('unauthorized.html',{

10
ietf/settings.py
View file

@ -165,7 +165,6 @@ MIDDLEWARE_CLASSES = (
'ietf.middleware.RedirectTrailingPeriod',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'ietf.middleware.UnicodeNfkcNormalization',
'ietf.secr.middleware.secauth.SecAuthMiddleware'
)
ROOT_URLCONF = 'ietf.urls'
@ -404,15 +403,6 @@ BIBXML_BASE_PATH = '/a/www/ietf-ftp/xml2rfc'
TZDATA_ICS_PATH = BASE_DIR + '/../vzic/zoneinfo/'
CHANGELOG_PATH = '/www/ietf-datatracker/web/changelog'
# Secretariat Tool
# this is a tuple of regular expressions. if the incoming URL matches one of
# these, than non secretariat access is allowed.
SECR_AUTH_UNRESTRICTED_URLS = (
#(r'^/$'),
(r'^/secr/announcement/'),
(r'^/secr/proceedings/'),
(r'^/secr/sreq/'),
)
SECR_BLUE_SHEET_PATH = '/a/www/ietf-datatracker/documents/blue_sheet.rtf'
SECR_BLUE_SHEET_URL = 'https://datatracker.ietf.org/documents/blue_sheet.rtf'
SECR_INTERIM_LISTING_DIR = '/a/www/www6/meeting/interim'