Skip to content

Commit 7b90b6a

Browse files
r4sasr4sas
committed
Add URL support for paste deletion, rewrite info parsing code
Signed-off-by: R4SAS <r4sas@i2pmail.org>
1 parent a9a4079 commit 7b90b6a

File tree

4 files changed

+62
-51
lines changed

4 files changed

+62
-51
lines changed

‎pbincli/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# -*- coding: utf-8 -*-
33

44
__author__ = "R4SAS <r4sas@i2pmail.org>"
5-
__version__ = "0.3.2"
5+
__version__ = "0.3.3"
66
__copyright__ = "Copyright (c) R4SAS"
77
__license__ = "MIT"

‎pbincli/actions.py‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
from pbincli.format import Paste
2-
from pbincli.utils import PBinCLIError, validate_url_ending
31
import signal
2+
from urllib.parse import urlparse, parse_qsl
3+
4+
from pbincli.api import Shortener
5+
from pbincli.format import Paste
6+
from pbincli.utils import PBinCLIError, check_writable, json_encode, uri_validator, validate_url_ending
7+
48

59
def signal_handler(sig, frame):
610
print('Keyboard interrupt received, terminating…')
711
exit(0)
812

13+
914
signal.signal(signal.SIGINT, signal_handler)
1015

1116

1217
def send(args, api_client, settings=None):
13-
from pbincli.api import Shortener
1418
if args.short:
1519
shortener = Shortener(settings)
1620

@@ -117,19 +121,17 @@ def send(args, api_client, settings=None):
117121

118122

119123
def get(args, api_client, settings=None):
120-
from pbincli.utils import check_writable, json_encode, uri_validator
121-
122-
try:
123-
if uri_validator(args.pasteinfo):
124-
api_client.server, pasteinfo = args.pasteinfo.split("?")
125-
pasteid, passphrase = pasteinfo.split("#")
126-
else:
127-
pasteid, passphrase = args.pasteinfo.split("#")
128-
except ValueError:
129-
PBinCLIError("Provided info hasn't contain valid PasteID#Passphrase string")
130-
131-
if not (pasteid and passphrase):
132-
PBinCLIError("Incorrect request")
124+
parseduri, isuri = uri_validator(args.pasteinfo)
125+
126+
if isuri and parseduri.query and parseduri.fragment:
127+
api_client.server = args.pasteinfo.split("?")[0]
128+
pasteid = parseduri.query
129+
passphrase = parseduri.fragment
130+
elif parseduri.path and parseduri.path != "/" and parseduri.fragment:
131+
pasteid = parseduri.path
132+
passphrase = parseduri.fragment
133+
else:
134+
PBinCLIError("Provided info hasn't contain valid URL or PasteID#Passphrase string")
133135

134136
if args.verbose: print("Used server: {}".format(api_client.getServer()))
135137
if args.debug: print("PasteID:\t{}\nPassphrase:\t{}".format(pasteid, passphrase))
@@ -194,10 +196,19 @@ def get(args, api_client, settings=None):
194196

195197

196198
def delete(args, api_client, settings=None):
197-
from pbincli.utils import json_encode
199+
parseduri, isuri = uri_validator(args.pasteinfo)
198200

199-
pasteid = args.paste
200-
token = args.token
201+
if isuri:
202+
api_client.server = args.pasteinfo.split("?")[0]
203+
query = dict(parse_qsl(parseduri.query))
204+
else:
205+
query = dict(parse_qsl(args.pasteinfo))
206+
207+
if 'pasteid' in query and 'deletetoken' in query:
208+
pasteid = query['pasteid']
209+
token = query['deletetoken']
210+
else:
211+
PBinCLIError("Provided info hasn't contain required information")
201212

202213
if args.verbose: print("Used server: {}".format(api_client.getServer()))
203214
if args.debug: print("PasteID:\t{}\nToken:\t\t{}".format(pasteid, token))

‎pbincli/cli.py‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ def main():
3636

3737
# a send command
3838
send_parser = subparsers.add_parser("send", description="Send data to PrivateBin instance")
39-
send_parser.add_argument("-t", "--text", help="text in quotes. Ignored if used stdin. If not used, forcefully used stdin")
40-
send_parser.add_argument("-f", "--file", help="example: image.jpg or full path to file")
41-
send_parser.add_argument("-p", "--password", help="password for encrypting paste")
39+
send_parser.add_argument("-t", "--text", help="Text in quotes. Ignored if used stdin. If not used, forcefully used stdin")
40+
send_parser.add_argument("-f", "--file", help="Example: image.jpg or full path to file")
41+
send_parser.add_argument("-p", "--password", help="Password for encrypting paste")
4242
send_parser.add_argument("-E", "--expire", default="1day", action="store",
43-
choices=["5min", "10min", "1hour", "1day", "1week", "1month", "1year", "never"], help="paste lifetime (default: 1day)")
44-
send_parser.add_argument("-B", "--burn", default=False, action="store_true", help="burn sent paste after reading")
45-
send_parser.add_argument("-D", "--discus", default=False, action="store_true", help="open discussion for sent paste")
43+
choices=["5min", "10min", "1hour", "1day", "1week", "1month", "1year", "never"], help="Paste lifetime (default: 1day)")
44+
send_parser.add_argument("-B", "--burn", default=False, action="store_true", help="Set \"Burn after reading\" flag")
45+
send_parser.add_argument("-D", "--discus", default=False, action="store_true", help="Open discussion for sent paste")
4646
send_parser.add_argument("-F", "--format", default="plaintext", action="store",
47-
choices=["plaintext", "syntaxhighlighting", "markdown"], help="format of text (default: plaintext)")
48-
send_parser.add_argument("-q", "--notext", default=False, action="store_true", help="don't send text in paste")
47+
choices=["plaintext", "syntaxhighlighting", "markdown"], help="Format of text (default: plaintext)")
48+
send_parser.add_argument("-q", "--notext", default=False, action="store_true", help="Don't send text in paste")
4949
send_parser.add_argument("-c", "--compression", default="zlib", action="store",
50-
choices=["zlib", "none"], help="set compression for paste (default: zlib). Note: works only on v2 paste format")
50+
choices=["zlib", "none"], help="Set compression for paste (default: zlib). Note: works only on v2 paste format")
5151
## URL shortener
52-
send_parser.add_argument("-S", "--short", default=False, action="store_true", help="use URL shortener")
52+
send_parser.add_argument("-S", "--short", default=False, action="store_true", help="Use URL shortener")
5353
send_parser.add_argument("--short-api", default=argparse.SUPPRESS, action="store",
5454
choices=["tinyurl", "clckru", "isgd", "vgd", "cuttly", "yourls", "custom"], help="API used by shortener service")
5555
send_parser.add_argument("--short-url", default=argparse.SUPPRESS, help="URL of shortener service API")
@@ -59,45 +59,44 @@ def main():
5959
## Connection options
6060
send_parser.add_argument("-s", "--server", default=argparse.SUPPRESS, help="Instance URL (default: https://paste.i2pd.xyz/)")
6161
send_parser.add_argument("-x", "--proxy", default=argparse.SUPPRESS, help="Proxy server address (default: None)")
62-
send_parser.add_argument("--no-check-certificate", default=False, action="store_true", help="disable certificate validation")
62+
send_parser.add_argument("--no-check-certificate", default=False, action="store_true", help="Disable certificate validation")
6363
send_parser.add_argument("--no-insecure-warning", default=False, action="store_true",
64-
help="suppress InsecureRequestWarning (only with --no-check-certificate)")
64+
help="Suppress InsecureRequestWarning (only with --no-check-certificate)")
6565
##
6666
send_parser.add_argument("-L", "--mirrors", default=argparse.SUPPRESS, help="Comma-separated list of mirrors of service with scheme (default: None)")
67-
send_parser.add_argument("-v", "--verbose", default=False, action="store_true", help="enable verbose output")
68-
send_parser.add_argument("-d", "--debug", default=False, action="store_true", help="enable debug output")
69-
send_parser.add_argument("--dry", default=False, action="store_true", help="invoke dry run")
70-
send_parser.add_argument("stdin", help="input paste text from stdin", nargs="?", type=argparse.FileType("r"), default=sys.stdin)
67+
send_parser.add_argument("-v", "--verbose", default=False, action="store_true", help="Enable verbose output")
68+
send_parser.add_argument("-d", "--debug", default=False, action="store_true", help="Enable debug output")
69+
send_parser.add_argument("--dry", default=False, action="store_true", help="Invoke dry run")
70+
send_parser.add_argument("stdin", help="Input paste text from stdin", nargs="?", type=argparse.FileType("r"), default=sys.stdin)
7171
send_parser.set_defaults(func=pbincli.actions.send)
7272

