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 1 commit 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
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions client/dl-cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from __future__ import unicode_literals, print_function, generators

import argparse
import secrets
import io, sys
from datetime import datetime

Expand Down Expand Up @@ -73,6 +74,10 @@ def progress(download_t, download_d, upload_t, upload_d):
c.FORM_FILENAME, filename.encode('utf8'))),
("msg", json.dumps({}))])

if 'ticket_pass' in params and params['ticket_pass'] == 1:
msg['pass'] = secrets.token_urlsafe(16)
print(msg['pass'])

try:
c.perform()
except pycurl.error as e:
Expand Down Expand Up @@ -212,6 +217,13 @@ def main():
die("fingerprint doesn't look like a valid hex-encoded SHA256 hash")
cfg['fingerprint'] = 'sha256//' + binascii.b2a_base64(binascii.a2b_hex(fp))[:-1]

# Ticket password parameter
if 'ticket_pass' in cfg:
try:
cfg['ticket_pass'] = v.check('boolean', cfg['ticket_pass'])
except validate.ValidateError:
die("Value for \"ticket_pass\" in configuration file is not a boolean.")

try:
if args.file:
if len(args.file) == 1:
Expand Down