Modified roundup-mailgw so it can read e-mails from a local mail spool

[roundup.git] / roundup / cgi_client.py

diff --git a/roundup/cgi_client.py b/roundup/cgi_client.py
index 7ad072f1842fa02c7a789421078ca97b4e41a7a2..43b648e85cf70746552d98ee706e83ca8715d370 100644 (file)
--- a/roundup/cgi_client.py
+++ b/roundup/cgi_client.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: cgi_client.py,v 1.52 2001-11-06 23:11:22 jhermann Exp $
+# $Id: cgi_client.py,v 1.55 2001-11-07 02:34:06 jhermann Exp $
 
 import os, cgi, pprint, StringIO, urlparse, re, traceback, mimetypes
 import binascii, Cookie, time
@@ -663,9 +663,14 @@ class Client:
     def set_cookie(self, user, password):
         # construct the cookie
         user = binascii.b2a_base64('%s:%s'%(user, password)).strip()
+        if user[-1] == '=':
+          if user[-2] == '=':
+            user = user[:-2]
+          else:
+            user = user[:-1]
         expire = Cookie._getdate(86400*365)
         path = '/'.join((self.env['SCRIPT_NAME'], self.env['INSTANCE_NAME']))
-        self.header({'Set-Cookie': 'roundup_user="%s"; expires="%s"; Path="%s";' % (
+        self.header({'Set-Cookie': 'roundup_user=%s; expires=%s; Path=%s;' % (
             user, expire, path)})
 
     def make_user_anonymous(self):
@@ -682,7 +687,7 @@ class Client:
         now = Cookie._getdate()
         path = '/'.join((self.env['SCRIPT_NAME'], self.env['INSTANCE_NAME']))
         self.header({'Set-Cookie':
-            'roundup_user=deleted; Max-Age=0; expires="%s"; Path="%s";'%(now,
+            'roundup_user=deleted; Max-Age=0; expires=%s; Path=%s;'%(now,
             path)})
         return self.login()
 
@@ -716,7 +721,14 @@ class Client:
         if (cookie.has_key('roundup_user') and
                 cookie['roundup_user'].value != 'deleted'):
             cookie = cookie['roundup_user'].value
-            user, password = binascii.a2b_base64(cookie).split(':')
+            if len(cookie)%4:
+              cookie = cookie + '='*(4-len(cookie)%4)
+            try:
+                user, password = binascii.a2b_base64(cookie).split(':')
+            except (TypeError, binascii.Error, binascii.Incomplete):
+                # damaged cookie!
+                user, password = 'anonymous', ''
+
             # make sure the user exists
             try:
                 uid = self.db.user.lookup(user)
@@ -943,6 +955,19 @@ def parsePropsFromForm(db, cl, form, nodeid=0):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.54  2001/11/07 01:16:12  richard
+# Remove the '=' padding from cookie value so quoting isn't an issue.
+#
+# Revision 1.53  2001/11/06 23:22:05  jhermann
+# More IE fixes: it does not like quotes around cookie values; in the
+# hope this does not break anything for other browser; if it does, we
+# need to check HTTP_USER_AGENT
+#
+# Revision 1.52  2001/11/06 23:11:22  jhermann
+# Fixed debug output in page footer; added expiry date to the login cookie
+# (expires 1 year in the future) to prevent probs with certain versions
+# of IE
+#
 # Revision 1.51  2001/11/06 22:00:34  jhermann
 # Get debug level from ROUNDUP_DEBUG env var
 #