Merged in [13722] and [13712] from rcross@amsl.com:

    Remove all use of request.session from secretariat apps.  Add tests for affected views.  Fixes ietf-tools#1455.
 - Legacy-Id: 13724
Note: SVN reference [13712] has been migrated to Git commit 915b445

Note: SVN reference [13722] has been migrated to Git commit 3a2cb9d

Author: levkowetz

ietf/secr/announcement/forms.py

@@ -138,6 +138,10 @@ class Meta:
         fields = ('nomcom', 'to','to_custom','frm','cc','bcc','reply_to','subject','body')
 
     def __init__(self, *args, **kwargs):
+        if 'hidden' in kwargs:
+            self.hidden = kwargs.pop('hidden')
+        else:
+            self.hidden = False
         user = kwargs.pop('user')
         person = user.person
         super(AnnounceForm, self).__init__(*args, **kwargs)
@@ -154,6 +158,10 @@ def __init__(self, *args, **kwargs):
         if not nomcom_roles and not secr_roles:
             self.fields['nomcom'].widget = forms.HiddenInput()
         self.initial['reply_to'] = 'ietf@ietf.org'
+        
+        if self.hidden:
+            for key in self.fields.keys():
+                self.fields[key].widget = forms.HiddenInput()
 
     def clean(self):
         super(AnnounceForm, self).clean()

ietf/secr/announcement/tests.py

@@ -4,9 +4,12 @@
 from pyquery import PyQuery
 
 from ietf.utils.test_utils import TestCase
+from ietf.group.models import Group
+from ietf.message.models import Message
+from ietf.nomcom.test_data import nomcom_test_data
 from ietf.person.models import Person
 from ietf.utils.test_data import make_test_data
-
+from ietf.utils.mail import outbox, empty_outbox
 
 SECR_USER='secretary'
 WG_USER=''
@@ -41,7 +44,6 @@ def test_invalid_submit(self):
         make_test_data()
         url = reverse('ietf.secr.announcement.views.main')
         post_data = {'id_subject':''}
-        #self.client.login(username='rcross', password='rcross+password")
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.post(url,post_data)
         self.assertEqual(r.status_code, 200)
@@ -51,17 +53,26 @@ def test_invalid_submit(self):
     def test_valid_submit(self):
         "Valid Submit"
         make_test_data()
-        #ietf.utils.mail.test_mode = True
+        nomcom_test_data()
+        empty_outbox()
         url = reverse('ietf.secr.announcement.views.main')
