open.source/whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update proxy init, change proxyloc var name

Browse Source 
Proxy is now only initialized if both type and location are specified,
as neither have a default fallback and both are required. I suppose the
type could fall back to http, but seems safer this way.

Also refactored proxyurl -> proxyloc for the runtime args in order to
match the Dockerfile args.
This commit is contained in:
Ben Busby 2020-10-25 21:39:44 -04:00
parent 0f92d92604
commit 0573484405
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/routes.py
View File

@ -301,7 +301,7 @@ def run_app():
help='Sets a username/password for a HTTP/SOCKS proxy (default None)') help='Sets a username/password for a HTTP/SOCKS proxy (default None)')
parser.add_argument('--proxytype', default='', metavar='<socks4|socks5|http>', parser.add_argument('--proxytype', default='', metavar='<socks4|socks5|http>',
help='Sets a proxy type for all connections (default None)') help='Sets a proxy type for all connections (default None)')
parser.add_argument('--proxyurl', default='', metavar='<location:port>', parser.add_argument('--proxyloc', default='', metavar='<location:port>',
help='Sets a proxy location for all connections (default None)') help='Sets a proxy location for all connections (default None)')
args = parser.parse_args() args = parser.parse_args()
@ -310,13 +310,13 @@ def run_app():
os.environ['WHOOGLE_USER'] = user_pass[0] os.environ['WHOOGLE_USER'] = user_pass[0]
os.environ['WHOOGLE_PASS'] = user_pass[1] os.environ['WHOOGLE_PASS'] = user_pass[1]
if args.proxyauth or args.proxytype or args.proxyurl: if args.proxytype and args.proxyloc:
if args.proxyauth: if args.proxyauth:
proxy_user_pass = args.proxyauth.split(':') proxy_user_pass = args.proxyauth.split(':')
os.environ['WHOOGLE_PROXY_USER'] = proxy_user_pass[0] os.environ['WHOOGLE_PROXY_USER'] = proxy_user_pass[0]
os.environ['WHOOGLE_PROXY_PASS'] = proxy_user_pass[1] os.environ['WHOOGLE_PROXY_PASS'] = proxy_user_pass[1]
os.environ['WHOOGLE_PROXY_TYPE'] = args.proxytype os.environ['WHOOGLE_PROXY_TYPE'] = args.proxytype
os.environ['WHOOGLE_PROXY_LOC'] = args.proxyurl os.environ['WHOOGLE_PROXY_LOC'] = args.proxyloc
os.environ['HTTPS_ONLY'] = '1' if args.https_only else '' os.environ['HTTPS_ONLY'] = '1' if args.https_only else ''