Skip to content

Cleaning up log creation #1

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

Merged
Zenith1415 merged 1 commit into from
Mar 7, 2026
Merged

Cleaning up log creation #1

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
Empty file added Dockerfile.allinone
View file
Open in desktop
Empty file.
Empty file added entrypoint_allinone.sh
View file
Open in desktop
Empty file.
32 changes: 16 additions & 16 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ fn load_shield_config() -> Option<ShieldConfig> {
if yaml_path.exists() {
let content = fs::read_to_string(yaml_path).ok()?;
let config: ShieldConfig = serde_yaml::from_str(&content).ok()?;
println!("📋 Loaded shieldci.yml configuration");
println!("Loaded shieldci.yml configuration");
Some(config)
} else {
println!("⚠️ No shieldci.yml found, falling back to auto-detection");
println!("No shieldci.yml found, falling back to auto-detection");
None
Comment on lines +108 to 112

Copilot AI Mar 7, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change removes emoji/prefixes from some log lines, but the file still prints emojis elsewhere (e.g., the scout and boot messages). If the goal is to “clean up log creation”, consider applying a consistent logging format across the remaining println! calls (either all plain text or all with the same prefixing style).

Copilot uses AI. Check for mistakes.
}
}
Expand Down Expand Up @@ -156,12 +156,12 @@ fn fetch_config_from_shell() -> TargetConfig {

fn launch_sandbox(config: &TargetConfig) {
if !config.build_command.is_empty() {
println!("⚙️ Running build: {}", config.build_command);
println!("Running build: {}", config.build_command);
let parts: Vec<&str> = config.build_command.split_whitespace().collect();
let _ = Command::new(parts[0]).args(&parts[1..]).status();
}

println!("🚀 Launching {} server on {}...", config.framework, config.target_url);
println!("Launching {} server", config.framework);

Copilot AI Mar 7, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new launch message no longer includes the target URL/port (it previously logged where the server would be reachable). For troubleshooting it’s helpful to log config.target_url (and/or the run command) along with the framework so users can immediately see what endpoint is expected to come up.

Suggested change
println!("Launching {} server", config.framework);
println!(
"Launching {} server at {} using: {}",
config.framework, config.target_url, config.run_command
);

Copilot uses AI. Check for mistakes.
let run_parts: Vec<&str> = config.run_command.split_whitespace().collect();
Command::new(run_parts[0])
.args(&run_parts[1..])
Expand All @@ -172,16 +172,16 @@ fn launch_sandbox(config: &TargetConfig) {
}

async fn wait_for_target(url: &str, max_retries: u8) -> Result<(), String> {
println!("⏳ Waiting for target {} to come online...", url);
println!("Waiting for target to come online");
let client = Client::builder().timeout(Duration::from_secs(2)).build().unwrap();
for _ in 1..=max_retries {
if client.get(url).send().await.is_ok() {
println!("✅ Target is up and responding!");
println!("Target is up and responding");
return Ok(());
}
sleep(Duration::from_secs(2)).await;
}
Err(format!("❌ Target {} failed to respond.", url))
Err(format!("Target failed to respond."))

Copilot AI Mar 7, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now uses format!("Target failed to respond.") with no interpolation, which typically triggers a Clippy warning and adds noise. Prefer returning a plain "...".to_string()/String::from(...) here.

Suggested change
Err(format!("Target failed to respond."))
Err("Target failed to respond.".to_string())

Copilot uses AI. Check for mistakes.
}
Comment on lines +175 to 185

Copilot AI Mar 7, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait_for_target logs and returns an error without including the url, which makes failures harder to diagnose. Consider including the URL (and possibly retry count/timeout) in both the initial log and the returned error string.

Copilot uses AI. Check for mistakes.

fn build_endpoint_context(config: &ShieldConfig, base_url: &str) -> String {
Expand Down Expand Up @@ -237,7 +237,7 @@ fn flatten_codebase(dir: &str) -> String {
}

async fn ask_llm(system_prompt: &str) -> ToolCall {
println!("🧠 Invoking local model via Ollama API...");
println!("Invoking ShieldCI LLM");
let client = Client::new();
let req_body = serde_json::json!({
"model": "llama3.1",
Expand Down Expand Up @@ -265,7 +265,7 @@ async fn ask_llm(system_prompt: &str) -> ToolCall {
}

async fn execute_mcp_tool_stdio(tool_call: &ToolCall) -> Result<String, Box<dyn std::error::Error>> {
println!("🤝 Initiating MCP Handshake & Strike: {} on {}", tool_call.tool, tool_call.target);
println!("Initiating MCP Handshake & Strike: {}", tool_call.tool);

Copilot AI Mar 7, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The MCP strike log line no longer includes the target being scanned. Including tool_call.target (or a sanitized/shortened version) would make scan output much easier to correlate with later results in attack_trace and in CI logs.

Suggested change
println!("Initiating MCP Handshake & Strike: {}", tool_call.tool);
println!(
"Initiating MCP Handshake & Strike: tool={} target={}",
tool_call.tool,
tool_call.target
);

Copilot uses AI. Check for mistakes.

let mut child = Command::new("docker")
.args(["run", "-i", "--rm", "shieldci-kali-image"])
Expand Down Expand Up @@ -303,7 +303,7 @@ async fn execute_mcp_tool_stdio(tool_call: &ToolCall) -> Result<String, Box<dyn
}

async fn generate_report(trace: &str, codebase: &str, success: bool) -> String {
println!("📝 Compiling final security assessment...");
println!("Compiling final security assessment");
let client = Client::new();
let status = if success { "VULNERABILITY DISCOVERED" } else { "NO VULNERABILITIES DETECTED" };

Expand Down Expand Up @@ -458,7 +458,7 @@ async fn main() {

// ── Generate dynamic test plan ──
let test_plan = generate_test_plan(&shield_config, &docker_url);
println!("\n📋 Test Plan ({} tests):", test_plan.len());
println!("\nTest Plan ({} tests):", test_plan.len());
for (i, (phase, tool, target)) in test_plan.iter().enumerate() {
println!(" {}. [{}] {} → {}", i + 1, phase, tool, target);
}
Expand All @@ -469,7 +469,7 @@ async fn main() {

// ── Execute each planned test ──
for (i, (phase, tool, target)) in test_plan.iter().enumerate() {
println!("\n--- Test {}/{}: {} ---", i + 1, total, phase);
println!("\nTest {}/{}: {}", i + 1, total, phase);

let tool_call = ToolCall { tool: tool.clone(), target: target.clone() };
let output = execute_mcp_tool_stdio(&tool_call).await.unwrap_or_else(|e| e.to_string());
Expand All @@ -482,7 +482,7 @@ async fn main() {

if output.to_lowercase().contains("vulnerable") || output.to_lowercase().contains("payload") {
exploit_found = true;
println!("🚨 Vulnerability detected in: {}", phase);
println!("Vulnerability detected in: {}", phase);
}
}

Expand Down Expand Up @@ -538,14 +538,14 @@ async fn main() {

if output.to_lowercase().contains("vulnerable") || output.to_lowercase().contains("payload") {
exploit_found = true;
println!("🚨 Vulnerability detected by adaptive strike!");
println!("Vulnerability detected by adaptive strike!");
}
}

// ── Generate final report ──
let report = generate_report(&attack_trace, &codebase, exploit_found).await;
fs::write("SHIELD_REPORT.md", &report).expect("Unable to write report");
println!("\n--- FINAL REPORT ---\n{}\n✅ Saved to SHIELD_REPORT.md", report);
println!("\n--- FINAL REPORT ---\n{}\n Saved to SHIELD_REPORT.md", report);

Copilot AI Mar 7, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The final report message now prints a leading space before “Saved to SHIELD_REPORT.md” ("\n Saved..."), which looks like an accidental formatting artifact in CLI output. Remove the extra space (or restore the prior formatting) so the message renders cleanly.

Suggested change
println!("\n--- FINAL REPORT ---\n{}\n Saved to SHIELD_REPORT.md", report);
println!("\n--- FINAL REPORT ---\n{}\nSaved to SHIELD_REPORT.md", report);

Copilot uses AI. Check for mistakes.

// ── Write structured JSON output for frontend API ──
let vulnerabilities = parse_vulns_from_trace(&attack_trace);
Expand All @@ -556,7 +556,7 @@ async fn main() {
};
let json_output = serde_json::to_string_pretty(&scan_output).unwrap_or_default();
fs::write("shield_results.json", &json_output).expect("Unable to write results JSON");
println!("✅ Saved structured results to shield_results.json");
println!("Saved structured results to shield_results.json");
}

/// Extract vulnerability entries from the attack trace.
Expand Down
Loading