checkpoint

 - Legacy-Id: 10027

Author: rjsparks

ietf/ipr/mail.py

@@ -5,13 +5,13 @@
 import os
 import pytz
 import re
-from django.conf import settings
 from django.template.loader import render_to_string
 
 from ietf.ipr.models import IprEvent
 from ietf.message.models import Message
 from ietf.person.models import Person
 from ietf.utils.log import log
+from ietf.mailtoken.utils import get_base_ipr_request_address
 
 # ----------------------------------------------------------------
 # Date Functions
@@ -89,7 +89,7 @@ def get_pseudo_submitter(ipr):
 def get_reply_to():
     """Returns a new reply-to address for use with an outgoing message.  This is an
     address with "plus addressing" using a random string.  Guaranteed to be unique"""
-    local,domain = settings.IPR_EMAIL_TO.split('@')
+    local,domain = get_base_ipr_request_address().split('@')
     while True:
         rand = base64.urlsafe_b64encode(os.urandom(12))
         address = "{}+{}@{}".format(local,rand,domain)
@@ -167,7 +167,7 @@ def process_response_email(msg):
     to = message.get('To')
 
     # exit if this isn't a response we're interested in (with plus addressing)
-    local,domain = settings.IPR_EMAIL_TO.split('@')
+    local,domain = get_base_ipr_request_address().split('@')
     if not re.match(r'^{}\+[a-zA-Z0-9_\-]{}@{}'.format(local,'{16}',domain),to):
         return None
 
@@ -193,4 +193,4 @@ def process_response_email(msg):
     )
 
     log(u"Received IPR email from %s" % ietf_message.frm)
-    return ietf_message
+    return ietf_message

ietf/ipr/tests.py

@@ -3,7 +3,6 @@
 
 from pyquery import PyQuery
 
-from django.conf import settings
 from django.core.urlresolvers import reverse as urlreverse
 
 from ietf.doc.models import DocAlias
@@ -16,6 +15,7 @@
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.test_data import make_test_data
 from ietf.utils.mail import outbox
+from ietf.mailtoken.utils import gather_addresses
 
 
 class IprTests(TestCase):
@@ -519,7 +519,7 @@ def test_process_response_email(self):
 From: joe@test.com
 Date: {}
 Subject: test
-""".format(settings.IPR_EMAIL_TO,datetime.datetime.now().ctime())
+""".format(gather_addresses('ipr_disclosure_submitted'),datetime.datetime.now().ctime())
         result = process_response_email(message_string)
         self.assertIsNone(result)
 

ietf/ipr/views.py

@@ -35,6 +35,7 @@
 from ietf.secr.utils.document import get_rfc_num, is_draft
 from ietf.utils.draft_search import normalize_draftname
 from ietf.utils.mail import send_mail, send_mail_message
+from ietf.mailtoken.utils import gather_address_list
 
 # ----------------------------------------------------------------
 # Globals
@@ -379,7 +380,7 @@ def email(request, id):
         reply_to = get_reply_to()
         initial = { 
             'to': ipr.submitter_email,
-            'frm': settings.IPR_EMAIL_TO,
+            'frm': settings.IPR_EMAIL_FROM,
             'subject': 'Regarding {}'.format(ipr.title),
             'reply_to': reply_to,
         }
@@ -474,7 +475,8 @@ def new(request, type, updates=None):
                 desc="Disclosure Submitted")
 
             # send email notification
-            send_mail(request, settings.IPR_EMAIL_TO, ('IPR Submitter App', 'ietf-ipr@ietf.org'),
+            to = gather_address_list('ipr_disclosure_submitted')
+            send_mail(request, to, ('IPR Submitter App', 'ietf-ipr@ietf.org'),
                 'New IPR Submission Notification',
                 "ipr/new_update_email.txt",
                 {"ipr": disclosure,})

ietf/mailtoken/migrations/0002_auto_20150809_1314.py

@@ -117,7 +117,7 @@ def make_recipients(apps):
        desc="The document's group's responsible AD(s) or IRTF chair",
        template=None)
 
-    rc(slug='internet_drafts',
+    rc(slug='internet_draft_requests',
        desc="The internet drafts ticketing system",
        template='internet-drafts@ietf.org')
 
@@ -157,6 +157,18 @@ def make_recipients(apps):
        desc="Any personnel who were added or deleted when a group's personnel changes",
        template='{{ changed_personnel | join:", " }}')
 
