mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 17:12:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

ftp: track login state isolated from pyftpdlib;

Browse source 
for convenience, the password can be provided as the username
but that confuses pyftpd a little so let's do this
This commit is contained in:
ed 2023-04-23 21:06:19 +00:00
parent d999f06bb9
commit d5109be559
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
copyparty/ftpd.py
View file

@ -55,6 +55,7 @@ class FtpAuth(DummyAuthorizer):
self, username: str, password: str, handler: Any self, username: str, password: str, handler: Any
) -> None: ) -> None:
handler.username = "{}:{}".format(username, password) handler.username = "{}:{}".format(username, password)
handler.uname = "*"
ip = handler.addr[0] ip = handler.addr[0]
if ip.startswith("::ffff:"): if ip.startswith("::ffff:"):
@ -86,14 +87,14 @@ class FtpAuth(DummyAuthorizer):
raise AuthenticationFailed("Authentication failed.") raise AuthenticationFailed("Authentication failed.")
handler.username = uname handler.uname = uname
def get_home_dir(self, username: str) -> str: def get_home_dir(self, username: str) -> str:
return "/" return "/"
def has_user(self, username: str) -> bool: def has_user(self, username: str) -> bool:
asrv = self.hub.asrv asrv = self.hub.asrv
return username in asrv.acct return username in asrv.acct or username in asrv.iacct
def has_perm(self, username: str, perm: int, path: Optional[str] = None) -> bool: def has_perm(self, username: str, perm: int, path: Optional[str] = None) -> bool:
return True # handled at filesystem layer return True # handled at filesystem layer
@ -115,8 +116,7 @@ class FtpFs(AbstractedFS):
self.h = self.cmd_channel = cmd_channel # type: FTPHandler self.h = self.cmd_channel = cmd_channel # type: FTPHandler
self.hub: "SvcHub" = cmd_channel.hub self.hub: "SvcHub" = cmd_channel.hub
self.args = cmd_channel.args self.args = cmd_channel.args
self.uname = cmd_channel.uname
self.uname = self.hub.asrv.iacct.get(cmd_channel.password, "*")
self.cwd = "/" # pyftpdlib convention of leading slash self.cwd = "/" # pyftpdlib convention of leading slash
self.root = "/var/lib/empty" self.root = "/var/lib/empty"
@ -215,7 +215,7 @@ class FtpFs(AbstractedFS):
self.can_delete, self.can_delete,
self.can_get, self.can_get,
self.can_upget, self.can_upget,
) = self.hub.asrv.vfs.can_access(self.cwd.lstrip("/"), self.h.username) ) = self.hub.asrv.vfs.can_access(self.cwd.lstrip("/"), self.h.uname)
def mkdir(self, path: str) -> None: def mkdir(self, path: str) -> None:
ap = self.rv2a(path, w=True)[0] ap = self.rv2a(path, w=True)[0]
@ -265,7 +265,7 @@ class FtpFs(AbstractedFS):
def rename(self, src: str, dst: str) -> None: def rename(self, src: str, dst: str) -> None:
if not self.can_move: if not self.can_move:
self.die("Not allowed for user " + self.h.username) self.die("Not allowed for user " + self.h.uname)
if self.args.no_mv: if self.args.no_mv:
self.die("The rename/move feature is disabled in server config") self.die("The rename/move feature is disabled in server config")
@ -344,10 +344,12 @@ class FtpHandler(FTPHandler):
abstracted_fs = FtpFs abstracted_fs = FtpFs
hub: "SvcHub" hub: "SvcHub"
args: argparse.Namespace args: argparse.Namespace
uname: str
def __init__(self, conn: Any, server: Any, ioloop: Any = None) -> None: def __init__(self, conn: Any, server: Any, ioloop: Any = None) -> None:
self.hub: "SvcHub" = FtpHandler.hub self.hub: "SvcHub" = FtpHandler.hub
self.args: argparse.Namespace = FtpHandler.args self.args: argparse.Namespace = FtpHandler.args
self.uname = "*"
if PY2: if PY2:
FTPHandler.__init__(self, conn, server, ioloop) FTPHandler.__init__(self, conn, server, ioloop)
@ -379,7 +381,7 @@ class FtpHandler(FTPHandler):
ap, ap,
vfs.canonical(rem), vfs.canonical(rem),
"", "",
self.username, self.uname,
0, 0,
0, 0,
self.cli_ip, self.cli_ip,
@ -408,7 +410,7 @@ class FtpHandler(FTPHandler):
# print("xfer_end: {} => {}".format(ap, vp)) # print("xfer_end: {} => {}".format(ap, vp))
if vp: if vp:
vp, fn = os.path.split(vp) vp, fn = os.path.split(vp)
vfs, rem = self.hub.asrv.vfs.get(vp, self.username, False, True) vfs, rem = self.hub.asrv.vfs.get(vp, self.uname, False, True)
vfs, rem = vfs.get_dbv(rem) vfs, rem = vfs.get_dbv(rem)
self.hub.up2k.hash_file( self.hub.up2k.hash_file(
vfs.realpath, vfs.realpath,
@ -418,7 +420,7 @@ class FtpHandler(FTPHandler):
fn, fn,
self.cli_ip, self.cli_ip,
time.time(), time.time(),
self.username, self.uname,
) )
return FTPHandler.log_transfer( return FTPHandler.log_transfer(