Skip to content

Z
Zope
Commit c3526c9b authored by Amos Latteier's avatar Amos Latteier
Browse files
Options

First cut at cookie support for ZServer FTP server. This is needed for things... 

First cut at cookie support for ZServer FTP server. This is needed for things like FTP authentication via UserDB.
parent 9dd04960
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 24 deletions
ZServer/FTPRequest.py
View file @ c3526c9b
......@@ -104,7 +104,11 @@ class FTPRequest(HTTPRequest):
stdin=StringIO()
env=self._get_env(path, command, channel, stdin)
HTTPRequest.__init__(self, stdin, env, response, clean=1)
self.cookies=channel.cookies
for k,v in self.cookies.items():
if not self.other.has_key(k):
self.other[k]=v
def _get_env(self, path, command, channel, stdin):
"Returns a CGI style environment"
env={}
......
ZServer/FTPResponse.py
View file @ c3526c9b
......@@ -133,8 +133,9 @@ class CallbackPipe:
return result
def make_response(callback,*args):
def make_response(channel, callback, *args):
# XXX should this be the FTPResponse constructor instead?
r=FTPResponse(stdout=CallbackPipe(callback, args), stderr=StringIO())
r.setHeader('content-type','text/plain')
r.cookies=channel.cookies
return r
ZServer/FTPServer.py
View file @ c3526c9b
......@@ -163,6 +163,7 @@ class zope_ftp_channel(ftp_channel):
self.userid=''
self.password=''
self.path='/'
self.cookies={}
def _join_paths(self,*args):
path=apply(os.path.join,args)
......@@ -218,7 +219,7 @@ class zope_ftp_channel(ftp_channel):
self.listdir(dir, long)
def listdir (self, path, long=0):
response=make_response(self.listdir_completion, long)
response=make_response(self, self.listdir_completion, long)
request=FTPRequest(path, 'LST', self, response)
handle(self.module, request, response)
......@@ -252,7 +253,7 @@ class zope_ftp_channel(ftp_channel):
def cmd_cwd (self, line):
'change working directory'
response=make_response(self.cwd_completion,
response=make_response(self, self.cwd_completion,
self._join_paths(self.path,line[1]))
request=FTPRequest(line[1],'CWD',self,response)
handle(self.module,request,response)
......@@ -297,7 +298,7 @@ class zope_ftp_channel(ftp_channel):
if len (line) != 2:
self.command.not_understood (string.join (line))
return
response=make_response(self.mdtm_completion)
response=make_response(self, self.mdtm_completion)
request=FTPRequest(line[1],'MDTM',self,response)
handle(self.module,request,response)
......@@ -324,7 +325,7 @@ class zope_ftp_channel(ftp_channel):
if len (line) != 2:
self.command.not_understood (string.join (line))
return
response=make_response(self.size_completion)
response=make_response(self, self.size_completion)
request=FTPRequest(line[1],'SIZE',self,response)
handle(self.module,request,response)
......@@ -343,7 +344,7 @@ class zope_ftp_channel(ftp_channel):
if len(line) < 2:
self.command_not_understood (string.join (line))
return
response=make_response(self.retr_completion,line[1])
response=make_response(self, self.retr_completion, line[1])
request=FTPRequest(line[1],'RETR',self,response)
handle(self.module,request,response)
......@@ -388,7 +389,7 @@ class zope_ftp_channel(ftp_channel):
def stor_callback(self,path,data):
'callback to do the STOR, after we have the input'
response=make_response(self.stor_completion)
response=make_response(self, self.stor_completion)
request=FTPRequest(path,'STOR',self,response,stdin=data)
handle(self.module,request,response)
......@@ -407,7 +408,7 @@ class zope_ftp_channel(ftp_channel):
self.command.not_understood (string.join (line))
return
path,id=os.path.split(line[1])
response=make_response(self.dele_completion)
response=make_response(self, self.dele_completion)
request=FTPRequest(path,('DELE',id),self,response)
handle(self.module,request,response)
......@@ -425,7 +426,7 @@ class zope_ftp_channel(ftp_channel):
self.command.not_understood (string.join (line))
return
path,id=os.path.split(line[1])
response=make_response(self.mkd_completion)
response=make_response(self, self.mkd_completion)
request=FTPRequest(path,('MKD',id),self,response)
handle(self.module,request,response)
......@@ -447,7 +448,7 @@ class zope_ftp_channel(ftp_channel):
self.command.not_understood (string.join (line))
return
path,id=os.path.split(line[1])
response=make_response(self.rmd_completion)
response=make_response(self, self.rmd_completion)
request=FTPRequest(path,('RMD',id),self,response)
handle(self.module,request,response)
......@@ -491,7 +492,8 @@ class zope_ftp_channel(ftp_channel):
path=self.userid[i+1:]
self.userid=self.userid[:i]
self.anonymous=None
response=make_response(self.pass_completion, self._join_paths('/',path))
response=make_response(self, self.pass_completion,
self._join_paths('/',path))
request=FTPRequest(path,'PASS',self,response)
handle(self.module,request,response)
......
lib/python/ZServer/FTPRequest.py
View file @ c3526c9b
......@@ -104,7 +104,11 @@ class FTPRequest(HTTPRequest):
stdin=StringIO()
env=self._get_env(path, command, channel, stdin)
HTTPRequest.__init__(self, stdin, env, response, clean=1)
self.cookies=channel.cookies
for k,v in self.cookies.items():
if not self.other.has_key(k):
self.other[k]=v
def _get_env(self, path, command, channel, stdin):
"Returns a CGI style environment"
env={}
......
lib/python/ZServer/FTPResponse.py
View file @ c3526c9b
......@@ -133,8 +133,9 @@ class CallbackPipe:
return result
def make_response(callback,*args):
def make_response(channel, callback, *args):
# XXX should this be the FTPResponse constructor instead?
r=FTPResponse(stdout=CallbackPipe(callback, args), stderr=StringIO())
r.setHeader('content-type','text/plain')
r.cookies=channel.cookies
return r
lib/python/ZServer/FTPServer.py
View file @ c3526c9b
......@@ -163,6 +163,7 @@ class zope_ftp_channel(ftp_channel):
self.userid=''
self.password=''
self.path='/'
self.cookies={}
def _join_paths(self,*args):
path=apply(os.path.join,args)
......@@ -218,7 +219,7 @@ class zope_ftp_channel(ftp_channel):
self.listdir(dir, long)
def listdir (self, path, long=0):
response=make_response(self.listdir_completion, long)
response=make_response(self, self.listdir_completion, long)
request=FTPRequest(path, 'LST', self, response)
handle(self.module, request, response)
......@@ -252,7 +253,7 @@ class zope_ftp_channel(ftp_channel):
def cmd_cwd (self, line):
'change working directory'
response=make_response(self.cwd_completion,
response=make_response(self, self.cwd_completion,
self._join_paths(self.path,line[1]))
request=FTPRequest(line[1],'CWD',self,response)
handle(self.module,request,response)
......@@ -297,7 +298,7 @@ class zope_ftp_channel(ftp_channel):
if len (line) != 2:
self.command.not_understood (string.join (line))
return
response=make_response(self.mdtm_completion)
response=make_response(self, self.mdtm_completion)
request=FTPRequest(line[1],'MDTM',self,response)
handle(self.module,request,response)
......@@ -324,7 +325,7 @@ class zope_ftp_channel(ftp_channel):
if len (line) != 2:
self.command.not_understood (string.join (line))
return
response=make_response(self.size_completion)
response=make_response(self, self.size_completion)
request=FTPRequest(line[1],'SIZE',self,response)
handle(self.module,request,response)
......@@ -343,7 +344,7 @@ class zope_ftp_channel(ftp_channel):
if len(line) < 2:
self.command_not_understood (string.join (line))
return
response=make_response(self.retr_completion,line[1])
response=make_response(self, self.retr_completion, line[1])
request=FTPRequest(line[1],'RETR',self,response)
handle(self.module,request,response)
......@@ -388,7 +389,7 @@ class zope_ftp_channel(ftp_channel):
def stor_callback(self,path,data):
'callback to do the STOR, after we have the input'
response=make_response(self.stor_completion)
response=make_response(self, self.stor_completion)
request=FTPRequest(path,'STOR',self,response,stdin=data)
handle(self.module,request,response)
......@@ -407,7 +408,7 @@ class zope_ftp_channel(ftp_channel):
self.command.not_understood (string.join (line))
return
path,id=os.path.split(line[1])
response=make_response(self.dele_completion)
response=make_response(self, self.dele_completion)
request=FTPRequest(path,('DELE',id),self,response)
handle(self.module,request,response)
......@@ -425,7 +426,7 @@ class zope_ftp_channel(ftp_channel):
self.command.not_understood (string.join (line))
return
path,id=os.path.split(line[1])
response=make_response(self.mkd_completion)
response=make_response(self, self.mkd_completion)
request=FTPRequest(path,('MKD',id),self,response)
handle(self.module,request,response)
......@@ -447,7 +448,7 @@ class zope_ftp_channel(ftp_channel):
self.command.not_understood (string.join (line))
return
path,id=os.path.split(line[1])
response=make_response(self.rmd_completion)
response=make_response(self, self.rmd_completion)
request=FTPRequest(path,('RMD',id),self,response)
handle(self.module,request,response)
......@@ -491,7 +492,8 @@ class zope_ftp_channel(ftp_channel):
path=self.userid[i+1:]
self.userid=self.userid[:i]
self.anonymous=None
response=make_response(self.pass_completion, self._join_paths('/',path))
response=make_response(self, self.pass_completion,
self._join_paths('/',path))
request=FTPRequest(path,'PASS',self,response)
handle(self.module,request,response)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7