Fix naming and script

Author: antibagr

.env

@@ -1,12 +1,10 @@
-ENVIRONMENT=development
-DEBUG=true
-TEST_SSL_WORKDIR=/home/testssl_user
-TEST_SSL_CONTAINER_NAME=testssl.sh
-TEST_SSL_COMMANDS_FILE=commands.txt
-TEST_SSL_OUTPUT_DIR=results
-CLICKHOUSE_HOST=clickhouse
+CLICKHOUSE_HOST=clickhouse
 CLICKHOUSE_PORT=8123
 CLICKHOUSE_USER=default
 CLICKHOUSE_PASSWORD=clickhouse_password
+CLICKHOUSE_DB=default
 CLICKHOUSE_TABLE_NAME=ssl_check
-CLICKHOUSE_DB=default
+TEST_SSL_CONTAINER_NAME=testssl.sh
+TEST_SSL_WORKDIR=/home/testssl_user
+TEST_SSL_OUTPUT_DIR=results
+TEST_SSL_COMMANDS_FILE=commands.txt

app/cmd.py

@@ -3,7 +3,7 @@
 
 import click
 
-from app.services.service import application_dependencies, ssl_checker_service
+from app.services.service import analyze_service, application_dependencies
 
 
 @click.group()
@@ -18,7 +18,7 @@ def handle_exit_signal(_sig, _frame) -> t.NoReturn:
 @click.command()
 def run() -> None:
     with application_dependencies():
-        ssl_checker_service.run()
+        analyze_service.analyze()
 
 
 cli.add_command(run)

app/services/ssl_checker.py renamed to app/services/analyze.py

@@ -14,11 +14,11 @@ def get(self) -> t.Generator[FQDN, None, None]:
 
 @t.final
 @attrs.define(slots=True, frozen=False, kw_only=True)
-class SSLCheckerService:
+class AnalyzeService:
     _data_provider_repo: DataProviderRepositoryInterface
     _db: DB
 
-    def run(self) -> None:
+    def analyze(self) -> None:
         logger.info("Starting SSL Checker")
         for fqdn in self._data_provider_repo.get():
             logger.info(f"Adding {fqdn}")

app/services/service.py

@@ -8,7 +8,7 @@
 from app.lib.testssl import TestSSLContainer, TestSSLJsonParser
 from app.repository.db import DB
 from app.repository.provider import TestSSLDataProviderRepository
-from app.services.ssl_checker import SSLCheckerService
+from app.services.analyze import AnalyzeService
 from app.settings import settings
 
 # Dependency Layer
@@ -40,7 +40,7 @@
 
 
 # Service Layer
-ssl_checker_service = SSLCheckerService(
+analyze_service = AnalyzeService(
     data_provider_repo=data_provider_repo,
     db=db,
 )

deploy/docker-compose.yaml

@@ -21,7 +21,7 @@ services:
     container_name: testssl.sh
     build:
       context: ..
-      dockerfile: deploy/testssl.Dockerfile
+      dockerfile: deploy/testssl/Dockerfile
     environment:
       - MASS_TESTING_MODE=parallel
     env_file:

deploy/testssl.Dockerfile renamed to deploy/testssl/Dockerfile

@@ -14,7 +14,7 @@ fi
 while IFS= read -r line || [ -n "$line" ]; do
     host=$(echo "$line" | cut -d: -f1)
     port=$(echo "$line" | cut -d: -f2)
-    cmd="MAX_PARALLEL=100 testssl.sh --jsonfile ./results/$host  --mode parallel --quiet --protocols --server-defaults --overwrite $host:$port"
+    cmd="MAX_PARALLEL=100 testssl.sh --jsonfile ./results/${host////_}  --mode parallel --quiet --protocols --server-defaults --overwrite $host:$port"
 
     echo "$cmd" >>"$2"
 done <"$1"