nufnuf/PBinCLI
1
0
Fork 0
forked from r4sas/PBinCLI
Code Issues Pull Requests Projects Releases Wiki Activity

add URL validation for trailing slash (closes #18)

Browse Source 
Signed-off-by: r4sas <r4sas@i2pmail.org>
This commit is contained in:
R4SAS 2019-09-09 14:23:30 +00:00
parent 692335ee62
commit 7c5ba2fdbe
Signed by untrusted user: r4sas
GPG Key ID: 66F6C87B98EBCFE2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pbincli/cli.py
View File

@ -3,7 +3,7 @@ import os, sys, argparse
import pbincli.actions import pbincli.actions
from pbincli.api import PrivateBin from pbincli.api import PrivateBin
from pbincli.utils import PBinCLIException from pbincli.utils import PBinCLIException, validate_url
CONFIG_PATHS = [os.path.join(".", "pbincli.conf", ), CONFIG_PATHS = [os.path.join(".", "pbincli.conf", ),
os.path.join(os.getenv("HOME") or "~", ".config", "pbincli", "pbincli.conf") ] os.path.join(os.getenv("HOME") or "~", ".config", "pbincli", "pbincli.conf") ]
@ -78,13 +78,15 @@ def main():
var = "PRIVATEBIN_{}".format(key.upper()) var = "PRIVATEBIN_{}".format(key.upper())
if var in os.environ: CONFIG[key] = os.getenv(var) if var in os.environ: CONFIG[key] = os.getenv(var)
PBIN_URL = validate_url(CONFIG["server"])
SETTINGS = { SETTINGS = {
"proxy": CONFIG["proxy"], "proxy": CONFIG["proxy"],
"nocheckcert": args.no_check_certificate, "nocheckcert": args.no_check_certificate,
"noinsecurewarn": args.no_insecure_warning "noinsecurewarn": args.no_insecure_warning
} }
api_client = PrivateBin(CONFIG["server"], settings=SETTINGS) api_client = PrivateBin(PBIN_URL, settings=SETTINGS)
if hasattr(args, "func"): if hasattr(args, "func"):
try: try:

6
pbincli/utils.py
View File

@ -23,3 +23,9 @@ def check_writable(f):
def json_encode(s): def json_encode(s):
return json.dumps(s, separators=(',',':')).encode() return json.dumps(s, separators=(',',':')).encode()
def validate_url(s):
if not s.endswith('/'):
s = s + "/"
return s