fixing loader issue

This commit is contained in:
mzack9999 2024-07-12 19:45:49 +02:00
parent 3c2af0e47c
commit 2bd68993e7
2 changed files with 23 additions and 5 deletions

View File

@ -172,7 +172,14 @@ func (h *nonExistentTemplateList) Execute(nonExistingTemplateList string) error
ts := httptest.NewServer(router) ts := httptest.NewServer(router)
defer ts.Close() defer ts.Close()
_, err := testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-template-url", ts.URL+"/404") configFileData := `remote-template-domain: [ "` + ts.Listener.Addr().String() + `" ]`
err := os.WriteFile("test-config.yaml", []byte(configFileData), permissionutil.ConfigFilePermission)
if err != nil {
return err
}
defer os.Remove("test-config.yaml")
_, err = testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-template-url", ts.URL+"/404", "-config", "test-config.yaml")
if err == nil { if err == nil {
return fmt.Errorf("expected error for nonexisting workflow url") return fmt.Errorf("expected error for nonexisting workflow url")
} }
@ -188,7 +195,14 @@ func (h *nonExistentWorkflowList) Execute(nonExistingWorkflowList string) error
ts := httptest.NewServer(router) ts := httptest.NewServer(router)
defer ts.Close() defer ts.Close()
_, err := testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-workflow-url", ts.URL+"/404") configFileData := `remote-template-domain: [ "` + ts.Listener.Addr().String() + `" ]`
err := os.WriteFile("test-config.yaml", []byte(configFileData), permissionutil.ConfigFilePermission)
if err != nil {
return err
}
defer os.Remove("test-config.yaml")
_, err = testutils.RunNucleiBareArgsAndGetResults(debug, nil, "-target", ts.URL, "-workflow-url", ts.URL+"/404", "-config", "test-config.yaml")
if err == nil { if err == nil {
return fmt.Errorf("expected error for nonexisting workflow url") return fmt.Errorf("expected error for nonexisting workflow url")
} }

View File

@ -14,6 +14,7 @@ import (
"github.com/gobwas/ws" "github.com/gobwas/ws"
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
"github.com/projectdiscovery/utils/conversion"
) )
// ExtraArgs // ExtraArgs
@ -74,9 +75,7 @@ func RunNucleiBareArgsAndGetResults(debug bool, env []string, extra ...string) (
if debug { if debug {
fmt.Println(string(data)) fmt.Println(string(data))
} }
if len(data) < 1 && err != nil { dataStr := conversion.String(data)
return nil, fmt.Errorf("%v: %v", err.Error(), string(data))
}
var parts []string var parts []string
items := strings.Split(string(data), "\n") items := strings.Split(string(data), "\n")
for _, i := range items { for _, i := range items {
@ -84,6 +83,11 @@ func RunNucleiBareArgsAndGetResults(debug bool, env []string, extra ...string) (
parts = append(parts, i) parts = append(parts, i)
} }
} }
if (dataStr == "" || len(parts) == 0) && err != nil {
return nil, fmt.Errorf("%v: %v", err.Error(), dataStr)
}
return parts, nil return parts, nil
} }