Skip to content
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

Fix findings applied to wrong projects #280

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix findings applied to wrong projects #280

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4bd3dc
For the webhook notification from dtrack, apply the finding only to t…
rerkcp Jan 24, 2025
0a8e67c
Since the requests were not completed in time and further webhooks th…
rerkcp Jan 27, 2025
a6513cc
Simplify finding the correct project for the component from webhook call
rerkcp Jan 28, 2025
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
61 changes: 46 additions & 15 deletions internal/api/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
"fmt"
"net/http"
"strings"
"sync"

"github.com/DependencyTrack/client-go"
dtrack "github.com/DependencyTrack/client-go"
"github.com/DependencyTrack/client-go/notification"
"github.com/rs/zerolog"

Expand All @@ -28,20 +29,9 @@ func handleDTNotification(dtClient *dtrack.Client, auditChan chan<- any, auditor

switch subject := n.Subject.(type) {
case *notification.NewVulnerabilitySubject:
for i := range subject.AffectedProjects {
finding := audit.Finding{
Component: resolveComponent(subject.Component, dtClient, logger),
Project: resolveProject(subject.AffectedProjects[i], dtClient, logger),
Vulnerability: resolveVulnerability(subject.Vulnerability, dtClient, logger),
}

analysisReq, auditErr := auditor.AuditFinding(context.Background(), finding)
if auditErr == nil && analysisReq != (dtrack.AnalysisRequest{}) {
auditChan <- analysisReq
} else if auditErr != nil {
logger.Error().Err(auditErr).Object("finding", finding).Msg("failed to audit finding")
}
}
logger.Info().Str("content", n.Content).Msg("Received notification")
go handleVulnerability(*subject, dtClient, auditChan, auditor, logger)

case *notification.PolicyViolationSubject:
violation := audit.Violation{
Component: resolveComponent(subject.Component, dtClient, logger),
Expand All @@ -68,6 +58,35 @@ func handleDTNotification(dtClient *dtrack.Client, auditChan chan<- any, auditor
}
}

var lock sync.Mutex

func handleVulnerability(subject notification.NewVulnerabilitySubject, dtClient *dtrack.Client, auditChan chan<- any, auditor audit.Auditor, logger zerolog.Logger) {
lock.Lock()

component := resolveComponent(subject.Component, dtClient, logger)

logger.Info().Str("component", component.UUID.String()).Msg("Handling notification started")

project := resolveProjectFromComponent(*component.Project, dtClient, logger)

finding := audit.Finding{
Component: component,
Project: project,
Vulnerability: resolveVulnerability(subject.Vulnerability, dtClient, logger),
}

analysisReq, auditErr := auditor.AuditFinding(context.Background(), finding)
if auditErr == nil && analysisReq != (dtrack.AnalysisRequest{}) {
auditChan <- analysisReq
} else if auditErr != nil {
logger.Error().Err(auditErr).Object("finding", finding).Msg("failed to audit finding")
}
logger.Info().Str("component", component.UUID.String()).Msg("Handling notification done")

lock.Unlock()
}


func handleOPAStatus(statusChan chan<- opa.Status) http.HandlerFunc {
return func(rw http.ResponseWriter, r *http.Request) {
logger := getRequestLogger(r)
Expand Down Expand Up @@ -102,6 +121,18 @@ func resolveComponent(input notification.Component, dtClient *dtrack.Client, log
return
}

func resolveProjectFromComponent(input dtrack.Project, dtClient *dtrack.Client, logger zerolog.Logger) (project dtrack.Project) {
project, err := dtClient.Project.Get(context.Background(), input.UUID)
if err != nil {
logger.Error().Err(err).
Str("project", input.UUID.String()).
Msg("failed to fetch project, proceeding with project from component instead")
project = input
}

return
}

func resolveProject(input notification.Project, dtClient *dtrack.Client, logger zerolog.Logger) (project dtrack.Project) {
project, err := dtClient.Project.Get(context.Background(), input.UUID)
if err != nil {
Expand Down