seasharp/basicswap_miserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: Add tor info to page header

Browse Source
This commit is contained in:
tecnovert 2022-10-08 14:37:22 +02:00
parent 7319d46988
commit af766876a1
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
basicswap/http_server.py
View File

@ -45,7 +45,7 @@ from .ui.page_automation import (
) )
from .ui.page_bids import page_bids, page_bid from .ui.page_bids import page_bids, page_bid
from .ui.page_offers import page_offers, page_offer, page_newoffer from .ui.page_offers import page_offers, page_offer, page_newoffer
from .ui.page_tor import page_tor from .ui.page_tor import page_tor, get_tor_established_state
from .ui.page_wallet import page_wallets, page_wallet from .ui.page_wallet import page_wallets, page_wallet
@ -107,6 +107,15 @@ class HttpHandler(BaseHTTPRequestHandler):
args_dict['debug_mode'] = True args_dict['debug_mode'] = True
if swap_client.debug_ui: if swap_client.debug_ui:
args_dict['debug_ui_mode'] = True args_dict['debug_ui_mode'] = True
if swap_client.use_tor_proxy:
args_dict['use_tor_proxy'] = True
# TODO: Cache value?
try:
args_dict['tor_established'] = True if get_tor_established_state(swap_client) == '1' else False
except Exception:
if swap_client.debug:
swap_client.log.error(traceback.format_exc())
return bytes(template.render( return bytes(template.render(
title=self.server.title, title=self.server.title,
h2=self.server.title, h2=self.server.title,

3
basicswap/templates/header.html
View File

@ -19,6 +19,9 @@
{% if debug_ui_mode == true %} {% if debug_ui_mode == true %}
<p>Debug UI mode: Active</p> <p>Debug UI mode: Active</p>
{% endif %} {% endif %}
{% if use_tor_proxy == true %}
<p>Tor mode: Active{% if tor_established == true %}, Connected{% endif %}</p>
{% endif %}
{% if ws_url %} {% if ws_url %}
<script> <script>

25
basicswap/ui/page_tor.py
View File

@ -16,20 +16,33 @@ def extract_data(bytes_in):
return str_in[start: end] return str_in[start: end]
def get_tor_established_state(swap_client):
rv = swap_client.torControl('GETINFO status/circuit-established')
return extract_data(rv)
def page_tor(self, url_split, post_string): def page_tor(self, url_split, post_string):
swap_client = self.server.swap_client swap_client = self.server.swap_client
page_data = {} page_data = {}
rv = swap_client.torControl('GETINFO status/circuit-established') try:
page_data['circuit_established'] = extract_data(rv) page_data['circuit_established'] = get_tor_established_state(swap_client)
except Exception:
page_data['circuit_established'] = 'error'
rv = swap_client.torControl('GETINFO traffic/read') try:
page_data['bytes_written'] = extract_data(rv) rv = swap_client.torControl('GETINFO traffic/read')
page_data['bytes_written'] = extract_data(rv)
except Exception:
page_data['bytes_written'] = 'error'
rv = swap_client.torControl('GETINFO traffic/written') try:
page_data['bytes_read'] = extract_data(rv) rv = swap_client.torControl('GETINFO traffic/written')
page_data['bytes_read'] = extract_data(rv)
except Exception:
page_data['bytes_read'] = 'error'
messages = [] messages = []