Fix subscription data handling to use tuple format consistently

Author: jaredmauch

Mailman/MailList.py

@@ -1124,7 +1124,8 @@ def InviteNewMember(self, userdesc, text=''):
                    self.real_name, invitee, pattern)
             raise Errors.MembershipIsBanned(pattern)
         userdesc.invitation = self.internal_name()
-        cookie = self.pend_new(Pending.SUBSCRIPTION, userdesc)
+        cookie = self.pend_new(Pending.SUBSCRIPTION,
+                               (userdesc, None))
         requestaddr = self.getListAddress('request')
         confirmurl = '%s/%s' % (self.GetScriptURL('confirm', absolute=1), cookie)
         listname = self.real_name
@@ -1172,7 +1173,7 @@ def AddMember(self, userdesc, remote=None):
         if self.subscribe_policy in (2, 3) and not self.HasAutoApprovedSender(email):
             # Pend the subscription
             cookie = self.pend_new(Pending.SUBSCRIPTION,
-                                   userdesc, remote)
+                                   (userdesc, remote))
             confirmurl = '%s/%s' % (self.GetScriptURL('confirm', absolute=1),
                                     cookie)
             lang = userdesc.language

Mailman/OldStyleMemberships.py

@@ -505,21 +505,24 @@ def ProcessConfirmation(self, cookie, msg):
 
         # Process based on action type
         if action == Pending.SUBSCRIPTION:
+            # Extract userdesc and remote from data
+            userdesc, remote = data
+            
             # Check if already a member
-            if self.isMember(data['email']):
-                raise Errors.MMAlreadyAMember(data['email'])
+            if self.isMember(userdesc.address):
+                raise Errors.MMAlreadyAMember(userdesc.address)
 
             # Check if banned
-            if self.__mlist.isBanned(data['email']):
-                raise Errors.MembershipIsBanned(data['email'])
+            if self.__mlist.isBanned(userdesc.address):
+                raise Errors.MembershipIsBanned(userdesc.address)
 
             # Add the member
             self.addNewMember(
-                data['email'],
-                digest=data.get('digest', 0),
-                password=data.get('password', Utils.MakeRandomPassword()),
-                language=data.get('language', self.__mlist.preferred_language),
-                realname=data.get('realname', '')
+                userdesc.address,
+                digest=userdesc.digest,
+                password=userdesc.password,
+                language=userdesc.language,
+                realname=userdesc.fullname
             )
 
         elif action == Pending.UNSUBSCRIPTION: