summaryrefslogtreecommitdiff
path: root/Mailman/SecurityManager.py
diff options
context:
space:
mode:
authorbwarsaw2006-04-17 13:10:09 +0000
committerbwarsaw2006-04-17 13:10:09 +0000
commit953d9bff95f70b66b1b6c04340959185a11c3d10 (patch)
treebd6aa3c6d30bcace2d628da71bc121f751ff1be2 /Mailman/SecurityManager.py
parent0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0 (diff)
downloadmailman-953d9bff95f70b66b1b6c04340959185a11c3d10.tar.gz
mailman-953d9bff95f70b66b1b6c04340959185a11c3d10.tar.zst
mailman-953d9bff95f70b66b1b6c04340959185a11c3d10.zip
Diffstat (limited to 'Mailman/SecurityManager.py')
-rw-r--r--Mailman/SecurityManager.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Mailman/SecurityManager.py b/Mailman/SecurityManager.py
index 91ab6f52f..46f90ad98 100644
--- a/Mailman/SecurityManager.py
+++ b/Mailman/SecurityManager.py
@@ -57,7 +57,6 @@ import logging
import marshal
import binascii
-from types import StringType, TupleType
from urlparse import urlparse
from Mailman import Errors
@@ -228,7 +227,7 @@ class SecurityManager:
def MakeCookie(self, authcontext, user=None):
key, secret = self.AuthContextInfo(authcontext, user)
- if key is None or secret is None or not isinstance(secret, StringType):
+ if key is None or secret is None or not isinstance(secret, str):
raise ValueError
# Timestamp
issued = int(time.time())
@@ -310,7 +309,7 @@ class SecurityManager:
key, secret = self.AuthContextInfo(authcontext, user)
except Errors.NotAMemberError:
return False
- if not c.has_key(key) or not isinstance(secret, StringType):
+ if not c.has_key(key) or not isinstance(secret, str):
return False
# Undo the encoding we performed in MakeCookie() above. BAW: I
# believe this is safe from exploit because marshal can't be forced to