🎉 new version v2.0.0

wjlin0 · Feb 9, 2024 · b07c76f · b07c76f
1 parent b7383f8
commit b07c76f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 374 deletions.
diff --git a/go.mod b/go.mod
@@ -5,11 +5,9 @@ go 1.21
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/charmbracelet/glamour v0.6.0
-	github.com/cheggaaa/pb/v3 v3.1.4
 	github.com/corpix/uarand v0.2.0
 	github.com/denisbrodbeck/machineid v1.0.1
 	github.com/fatih/color v1.15.0
-	github.com/google/go-github/v30 v30.1.0
 	github.com/hashicorp/golang-lru v1.0.2
 	github.com/minio/selfupdate v0.6.1-0.20230907112617-f11e74f84ca7
 	github.com/pkg/errors v0.9.1
@@ -23,11 +21,9 @@ require (
 	github.com/projectdiscovery/utils v0.0.77
 	github.com/remeh/sizedwaitgroup v1.0.0
 	github.com/stretchr/testify v1.8.4
-	github.com/wjlin0/pathScan v1.5.4
 	github.com/wjlin0/uncover v1.0.9
 	github.com/wjlin0/utils v0.0.5
 	golang.org/x/net v0.18.0
-	golang.org/x/oauth2 v0.11.0
 	golang.org/x/text v0.14.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -51,6 +47,7 @@ require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/c4milo/unpackit v0.1.0 // indirect
+	github.com/cheggaaa/pb/v3 v3.1.4 // indirect
 	github.com/cloudflare/cfssl v1.6.4 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 // indirect
@@ -69,6 +66,7 @@ require (
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/certificate-transparency-go v1.1.4 // indirect
 	github.com/google/go-github v17.0.0+incompatible // indirect
+	github.com/google/go-github/v30 v30.1.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
@@ -129,6 +127,7 @@ require (
 	github.com/ulule/deepcopier v0.0.0-20200430083143-45decc6639b6 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222 // indirect
+	github.com/wjlin0/pathScan v1.5.0 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/yl2chen/cidranger v1.0.2 // indirect
 	github.com/yuin/goldmark v1.5.4 // indirect
@@ -140,6 +139,7 @@ require (
 	golang.org/x/crypto v0.17.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
 	golang.org/x/mod v0.13.0 // indirect
+	golang.org/x/oauth2 v0.11.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/tools v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect

diff --git a/go.sum b/go.sum
@@ -379,8 +379,8 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC
 github.com/weppos/publicsuffix-go v0.13.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k=
 github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222 h1:h2JizvZl9aIj6za9S5AyrkU+OzIS4CetQthH/ejO+lg=
 github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222/go.mod h1:s41lQh6dIsDWIC1OWh7ChWJXLH0zkJ9KHZVqA7vHyuQ=
-github.com/wjlin0/pathScan v1.5.4 h1:9Ex67IdDsbCER6mcejUN1olU/F9/WgZGeUNCvZb6hNo=
-github.com/wjlin0/pathScan v1.5.4/go.mod h1:ZTEbxhgPnNhQz/tffFMnkLn7Cff2uxv+6HX0Y7IEqKM=
+github.com/wjlin0/pathScan v1.5.0 h1:BryByF4FTbiUfuH7Cn3TPnklug/KydY+qNsDV9NyhYY=
+github.com/wjlin0/pathScan v1.5.0/go.mod h1:JjFg5C1DySORlhtNhnfN+X3qEQ4thWauKR+uS8HCl8M=
 github.com/wjlin0/uncover v1.0.9 h1:8h8doWaFGd0dkWEQ81MIHbMPsInaoIETWyHkE0hYJn8=
 github.com/wjlin0/uncover v1.0.9/go.mod h1:8s6slnc8d8WcboPbAmy3lK/uRhgujrMQYyAP+lmttVY=
 github.com/wjlin0/utils v0.0.5 h1:cZEc6AYKg0iZsnrLh+Fq94NSiLhczahwf4dBPgPd+Jo=

diff --git a/pkg/identification/matchers/match.go b/pkg/identification/matchers/match.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/expressions"
-	"github.com/wjlin0/pathScan/pkg/util"
+	"github.com/wjlin0/pathScan/v2/pkg/util"
 	"strings"
 )
 

diff --git a/pkg/runner/banner.go b/pkg/runner/banner.go
@@ -3,7 +3,7 @@ package runner
 import (
 	"github.com/projectdiscovery/gologger"
 	folderutil "github.com/projectdiscovery/utils/folder"
-	"github.com/wjlin0/pathScan/pkg/util"
+	"github.com/wjlin0/pathScan/v2/pkg/util"
 	"path/filepath"
 )
 

diff --git a/pkg/runner/options.go b/pkg/runner/options.go
@@ -11,11 +11,11 @@ import (
 	"github.com/projectdiscovery/retryablehttp-go"
 	fileutil "github.com/projectdiscovery/utils/file"
 	httputil "github.com/projectdiscovery/utils/http"
-	updateutils "github.com/wjlin0/pathScan/pkg/util/update"
 	"github.com/wjlin0/pathScan/v2/pkg/identification"
 	"github.com/wjlin0/pathScan/v2/pkg/types"
 	"github.com/wjlin0/pathScan/v2/pkg/util"
 	"github.com/wjlin0/uncover"
+	updateutils "github.com/wjlin0/utils/update"
 	"io"
 	"net/http"
 	"os"

diff --git a/pkg/runner/validate.go b/pkg/runner/validate.go
@@ -9,8 +9,8 @@ import (
 	httputil "github.com/projectdiscovery/utils/http"
 	sliceutil "github.com/projectdiscovery/utils/slice"
 	stringsutil "github.com/projectdiscovery/utils/strings"
-	"github.com/wjlin0/pathScan/pkg/util"
 	"github.com/wjlin0/pathScan/v2/pkg/types"
+	"github.com/wjlin0/pathScan/v2/pkg/util"
 	proxyutils "github.com/wjlin0/utils/proxy"
 	"net/url"
 	"os"

diff --git a/pkg/scanner/uncover.go b/pkg/scanner/uncover.go
@@ -6,7 +6,6 @@ import (
 	"github.com/projectdiscovery/gologger"
 	folderutil "github.com/projectdiscovery/utils/folder"
 	stringsutil "github.com/projectdiscovery/utils/strings"
-	"github.com/wjlin0/pathScan/pkg/writer"
 	"github.com/wjlin0/uncover/sources"
 	"path/filepath"
 	"strings"
@@ -34,7 +33,7 @@ func (scanner *Scanner) ScanUncover(resultCallback func(event string)) (<-chan s
 			case result.Error != nil:
 				gologger.Warning().Msgf("Request %s sending error: %s", result.Source, result.Error)
 			case scanner.options.CSV:
-				toString, err := writer.CSVToString(result)
+				toString := result.CSV()
 				if err != nil {
 					continue
 				}