bj/torch-agent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed PySocks (lack of) dependency and formatting

Browse Source
This commit is contained in:
B.J. Dweck 2020-10-20 00:20:33 +02:00
parent d9e68d50fe
commit 64b9698010
3 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requires.txt
View File

@ -1,4 +1,3 @@
setuptools>=50.3.2 setuptools>=50.3.2
stem>=1.8.0 stem>=1.8.0
paho-mqtt>=1.5.1 paho-mqtt>=1.5.1
PySocks>=1.7.1

2
setup.py
View File

@ -18,7 +18,6 @@ setuptools.setup(
install_requires=[ install_requires=[
'stem', 'stem',
'paho-mqtt>=1.5.1', 'paho-mqtt>=1.5.1',
'PySocks',
], ],
entry_points={ entry_points={
'console_scripts': ['torch-agent=torch_agent.torch_agent:main'], 'console_scripts': ['torch-agent=torch_agent.torch_agent:main'],
@ -29,4 +28,3 @@ setuptools.setup(
], ],
python_requires='>=3.6', python_requires='>=3.6',
) )

77
torch_agent/torch_agent.py
View File

@ -1,8 +1,8 @@
from stem.control import Controller from stem.control import Controller
import stem.connection import stem.connection
import paho.mqtt.client as mqtt import paho.mqtt.client as mqtt
from paho.mqtt.client import socks
import ssl import ssl
import socks
import socket import socket
import json import json
import configparser import configparser
@ -10,6 +10,7 @@ import argparse
from datetime import datetime from datetime import datetime
from os import environ from os import environ
def main(): def main():
parser = argparse.ArgumentParser(description='Broadcast SSH hidden service hostname via MQTT') parser = argparse.ArgumentParser(description='Broadcast SSH hidden service hostname via MQTT')
@ -18,79 +19,79 @@ def main():
args = parser.parse_args() args = parser.parse_args()
configPath = args.configPath config_path = args.configPath
if "TORCH_CONFIG_DIR" in environ: if "TORCH_CONFIG_DIR" in environ:
configPath = environ.get("TORCH_CONFIG_DIR") config_path = environ.get("TORCH_CONFIG_DIR")
if not configPath.endswith("/"): if not config_path.endswith("/"):
configPath = configPath + "/" config_path = config_path + "/"
print("Using torch configuration path: " + configPath) print("Using torch configuration path: " + config_path)
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(configPath + "torch.conf") config.read(config_path + "torch.conf")
torProxyPort = config['tor'].getint('ProxyPort', fallback = 9050) tor_proxy_port = config['tor'].getint('ProxyPort', fallback=9050)
torControllerPort = config['tor'].getint('ControllerPort', fallback = 9051) tor_controller_port = config['tor'].getint('ControllerPort', fallback=9051)
sshPort = config['ssh'].getint('Port', fallback = 22) ssh_port = config['ssh'].getint('Port', fallback=22)
mqttConfig = config['mqtt'] mqtt_config = config['mqtt']
mqttBrokerHost = mqttConfig.get('BrokerHost', fallback = "localhost") mqtt_broker_host = mqtt_config.get('BrokerHost', fallback="localhost")
mqttBrokerPort = mqttConfig.getint('BrokerPort', fallback = 1883) mqtt_broker_port = mqtt_config.getint('BrokerPort', fallback=1883)
clientID = mqttConfig.get('ClientID', fallback = socket.gethostname()) client_id = mqtt_config.get('ClientID', fallback=socket.gethostname())
mqttTopic = mqttConfig.get('Topic', fallback = "torch/%s/onion_url" % (clientID)) mqtt_topic = mqtt_config.get('Topic', fallback="torch/%s/onion_url" % client_id)
mqttRequireCertificate = mqttConfig.getboolean( mqtt_require_certificate = mqtt_config.getboolean(
'RequireCertificate', 'RequireCertificate',
fallback=False) fallback=False)
mqttCaFile = configPath + mqttConfig.get('CaFile') mqtt_ca_file = config_path + mqtt_config.get('CaFile')
mqttCertFile = configPath + mqttConfig.get('CertFile') mqtt_cert_file = config_path + mqtt_config.get('CertFile')
mqttKeyFile = configPath + mqttConfig.get('KeyFile') mqtt_key_file = config_path + mqtt_config.get('KeyFile')
with Controller.from_port(port = torControllerPort) as controller: with Controller.from_port(port=tor_controller_port) as controller:
protocolInfo = stem.connection.get_protocolinfo(controller) protocol_info = stem.connection.get_protocolinfo(controller)
stem.connection.authenticate_safecookie( stem.connection.authenticate_safecookie(
controller, controller,
protocolInfo.cookie_path) protocol_info.cookie_path)
print("Connected to Tor on port %s" % (torControllerPort)) print("Connected to Tor on port %s" % tor_controller_port)
service = controller.create_ephemeral_hidden_service(sshPort, detached = True) service = controller.create_ephemeral_hidden_service(ssh_port, detached=True)
onionAddress = "%s.onion" % (service.service_id) onion_address = "%s.onion" % service.service_id
print("Created Tor Hidden Service for local port %s at %s" % (sshPort, onionAddress)) print("Created Tor Hidden Service for local port %s at %s" % (ssh_port, onion_address))
payload = { payload = {
'clientId': clientID, 'clientId': client_id,
'timestamp': datetime.now().strftime("%d-%b-%Y (%H:%M:%S.%f)"), 'timestamp': datetime.now().strftime("%d-%b-%Y (%H:%M:%S.%f)"),
'onionAddress': onionAddress, 'onionAddress': onion_address,
'sshPort': sshPort 'sshPort': ssh_port
} }
client = mqtt.Client() client = mqtt.Client()
protocol = "mqtt" protocol = "mqtt"
if mqttRequireCertificate: if mqtt_require_certificate:
client.tls_set( client.tls_set(
ca_certs = mqttCaFile, ca_certs=mqtt_ca_file,
certfile = mqttCertFile, certfile=mqtt_cert_file,
keyfile = mqttKeyFile, keyfile=mqtt_key_file,
cert_reqs=ssl.CERT_REQUIRED) cert_reqs=ssl.CERT_REQUIRED)
protocol = "mqtts" protocol = "mqtts"
if mqttBrokerHost.endswith(".onion"): if mqtt_broker_host.endswith(".onion"):
client.proxy_set(proxy_type=socks.SOCKS5, proxy_addr="localhost", proxy_port=torProxyPort) client.proxy_set(proxy_type=socks.SOCKS5, proxy_addr="localhost", proxy_port=tor_proxy_port)
client.tls_insecure_set(True) client.tls_insecure_set(True)
client.connect(mqttBrokerHost, mqttBrokerPort, 60) client.connect(mqtt_broker_host, mqtt_broker_port, 60)
client.publish(mqttTopic, json.dumps(payload)) client.publish(mqtt_topic, json.dumps(payload))
print("Connected to MQTT Broker at %s://%s:%s/%s" % (protocol, mqttBrokerHost, mqttBrokerPort, mqttTopic)) print("Connected to MQTT Broker at %s://%s:%s/%s" % (protocol, mqtt_broker_host, mqtt_broker_port, mqtt_topic))
print("Published payload: " + json.dumps(payload)) print("Published payload: " + json.dumps(payload))
client.disconnect() client.disconnect()