From 70a2d92919ab503cbbc6793cf90116c3528549dc Mon Sep 17 00:00:00 2001
From: Yurii Kovalchuk <yurii.kovalchuk@fortegrp.com>
Date: Tue, 5 Mar 2024 09:20:09 +0200
Subject: [PATCH] ATOR-173 - Fix cron and add todos for later improvements

---
 docker/scanner/docker-entrypoint.sh   | 8 +++++---
 docs/source/config_tor.rst            | 3 ++-
 sbws/util/stem.py                     | 3 ++-
 scripts/tools/get-per-relay-budget.py | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docker/scanner/docker-entrypoint.sh b/docker/scanner/docker-entrypoint.sh
index 62ef8f66..be656771 100755
--- a/docker/scanner/docker-entrypoint.sh
+++ b/docker/scanner/docker-entrypoint.sh
@@ -1,6 +1,8 @@
-mkdir -p /root/.sbws/logs
+mkdir -p /root/.sbws/log
 
-crontab -l | { cat; echo "*/5 * * * * /usr/local/bin/sbws -c /root/.sbws.ini generate >> /root/.sbws/logs/generate.log  2>&1"; } | crontab -
-crontab -l | { cat; echo "30  0 * * * /usr/local/bin/sbws -c /root/.sbws.ini cleanup >> /root/.sbws/logs/cleanup.log  2>&1"; } | crontab -
+crontab -l | { cat; echo "*/5 * * * * /usr/local/bin/sbws -c /root/.sbws.ini generate >> /root/.sbws/log/generate.log  2>&1"; } | crontab -
+crontab -l | { cat; echo "30  0 * * * /usr/local/bin/sbws -c /root/.sbws.ini cleanup >> /root/.sbws/log/cleanup.log  2>&1"; } | crontab -
+
+service cron start
 
 sbws scanner
diff --git a/docs/source/config_tor.rst b/docs/source/config_tor.rst
index e6094687..35bd9add 100644
--- a/docs/source/config_tor.rst
+++ b/docs/source/config_tor.rst
@@ -10,7 +10,8 @@ connection to an existing Tor daemon.
 Default configuration:
 
 - ``SocksPort auto``: To proxy requests over Tor.
-- ``CookieAuthentication 1``: The easiest way to authenticate to Tor.
+- ``CookieAuthentication 0``: The easiest way to authenticate to Tor.
+- ``HashedControlPassword``: The how to authenticate using password
 - ``UseEntryGuards 0``: To avoid path bias warnings.
 - ``UseMicrodescriptors 0``: Because full server descriptors are needed.
 - ``SafeLogging 0``: Useful for logging, since there's no need for anonymity.
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 608de2e6..c54ff04b 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -166,6 +166,7 @@ def is_bootstrapped(c):
 def _init_controller_port(port):
     try:
         c = Controller.from_port(port=port)
+        # todo - extract password to config
         c.authenticate(password="password")
     except (IncorrectSocketType, SocketError):
         fail_hard("Unable to connect to control port %s.", port)
@@ -177,6 +178,7 @@ def _init_controller_port(port):
 def _init_controller_socket(socket):
     try:
         c = Controller.from_socket_file(path=socket)
+        # todo - extract password to config
         c.authenticate(password="password")
     except (IncorrectSocketType, SocketError):
         log.debug("Error initting controller socket: socket error.")
@@ -305,7 +307,6 @@ def launch_tor(conf):
 
     torrc = parse_user_torrc_config(torrc, conf["tor"]["extra_lines"])
     # Finally launch Tor
-    log.info(torrc)
     try:
         # If there is already a tor process running with the same control
         # socket, this will exit here.
diff --git a/scripts/tools/get-per-relay-budget.py b/scripts/tools/get-per-relay-budget.py
index 96cf08fc..8529aecc 100755
--- a/scripts/tools/get-per-relay-budget.py
+++ b/scripts/tools/get-per-relay-budget.py
@@ -37,6 +37,7 @@ def print_regular(bws):
 
 def main(args):
     cont = get_controller(args)
+    # todo - extract password to config
     cont.authenticate(password="password")
     bws = [ns.bandwidth for ns in cont.get_network_statuses()]
     if args.quiet: