@@ -86,7 +86,7 @@ func (s APIService) scanDirect(w http.ResponseWriter, r *http.Request, zs *zap.S
8686 setSpanError (span , "No WFP contents supplied" )
8787 return 0
8888 }
89- flags , scanType , sbom := s .getFlags (r , zs )
89+ flags , scanType , sbom , dbName := s .getFlags (r , zs )
9090 // Check if we have an SBOM (and type) supplied
9191 var sbomFilename string
9292 if len (sbom ) > 0 && len (scanType ) > 0 {
@@ -121,9 +121,9 @@ func (s APIService) scanDirect(w http.ResponseWriter, r *http.Request, zs *zap.S
121121 s .countScanSize (wfps , wfpCount , zs , context , span )
122122 // Only one worker selected, so send the whole WFP in a single command
123123 if s .config .Scanning .Workers <= 1 {
124- s .singleScan (string (contentsTrimmed ), flags , scanType , sbomFilename , zs , w )
124+ s .singleScan (string (contentsTrimmed ), flags , scanType , sbomFilename , dbName , zs , w )
125125 } else {
126- s .scanThreaded (wfps , int (wfpCount ), flags , scanType , sbomFilename , zs , w , span )
126+ s .scanThreaded (wfps , int (wfpCount ), flags , scanType , sbomFilename , dbName , zs , w , span )
127127 }
128128 return wfpCount
129129}
@@ -155,10 +155,11 @@ func (s APIService) countScanSize(wfps []string, wfpCount int64, zs *zap.Sugared
155155}
156156
157157// getFlags extracts the form values from a request returns the flags, scan type, and sbom data if detected.
158- func (s APIService ) getFlags (r * http.Request , zs * zap.SugaredLogger ) (string , string , string ) {
159- flags := strings .TrimSpace (r .FormValue ("flags" )) // Check form for Scanning flags
160- scanType := strings .TrimSpace (r .FormValue ("type" )) // Check form for SBOM type
161- sbom := strings .TrimSpace (r .FormValue ("assets" )) // Check form for SBOM contents
158+ func (s APIService ) getFlags (r * http.Request , zs * zap.SugaredLogger ) (string , string , string , string ) {
159+ flags := strings .TrimSpace (r .FormValue ("flags" )) // Check form for Scanning flags
160+ scanType := strings .TrimSpace (r .FormValue ("type" )) // Check form for SBOM type
161+ sbom := strings .TrimSpace (r .FormValue ("assets" )) // Check form for SBOM contents
162+ dbName := strings .TrimSpace (r .FormValue ("db_name" )) // Check form for db name
162163 // TODO is it necessary to check the header also for these values?
163164 if len (flags ) == 0 {
164165 flags = strings .TrimSpace (r .Header .Get ("flags" )) // Check header for Scanning flags
@@ -169,10 +170,13 @@ func (s APIService) getFlags(r *http.Request, zs *zap.SugaredLogger) (string, st
169170 if len (sbom ) == 0 {
170171 sbom = strings .TrimSpace (r .Header .Get ("assets" )) // Check header for SBOM contents
171172 }
173+ if len (dbName ) == 0 {
174+ dbName = strings .TrimSpace (r .Header .Get ("db_name" )) // Check header for SBOM contents
175+ }
172176 if s .config .App .Trace {
173- zs .Debugf ("Header: %v, Form: %v, flags: %v, type: %v, assets: %v" , r .Header , r .Form , flags , scanType , sbom )
177+ zs .Debugf ("Header: %v, Form: %v, flags: %v, type: %v, assets: %v, db_name %v " , r .Header , r .Form , flags , scanType , sbom , dbName )
174178 }
175- return flags , scanType , sbom
179+ return flags , scanType , sbom , dbName
176180}
177181
178182// writeSbomFile writes the given string into an SBOM temporary file.
@@ -192,9 +196,9 @@ func (s APIService) writeSbomFile(sbom string, zs *zap.SugaredLogger) (*os.File,
192196}
193197
194198// singleScan runs a scan of the WFP in a single thread.
195- func (s APIService ) singleScan (wfp , flags , sbomType , sbomFile string , zs * zap.SugaredLogger , w http.ResponseWriter ) {
199+ func (s APIService ) singleScan (wfp , flags , sbomType , sbomFile , dbName string , zs * zap.SugaredLogger , w http.ResponseWriter ) {
196200 zs .Debugf ("Single threaded scan..." )
197- result , err := s .scanWfp (wfp , flags , sbomType , sbomFile , zs )
201+ result , err := s .scanWfp (wfp , flags , sbomType , sbomFile , dbName , zs )
198202 if err != nil {
199203 zs .Errorf ("Engine scan failed: %v" , err )
200204 http .Error (w , "ERROR engine scan failed" , http .StatusInternalServerError )
@@ -212,7 +216,7 @@ func (s APIService) singleScan(wfp, flags, sbomType, sbomFile string, zs *zap.Su
212216}
213217
214218// scanThreaded scan the given WFPs in multiple threads.
215- func (s APIService ) scanThreaded (wfps []string , wfpCount int , flags , sbomType , sbomFile string , zs * zap.SugaredLogger , w http.ResponseWriter , span oteltrace.Span ) {
219+ func (s APIService ) scanThreaded (wfps []string , wfpCount int , flags , sbomType , sbomFile , dbName string , zs * zap.SugaredLogger , w http.ResponseWriter , span oteltrace.Span ) {
216220 addSpanEvent (span , "Started Scanning." )
217221 numWorkers := s .config .Scanning .Workers
218222 groupedWfps := wfpCount / s .config .Scanning .WfpGrouping
@@ -229,7 +233,7 @@ func (s APIService) scanThreaded(wfps []string, wfpCount int, flags, sbomType, s
229233 zs .Debugf ("Creating %v scanning workers..." , numWorkers )
230234 // Create workers
231235 for i := 1 ; i <= numWorkers ; i ++ {
232- go s .workerScan (fmt .Sprintf ("%d_%s" , i , uuid .New ().String ()), requests , results , flags , sbomType , sbomFile , zs )
236+ go s .workerScan (fmt .Sprintf ("%d_%s" , i , uuid .New ().String ()), requests , results , flags , sbomType , sbomFile , dbName , zs )
233237 }
234238 requestCount := 0 // Count the number of actual requests sent
235239 var wfpRequests []string
@@ -304,7 +308,7 @@ func (s APIService) validateHPSM(contents []byte, zs *zap.SugaredLogger, w http.
304308}
305309
306310// workerScan attempts to process all incoming scanning jobs and dumps the results into the subsequent results channel.
307- func (s APIService ) workerScan (id string , jobs <- chan string , results chan <- string , flags , sbomType , sbomFile string , zs * zap.SugaredLogger ) {
311+ func (s APIService ) workerScan (id string , jobs <- chan string , results chan <- string , flags , sbomType , sbomFile , dbName string , zs * zap.SugaredLogger ) {
308312 if s .config .App .Trace {
309313 zs .Debugf ("Starting up scanning worker: %v" , id )
310314 }
@@ -318,7 +322,7 @@ func (s APIService) workerScan(id string, jobs <-chan string, results chan<- str
318322 zs .Warnf ("Nothing in the job request to scan. Ignoring" )
319323 results <- ""
320324 } else {
321- result , err := s .scanWfp (job , flags , sbomType , sbomFile , zs )
325+ result , err := s .scanWfp (job , flags , sbomType , sbomFile , dbName , zs )
322326 if s .config .App .Trace {
323327 zs .Debugf ("scan result (%v): %v, %v" , id , result , err )
324328 }
@@ -343,7 +347,7 @@ func (s APIService) workerScan(id string, jobs <-chan string, results chan<- str
343347}
344348
345349// scanWfp run the scanoss engine scan of the supplied WFP.
346- func (s APIService ) scanWfp (wfp , flags , sbomType , sbomFile string , zs * zap.SugaredLogger ) (string , error ) {
350+ func (s APIService ) scanWfp (wfp , flags , sbomType , sbomFile , dbName string , zs * zap.SugaredLogger ) (string , error ) {
347351 if len (wfp ) == 0 {
348352 zs .Warnf ("Nothing in the job request to scan. Ignoring" )
349353 return "" , fmt .Errorf ("no wfp supplied to scan. ignoring" )
@@ -367,6 +371,11 @@ func (s APIService) scanWfp(wfp, flags, sbomType, sbomFile string, zs *zap.Sugar
367371 if s .config .Scanning .ScanDebug {
368372 args = append (args , "-d" ) // Set debug mode
369373 }
374+ if len (dbName ) > 0 && dbName != "" { // we want to prefer request over the local config
375+ args = append (args , fmt .Sprintf ("-n%s" , dbName ))
376+ } else if s .config .Scanning .ScanKbName != "" { // Set scanning KB name
377+ args = append (args , fmt .Sprintf ("-n%s" , s .config .Scanning .ScanKbName ))
378+ }
370379 if s .config .Scanning .ScanFlags > 0 { // Set system flags if enabled
371380 args = append (args , fmt .Sprintf ("-F %v" , s .config .Scanning .ScanFlags ))
372381 } else if len (flags ) > 0 && flags != "0" { // Set user supplied flags if enabled
0 commit comments