httpd: add mitm field to JSON proxy list endpoints
This commit is contained in:
10
httpd.py
10
httpd.py
@@ -1566,7 +1566,7 @@ class ProxyAPIServer(threading.Thread):
|
|||||||
mitm_filter = query_params.get('mitm', '')
|
mitm_filter = query_params.get('mitm', '')
|
||||||
fmt = query_params.get('format', 'json')
|
fmt = query_params.get('format', 'json')
|
||||||
|
|
||||||
sql = 'SELECT ip, port, proto, country, asn, avg_latency, protos_working FROM proxylist WHERE failed=0 AND proto IS NOT NULL AND last_seen >= strftime("%s","now") - 3600'
|
sql = 'SELECT ip, port, proto, country, asn, avg_latency, protos_working, mitm FROM proxylist WHERE failed=0 AND proto IS NOT NULL AND last_seen >= strftime("%s","now") - 3600'
|
||||||
args = []
|
args = []
|
||||||
if proto:
|
if proto:
|
||||||
sql += ' AND proto=?'
|
sql += ' AND proto=?'
|
||||||
@@ -1592,7 +1592,8 @@ class ProxyAPIServer(threading.Thread):
|
|||||||
proxies = [{
|
proxies = [{
|
||||||
'proxy': '%s:%s' % (r[0], r[1]), 'proto': r[2], 'country': r[3],
|
'proxy': '%s:%s' % (r[0], r[1]), 'proto': r[2], 'country': r[3],
|
||||||
'asn': r[4], 'latency': r[5],
|
'asn': r[4], 'latency': r[5],
|
||||||
'protos': r[6].split(',') if r[6] else [r[2]]
|
'protos': r[6].split(',') if r[6] else [r[2]],
|
||||||
|
'mitm': bool(r[7]),
|
||||||
} for r in rows]
|
} for r in rows]
|
||||||
return json.dumps({'count': len(proxies), 'proxies': proxies}, indent=2), 'application/json', 200
|
return json.dumps({'count': len(proxies), 'proxies': proxies}, indent=2), 'application/json', 200
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -1605,7 +1606,7 @@ class ProxyAPIServer(threading.Thread):
|
|||||||
mitm_filter = query_params.get('mitm', '')
|
mitm_filter = query_params.get('mitm', '')
|
||||||
fmt = query_params.get('format', 'json')
|
fmt = query_params.get('format', 'json')
|
||||||
|
|
||||||
sql = 'SELECT ip, port, proto, country, asn, avg_latency, protos_working FROM proxylist WHERE failed=0 AND proto IS NOT NULL AND last_seen >= strftime("%s","now") - 3600'
|
sql = 'SELECT ip, port, proto, country, asn, avg_latency, protos_working, mitm FROM proxylist WHERE failed=0 AND proto IS NOT NULL AND last_seen >= strftime("%s","now") - 3600'
|
||||||
args = []
|
args = []
|
||||||
if proto:
|
if proto:
|
||||||
sql += ' AND proto=?'
|
sql += ' AND proto=?'
|
||||||
@@ -1630,7 +1631,8 @@ class ProxyAPIServer(threading.Thread):
|
|||||||
proxies = [{
|
proxies = [{
|
||||||
'proxy': '%s:%s' % (r[0], r[1]), 'proto': r[2], 'country': r[3],
|
'proxy': '%s:%s' % (r[0], r[1]), 'proto': r[2], 'country': r[3],
|
||||||
'asn': r[4], 'latency': r[5],
|
'asn': r[4], 'latency': r[5],
|
||||||
'protos': r[6].split(',') if r[6] else [r[2]]
|
'protos': r[6].split(',') if r[6] else [r[2]],
|
||||||
|
'mitm': bool(r[7]),
|
||||||
} for r in rows]
|
} for r in rows]
|
||||||
return json.dumps({'count': len(proxies), 'proxies': proxies}, indent=2), 'application/json', 200
|
return json.dumps({'count': len(proxies), 'proxies': proxies}, indent=2), 'application/json', 200
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
Reference in New Issue
Block a user