7373
# a get command
7474
get_parser = subparsers.add_parser("get", description="Get data from PrivateBin instance")
7575
get_parser.add_argument("pasteinfo", help="\"PasteID#Passphrase\" or full URL")
76-
get_parser.add_argument("-p", "--password", help="password for decrypting paste")
76+
get_parser.add_argument("-p", "--password", help="Password for decrypting paste")
7777
## Connection options
7878
get_parser.add_argument("-s", "--server", default=argparse.SUPPRESS, help="Instance URL (default: https://paste.i2pd.xyz/, ignored if URL used in pasteinfo)")
7979
get_parser.add_argument("-x", "--proxy", default=argparse.SUPPRESS, help="Proxy server address (default: None)")
80-
get_parser.add_argument("--no-check-certificate", default=False, action="store_true", help="disable certificate validation")
80+
get_parser.add_argument("--no-check-certificate", default=False, action="store_true", help="Disable certificate validation")
8181
get_parser.add_argument("--no-insecure-warning", default=False, action="store_true",
82-
help="suppress InsecureRequestWarning (only with --no-check-certificate)")
82+
help="Suppress InsecureRequestWarning (only with --no-check-certificate)")
8383
##
84-
get_parser.add_argument("-v", "--verbose", default=False, action="store_true", help="enable verbose output")
85-
get_parser.add_argument("-d", "--debug", default=False, action="store_true", help="enable debug output")
84+
get_parser.add_argument("-v", "--verbose", default=False, action="store_true", help="Enable verbose output")
85+
get_parser.add_argument("-d", "--debug", default=False, action="store_true", help="Enable debug output")
8686
get_parser.set_defaults(func=pbincli.actions.get)
8787

8888
# a delete command
89-
delete_parser = subparsers.add_parser("delete", description="Delete paste from PrivateBin instance using token")
90-
delete_parser.add_argument("-p", "--paste", required=True, help="paste id")
91-
delete_parser.add_argument("-t", "--token", required=True, help="paste deletion token")
89+
delete_parser = subparsers.add_parser("delete", description="Delete paste from PrivateBin instance")
90+
delete_parser.add_argument("pasteinfo", help="Paste deletion URL or string in \"pasteid=PasteID&deletetoken=Token\" format")
9291
## Connection options
9392
delete_parser.add_argument("-s", "--server", default=argparse.SUPPRESS, help="Instance URL (default: https://paste.i2pd.xyz/)")
9493
delete_parser.add_argument("-x", "--proxy", default=argparse.SUPPRESS, help="Proxy server address (default: None)")
95-
delete_parser.add_argument("--no-check-certificate", default=False, action="store_true", help="disable certificate validation")
94+
delete_parser.add_argument("--no-check-certificate", default=False, action="store_true", help="Disable certificate validation")
9695
delete_parser.add_argument("--no-insecure-warning", default=False, action="store_true",
97-
help="suppress InsecureRequestWarning (only with --no-check-certificate)")
96+
help="Suppress InsecureRequestWarning (only with --no-check-certificate)")
9897
##
99-
delete_parser.add_argument("-v", "--verbose", default=False, action="store_true", help="enable verbose output")
100-
delete_parser.add_argument("-d", "--debug", default=False, action="store_true", help="enable debug output")
98+
delete_parser.add_argument("-v", "--verbose", default=False, action="store_true", help="Enable verbose output")
99+
delete_parser.add_argument("-d", "--debug", default=False, action="store_true", help="Enable debug output")
101100
delete_parser.set_defaults(func=pbincli.actions.delete)
102101

103102
# parse arguments

‎pbincli/utils.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ def validate_url_ending(s):
3636
return s
3737

3838
def uri_validator(x):
39-
from urllib.parse import urlparse
39+
from urllib.parse import urlsplit
4040
try:
41-
result = urlparse(x)
42-
return all([result.scheme, result.netloc])
41+
result = urlsplit(x)
42+
isuri = all([result.scheme, result.netloc])
43+
return result, isuri
4344
except ValueError:
4445
return False

0 commit comments

Comments
 (0)