-        redirect = reverse('ietf.secr.announcement.views.confirm')
-        post_data = {'to':'Other...',
+        confirm_url = reverse('ietf.secr.announcement.views.confirm')
+        nomcom = Group.objects.get(type='nomcom')
+        post_data = {'nomcom': nomcom.pk,
+                     'to':'Other...',
                      'to_custom':'rcross@amsl.com',
                      'frm':'IETF Secretariat <ietf-secretariat@ietf.org>',
                      'subject':'Test Subject',
                      'body':'This is a test.'}
         self.client.login(username="secretary", password="secretary+password")
-        r = self.client.post(url,post_data,follow=True)
-        self.assertRedirects(r, redirect)
-	# good enough if we get to confirm page
-        #self.assertEqual(len(outbox), 1)
-        #self.assertTrue(len(outbox) > mailbox_before)
+        response = self.client.post(url,post_data)
+        self.assertEqual(response.status_code, 200)
+        self.assertTrue('Confirm Announcement' in response.content)
+        response = self.client.post(confirm_url,post_data,follow=True)
+        self.assertRedirects(response, url)
+        self.assertEqual(len(outbox),1)
+        self.assertEqual(outbox[0]['subject'],'Test Subject')
+        self.assertEqual(outbox[0]['to'],'<rcross@amsl.com>')
+        message = Message.objects.last()
+        self.assertEqual(message.subject,'Test Subject')
+        self.assertTrue(nomcom in message.related_groups.all())

ietf/secr/announcement/views.py

@@ -6,7 +6,7 @@
 from ietf.group.models import Role
 from ietf.ietfauth.utils import has_role
 from ietf.secr.announcement.forms import AnnounceForm
-from ietf.secr.utils.decorators import check_for_cancel, clear_non_auth
+from ietf.secr.utils.decorators import check_for_cancel
 from ietf.utils.mail import send_mail_text
 
 # -------------------------------------------------
@@ -59,51 +59,45 @@ def main(request):
     form = AnnounceForm(request.POST or None,user=request.user)
 
     if form.is_valid():
-        # nomcom is a ModelChoice, store pk, not Group object
-        data = form.cleaned_data
-        if data['nomcom']:
-            data['nomcom'] = data['nomcom'].pk
-        request.session['data'] = data
+        # recast as hidden form for next page of process
+        form = AnnounceForm(request.POST, user=request.user, hidden=True)
+        if form.data['to'] == 'Other...':
+            to = form.data['to_custom']
+        else:
+            to = form.data['to']
 
-        return redirect('ietf.secr.announcement.views.confirm')
+        return render(request, 'announcement/confirm.html', {
+            'message': form.data,
+            'to': to,
+            'form': form},
+        )
 
     return render(request, 'announcement/main.html', { 'form': form} )
 
 @login_required
 @check_for_cancel('../')
 def confirm(request):
 
-    if request.session.get('data',None):
-        data = request.session['data']
-    else:
-        messages.error(request, 'No session data.  Your session may have expired or cookies are disallowed.')
-        return redirect('ietf.secr.announcement.views.main')
+    if not check_access(request.user):
+        return HttpResponseForbidden('Restricted to: Secretariat, IAD, or chair of IETF, IAB, RSOC, RSE, IAOC, ISOC, NomCom.')
 
     if request.method == 'POST':
-        form = AnnounceForm(data, user=request.user)
-        message = form.save(user=request.user,commit=True)
-        extra = {'Reply-To':message.reply_to}
-        send_mail_text(None,
-                       message.to,
-                       message.frm,
-                       message.subject,
-                       message.body,
-                       cc=message.cc,
-                       bcc=message.bcc,
-                       extra=extra)
-
-        # clear session
-        clear_non_auth(request.session)
-
-        messages.success(request, 'The announcement was sent.')
-        return redirect('ietf.secr.announcement.views.main')
-
-    if data['to'] == 'Other...':
-        to = ','.join(data['to_custom'])
-    else:
-        to = data['to']
-
-    return render(request, 'announcement/confirm.html', {
-        'message': data,
-        'to': to},
-    )
+        form = AnnounceForm(request.POST, user=request.user)
+        if request.method == 'POST':
+            message = form.save(user=request.user,commit=True)
+            extra = {'Reply-To':message.reply_to}
+            send_mail_text(None,
+                           message.to,
+                           message.frm,
+                           message.subject,
+                           message.body,
+                           cc=message.cc,
+                           bcc=message.bcc,
+                           extra=extra)
+
+            messages.success(request, 'The announcement was sent.')
+            return redirect('ietf.secr.announcement.views.main')
+
+
+
+

ietf/secr/drafts/email.py

@@ -170,7 +170,7 @@ def get_fullcc_list(draft):
 
     return ','.join(result_list) 
 
-def get_email_initial(draft, type=None, input=None):
+def get_email_initial(draft, action=None, input=None):
     """
     Takes a draft object, a string representing the email type:
     (extend,new,replace,resurrect,revision,update,withdraw) and
@@ -182,20 +182,22 @@ def get_email_initial(draft, type=None, input=None):
     It appears datatracker abbreviates the list with "et al".  Datatracker scheduled_announcement
     entries have "Action" in subject whereas this app uses "ACTION"
     """
-    # assert False, (draft, type, input)
     expiration_date = (datetime.date.today() + datetime.timedelta(185)).strftime('%B %d, %Y')
     new_revision = str(int(draft.rev)+1).zfill(2)
     new_filename = draft.name + '-' + new_revision + '.txt'
     curr_filename = draft.name + '-' + draft.rev + '.txt'
     data = {}
     data['cc'] = get_fullcc_list(draft)
     data['to'] = ''
-    if type == 'extend':
+    data['action'] = action
+
+    if action == 'extend':
         context = {'doc':curr_filename,'expire_date':input['expiration_date']}
         data['subject'] = 'Extension of Expiration Date for %s' % (curr_filename)
         data['body'] = render_to_string('drafts/message_extend.txt', context)
+        data['expiration_date'] = input['expiration_date']
 
-    elif type == 'new':
+    elif action == 'new':
         # if the ID belongs to a group other than "none" add line to message body
         if draft.group.type.slug == 'wg':
             wg_message = 'This draft is a work item of the %s Working Group of the IETF.' % draft.group.name
@@ -211,37 +213,43 @@ def get_email_initial(draft, type=None, input=None):
         data['subject'] = 'I-D ACTION:%s' % (curr_filename)
         data['body'] = render_to_string('drafts/message_new.txt', context)
 
-    elif type == 'replace':
+    elif action == 'replace':
         '''
         input['replaced'] is a DocAlias
         input['replaced_by'] is a Document
         '''
-        context = {'doc':input['replaced'].name,'replaced_by':input['replaced_by'].name}
-        data['subject'] = 'Replacement of %s with %s' % (input['replaced'].name,input['replaced_by'].name)
+        context = {'doc':input['replaced'],'replaced_by':input['replaced_by']}
+        data['subject'] = 'Replacement of %s with %s' % (input['replaced'],input['replaced_by'])
         data['body'] = render_to_string('drafts/message_replace.txt', context)
-
-    elif type == 'resurrect':
+        data['replaced'] = input['replaced']
+        data['replaced_by'] = input['replaced_by']
+        
+    elif action == 'resurrect':
         last_revision = get_last_revision(draft.name)
         last_filename = draft.name + '-' + last_revision + '.txt'
         context = {'doc':last_filename,'expire_date':expiration_date}
         data['subject'] = 'Resurrection of %s' % (last_filename)
         data['body'] = render_to_string('drafts/message_resurrect.txt', context)
+        data['action'] = action
 
-    elif type == 'revision':
+    elif action == 'revision':
         context = {'rev':new_revision,'doc':new_filename,'doc_base':new_filename[:-4]}
         data['to'] = get_revision_emails(draft)
         data['cc'] = ''
         data['subject'] = 'New Version Notification - %s' % (new_filename)
         data['body'] = render_to_string('drafts/message_revision.txt', context)
 
-    elif type == 'update':
+    elif action == 'update':
         context = {'doc':input['filename'],'expire_date':expiration_date}
         data['subject'] = 'Posting of %s' % (input['filename'])
         data['body'] = render_to_string('drafts/message_update.txt', context)
-
-    elif type == 'withdraw':
-        context = {'doc':curr_filename,'by':input['type']}
+        data['action'] = action
+        
+    elif action == 'withdraw':
+        context = {'doc':curr_filename,'by':input['withdraw_type']}
         data['subject'] = 'Withdrawl of %s' % (curr_filename)
         data['body'] = render_to_string('drafts/message_withdraw.txt', context)
+        data['action'] = action
+        data['withdraw_type'] = input['withdraw_type']
 
     return data

ietf/secr/drafts/forms.py

@@ -213,12 +213,30 @@ def clean(self):
 
 class EmailForm(forms.Form):
     # max_lengths come from db limits, cc is not limited
+    action = forms.CharField(max_length=255, widget=forms.HiddenInput(), required=False)
+    expiration_date = forms.CharField(max_length=255, widget=forms.HiddenInput(), required=False)
+    withdraw_type = forms.CharField(max_length=255, widget=forms.HiddenInput(), required=False)
+    replaced = forms.CharField(max_length=255, widget=forms.HiddenInput(), required=False)
+    replaced_by = forms.CharField(max_length=255, widget=forms.HiddenInput(), required=False)
+    filename = forms.CharField(max_length=255, widget=forms.HiddenInput(), required=False)
     to = forms.CharField(max_length=255)
     cc = forms.CharField(required=False)
     subject = forms.CharField(max_length=255)
     body = forms.CharField(widget=forms.Textarea(), strip=False)
 
+    def __init__(self, *args, **kwargs):
+        if 'hidden' in kwargs:
+            self.hidden = kwargs.pop('hidden')
+        else:
+            self.hidden = False
+        super(EmailForm, self).__init__(*args, **kwargs)
+
+        if self.hidden:
+            for key in self.fields.keys():
+                self.fields[key].widget = forms.HiddenInput()
+
 class ExtendForm(forms.Form):
+    action = forms.CharField(max_length=255, widget=forms.HiddenInput(),initial='extend')
     expiration_date = forms.DateField()
 
 class ReplaceForm(forms.Form):
@@ -369,5 +387,5 @@ def clean(self):
         return self.cleaned_data
 
 class WithdrawForm(forms.Form):
-    type = forms.CharField(widget=forms.Select(choices=WITHDRAW_CHOICES),help_text='Select which type of withdraw to perform.')
+    withdraw_type = forms.CharField(widget=forms.Select(choices=WITHDRAW_CHOICES),help_text='Select which type of withdraw to perform.')