fix: resolve Phase 14 merge conflicts across CI/CD, archive, and frontend sources
This commit is contained in:
@@ -11,53 +11,6 @@ import (
|
||||
"github.com/salvacybersec/keyhunter/pkg/recon"
|
||||
)
|
||||
|
||||
<<<<<<< HEAD
|
||||
const travisFixtureJSON = `{
|
||||
"builds": [
|
||||
{
|
||||
"id": 12345,
|
||||
"state": "passed",
|
||||
"repository": {"slug": "alice/project"}
|
||||
},
|
||||
{
|
||||
"id": 67890,
|
||||
"state": "passed",
|
||||
"repository": {"slug": "bob/app"}
|
||||
}
|
||||
]
|
||||
}`
|
||||
|
||||
func TestTravisCI_Sweep_ExtractsFindings(t *testing.T) {
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path != "/builds" {
|
||||
t.Errorf("unexpected path: %s", r.URL.Path)
|
||||
}
|
||||
if r.Header.Get("Travis-API-Version") != "3" {
|
||||
t.Error("missing Travis-API-Version header")
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
_, _ = w.Write([]byte(travisFixtureJSON))
|
||||
}))
|
||||
defer srv.Close()
|
||||
|
||||
src := &TravisCISource{
|
||||
BaseURL: srv.URL,
|
||||
Registry: providers.NewRegistryFromProviders([]providers.Provider{
|
||||
{Name: "openai", Keywords: []string{"sk-proj-"}},
|
||||
}),
|
||||
Limiters: recon.NewLimiterRegistry(),
|
||||
Client: NewClient(),
|
||||
}
|
||||
|
||||
out := make(chan recon.Finding, 16)
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer cancel()
|
||||
|
||||
if err := src.Sweep(ctx, "", out); err != nil {
|
||||
t.Fatalf("Sweep err: %v", err)
|
||||
}
|
||||
close(out)
|
||||
=======
|
||||
func TestTravisCI_Name(t *testing.T) {
|
||||
s := &TravisCISource{}
|
||||
if s.Name() != "travisci" {
|
||||
@@ -107,46 +60,15 @@ Running tests...`))
|
||||
if err != nil {
|
||||
t.Fatalf("Sweep error: %v", err)
|
||||
}
|
||||
>>>>>>> worktree-agent-adad8c10
|
||||
|
||||
var findings []recon.Finding
|
||||
for f := range out {
|
||||
findings = append(findings, f)
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
if len(findings) != 2 {
|
||||
t.Fatalf("expected 2 findings, got %d", len(findings))
|
||||
}
|
||||
for _, f := range findings {
|
||||
if f.SourceType != "recon:travisci" {
|
||||
t.Errorf("unexpected SourceType: %s", f.SourceType)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestTravisCI_EnabledAlwaysTrue(t *testing.T) {
|
||||
s := &TravisCISource{}
|
||||
if !s.Enabled(recon.Config{}) {
|
||||
t.Fatal("expected Enabled=true")
|
||||
}
|
||||
}
|
||||
|
||||
func TestTravisCI_NameAndRate(t *testing.T) {
|
||||
s := &TravisCISource{}
|
||||
if s.Name() != "travisci" {
|
||||
t.Errorf("unexpected name: %s", s.Name())
|
||||
}
|
||||
if s.Burst() != 1 {
|
||||
t.Errorf("burst: %d", s.Burst())
|
||||
}
|
||||
if !s.RespectsRobots() {
|
||||
t.Error("expected RespectsRobots=true")
|
||||
=======
|
||||
if len(findings) == 0 {
|
||||
t.Fatal("expected at least one finding from Travis CI build log")
|
||||
}
|
||||
if findings[0].SourceType != "recon:travisci" {
|
||||
t.Fatalf("expected recon:travisci, got %s", findings[0].SourceType)
|
||||
>>>>>>> worktree-agent-adad8c10
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user