Ticket #442: fix_email_verification.patch

a/acct_mgr/tests/functional/testcases.py

@@ -265 +265 @@
-        self._tester.logout()
-        self._smtpd.full_reset()
-
+class NoEmailVerificationForAnonymousUsers(FunctionalTestCaseSetup):
+    def runTest(self):
+        """Anonymous users don't get their email address verified"""
+        tc.find("Login")
+        tc.follow("Preferences")
+        form_name = 'userprefs'
+        email_address = 'anonyous.user@fakedomain.tld'
+        tc.formvalue(form_name, 'email', email_address)
+        tc.submit()
+        tc.notfind('<strong>Notice:</strong> <span>An email has been sent to '
+                   '%s with a token to <a href="/verify_email">verify your new '
+                   'email address</a></span>' % email_address)
+        self._tester.go_to_front()
+        tc.notfind('<strong>Warning:</strong> <span>Your permissions have been '
+                   'limited until you <a href="/verify_email">verify your email '
+                   'address</a></span>')
+        
+        
-def suite():
-    suite = FunctionalTestSuite()
-    suite.addTest(TestFormLoginAdmin())
@@ -284 +302 @@
-    suite.addTest(DeleteAccountNotifiesAdmin())
-    suite.addTest(UserNoLongerLogins())
-    suite.addTest(UserIsAbleToRegisterWithSameUserName())
+    suite.addTest(NoEmailVerificationForAnonymousUsers())
-    return suite
-
-

a/acct_mgr/web_ui.py

@@ -514 +514 @@
-    # IRequestFilter methods
-
-    def pre_process_request(self, req, handler):
+        if not req.session.authenticated:
+            # Anonymous users should register and perms should be tweaked so
+            # that anonymous users can't edit wiki pages and change or create
+            # tickets. As such, this email verifying code won't be used on them
+            return handler
-        if handler is not self and 'email_verification_token' in req.session:
-            chrome.add_warning(req, MessageWrapper(tag.span(
-                    'Your permissions have been limited until you ',
@@ -523 +528 @@
-        return handler
-
-    def post_process_request(self, req, template, data, content_type):
+        if not req.session.authenticated:
+            # Anonymous users should register and perms should be tweaked so
+            # that anonymous users can't edit wiki pages and change or create
+            # tickets. As such, this email verifying code won't be used on them
+            return template, data, content_type
-        if req.session.get('email') != req.session.get('email_verification_sent_to'):
-            req.session['email_verification_token'] = self._gen_token()
-            req.session['email_verification_sent_to'] = req.session.get('email')