@@ -669,60 +669,60 @@ func NewSBOM(c *fiber.Ctx) error {
669669 }
670670
671671 logger .Sugar ().Infof ("Created document in collection '%s' in db '%s' key='%s'\n " , dbconn .Collections ["sbom" ].Name (), dbconn .Database .Name (), sbom .Key )
672+ /*
673+ dhurl := c.BaseURL()
672674
673- dhurl := c . BaseURL ( )
675+ dhurl = strings.Replace(dhurl, "http:", "https:", 1 )
674676
675- dhurl = strings .Replace (dhurl , "http:" , "https:" , 1 )
676-
677- // Send an HTTP HEAD request to check the redirect
678- req , err := http .NewRequest ("HEAD" , dhurl , nil )
679- if err != nil {
680- logger .Sugar ().Errorf ("Failed to create HEAD request: %v\n Stack trace:\n %s" , err , debug .Stack ())
681- dhurl = c .BaseURL ()
682- } else {
683- client := & http.Client {}
684- resp , err := client .Do (req )
677+ // Send an HTTP HEAD request to check the redirect
678+ req, err := http.NewRequest("HEAD", dhurl, nil)
685679 if err != nil {
686- logger .Sugar ().Infof ( "No https available : %v" , err )
680+ logger.Sugar().Errorf("Failed to create HEAD request : %v\nStack trace:\n%s ", err, debug.Stack() )
687681 dhurl = c.BaseURL()
688682 } else {
689- defer resp .Body .Close ()
690-
691- // Check if the response is a redirect
692- if resp .StatusCode >= 300 && resp .StatusCode <= 399 {
693- dhurl = resp .Header .Get ("Location" )
694- } else if resp .StatusCode != 200 {
695- reqDump , _ := httputil .DumpRequestOut (req , true )
696- respDump , _ := httputil .DumpResponse (resp , true )
697- logger .Sugar ().Errorf (
698- "Non-200 status code: %d\n \n === REQUEST ===\n %s\n \n === RESPONSE ===\n %s\n \n === STACK TRACE ===\n %s" ,
699- resp .StatusCode ,
700- string (reqDump ),
701- string (respDump ),
702- debug .Stack (),
703- )
683+ client := &http.Client{}
684+ resp, err := client.Do(req)
685+ if err != nil {
686+ logger.Sugar().Infof("No https available: %v", err)
704687 dhurl = c.BaseURL()
688+ } else {
689+ defer resp.Body.Close()
690+
691+ // Check if the response is a redirect
692+ if resp.StatusCode >= 300 && resp.StatusCode <= 399 {
693+ dhurl = resp.Header.Get("Location")
694+ } else if resp.StatusCode != 200 {
695+ reqDump, _ := httputil.DumpRequestOut(req, true)
696+ respDump, _ := httputil.DumpResponse(resp, true)
697+ logger.Sugar().Errorf(
698+ "Non-200 status code: %d\n\n=== REQUEST ===\n%s\n\n=== RESPONSE ===\n%s\n\n=== STACK TRACE ===\n%s",
699+ resp.StatusCode,
700+ string(reqDump),
701+ string(respDump),
702+ debug.Stack(),
703+ )
704+ dhurl = c.BaseURL()
705+ }
705706 }
706707 }
707- }
708708
709- // dhurl := "http://localhost:5003"
710- dhurl = strings .Trim (dhurl , "/" )
711- logger .Sugar ().Infof ("dhurl=%s" , dhurl )
709+ // dhurl := "http://localhost:5003"
710+ dhurl = strings.Trim(dhurl, "/")
711+ logger.Sugar().Infof("dhurl=%s", dhurl)
712712
713- var cookies []* http.Cookie
713+ var cookies []*http.Cookie
714714
715- reqCookies := c .Request ().Header .Cookies ()
716- for key , value := range reqCookies {
717- cookie := & http.Cookie {
718- Name : string (key ),
719- Value : string (value ),
715+ reqCookies := c.Request().Header.Cookies()
716+ for key, value := range reqCookies {
717+ cookie := &http.Cookie{
718+ Name: string(key),
719+ Value: string(value),
720+ }
721+ cookies = append(cookies, cookie)
720722 }
721- cookies = append (cookies , cookie )
722- }
723-
724- Purl2Comp (dhurl , cookies , sbom .Key )
725723
724+ Purl2Comp(dhurl, cookies, sbom.Key)
725+ */
726726 var res model.ResponseKey
727727 res .Key = sbom .Key
728728 return c .JSON (res ) // return the package object in JSON format. This includes the new _key
0 commit comments