validate config file for empty lines (closes #24)

Signed-off-by: r4sas <r4sas@i2pmail.org>
This commit is contained in:
R4SAS 2020-06-22 11:22:21 +00:00
parent d0f23094bc
commit 5909e7330b
Signed by untrusted user: r4sas
GPG Key ID: 66F6C87B98EBCFE2
3 changed files with 17 additions and 4 deletions

View File

@ -1,5 +1,13 @@
from pbincli.format import Paste from pbincli.format import Paste
from pbincli.utils import PBinCLIError from pbincli.utils import PBinCLIError
import signal
def signal_handler(sig, frame):
print('Keyboard interrupt received, terminating...')
exit(0)
signal.signal(signal.SIGINT, signal_handler)
def send(args, api_client, settings=None): def send(args, api_client, settings=None):
from pbincli.api import Shortener from pbincli.api import Shortener

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, validate_url from pbincli.utils import PBinCLIException, PBinCLIError, 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") ]
@ -13,8 +13,13 @@ def read_config(filename):
settings = {} settings = {}
with open(filename) as f: with open(filename) as f:
for l in f.readlines(): for l in f.readlines():
key, value = l.strip().split("=") if len(l.strip()) == 0:
settings[key.strip()] = value.strip() continue
try:
key, value = l.strip().split("=")
settings[key.strip()] = value.strip()
except ValueError as pe:
PBinCLIError("Unable to parse config file, please check it for errors.")
return settings return settings

View File

@ -17,7 +17,7 @@ setup(
long_description_content_type='text/x-rst', long_description_content_type='text/x-rst',
author='R4SAS', author='R4SAS',
author_email='r4sas@i2pmail.org', author_email='r4sas@i2pmail.org',
url='https://github.com/r4sas/PBinCLI', url='https://github.com/r4sas/PBinCLI/',
keywords='privatebin cryptography security', keywords='privatebin cryptography security',
license='MIT', license='MIT',
classifiers=[ classifiers=[