Fixed a bug in FTP cookie authentication.

922f6682 · Amos Latteier · d1f544be · 922f6682 · 922f6682
Commit 922f6682 authored Sep 09, 1999 by Amos Latteier
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

ZServer/FTPRequest.py ZServer/FTPRequest.py +3 -2

lib/python/ZServer/FTPRequest.py lib/python/ZServer/FTPRequest.py +3 -2

No files found.
--- a/ZServer/FTPRequest.py
+++ b/ZServer/FTPRequest.py
@@ -110,11 +110,12 @@ class FTPRequest(HTTPRequest):
        # support for cookies and cookie authentication
        self.cookies=channel.cookies
        if not self.cookies.has_key('__ac') and channel.userid != 'anonymous':
-            self.cookies['__ac']=encodestring('%s:%s' %
+            self.other['__ac_name']=channel.userid
-                    (channel.userid, channel.password))       
+            self.other['__ac_password']=channel.password
        for k,v in self.cookies.items():
            if not self.other.has_key(k):
                self.other[k]=v
    def retry(self):
        self.retry_count=self.retry_count+1

--- a/lib/python/ZServer/FTPRequest.py
+++ b/lib/python/ZServer/FTPRequest.py
@@ -110,11 +110,12 @@ class FTPRequest(HTTPRequest):
        # support for cookies and cookie authentication
        self.cookies=channel.cookies
        if not self.cookies.has_key('__ac') and channel.userid != 'anonymous':
-            self.cookies['__ac']=encodestring('%s:%s' %
+            self.other['__ac_name']=channel.userid
-                    (channel.userid, channel.password))       
+            self.other['__ac_password']=channel.password
        for k,v in self.cookies.items():
            if not self.other.has_key(k):
                self.other[k]=v
    def retry(self):
        self.retry_count=self.retry_count+1