Skip to content

Implement ticket password feature in dl-cli.py #82

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.

Sign up for GitHub

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

Open
egcmi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement ticket password feature in dl-cli.py #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
212c193
Implement ticket password feature in dl-cli.py
egcmi Apr 7, 2026
d882708
Implement ticket password reading from file
egcmi Jul 21, 2026
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
31 changes: 30 additions & 1 deletion client/dl-cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,16 @@ def progress(download_t, download_d, upload_t, upload_d):

if not filename:
filename = os.path.basename(path)

msg = {}
# add ticket parameters, if present/configured
if 'ticket_password' in params:
msg['pass'] = params['ticket_password']

c.setopt(c.HTTPPOST, [
("file", (c.FORM_FILE, path.encode(sys.getfilesystemencoding()),
c.FORM_FILENAME, filename.encode('utf8'))),
("msg", json.dumps({}))])
("msg", json.dumps(msg))])

try:
c.perform()
Expand Down Expand Up @@ -165,10 +171,28 @@ def die(descr, code=1):
exit(code)


def read_ticket_password(password_file):
if password_file == '-':
password = sys.stdin.read()
else:
try:
with io.open(password_file, 'r', encoding='utf8') as f:
password = f.read()
except IOError as e:
die("cannot read password file \"{0}\": {1}".format(password_file, e))

password = password.rstrip('\r\n')
if not password:
die("ticket password is empty")
return password


def main():
parser = argparse.ArgumentParser(description="Upload a file to DL", epilog=DL_AGENT)
parser.add_argument('-r', metavar="file", dest="rc",
default="~/.dl.rc", help="Use alternate RC file")
parser.add_argument('--password-file', metavar="file", dest="ticket_password_file",
help="Read download ticket password from file ('-' for stdin)")
group = parser.add_mutually_exclusive_group(required=True)
group.add_argument('-g', metavar="email", dest="grant", nargs='?', default=False,
help="Generate a grant with notification sent to 'email'")
Expand Down Expand Up @@ -204,6 +228,11 @@ def main():
if not cfg['verify']:
print("WARNING: SSL validation is disabled (use fingerprint for self-signed certs instead!)")

if args.ticket_password_file:
if not args.file:
die("--password-file can only be used when uploading files")
cfg['ticket_password'] = read_ticket_password(args.ticket_password_file)

# Pre-process the fingerprint
if cfg['fingerprint'] and cfg['fingerprint'][0] not in '~./' \
and len(cfg['fingerprint']) in [64, 95]:
Expand Down