Skip to content

Commit

Permalink
imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Mzack9999 committed Aug 2, 2023
1 parent 70d84fc commit b7e2694
Show file tree
Hide file tree
Showing 31 changed files with 66 additions and 67 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ blank_issues_enabled: false

contact_links:
- name: Ask an question / advise on using naabu
url: https://github.com/projectdiscovery/naabu/discussions/categories/q-a
url: https://github.com/Mzack9999/naabu/discussions/categories/q-a
about: Ask a question or request support for using naabu

- name: Share idea / feature to discuss for naabu
url: https://github.com/projectdiscovery/naabu/discussions/categories/ideas
url: https://github.com/Mzack9999/naabu/discussions/categories/ideas
about: Share idea / feature to discuss for naabu

- name: Connect with PD Team (Discord)
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ labels: 'Type: Enhancement'
<!--
1. Please make sure to provide a detailed description with all the relevant information that might be required to start working on this feature.
2. In case you are not sure about your request or whether the particular feature is already supported or not, please start a discussion instead.
3. GitHub Discussion: https://github.com/projectdiscovery/naabu/discussions/categories/ideas
3. GitHub Discussion: https://github.com/Mzack9999/naabu/discussions/categories/ideas
4. Join our discord server at https://discord.gg/projectdiscovery to discuss the idea on the #naabu channel.
-->

Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/issue-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ labels: 'Type: Bug'

<!--
1. Please search to see if an issue already exists for the bug you encountered.
2. For support requests, FAQs or "How to" questions, please use the GitHub Discussions section instead - https://github.com/projectdiscovery/naabu/discussions or
2. For support requests, FAQs or "How to" questions, please use the GitHub Discussions section instead - https://github.com/Mzack9999/naabu/discussions or
3. Join our discord server at https://discord.gg/projectdiscovery and post the question on the #naabu channel.
-->

Expand All @@ -16,7 +16,7 @@ labels: 'Type: Bug'
### Naabu version:
<!-- You can find current version of naabu with "naabu -version" -->
<!-- We only accept issues that are reproducible on the latest version of naabu. -->
<!-- You can find the latest version of project at https://github.com/projectdiscovery/naabu/releases/ -->
<!-- You can find the latest version of project at https://github.com/Mzack9999/naabu/releases/ -->

### Current Behavior:
<!-- A concise description of what you're experiencing. -->
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

<p align="center">
<a href="https://opensource.org/licenses/MIT"><img src="https://img.shields.io/badge/license-MIT-_red.svg"></a>
<a href="https://github.com/projectdiscovery/naabu/issues"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat"></a>
<a href="https://goreportcard.com/badge/github.com/projectdiscovery/naabu"><img src="https://goreportcard.com/badge/github.com/projectdiscovery/naabu"></a>
<a href="https://github.com/projectdiscovery/naabu/releases"><img src="https://img.shields.io/github/release/projectdiscovery/naabu"></a>
<a href="https://github.com/Mzack9999/naabu/issues"><img src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat"></a>
<a href="https://goreportcard.com/badge/github.com/Mzack9999/naabu"><img src="https://goreportcard.com/badge/github.com/Mzack9999/naabu"></a>
<a href="https://github.com/Mzack9999/naabu/releases"><img src="https://img.shields.io/github/release/projectdiscovery/naabu"></a>
<a href="https://twitter.com/pdiscoveryio"><img src="https://img.shields.io/twitter/follow/pdiscoveryio.svg?logo=twitter"></a>
<a href="https://discord.gg/projectdiscovery"><img src="https://img.shields.io/discord/695645237418131507.svg?logo=discord"></a>
</p>
Expand Down Expand Up @@ -131,7 +131,7 @@ DEBUG:

# Installation Instructions