+    rc(slug='session_requests',
+       desc="The session request ticketing system",
+       template='session-request@ietf.org')
+
+    rc(slug='ipr_requests',
+       desc="The ipr disclosure handling system",
+       template='ietf-ipr@ietf.org')
+
+    rc(slug='logged_in_person',
+       desc="The person currently logged into the datatracker who initiated a given action",
+       template='{% if person and person.email_address %}{{ person.email_address }}{% endif %}')
+
 def make_mailtokens(apps):
 
     Recipient=apps.get_model('mailtoken','Recipient')
@@ -467,7 +479,7 @@ def mt_factory(slug,desc,recipient_slugs):
 
     mt_factory(slug='resurrection_requested',
                desc="Recipients of a request to change the state of a draft away from 'Dead'",
-               recipient_slugs=['internet_drafts',])
+               recipient_slugs=['internet_draft_requests',])
 
     mt_factory(slug='resurrection_completed',
                desc="Recipients when a draft resurrection request has been completed",
@@ -477,7 +489,7 @@ def mt_factory(slug,desc,recipient_slugs):
 
     mt_factory(slug='sub_manual_post_requested',
                desc="Recipients for a manual post request for a draft submission",
-               recipient_slugs=['internet_drafts',
+               recipient_slugs=['internet_draft_requests',
                                ])
 
     mt_factory(slug='sub_manual_post_requested_cc',
@@ -552,6 +564,74 @@ def mt_factory(slug,desc,recipient_slugs):
                                 'group_changed_personnel',
                                ])
 
+    mt_factory(slug='session_requested',
+               desc="Recipients for a normal meeting session request",
+               recipient_slugs=['session_requests',
+                               ]) 
+
+    mt_factory(slug='session_requested_cc',
+               desc="Copied on a normal meeting session request",
+               recipient_slugs=['group_mail_list',
+                                'group_chairs',
+                                'group_responsible_directors',
+                                'logged_in_person',
+                               ]) 
+
+    mt_factory(slug='session_requested_long',
+               desc="Recipients for a meeting session request for more than 2 sessions",
+               recipient_slugs=['group_responsible_directors',
+                               ])
+     
+    mt_factory(slug='session_requested_long_cc',
+               desc="Copied on a meeting session request for more than 2 sessions",
+               recipient_slugs=['session_requests',
+                                'group_chairs',
+                                'logged_in_person',
+                               ])
+
+    mt_factory(slug='session_request_cancelled',
+               desc="Recipients for a message cancelling a session request",
+               recipient_slugs=['session_requests',
+                               ])
+
+    mt_factory(slug='session_request_cancelled_cc',
+               desc="Copied on a message cancelling a session request",
+               recipient_slugs=['group_mail_list',
+                                'group_chairs',
+                                'group_responsible_directors',
+                                'logged_in_person',
+                               ]) 
+
+    mt_factory(slug='session_request_not_meeting',
+               desc="Recipients for a message noting a group plans to not meet",
+               recipient_slugs=['session_requests',
+                               ])
+
+    mt_factory(slug='session_request_not_meeting_cc',
+               desc="Copied on a message noting a group plans to not meet",
+               recipient_slugs=['group_mail_list',
+                                'group_chairs',
+                                'group_responsible_directors',
+                                'logged_in_person',
+                               ]) 
+
+    mt_factory(slug='session_scheduled',
+               desc="Recipients for details when a session has been scheduled",
+               recipient_slugs=['session_requester',
+                                'group_chairs',
+                               ])
+
+    mt_factory(slug='session_scheduled_cc',
+               desc="Recipients for details when a session has been scheduled",
+               recipient_slugs=['group_mail_list',
+                                'group_responsible_directors',
+                               ])
+
+    mt_factory(slug='ipr_disclosure_submitted',
+               desc="Recipients when an IPR notification is submitted",
+               recipient_slugs=['ipr_requests',
+                               ])
+
 def forward(apps, schema_editor):
 
     make_recipients(apps)

ietf/mailtoken/utils.py

@@ -1,7 +1,6 @@
-
 from django.core.exceptions import ObjectDoesNotExist
 
-from ietf.mailtoken.models import MailToken
+from ietf.mailtoken.models import MailToken, Recipient
 
 def gather_address_list(slug,**kwargs):
 
@@ -21,3 +20,8 @@ def gather_address_list(slug,**kwargs):
 
 def gather_addresses(slug,**kwargs):
     return ",\n   ".join(gather_address_list(slug,**kwargs))
+
+def get_base_ipr_request_address():
+    return Recipient.objects.get(slug='ipr_requests').gather()[0]
+
+