From 31ea4c4fe36f5926f8cae5e6238560ba3009f321 Mon Sep 17 00:00:00 2001 From: oliveiraj4 Date: Tue, 4 Nov 2025 17:18:43 +0000 Subject: [PATCH 1/2] updating rootboxes' ssl config --- surface/scanners/utils/__init__.py | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/surface/scanners/utils/__init__.py b/surface/scanners/utils/__init__.py index 29e315ad..d2c11563 100644 --- a/surface/scanners/utils/__init__.py +++ b/surface/scanners/utils/__init__.py @@ -8,28 +8,10 @@ from . import _docker from scanners import models - -def settings_to_file(b64content, filepath, mode=0o600): - if b64content is None or not filepath: - raise Exception('missing file path') - if not os.path.isfile(filepath) or os.stat(filepath).st_size == 0: - with open(filepath, 'wb') as file: - file.write(base64.b64decode(b64content)) - os.chmod(filepath, mode) - return True - return False - - def get_docker_client(ip, port=80, use_tls=True): - if use_tls: - settings_to_file(settings.SCANNERS_DOCKER_CA_CERT, settings.SCANNERS_DOCKER_CA_CERT_PATH) - settings_to_file(settings.SCANNERS_DOCKER_CLIENT_KEY, settings.SCANNERS_DOCKER_CLIENT_KEY_PATH) - settings_to_file(settings.SCANNERS_DOCKER_CLIENT_CERT, settings.SCANNERS_DOCKER_CLIENT_CERT_PATH) - tlsconfig = docker.tls.TLSConfig( - ca_cert=settings.SCANNERS_DOCKER_CA_CERT_PATH, - client_cert=(settings.SCANNERS_DOCKER_CLIENT_CERT_PATH, settings.SCANNERS_DOCKER_CLIENT_KEY_PATH), - verify=settings.SCANNERS_DOCKER_CA_CERT_PATH, - ) + tlsconfig = docker.tls.TLSConfig( + verify=True, + ) else: tlsconfig = False From 1da627461d89bcbcc98c7efee0326c9b00bc287c Mon Sep 17 00:00:00 2001 From: oliveiraj4 Date: Wed, 5 Nov 2025 09:44:40 +0000 Subject: [PATCH 2/2] test commit:will --- surface/scanners/utils/__init__.py | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/surface/scanners/utils/__init__.py b/surface/scanners/utils/__init__.py index d2c11563..6e2b1f6b 100644 --- a/surface/scanners/utils/__init__.py +++ b/surface/scanners/utils/__init__.py @@ -8,10 +8,29 @@ from . import _docker from scanners import models + +def settings_to_file(b64content, filepath, mode=0o600): + if b64content is None or not filepath: + raise Exception('missing file path') + if not os.path.isfile(filepath) or os.stat(filepath).st_size == 0: + with open(filepath, 'wb') as file: + file.write(base64.b64decode(b64content)) + os.chmod(filepath, mode) + return True + return False + + def get_docker_client(ip, port=80, use_tls=True): - tlsconfig = docker.tls.TLSConfig( - verify=True, - ) + if use_tls: + settings_to_file(settings.SCANNERS_DOCKER_CA_CERT, settings.SCANNERS_DOCKER_CA_CERT_PATH) + settings_to_file(settings.SCANNERS_DOCKER_CLIENT_KEY, settings.SCANNERS_DOCKER_CLIENT_KEY_PATH) + settings_to_file(settings.SCANNERS_DOCKER_CLIENT_CERT, settings.SCANNERS_DOCKER_CLIENT_CERT_PATH) + tlsconfig = docker.tls.TLSConfig( + ca_cert=settings.SCANNERS_DOCKER_CA_CERT_PATH, + client_cert=(settings.SCANNERS_DOCKER_CLIENT_CERT_PATH, settings.SCANNERS_DOCKER_CLIENT_KEY_PATH), + verify=settings.SCANNERS_DOCKER_CA_CERT_PATH, + ) + #test commit else: tlsconfig = False