From b644cd0adb019ab600894089ed9db297f0d745e7 Mon Sep 17 00:00:00 2001 From: "Alex Munene (enenumxela)" <62714471+enenumxela@users.noreply.github.com> Date: Sun, 12 Feb 2023 12:01:05 +0300 Subject: [PATCH] chore: - --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 2 +- v2/.goreleaser.yaml => .goreleaser.yaml | 0 README.md | 2 +- {v2/cmd => cmd}/hqurlfind3r/main.go | 0 v2/go.mod => go.mod | 0 v2/go.sum => go.sum | 0 {v2/internal => internal}/configuration/configuration.go | 0 {v2/pkg => pkg}/runner/collector/collector.go | 0 {v2/pkg => pkg}/runner/collector/filter/filter.go | 6 +++--- {v2/pkg => pkg}/runner/collector/output/output.go | 0 {v2/pkg => pkg}/runner/collector/requests/requests.go | 0 .../runner/collector/sources/commoncrawl/commoncrawl.go | 0 {v2/pkg => pkg}/runner/collector/sources/github/github.go | 0 .../runner/collector/sources/github/tokenmanager.go | 0 {v2/pkg => pkg}/runner/collector/sources/intelx/intelx.go | 0 {v2/pkg => pkg}/runner/collector/sources/otx/otx.go | 0 {v2/pkg => pkg}/runner/collector/sources/sources.go | 0 .../runner/collector/sources/urlscan/urlscan.go | 0 .../runner/collector/sources/wayback/wayback.go | 0 .../collector/sources/waybackrobots/waybackrobots.go | 4 ++-- {v2/pkg => pkg}/runner/runner.go | 8 ++++---- 22 files changed, 13 insertions(+), 13 deletions(-) rename v2/.goreleaser.yaml => .goreleaser.yaml (100%) rename {v2/cmd => cmd}/hqurlfind3r/main.go (100%) rename v2/go.mod => go.mod (100%) rename v2/go.sum => go.sum (100%) rename {v2/internal => internal}/configuration/configuration.go (100%) rename {v2/pkg => pkg}/runner/collector/collector.go (100%) rename {v2/pkg => pkg}/runner/collector/filter/filter.go (88%) rename {v2/pkg => pkg}/runner/collector/output/output.go (100%) rename {v2/pkg => pkg}/runner/collector/requests/requests.go (100%) rename {v2/pkg => pkg}/runner/collector/sources/commoncrawl/commoncrawl.go (100%) rename {v2/pkg => pkg}/runner/collector/sources/github/github.go (100%) rename {v2/pkg => pkg}/runner/collector/sources/github/tokenmanager.go (100%) rename {v2/pkg => pkg}/runner/collector/sources/intelx/intelx.go (100%) rename {v2/pkg => pkg}/runner/collector/sources/otx/otx.go (100%) rename {v2/pkg => pkg}/runner/collector/sources/sources.go (100%) rename {v2/pkg => pkg}/runner/collector/sources/urlscan/urlscan.go (100%) rename {v2/pkg => pkg}/runner/collector/sources/wayback/wayback.go (100%) rename {v2/pkg => pkg}/runner/collector/sources/waybackrobots/waybackrobots.go (95%) rename {v2/pkg => pkg}/runner/runner.go (90%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41469fb..0513209 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,8 +29,8 @@ jobs: run: | go clean -modcache go mod tidy - working-directory: v2/ + working-directory: . - name: Build run: go build -v . - working-directory: v2/cmd/hqurlfind3r/ \ No newline at end of file + working-directory: cmd/hqurlfind3r/ \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1195117..7f21fc0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,6 @@ jobs: with: args: "release --rm-dist" version: latest - workdir: v2/ + workdir: . env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file diff --git a/v2/.goreleaser.yaml b/.goreleaser.yaml similarity index 100% rename from v2/.goreleaser.yaml rename to .goreleaser.yaml diff --git a/README.md b/README.md index 5db0f1e..44b93d6 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ go install -v github.com/hueristiq/hqurlfind3r/v2/cmd/hqurlfind3r@latest ```bash git clone https://github.com/hueristiq/hqurlfind3r.git && \ -cd hqurlfind3r/v2/cmd/hqurlfind3r/ && \ +cd hqurlfind3r/cmd/hqurlfind3r/ && \ go build; mv hqurlfind3r /usr/local/bin/ && \ hqurlfind3r -h ``` diff --git a/v2/cmd/hqurlfind3r/main.go b/cmd/hqurlfind3r/main.go similarity index 100% rename from v2/cmd/hqurlfind3r/main.go rename to cmd/hqurlfind3r/main.go diff --git a/v2/go.mod b/go.mod similarity index 100% rename from v2/go.mod rename to go.mod diff --git a/v2/go.sum b/go.sum similarity index 100% rename from v2/go.sum rename to go.sum diff --git a/v2/internal/configuration/configuration.go b/internal/configuration/configuration.go similarity index 100% rename from v2/internal/configuration/configuration.go rename to internal/configuration/configuration.go diff --git a/v2/pkg/runner/collector/collector.go b/pkg/runner/collector/collector.go similarity index 100% rename from v2/pkg/runner/collector/collector.go rename to pkg/runner/collector/collector.go diff --git a/v2/pkg/runner/collector/filter/filter.go b/pkg/runner/collector/filter/filter.go similarity index 88% rename from v2/pkg/runner/collector/filter/filter.go rename to pkg/runner/collector/filter/filter.go index 5270745..bb2e15c 100644 --- a/v2/pkg/runner/collector/filter/filter.go +++ b/pkg/runner/collector/filter/filter.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - "github.com/hueristiq/hqgoutils/url" + hqurl "github.com/hueristiq/hqgoutils/url" ) type Filter struct { @@ -16,7 +16,7 @@ type Filter struct { func (filter Filter) Examine(inputURL string) (outputURL string, pass bool) { var ( err error - parsedURL *url.URL + parsedURL *hqurl.URL ) outputURL = inputURL @@ -27,7 +27,7 @@ func (filter Filter) Examine(inputURL string) (outputURL string, pass bool) { outputURL = strings.Trim(outputURL, " ") // if error parsing, ignore URL - parsedURL, err = url.Parse(url.Options{URL: outputURL}) + parsedURL, err = hqurl.Parse(hqurl.Options{URL: outputURL}) if err != nil { return } diff --git a/v2/pkg/runner/collector/output/output.go b/pkg/runner/collector/output/output.go similarity index 100% rename from v2/pkg/runner/collector/output/output.go rename to pkg/runner/collector/output/output.go diff --git a/v2/pkg/runner/collector/requests/requests.go b/pkg/runner/collector/requests/requests.go similarity index 100% rename from v2/pkg/runner/collector/requests/requests.go rename to pkg/runner/collector/requests/requests.go diff --git a/v2/pkg/runner/collector/sources/commoncrawl/commoncrawl.go b/pkg/runner/collector/sources/commoncrawl/commoncrawl.go similarity index 100% rename from v2/pkg/runner/collector/sources/commoncrawl/commoncrawl.go rename to pkg/runner/collector/sources/commoncrawl/commoncrawl.go diff --git a/v2/pkg/runner/collector/sources/github/github.go b/pkg/runner/collector/sources/github/github.go similarity index 100% rename from v2/pkg/runner/collector/sources/github/github.go rename to pkg/runner/collector/sources/github/github.go diff --git a/v2/pkg/runner/collector/sources/github/tokenmanager.go b/pkg/runner/collector/sources/github/tokenmanager.go similarity index 100% rename from v2/pkg/runner/collector/sources/github/tokenmanager.go rename to pkg/runner/collector/sources/github/tokenmanager.go diff --git a/v2/pkg/runner/collector/sources/intelx/intelx.go b/pkg/runner/collector/sources/intelx/intelx.go similarity index 100% rename from v2/pkg/runner/collector/sources/intelx/intelx.go rename to pkg/runner/collector/sources/intelx/intelx.go diff --git a/v2/pkg/runner/collector/sources/otx/otx.go b/pkg/runner/collector/sources/otx/otx.go similarity index 100% rename from v2/pkg/runner/collector/sources/otx/otx.go rename to pkg/runner/collector/sources/otx/otx.go diff --git a/v2/pkg/runner/collector/sources/sources.go b/pkg/runner/collector/sources/sources.go similarity index 100% rename from v2/pkg/runner/collector/sources/sources.go rename to pkg/runner/collector/sources/sources.go diff --git a/v2/pkg/runner/collector/sources/urlscan/urlscan.go b/pkg/runner/collector/sources/urlscan/urlscan.go similarity index 100% rename from v2/pkg/runner/collector/sources/urlscan/urlscan.go rename to pkg/runner/collector/sources/urlscan/urlscan.go diff --git a/v2/pkg/runner/collector/sources/wayback/wayback.go b/pkg/runner/collector/sources/wayback/wayback.go similarity index 100% rename from v2/pkg/runner/collector/sources/wayback/wayback.go rename to pkg/runner/collector/sources/wayback/wayback.go diff --git a/v2/pkg/runner/collector/sources/waybackrobots/waybackrobots.go b/pkg/runner/collector/sources/waybackrobots/waybackrobots.go similarity index 95% rename from v2/pkg/runner/collector/sources/waybackrobots/waybackrobots.go rename to pkg/runner/collector/sources/waybackrobots/waybackrobots.go index d919009..25e2a80 100644 --- a/v2/pkg/runner/collector/sources/waybackrobots/waybackrobots.go +++ b/pkg/runner/collector/sources/waybackrobots/waybackrobots.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "github.com/hueristiq/hqgoutils/url" + hqurl "github.com/hueristiq/hqgoutils/url" "github.com/hueristiq/hqurlfind3r/v2/pkg/runner/collector/filter" "github.com/hueristiq/hqurlfind3r/v2/pkg/runner/collector/output" "github.com/hueristiq/hqurlfind3r/v2/pkg/runner/collector/requests" @@ -94,7 +94,7 @@ func (source *Source) Run(keys sources.Keys, ftr filter.Filter) chan output.URL } } - parsedURL, _ := url.Parse(url.Options{URL: row[1]}) + parsedURL, _ := hqurl.Parse(hqurl.Options{URL: row[1]}) endpoint = filepath.Join(parsedURL.Host, endpoint) endpoint = parsedURL.Scheme + "://" + endpoint diff --git a/v2/pkg/runner/runner.go b/pkg/runner/runner.go similarity index 90% rename from v2/pkg/runner/runner.go rename to pkg/runner/runner.go index 4cda4df..035fcd3 100644 --- a/v2/pkg/runner/runner.go +++ b/pkg/runner/runner.go @@ -2,9 +2,9 @@ package runner import ( "fmt" - urlz "net/url" + "net/url" - "github.com/hueristiq/hqgoutils/url" + hqurl "github.com/hueristiq/hqgoutils/url" "github.com/hueristiq/hqurlfind3r/v2/pkg/runner/collector" "github.com/hueristiq/hqurlfind3r/v2/pkg/runner/collector/output" ) @@ -26,7 +26,7 @@ func (runner *Runner) Run() (URLs chan output.URL, err error) { results := runner.Collector.Collect() - deDupMap := make(map[string]urlz.Values) + deDupMap := make(map[string]url.Values) uniqueMap := make(map[string]output.URL) // Process the results in a separate goroutine @@ -39,7 +39,7 @@ func (runner *Runner) Run() (URLs chan output.URL, err error) { continue } - parsedURL, err := url.Parse(url.Options{URL: result.Value}) + parsedURL, err := hqurl.Parse(hqurl.Options{URL: result.Value}) if err != nil { continue }