diff --git a/api/schemas/main_test.go b/api/schemas/main_test.go index 5eec2695..41e1a0e0 100644 --- a/api/schemas/main_test.go +++ b/api/schemas/main_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap/zapcore" ) diff --git a/cmd/cmd_test.go b/cmd/cmd_test.go index 76f59a01..7fd7137d 100644 --- a/cmd/cmd_test.go +++ b/cmd/cmd_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // TestConfigFlagOverride verifies that CLI flags correctly override configuration diff --git a/cmd/evolution.go b/cmd/evolution.go index 8b61cd82..6101ea43 100644 --- a/cmd/evolution.go +++ b/cmd/evolution.go @@ -11,7 +11,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/config" "github.com/xkilldash9x/scalpel-cli/internal/evolution/analyst" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "github.com/xkilldash9x/scalpel-cli/internal/service" ) diff --git a/cmd/evolution_test.go b/cmd/evolution_test.go index 22cc830b..7c7d6c4c 100644 --- a/cmd/evolution_test.go +++ b/cmd/evolution_test.go @@ -13,7 +13,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/config" "github.com/xkilldash9x/scalpel-cli/internal/mocks" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // MockAnalystRunner is a mock implementation of the AnalystRunner interface. diff --git a/cmd/main_test.go b/cmd/main_test.go index 97a02e88..956c1969 100644 --- a/cmd/main_test.go +++ b/cmd/main_test.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "github.com/xkilldash9x/scalpel-cli/internal/service" // FIX: Import the service package "go.uber.org/zap" ) diff --git a/cmd/report.go b/cmd/report.go index 9c634eda..5224956b 100644 --- a/cmd/report.go +++ b/cmd/report.go @@ -14,7 +14,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "github.com/xkilldash9x/scalpel-cli/internal/reporting" "github.com/xkilldash9x/scalpel-cli/internal/results" "github.com/xkilldash9x/scalpel-cli/internal/store" diff --git a/cmd/root.go b/cmd/root.go index 36913ae6..565c4e0d 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "github.com/xkilldash9x/scalpel-cli/internal/service" "go.uber.org/zap" ) diff --git a/cmd/scalpel/main.go b/cmd/scalpel/main.go index 74f2f565..6c18a0bf 100644 --- a/cmd/scalpel/main.go +++ b/cmd/scalpel/main.go @@ -19,7 +19,7 @@ import ( "time" "github.com/xkilldash9x/scalpel-cli/cmd" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) const panicLogFile = "panic.log" diff --git a/cmd/scan.go b/cmd/scan.go index 814d0490..52cdc5fc 100644 --- a/cmd/scan.go +++ b/cmd/scan.go @@ -18,7 +18,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "github.com/xkilldash9x/scalpel-cli/internal/reporting" "github.com/xkilldash9x/scalpel-cli/internal/results" "github.com/xkilldash9x/scalpel-cli/internal/service" diff --git a/cmd/scan_test.go b/cmd/scan_test.go index 01b2993d..cfb1b2da 100644 --- a/cmd/scan_test.go +++ b/cmd/scan_test.go @@ -16,7 +16,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/config" "github.com/xkilldash9x/scalpel-cli/internal/mocks" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "github.com/xkilldash9x/scalpel-cli/internal/service" "go.uber.org/zap/zapcore" ) diff --git a/cmd/self_heal.go b/cmd/self_heal.go index 0d804152..156a03af 100644 --- a/cmd/self_heal.go +++ b/cmd/self_heal.go @@ -10,7 +10,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/autofix/metalyst" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "github.com/xkilldash9x/scalpel-cli/internal/service" "go.uber.org/zap" ) diff --git a/cmd/self_heal_test.go b/cmd/self_heal_test.go index 0af501cf..7f75efbf 100644 --- a/cmd/self_heal_test.go +++ b/cmd/self_heal_test.go @@ -12,7 +12,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/config" "github.com/xkilldash9x/scalpel-cli/internal/mocks" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // MockMetalystRunner is a mock implementation of the MetalystRunner interface. diff --git a/go.mod b/go.mod index 4227d67b..82854221 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/xkilldash9x/scalpel-cli go 1.25.4 require ( - github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 github.com/andybalholm/brotli v1.2.0 github.com/beevik/etree v1.6.0 github.com/cespare/xxhash/v2 v2.3.0 diff --git a/go.sum b/go.sum index e6d8e9c0..028195e8 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,6 @@ cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdB cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10= dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= diff --git a/internal/agent/analysis_executor.go b/internal/agent/analysis_executor.go index e89917fd..f86d7350 100644 --- a/internal/agent/analysis_executor.go +++ b/internal/agent/analysis_executor.go @@ -8,7 +8,7 @@ import ( "net/url" "time" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" "github.com/xkilldash9x/scalpel-cli/api/schemas" diff --git a/internal/agent/analysis_executor_test.go b/internal/agent/analysis_executor_test.go index da0eb653..55ff2312 100644 --- a/internal/agent/analysis_executor_test.go +++ b/internal/agent/analysis_executor_test.go @@ -15,7 +15,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/analysis/core" "github.com/xkilldash9x/scalpel-cli/internal/mocks" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // Setup function for AnalysisExecutor tests. diff --git a/internal/agent/codebase_executor.go b/internal/agent/codebase_executor.go index b6d82465..bdfa4e1e 100644 --- a/internal/agent/codebase_executor.go +++ b/internal/agent/codebase_executor.go @@ -12,7 +12,7 @@ import ( "path/filepath" "sort" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" "golang.org/x/tools/go/packages" ) diff --git a/internal/agent/executors.go b/internal/agent/executors.go index ec515b55..571a78eb 100644 --- a/internal/agent/executors.go +++ b/internal/agent/executors.go @@ -11,7 +11,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/analysis/core" "github.com/xkilldash9x/scalpel-cli/internal/browser/humanoid" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" ) diff --git a/internal/agent/humanoid_executor.go b/internal/agent/humanoid_executor.go index e9b1861b..a65123d9 100644 --- a/internal/agent/humanoid_executor.go +++ b/internal/agent/humanoid_executor.go @@ -8,7 +8,7 @@ import ( json "github.com/json-iterator/go" "github.com/xkilldash9x/scalpel-cli/internal/browser/humanoid" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" ) diff --git a/internal/agent/humanoid_executor_test.go b/internal/agent/humanoid_executor_test.go index f9e219d3..f28f7848 100644 --- a/internal/agent/humanoid_executor_test.go +++ b/internal/agent/humanoid_executor_test.go @@ -13,7 +13,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/internal/browser/humanoid" "github.com/xkilldash9x/scalpel-cli/internal/mocks" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // setupHumanoidExecutorTest initializes the executor with a mock humanoid controller. diff --git a/internal/agent/login_executor.go b/internal/agent/login_executor.go index aa169ab7..2726caf4 100644 --- a/internal/agent/login_executor.go +++ b/internal/agent/login_executor.go @@ -9,7 +9,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/browser/humanoid" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" ) diff --git a/internal/agent/main_test.go b/internal/agent/main_test.go index 322af5d6..3d4e4f3e 100644 --- a/internal/agent/main_test.go +++ b/internal/agent/main_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap/zapcore" ) diff --git a/internal/agent/signup_executor.go b/internal/agent/signup_executor.go index 02bb30dd..c4fdb2ac 100644 --- a/internal/agent/signup_executor.go +++ b/internal/agent/signup_executor.go @@ -22,7 +22,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/browser/humanoid" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" ) diff --git a/internal/agent/signup_executor_test.go b/internal/agent/signup_executor_test.go index 25500f0e..3672201b 100644 --- a/internal/agent/signup_executor_test.go +++ b/internal/agent/signup_executor_test.go @@ -21,7 +21,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/internal/browser/humanoid" "github.com/xkilldash9x/scalpel-cli/internal/config" "github.com/xkilldash9x/scalpel-cli/internal/mocks" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" "go.uber.org/zap/zaptest" ) diff --git a/internal/analysis/active/timeslip/concurrency_test.go b/internal/analysis/active/timeslip/concurrency_test.go index eb2e34be..2b31d967 100644 --- a/internal/analysis/active/timeslip/concurrency_test.go +++ b/internal/analysis/active/timeslip/concurrency_test.go @@ -17,7 +17,7 @@ import ( "golang.org/x/net/http2" // -- ADDED -- - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // --- III. Concurrency & Reliability Tests --- diff --git a/internal/analysis/active/timeslip/e2e_test.go b/internal/analysis/active/timeslip/e2e_test.go index 50596a4b..33f77e17 100644 --- a/internal/analysis/active/timeslip/e2e_test.go +++ b/internal/analysis/active/timeslip/e2e_test.go @@ -18,7 +18,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/internal/analysis/active/timeslip" "github.com/xkilldash9x/scalpel-cli/internal/analysis/core" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // MockReporter for E2E tests (Thread-safe). diff --git a/internal/analysis/active/timeslip/graphql_async.go b/internal/analysis/active/timeslip/graphql_async.go index d0becaf1..e2ef1a12 100644 --- a/internal/analysis/active/timeslip/graphql_async.go +++ b/internal/analysis/active/timeslip/graphql_async.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + "github.com/xkilldash9x/scalpel-cli/pkg/network" "go.uber.org/zap" ) diff --git a/internal/analysis/active/timeslip/h1_concurrent.go b/internal/analysis/active/timeslip/h1_concurrent.go index 556179e6..714bdc0f 100644 --- a/internal/analysis/active/timeslip/h1_concurrent.go +++ b/internal/analysis/active/timeslip/h1_concurrent.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network/customhttp" + "github.com/xkilldash9x/scalpel-cli/pkg/customhttp" "go.uber.org/zap" ) diff --git a/internal/analysis/active/timeslip/h1_singlebyte.go b/internal/analysis/active/timeslip/h1_singlebyte.go index 3ad31415..1ba95dbd 100644 --- a/internal/analysis/active/timeslip/h1_singlebyte.go +++ b/internal/analysis/active/timeslip/h1_singlebyte.go @@ -12,7 +12,7 @@ import ( "net/url" "time" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + "github.com/xkilldash9x/scalpel-cli/pkg/network" "go.uber.org/zap" ) diff --git a/internal/analysis/active/timeslip/h1_singlebyte_test.go b/internal/analysis/active/timeslip/h1_singlebyte_test.go index 1c94d472..c90fe4f0 100644 --- a/internal/analysis/active/timeslip/h1_singlebyte_test.go +++ b/internal/analysis/active/timeslip/h1_singlebyte_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + "github.com/xkilldash9x/scalpel-cli/pkg/network" ) // TestSetupConnectionDetails validates the configuration of the DialerConfig diff --git a/internal/analysis/active/timeslip/h2_multiplex.go b/internal/analysis/active/timeslip/h2_multiplex.go index f053e01f..10e8ef4e 100644 --- a/internal/analysis/active/timeslip/h2_multiplex.go +++ b/internal/analysis/active/timeslip/h2_multiplex.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network/customhttp" + "github.com/xkilldash9x/scalpel-cli/pkg/customhttp" "go.uber.org/zap" ) diff --git a/internal/analysis/active/timeslip/integration_test.go b/internal/analysis/active/timeslip/integration_test.go index d1b6f49a..1410dc5a 100644 --- a/internal/analysis/active/timeslip/integration_test.go +++ b/internal/analysis/active/timeslip/integration_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" // -- ADDED -- - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // Helper struct to track requests received by the mock server in a thread-safe manner. diff --git a/internal/analysis/active/timeslip/main_test.go b/internal/analysis/active/timeslip/main_test.go index 6a052a3c..edb869b4 100644 --- a/internal/analysis/active/timeslip/main_test.go +++ b/internal/analysis/active/timeslip/main_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap/zapcore" ) diff --git a/internal/analysis/active/timeslip/timeslip_analyzer.go b/internal/analysis/active/timeslip/timeslip_analyzer.go index b5a2aaac..86c4ec73 100644 --- a/internal/analysis/active/timeslip/timeslip_analyzer.go +++ b/internal/analysis/active/timeslip/timeslip_analyzer.go @@ -16,7 +16,7 @@ import ( "github.com/google/uuid" "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/analysis/core" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" ) diff --git a/internal/analysis/auth/idor/analyzer_test.go b/internal/analysis/auth/idor/analyzer_test.go index ed866c80..4c7460ff 100644 --- a/internal/analysis/auth/idor/analyzer_test.go +++ b/internal/analysis/auth/idor/analyzer_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + "github.com/xkilldash9x/scalpel-cli/pkg/network" "github.com/xkilldash9x/scalpel-cli/internal/jsoncompare" ) diff --git a/internal/analysis/auth/idor/idor_analyzer.go b/internal/analysis/auth/idor/idor_analyzer.go index 7144183f..8c5da7bb 100644 --- a/internal/analysis/auth/idor/idor_analyzer.go +++ b/internal/analysis/auth/idor/idor_analyzer.go @@ -7,9 +7,9 @@ import ( "log" "runtime" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + "github.com/xkilldash9x/scalpel-cli/pkg/network" "github.com/xkilldash9x/scalpel-cli/internal/jsoncompare" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // IDORAnalyzer is the main orchestrator for the Insecure Direct Object Reference diff --git a/internal/analysis/auth/idor/idor_test.go b/internal/analysis/auth/idor/idor_test.go index 3c4a9b6f..19889b30 100644 --- a/internal/analysis/auth/idor/idor_test.go +++ b/internal/analysis/auth/idor/idor_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/require" "github.com/xkilldash9x/scalpel-cli/internal/config" "github.com/xkilldash9x/scalpel-cli/internal/jsoncompare" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/goleak" ) diff --git a/internal/autofix/metalyst/matalyst_test.go b/internal/autofix/metalyst/matalyst_test.go index 6f5f8234..882438b4 100644 --- a/internal/autofix/metalyst/matalyst_test.go +++ b/internal/autofix/metalyst/matalyst_test.go @@ -18,7 +18,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/internal/autofix/coroner" "github.com/xkilldash9x/scalpel-cli/internal/config" "github.com/xkilldash9x/scalpel-cli/internal/mocks" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest" ) diff --git a/internal/autofix/metalyst/metalyst.go b/internal/autofix/metalyst/metalyst.go index 05a1d39b..39ff775a 100644 --- a/internal/autofix/metalyst/metalyst.go +++ b/internal/autofix/metalyst/metalyst.go @@ -18,7 +18,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/internal/autofix/coroner" "github.com/xkilldash9x/scalpel-cli/internal/config" "github.com/xkilldash9x/scalpel-cli/internal/llmutil" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" ) diff --git a/internal/discovery/adapter.go b/internal/discovery/adapter.go index 2c091582..a3ca4a0e 100644 --- a/internal/discovery/adapter.go +++ b/internal/discovery/adapter.go @@ -7,7 +7,7 @@ import ( "net/http" // This import is no longer needed since we are using the standard http.Client. - // "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + // "github.com/xkilldash9x/scalpel-cli/pkg/network" ) // HTTPClient interface (defined elsewhere in discovery package, e.g., passive.go): diff --git a/internal/discovery/discover_dom.go b/internal/discovery/discover_dom.go index ce5d561d..c778d3a3 100644 --- a/internal/discovery/discover_dom.go +++ b/internal/discovery/discover_dom.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/xkilldash9x/scalpel-cli/api/schemas" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" ) diff --git a/internal/jsoncompare/main_test.go b/internal/jsoncompare/main_test.go index 2b0f6e30..b033f4ef 100644 --- a/internal/jsoncompare/main_test.go +++ b/internal/jsoncompare/main_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap/zapcore" ) diff --git a/internal/jsoncompare/service.go b/internal/jsoncompare/service.go index 4e8e6d3f..5d516e31 100644 --- a/internal/jsoncompare/service.go +++ b/internal/jsoncompare/service.go @@ -14,7 +14,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/google/uuid" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" ) diff --git a/internal/reporting/main_test.go b/internal/reporting/main_test.go index 46b55cee..a21de06a 100644 --- a/internal/reporting/main_test.go +++ b/internal/reporting/main_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap/zapcore" ) diff --git a/internal/reporting/reporter.go b/internal/reporting/reporter.go index b55afe6a..8e88a42d 100644 --- a/internal/reporting/reporter.go +++ b/internal/reporting/reporter.go @@ -9,7 +9,7 @@ import ( "go.uber.org/zap" "github.com/xkilldash9x/scalpel-cli/api/schemas" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // Reporter defines the interface for writing scan results to an output. diff --git a/internal/reporting/sarif_reporter.go b/internal/reporting/sarif_reporter.go index f40bf97b..982522e0 100644 --- a/internal/reporting/sarif_reporter.go +++ b/internal/reporting/sarif_reporter.go @@ -16,7 +16,7 @@ import ( "go.uber.org/zap" "github.com/xkilldash9x/scalpel-cli/api/schemas" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "github.com/xkilldash9x/scalpel-cli/internal/reporting/sarif" ) diff --git a/internal/service/components.go b/internal/service/components.go index 01590bfc..24f5122e 100644 --- a/internal/service/components.go +++ b/internal/service/components.go @@ -10,7 +10,7 @@ import ( "go.uber.org/zap" "github.com/xkilldash9x/scalpel-cli/api/schemas" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) // Components holds all the initialized services required for a scan. diff --git a/internal/service/factory.go b/internal/service/factory.go index 3b4bd44c..2e5d5402 100644 --- a/internal/service/factory.go +++ b/internal/service/factory.go @@ -12,7 +12,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/analysis/core" "github.com/xkilldash9x/scalpel-cli/internal/browser" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + "github.com/xkilldash9x/scalpel-cli/pkg/network" "github.com/xkilldash9x/scalpel-cli/internal/config" "github.com/xkilldash9x/scalpel-cli/internal/discovery" "github.com/xkilldash9x/scalpel-cli/internal/engine" diff --git a/internal/service/service_helpers_test.go b/internal/service/service_helpers_test.go index 7b1cd394..1434c204 100644 --- a/internal/service/service_helpers_test.go +++ b/internal/service/service_helpers_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" ) func TestMain(m *testing.M) { diff --git a/internal/worker/adapters/idor_adapter.go b/internal/worker/adapters/idor_adapter.go index 811f4320..17ffbc53 100644 --- a/internal/worker/adapters/idor_adapter.go +++ b/internal/worker/adapters/idor_adapter.go @@ -16,7 +16,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/internal/analysis/core" // (Fix 4.1: Import centralized networking package) - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + "github.com/xkilldash9x/scalpel-cli/pkg/network" "github.com/xkilldash9x/scalpel-cli/internal/jsoncompare" "go.uber.org/zap" ) diff --git a/internal/worker/adapters/taint_adapter.go b/internal/worker/adapters/taint_adapter.go index a00ce851..0e27cdc4 100644 --- a/internal/worker/adapters/taint_adapter.go +++ b/internal/worker/adapters/taint_adapter.go @@ -10,7 +10,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/api/schemas" "github.com/xkilldash9x/scalpel-cli/internal/analysis/active/taint" "github.com/xkilldash9x/scalpel-cli/internal/analysis/core" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap" ) diff --git a/internal/worker/worker_test.go b/internal/worker/worker_test.go index a1c9d3d7..2c7ed70e 100644 --- a/internal/worker/worker_test.go +++ b/internal/worker/worker_test.go @@ -21,7 +21,7 @@ import ( "github.com/xkilldash9x/scalpel-cli/internal/analysis/core" "github.com/xkilldash9x/scalpel-cli/internal/config" "github.com/xkilldash9x/scalpel-cli/internal/mocks" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "github.com/xkilldash9x/scalpel-cli/internal/worker" ) diff --git a/internal/browser/network/customhttp/chaos_test.go b/pkg/customhttp/chaos_test.go similarity index 100% rename from internal/browser/network/customhttp/chaos_test.go rename to pkg/customhttp/chaos_test.go diff --git a/internal/browser/network/customhttp/client.go b/pkg/customhttp/client.go similarity index 99% rename from internal/browser/network/customhttp/client.go rename to pkg/customhttp/client.go index 540eece9..d9b61593 100644 --- a/internal/browser/network/customhttp/client.go +++ b/pkg/customhttp/client.go @@ -17,7 +17,7 @@ import ( "sync" "time" - "github.com/xkilldash9x/scalpel-cli/internal/observability" // Added import + "github.com/xkilldash9x/scalpel-cli/pkg/observability" // Added import "golang.org/x/net/http2" // Added import "go.uber.org/zap" ) diff --git a/internal/browser/network/customhttp/client_integration_test.go b/pkg/customhttp/client_integration_test.go similarity index 100% rename from internal/browser/network/customhttp/client_integration_test.go rename to pkg/customhttp/client_integration_test.go diff --git a/internal/browser/network/customhttp/client_test.go b/pkg/customhttp/client_test.go similarity index 100% rename from internal/browser/network/customhttp/client_test.go rename to pkg/customhttp/client_test.go diff --git a/internal/browser/network/customhttp/config.go b/pkg/customhttp/config.go similarity index 99% rename from internal/browser/network/customhttp/config.go rename to pkg/customhttp/config.go index 0518746e..1f6c444b 100644 --- a/internal/browser/network/customhttp/config.go +++ b/pkg/customhttp/config.go @@ -7,7 +7,7 @@ import ( "net/url" "time" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + "github.com/xkilldash9x/scalpel-cli/pkg/network" ) // ErrCredentialsNotFound is a sentinel error returned by a CredentialsProvider diff --git a/internal/browser/network/customhttp/fuzz_test.go b/pkg/customhttp/fuzz_test.go similarity index 95% rename from internal/browser/network/customhttp/fuzz_test.go rename to pkg/customhttp/fuzz_test.go index 9a1c28c8..48926655 100644 --- a/internal/browser/network/customhttp/fuzz_test.go +++ b/pkg/customhttp/fuzz_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + "github.com/xkilldash9x/scalpel-cli/pkg/network" "go.uber.org/zap/zaptest" ) diff --git a/internal/browser/network/customhttp/h1client.go b/pkg/customhttp/h1client.go similarity index 99% rename from internal/browser/network/customhttp/h1client.go rename to pkg/customhttp/h1client.go index 6dc13bd1..12cb7c35 100644 --- a/internal/browser/network/customhttp/h1client.go +++ b/pkg/customhttp/h1client.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" - "github.com/xkilldash9x/scalpel-cli/internal/observability" // Added import + "github.com/xkilldash9x/scalpel-cli/pkg/network" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" // Added import "go.uber.org/zap" ) diff --git a/internal/browser/network/customhttp/h1client_test.go b/pkg/customhttp/h1client_test.go similarity index 100% rename from internal/browser/network/customhttp/h1client_test.go rename to pkg/customhttp/h1client_test.go diff --git a/internal/browser/network/customhttp/h2client.go b/pkg/customhttp/h2client.go similarity index 99% rename from internal/browser/network/customhttp/h2client.go rename to pkg/customhttp/h2client.go index 935481fd..bc3217b1 100644 --- a/internal/browser/network/customhttp/h2client.go +++ b/pkg/customhttp/h2client.go @@ -18,8 +18,8 @@ import ( "sync" "time" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" - "github.com/xkilldash9x/scalpel-cli/internal/observability" // Added import + "github.com/xkilldash9x/scalpel-cli/pkg/network" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" // Added import "go.uber.org/zap" "golang.org/x/net/http2" "golang.org/x/net/http2/hpack" diff --git a/internal/browser/network/customhttp/h2client_test.go b/pkg/customhttp/h2client_test.go similarity index 100% rename from internal/browser/network/customhttp/h2client_test.go rename to pkg/customhttp/h2client_test.go diff --git a/internal/browser/network/customhttp/mock_server_test.go b/pkg/customhttp/mock_server_test.go similarity index 100% rename from internal/browser/network/customhttp/mock_server_test.go rename to pkg/customhttp/mock_server_test.go diff --git a/internal/browser/network/customhttp/performance_test.go b/pkg/customhttp/performance_test.go similarity index 100% rename from internal/browser/network/customhttp/performance_test.go rename to pkg/customhttp/performance_test.go diff --git a/internal/browser/network/compression.go b/pkg/network/compression.go similarity index 100% rename from internal/browser/network/compression.go rename to pkg/network/compression.go diff --git a/internal/browser/network/compression_test.go b/pkg/network/compression_test.go similarity index 98% rename from internal/browser/network/compression_test.go rename to pkg/network/compression_test.go index e010bfa0..7b3e166b 100644 --- a/internal/browser/network/compression_test.go +++ b/pkg/network/compression_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/xkilldash9x/scalpel-cli/internal/browser/network" + "github.com/xkilldash9x/scalpel-cli/pkg/network" ) const testBody = "Hello, world! This is a compressible string." diff --git a/internal/browser/network/dialer.go b/pkg/network/dialer.go similarity index 100% rename from internal/browser/network/dialer.go rename to pkg/network/dialer.go diff --git a/internal/browser/network/dialer_test.go b/pkg/network/dialer_test.go similarity index 100% rename from internal/browser/network/dialer_test.go rename to pkg/network/dialer_test.go diff --git a/internal/browser/network/http_parser.go b/pkg/network/http_parser.go similarity index 100% rename from internal/browser/network/http_parser.go rename to pkg/network/http_parser.go diff --git a/internal/browser/network/http_parser_test.go b/pkg/network/http_parser_test.go similarity index 100% rename from internal/browser/network/http_parser_test.go rename to pkg/network/http_parser_test.go diff --git a/internal/browser/network/httpclient.go b/pkg/network/httpclient.go similarity index 100% rename from internal/browser/network/httpclient.go rename to pkg/network/httpclient.go diff --git a/internal/browser/network/httpclient_test.go b/pkg/network/httpclient_test.go similarity index 100% rename from internal/browser/network/httpclient_test.go rename to pkg/network/httpclient_test.go diff --git a/internal/browser/network/proxy.go b/pkg/network/proxy.go similarity index 100% rename from internal/browser/network/proxy.go rename to pkg/network/proxy.go diff --git a/internal/browser/network/proxy_test.go b/pkg/network/proxy_test.go similarity index 100% rename from internal/browser/network/proxy_test.go rename to pkg/network/proxy_test.go diff --git a/internal/browser/network/tls_test.go b/pkg/network/tls_test.go similarity index 100% rename from internal/browser/network/tls_test.go rename to pkg/network/tls_test.go diff --git a/internal/observability/logger.go b/pkg/observability/logger.go similarity index 100% rename from internal/observability/logger.go rename to pkg/observability/logger.go diff --git a/internal/observability/logger_test.go b/pkg/observability/logger_test.go similarity index 100% rename from internal/observability/logger_test.go rename to pkg/observability/logger_test.go diff --git a/internal/observability/main_test.go b/pkg/observability/main_test.go similarity index 94% rename from internal/observability/main_test.go rename to pkg/observability/main_test.go index 08949ee5..106a9287 100644 --- a/internal/observability/main_test.go +++ b/pkg/observability/main_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/xkilldash9x/scalpel-cli/internal/config" - "github.com/xkilldash9x/scalpel-cli/internal/observability" + "github.com/xkilldash9x/scalpel-cli/pkg/observability" "go.uber.org/zap/zapcore" )