Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always return 200 for OPTS UTF8 or OPTS UTF-8 ON #596

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pyftpdlib/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -2992,12 +2992,14 @@ def ftp_OPTS(self, line):
if line.count(' ') > 1:
raise ValueError('Invalid number of arguments')
if ' ' in line:
cmd, arg = line.split(' ')
if ';' not in arg:
raise ValueError('Invalid argument')
cmd, arg = line.split(' ')
else:
cmd, arg = line, ''
# actually the only command able to accept options is MLST
if cmd.upper() in ("UTF8", "UTF-8"):
self.respond('200 Always in UTF8 mode.')
return
if arg and ';' not in arg:
raise ValueError('Invalid argument')
if cmd.upper() != 'MLST' or 'MLST' not in self.proto_cmds:
raise ValueError('Unsupported command "%s"' % cmd)
except ValueError as err:
Expand Down
Loading