Download the ready to run [binary](https://github.com/projectdiscovery/naabu/releases/) / [docker](https://hub.docker.com/r/projectdiscovery/naabu) or install with GO
Download the ready to run [binary](https://github.com/Mzack9999/naabu/releases/) / [docker](https://hub.docker.com/r/projectdiscovery/naabu) or install with GO

## Prerequisite

Expand All @@ -143,7 +143,7 @@ To install libcap on **Linux**: `sudo apt install -y libpcap-dev`, on **Mac**: `
## Installing Naabu

```sh
go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest
go install -v github.com/Mzack9999/naabu/v2/cmd/naabu@latest
```

# Running Naabu
Expand Down Expand Up @@ -359,8 +359,8 @@ import (
"log"

"github.com/projectdiscovery/goflags"
"github.com/projectdiscovery/naabu/v2/pkg/result"
"github.com/projectdiscovery/naabu/v2/pkg/runner"
"github.com/Mzack9999/naabu/v2/pkg/result"
"github.com/Mzack9999/naabu/v2/pkg/runner"
)

func main() {
Expand All @@ -385,7 +385,7 @@ func main() {

# Notes

- Naabu allows arbitrary binary execution as a feature to support [nmap integration](https://github.com/projectdiscovery/naabu#nmap-integration).
- Naabu allows arbitrary binary execution as a feature to support [nmap integration](https://github.com/Mzack9999/naabu#nmap-integration).
- Naabu is designed to scan ports on multiple hosts / mass port scanning.
- As default naabu is configured with a assumption that you are running it from VPS.
- We suggest tuning the flags / rate if running naabu from local system.
Expand All @@ -395,4 +395,4 @@ func main() {

Naabu is made with 🖤 by the [projectdiscovery](https://projectdiscovery.io) team. Community contributions have made the project what it is.

See the **[Thanks.md](https://github.com/projectdiscovery/naabu/blob/master/THANKS.md)** file for more details.
See the **[Thanks.md](https://github.com/Mzack9999/naabu/blob/master/THANKS.md)** file for more details.
2 changes: 1 addition & 1 deletion v2/cmd/functional-test/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/logrusorgru/aurora"
"github.com/pkg/errors"

"github.com/projectdiscovery/naabu/v2/internal/testutils"
"github.com/Mzack9999/naabu/v2/internal/testutils"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion v2/cmd/functional-test/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ echo 'Building NAABU binary from current branch'
go build -o naabu_dev ../naabu

echo 'Installing latest release of NAABU'
GO111MODULE=on go build -v github.com/projectdiscovery/naabu/v2/cmd/naabu
GO111MODULE=on go build -v github.com/Mzack9999/naabu/v2/cmd/naabu

echo 'Starting NAABU functional test'
./functional-test -main ./naabu -dev ./naabu_dev -testcases testcases.txt
2 changes: 1 addition & 1 deletion v2/cmd/integration-test/integration-test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"strings"

"github.com/Mzack9999/naabu/v2/internal/testutils"
"github.com/logrusorgru/aurora"
"github.com/projectdiscovery/naabu/v2/internal/testutils"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions v2/cmd/integration-test/library.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package main
import (
"os"

"github.com/projectdiscovery/naabu/v2/internal/testutils"
"github.com/projectdiscovery/naabu/v2/pkg/result"
"github.com/projectdiscovery/naabu/v2/pkg/runner"
"github.com/Mzack9999/naabu/v2/internal/testutils"
"github.com/Mzack9999/naabu/v2/pkg/result"
"github.com/Mzack9999/naabu/v2/pkg/runner"
)

var libraryTestcases = map[string]testutils.TestCase{
Expand Down
2 changes: 1 addition & 1 deletion v2/cmd/naabu/main.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package main

import (
"github.com/Mzack9999/naabu/v2/pkg/runner"
_ "github.com/projectdiscovery/fdmax/autofdmax"
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/naabu/v2/pkg/runner"
"os"
"os/signal"
)
Expand Down
2 changes: 1 addition & 1 deletion v2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ require (
github.com/projectdiscovery/mapcidr v1.1.1
github.com/projectdiscovery/networkpolicy v0.0.5
github.com/projectdiscovery/ratelimit v0.0.6
github.com/projectdiscovery/retryablehttp-go v1.0.15
github.com/projectdiscovery/utils v0.0.25
github.com/remeh/sizedwaitgroup v1.0.0
github.com/stretchr/testify v1.8.2
Expand Down Expand Up @@ -70,6 +69,7 @@ require (
github.com/projectdiscovery/asnmap v1.0.3 // indirect
github.com/projectdiscovery/hmap v0.0.11 // indirect
github.com/projectdiscovery/retryabledns v1.0.23 // indirect
github.com/projectdiscovery/retryablehttp-go v1.0.15 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
github.com/syndtr/goleveldb v1.0.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/port/port.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package port
import (
"fmt"

"github.com/projectdiscovery/naabu/v2/pkg/protocol"
"github.com/Mzack9999/naabu/v2/pkg/protocol"
)

type Port struct {
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/privileges/privileges_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"runtime"

"github.com/projectdiscovery/naabu/v2/pkg/israce"
"github.com/Mzack9999/naabu/v2/pkg/israce"
"golang.org/x/sys/unix"
)

Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/result/results.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package result
import (
"sync"

"github.com/projectdiscovery/naabu/v2/pkg/port"
"github.com/Mzack9999/naabu/v2/pkg/port"
"golang.org/x/exp/maps"
)

Expand Down
4 changes: 2 additions & 2 deletions v2/pkg/result/results_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package result
import (
"testing"

"github.com/projectdiscovery/naabu/v2/pkg/port"
"github.com/projectdiscovery/naabu/v2/pkg/protocol"
"github.com/Mzack9999/naabu/v2/pkg/port"
"github.com/Mzack9999/naabu/v2/pkg/protocol"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions v2/pkg/runner/banners.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"net"
"strings"

"github.com/Mzack9999/naabu/v2/pkg/privileges"
"github.com/Mzack9999/naabu/v2/pkg/scan"
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/naabu/v2/pkg/privileges"
"github.com/projectdiscovery/naabu/v2/pkg/scan"
osutil "github.com/projectdiscovery/utils/os"
updateutils "github.com/projectdiscovery/utils/update"
)
Expand Down Expand Up @@ -96,4 +96,4 @@ func GetUpdateCallback() func() {
showBanner()
updateutils.GetUpdateToolCallback("naabu", version)()
}
}
}
2 changes: 1 addition & 1 deletion v2/pkg/runner/healthcheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"runtime"
"strings"

"github.com/Mzack9999/naabu/v2/pkg/privileges"
"github.com/projectdiscovery/goflags"
"github.com/projectdiscovery/naabu/v2/pkg/privileges"
fileutil "github.com/projectdiscovery/utils/file"
)

Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/runner/nmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/pkg/errors"

"github.com/Mzack9999/naabu/v2/pkg/result"
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/naabu/v2/pkg/result"
osutil "github.com/projectdiscovery/utils/os"
)

Expand Down
8 changes: 4 additions & 4 deletions v2/pkg/runner/nmap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package runner
import (
"testing"

"github.com/projectdiscovery/naabu/v2/pkg/port"
"github.com/projectdiscovery/naabu/v2/pkg/protocol"
"github.com/projectdiscovery/naabu/v2/pkg/result"
"github.com/projectdiscovery/naabu/v2/pkg/scan"
"github.com/Mzack9999/naabu/v2/pkg/port"
"github.com/Mzack9999/naabu/v2/pkg/protocol"
"github.com/Mzack9999/naabu/v2/pkg/result"
"github.com/Mzack9999/naabu/v2/pkg/scan"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions v2/pkg/runner/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"
"time"

"github.com/projectdiscovery/naabu/v2/pkg/privileges"
"github.com/projectdiscovery/naabu/v2/pkg/result"
"github.com/Mzack9999/naabu/v2/pkg/privileges"
"github.com/Mzack9999/naabu/v2/pkg/result"
fileutil "github.com/projectdiscovery/utils/file"

"github.com/projectdiscovery/goflags"
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/runner/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"time"

"github.com/Mzack9999/naabu/v2/pkg/port"
"github.com/pkg/errors"
"github.com/projectdiscovery/naabu/v2/pkg/port"
)

// Result contains the result for a host
Expand Down
4 changes: 2 additions & 2 deletions v2/pkg/runner/output_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strings"
"testing"

"github.com/projectdiscovery/naabu/v2/pkg/port"
"github.com/projectdiscovery/naabu/v2/pkg/protocol"
"github.com/Mzack9999/naabu/v2/pkg/port"
"github.com/Mzack9999/naabu/v2/pkg/protocol"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions v2/pkg/runner/ports.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strconv"
"strings"

"github.com/Mzack9999/naabu/v2/pkg/port"
"github.com/Mzack9999/naabu/v2/pkg/protocol"
"github.com/pkg/errors"
"github.com/projectdiscovery/naabu/v2/pkg/port"
"github.com/projectdiscovery/naabu/v2/pkg/protocol"
)

const portListStrParts = 2
Expand Down
4 changes: 2 additions & 2 deletions v2/pkg/runner/ports_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"reflect"
"testing"

"github.com/projectdiscovery/naabu/v2/pkg/port"
"github.com/projectdiscovery/naabu/v2/pkg/protocol"
"github.com/Mzack9999/naabu/v2/pkg/port"
"github.com/Mzack9999/naabu/v2/pkg/protocol"
"github.com/stretchr/testify/assert"
)

Expand Down
13 changes: 6 additions & 7 deletions v2/pkg/runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,19 @@ import (
"sync"
"time"

"github.com/Mzack9999/naabu/v2/pkg/port"
"github.com/Mzack9999/naabu/v2/pkg/privileges"
"github.com/Mzack9999/naabu/v2/pkg/protocol"
"github.com/Mzack9999/naabu/v2/pkg/result"
"github.com/Mzack9999/naabu/v2/pkg/scan"
"github.com/miekg/dns"
"github.com/pkg/errors"
"github.com/projectdiscovery/blackrock"
"github.com/projectdiscovery/clistats"
"github.com/projectdiscovery/dnsx/libs/dnsx"
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/mapcidr"
"github.com/projectdiscovery/naabu/v2/pkg/port"
"github.com/projectdiscovery/naabu/v2/pkg/privileges"
"github.com/projectdiscovery/naabu/v2/pkg/protocol"
"github.com/projectdiscovery/naabu/v2/pkg/result"
"github.com/projectdiscovery/naabu/v2/pkg/scan"
"github.com/projectdiscovery/ratelimit"
"github.com/projectdiscovery/retryablehttp-go"

// "github.com/projectdiscovery/uncover/uncover/agent/shodanidb"
fileutil "github.com/projectdiscovery/utils/file"
Expand Down Expand Up @@ -255,7 +254,7 @@ func (r *Runner) RunEnumeration() error {
case r.options.Stream && r.options.Passive: // stream passive
showNetworkCapabilities(r.options)
// create retryablehttp instance
httpClient := retryablehttp.NewClient(retryablehttp.DefaultOptionsSingle)
// httpClient := retryablehttp.NewClient(retryablehttp.DefaultOptionsSingle)
r.scanner.Phase.Set(scan.Scan)
for cidr := range r.streamChannel {
if err := r.scanner.IPRanger.Add(cidr.String()); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions v2/pkg/runner/targets.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"os"
"strings"

"github.com/Mzack9999/naabu/v2/pkg/privileges"
"github.com/Mzack9999/naabu/v2/pkg/scan"
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/mapcidr/asn"
"github.com/projectdiscovery/naabu/v2/pkg/privileges"
"github.com/projectdiscovery/naabu/v2/pkg/scan"
iputil "github.com/projectdiscovery/utils/ip"
readerutil "github.com/projectdiscovery/utils/reader"
"github.com/remeh/sizedwaitgroup"
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/runner/targets_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package runner
import (
"testing"

"github.com/Mzack9999/naabu/v2/pkg/scan"
"github.com/projectdiscovery/ipranger"
"github.com/projectdiscovery/naabu/v2/pkg/scan"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/runner/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net"
"strings"

"github.com/Mzack9999/naabu/v2/pkg/privileges"
"github.com/pkg/errors"
"github.com/projectdiscovery/naabu/v2/pkg/privileges"
fileutil "github.com/projectdiscovery/utils/file"
iputil "github.com/projectdiscovery/utils/ip"
osutil "github.com/projectdiscovery/utils/os"
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/scan/connect.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net"

"github.com/Mzack9999/naabu/v2/pkg/port"
"github.com/projectdiscovery/gologger"
"github.com/projectdiscovery/naabu/v2/pkg/port"
)

// ConnectVerify is used to verify if ports are accurate using a connect request
Expand Down
Loading

0 comments on commit b7e2694

Please sign in to comment.