From c61ebf63a19d15244a25ea122297309251175af7 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 18 Sep 2019 15:47:02 +0200 Subject: [PATCH] use configuration names without spaces --- main.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/main.py b/main.py index 36a52a5..f662447 100755 --- a/main.py +++ b/main.py @@ -33,17 +33,17 @@ class LoadConfig: allow_no_value=True, delimiters=('=',), inline_comment_prefixes=('#',)) self.config.read(configfile) - self.proxy_name = self.config['General'].get('ProxAddr') - self.front_name = self.config['General'].get('FrontAddr', 'localhost') - self.rear_name = self.config['General'].get('RearAddr', 'localhost') - self.front_port = int(self.config['General'].get('FrontPort')) - self.rear_port = int(self.config['General'].get('RearPort')) - self.proxy = self.config['General'].get('DefaultProxy') - self.loglevel = self.config['General'].get('LogLevel') - self.ca = self.config['General'].get('CACert') - self.certdir = self.config['General'].get('CertDir') + self.proxy_name = self.config['general'].get('proxAddr') + self.front_name = self.config['general'].get('frontAddr', 'localhost') + self.rear_name = self.config['general'].get('rearAddr', 'localhost') + self.front_port = int(self.config['general'].get('frontPort')) + self.rear_port = int(self.config['general'].get('rearPort')) + self.proxy = self.config['general'].get('defaultProxy') + self.loglevel = self.config['general'].get('logLevel') + self.ca = self.config['general'].get('caCert') + self.certdir = self.config['general'].get('certDir') + - class ConnectionPools: """ self.pools is a list of {'proxy': 'http://127.0.0.1:8080', @@ -69,13 +69,13 @@ class ConnectionPools: self.conf.read(self.file) self.pools = [] proxy_sections = [section for section in self.conf.sections() - if section.startswith('Proxy')] + if section.startswith('proxy')] for section in proxy_sections: proxy = section.split()[1] self.pools.append(dict(proxy=proxy, pool=self.setProxyPool(proxy), patterns=list(self.conf[section].keys()))) - default_proxy = self.conf['General'].get('DefaultProxy') + default_proxy = self.conf['general'].get('defaultProxy') if default_proxy: default_pool = self.setProxyPool(default_proxy) @@ -93,10 +93,10 @@ class ConnectionPools: sections = collections.defaultdict(dict) for name in self.conf.sections(): sections[name] = self.conf[name] - self.noverifylist = list(sections['TLS NoVerify'].keys()) - self.sslpasslist = list(sections['TLS Passthru'].keys()) - self.blacklist = list(sections['Blacklist'].keys()) - self.bypasslist = list(sections['Bypass URL'].keys()) + self.noverifylist = list(sections['noVerify'].keys()) + self.sslpasslist = list(sections['passthru'].keys()) + self.blacklist = list(sections['blacklist'].keys()) + self.bypasslist = list(sections['bypassURL'].keys()) def reloadConfig(self): while True: