oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2426 from canewsin/patch-2

Browse source 
Added Custom Openssl Path for Native Clients and start_dir config
This commit is contained in:
ZeroNet 2020-02-19 17:20:24 +01:00 committed by GitHub
commit 32855d0479
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Config.py
View file

@ -29,6 +29,7 @@ class Config(object):
])
self.start_dir = self.getStartDir()
self.openssl_path = "default"
self.config_file = self.start_dir + "/zeronet.conf"
self.data_dir = self.start_dir + "/data"
self.log_dir = self.start_dir + "/log"
@ -106,6 +107,8 @@ class Config(object):
else:
fix_float_decimals = False
openssl_path = "default"
start_dir = self.start_dir
config_file = self.start_dir + "/zeronet.conf"
data_dir = self.start_dir + "/data"
log_dir = self.start_dir + "/log"
@ -220,6 +223,7 @@ class Config(object):
self.parser.add_argument('--batch', help="Batch mode (No interactive input for commands)", action='store_true')
self.parser.add_argument('--start_dir', help='Start Directory of ZeroNet(Usually dir where zeronet.py Exists)',default=start_dir, metavar="path")
self.parser.add_argument('--config_file', help='Path of config file', default=config_file, metavar="path")
self.parser.add_argument('--data_dir', help='Path of data directory', default=data_dir, metavar="path")
@ -259,6 +263,7 @@ class Config(object):
self.parser.add_argument('--ip_external', help='Set reported external ip (tested on start if None)', metavar='ip', nargs='*')
self.parser.add_argument('--offline', help='Disable network communication', action='store_true')
self.parser.add_argument('--openssl_path', help='Custom Path to OpenSSL Binary', default=openssl_path, metavar="path")
self.parser.add_argument('--disable_udp', help='Disable UDP connections', action='store_true')
self.parser.add_argument('--proxy', help='Socks proxy address', metavar='ip:port')
self.parser.add_argument('--bind', help='Bind outgoing sockets to this address', metavar='ip')
@ -479,7 +484,7 @@ class Config(object):
for key, val in args.items():
if type(val) is list:
val = val[:]
if key in ("data_dir", "log_dir"):
if key in ("start_dir", "data_dir", "log_dir", "openssl_path"):
val = val.replace("\\", "/")
setattr(self, key, val)
@ -560,7 +565,7 @@ class Config(object):
"language": self.language,
"debug": self.debug,
"plugins": PluginManager.plugin_manager.plugin_names,
"openssl_path": os.path.abspath(self.openssl_path),
"log_dir": os.path.abspath(self.log_dir),
"data_dir": os.path.abspath(self.data_dir),
"src_dir": os.path.dirname(os.path.abspath(__file__))

3
src/Crypt/CryptConnection.py
View file

@ -11,6 +11,9 @@ from util import helper
class CryptConnectionManager:
def __init__(self):
if config.openssl_path != "default":
self.openssl_bin = config.openssl_path
else:
if sys.platform.startswith("win"):
self.openssl_bin = "tools\\openssl\\openssl.exe"
elif config.dist_type.startswith("bundle_linux"):