Skip to content

fix: surface failed compose service scan information #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dharshukutti wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −6
Open

fix: surface failed compose service scan information #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions docksec/compose_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,8 @@ def run_full_scan(self, severity: str = "CRITICAL,HIGH") -> Dict:
'timestamp': "",
'image_name': "N/A",
'dockerfile_path': self.compose_path,
'scan_mode': 'compose'
'scan_mode': 'compose',
'failed_services': []
}

compose_findings = self.scanner.scan()
Expand All @@ -394,6 +395,7 @@ def run_full_scan(self, severity: str = "CRITICAL,HIGH") -> Dict:
dockerfile_outputs = []
image_outputs = []
all_success = True
failed_services = []

for service_name, config in services.items():
if not isinstance(config, dict):
Expand Down Expand Up @@ -441,13 +443,21 @@ def run_full_scan(self, severity: str = "CRITICAL,HIGH") -> Dict:
df_success, df_output = service_scanner.scan_dockerfile()
if not df_success:
all_success = False
failed_services.append({
"service": service_name,
"reason": "Dockerfile scan failed"
})
if df_output:
dockerfile_outputs.append(f"--- Service: {service_name} ---\n{df_output}")
elif image_name and not dockerfile_path:
# Only image
res = service_scanner.run_image_only_scan(severity)
if not res['image_scan']['success']:
all_success = False
failed_services.append({
"service": service_name,
"reason": "Image scan failed"
})
if res['image_scan']['output']:
image_outputs.append(f"--- Service: {service_name} ---\n{res['image_scan']['output']}")
if res.get('json_data'):
Expand All @@ -460,9 +470,22 @@ def run_full_scan(self, severity: str = "CRITICAL,HIGH") -> Dict:
res = service_scanner.run_full_scan(severity)
if not res['dockerfile_scan']['success'] or not res['image_scan']['success']:
all_success = False
if res['dockerfile_scan']['output'] and not res['dockerfile_scan'].get('skipped'):
dockerfile_outputs.append(f"--- Service: {service_name} ---\n{res['dockerfile_scan']['output']}")
if res['image_scan']['output'] and not res['image_scan'].get('skipped'):

if not res['dockerfile_scan']['success']:
failed_services.append({
"service": service_name,
"reason": "Dockerfile scan failed"
})

if not res['image_scan']['success']:
failed_services.append({
"service": service_name,
"reason": "Image scan failed"
})

if res['dockerfile_scan'].get('output') and not res['dockerfile_scan'].get('skipped'):
dockerfile_outputs.append(f"--- Service: {service_name} ---\n{res['dockerfile_scan']['output']}") # type: ignore
if res['image_scan'].get('output') and not res['image_scan'].get('skipped'):
image_outputs.append(f"--- Service: {service_name} ---\n{res['image_scan']['output']}")
if res.get('json_data'):
for f in res['json_data']:
Expand All @@ -471,6 +494,10 @@ def run_full_scan(self, severity: str = "CRITICAL,HIGH") -> Dict:
except Exception as e:
logger.error(f"Failed to scan service {service_name}: {e}")
all_success = False
failed_services.append({
"service": service_name,
"reason": str(e)
})

from datetime import datetime
return {
Expand All @@ -488,5 +515,6 @@ def run_full_scan(self, severity: str = "CRITICAL,HIGH") -> Dict:
'timestamp': datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
'image_name': "Multiple Services",
'dockerfile_path': self.compose_path,
'scan_mode': 'compose'
'scan_mode': 'compose',
'failed_services': failed_services
}
3 changes: 2 additions & 1 deletion tests/test_compose_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,5 @@ def test_compose_orchestrator_offline(valid_compose_file, mocker):

assert results['scan_mode'] == 'compose'
assert results['dockerfile_scan']['success'] is True
assert results['image_scan']['success'] is True
assert results['image_scan']['success'] is True
assert results["failed_services"] == []