diff --git a/.gitignore b/.gitignore index c97f2e54..2d510024 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,6 @@ *.prof* pcaps build -bettercap-ng*.* -bettercap-ng* +bettercap*.* +bettercap* bettercap.history diff --git a/.travis.yml b/.travis.yml index b71b74f7..c9280454 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: install: - make deps -go_import_path: github.com/evilsocket/bettercap-ng +go_import_path: github.com/bettercap/bettercap script: - make test diff --git a/Dockerfile b/Dockerfile index 3cd9e45c..4c59b727 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM iron/go:dev MAINTAINER Simone Margaritelli ENV GOPATH=/gocode -ENV SRC_DIR=/gocode/src/github.com/evilsocket/bettercap-ng +ENV SRC_DIR=/gocode/src/github.com/bettercap/bettercap COPY . $SRC_DIR WORKDIR $SRC_DIR @@ -13,4 +13,4 @@ RUN make deps RUN make EXPOSE 80 443 53 5300 8080 8081 8082 8083 8000 -ENTRYPOINT ["./bettercap-ng"] +ENTRYPOINT ["./bettercap"] diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 2b1f12ce..f590c347 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,8 +1,8 @@ ### Prerequisites -* [ ] I read the [README](https://github.com/evilsocket/bettercap-ng/blob/master/README.md). -* [ ] I am running the [latest source code version](https://github.com/evilsocket/bettercap-ng). -* [ ] I already searched [other issues](https://github.com/evilsocket/bettercap-ng/issues?q=is%3Aopen+is%3Aissue+label%3Abug) to see if this problem was already reported. +* [ ] I read the [README](https://github.com/bettercap/bettercap/blob/master/README.md). +* [ ] I am running the [latest source code version](https://github.com/bettercap/bettercap). +* [ ] I already searched [other issues](https://github.com/bettercap/bettercap/issues?q=is%3Aopen+is%3Aissue+label%3Abug) to see if this problem was already reported. ### Description @@ -16,7 +16,7 @@ Please provide: * Command line arguments you are using. * Caplet code you are using (if any). * Interactive session commands you are using (if any). -* **Full debug output** while reproducing the issue ( `bettercap-ng -debug ...` ). +* **Full debug output** while reproducing the issue ( `bettercap -debug ...` ). ### Steps to Reproduce diff --git a/Makefile b/Makefile index 1b2d3210..ad76eb42 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -TARGET=bettercap-ng +TARGET=bettercap all: fmt vet build @echo "@ Done" diff --git a/README.md b/README.md index 3e85b1c6..f0df3133 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@

- BetterCap + BetterCap

- Release + Release Software License - Travis - Go Report Card + Travis + Go Report Card

-**bettercap-ng** is a complete reimplementation of bettercap, the Swiss army knife for network attacks and monitoring. It is faster, stabler, smaller, easier to install and to use. +**bettercap** is a complete reimplementation of bettercap, the Swiss army knife for network attacks and monitoring. It is faster, stabler, smaller, easier to install and to use. ## Using it with Docker @@ -16,25 +16,25 @@ In this repository, BetterCAP is containerized using [Alpine Linux](https://alpi To pull latest BetterCAP version of the image: - $ docker pull evilsocket/bettercap-ng + $ docker pull bettercap/bettercap To run: - $ docker run -it --privileged --net=host evilsocket/bettercap-ng -h + $ docker run -it --privileged --net=host bettercap/bettercap -h ## Compilation Make sure you have a correctly configured **Go >= 1.8** environment, that `$GOPATH/bin` is in `$PATH` and the `libpcap-dev` package installed for your system, then: - $ go get github.com/evilsocket/bettercap-ng + $ go get github.com/bettercap/bettercap -This command will download bettercap-ng, install its dependencies, compile it and move the `bettercap-ng` executable to `$GOPATH/bin`. +This command will download bettercap, install its dependencies, compile it and move the `bettercap` executable to `$GOPATH/bin`. -Now you can use `sudo bettercap-ng -h` to show the basic command line options and just `sudo bettercap-ng` to start an interactive session on your default network interface. +Now you can use `sudo bettercap -h` to show the basic command line options and just `sudo bettercap` to start an interactive session on your default network interface. ## Compilation on Windows -Despite Windows support [is not yet 100% complete](https://github.com/evilsocket/bettercap-ng/issues/45), it is possible to build bettercap-ng for Microsoft platforms and enjoy 99.99% of the experience. The steps to prepare the building environment are: +Despite Windows support [is not yet 100% complete](https://github.com/bettercap/bettercap/issues/45), it is possible to build bettercap for Microsoft platforms and enjoy 99.99% of the experience. The steps to prepare the building environment are: - Install [go amd64](https://golang.org/dl/) (add go binaries to your `%PATH%`). - Install [TDM GCC for amd64](http://tdm-gcc.tdragon.net/download) (add TDM-GCC binaries to your `%PATH%`). @@ -51,7 +51,7 @@ This will generate `.def` files, now we'll generate the static libraries files: - and `dlltool --as-flags=--64 -m i386:x86-64 -k --output-lib libpacket.a --input-def packet.def`. - Copy both `libwpcap.a` and `libpacket.a` to `c:\WpdPack\Lib\x64`. -And eventually just `go get github.com/evilsocket/bettercap-ng` as you would do on other platforms. +And eventually just `go get github.com/bettercap/bettercap` as you would do on other platforms. ## Cross Compilation @@ -68,14 +68,14 @@ Download and cross compile libpcap-1.8.1 for ARM (adjust `PCAPV` to use a differ ./configure --host=arm-linux --with-pcap=linux make -Cross compile bettercap-ng itself: +Cross compile bettercap itself: - cd $GOPATH/src/github.com/evilsocket/bettercap-ng + cd $GOPATH/src/github.com/bettercap/bettercap env CC=arm-linux-gnueabi-gcc CGO_ENABLED=1 GOOS=linux GOARCH=arm CGO_LDFLAGS="-L/tmp/libpcap-$PCAPV" make ## Interactive Mode -If no `-caplet` option is specified, bettercap-ng will start in interactive mode, allowing you to start and stop modules manually, change options and apply new firewall rules on the fly. +If no `-caplet` option is specified, bettercap will start in interactive mode, allowing you to start and stop modules manually, change options and apply new firewall rules on the fly. To get a grasp of what you can do, type `help` and the general help menu will be shown, you can also have module specific help by using `help module-name` (for instance try with `help net.recon`), to see which modules are running and their configuration at any time, you can use the `active` command. @@ -131,7 +131,7 @@ Execute an ARP spoofing attack on the whole network (by default) or on a host (u ```sh # targeting the whole subnet by default, to make it selective: # -# sudo ./bettercap-ng -caplet caplets/http-req-dump.cap -eval "set arp.spoof.targets 192.168.1.64" +# sudo ./bettercap -caplet caplets/http-req-dump.cap -eval "set arp.spoof.targets 192.168.1.64" # to make it less verbose # events.stream off @@ -284,7 +284,7 @@ Use a proxy script to inject a BEEF javascript hook: ```sh # targeting the whole subnet by default, to make it selective: # -# sudo ./bettercap-ng -caplet caplets/beef-active.cap -eval "set arp.spoof.targets 192.168.1.64" +# sudo ./bettercap -caplet caplets/beef-active.cap -eval "set arp.spoof.targets 192.168.1.64" # inject beef hook set http.proxy.script caplets/beef-inject.js @@ -374,4 +374,4 @@ clear ## License -`bettercap` and `bettercap-ng` are made with ♥ by [Simone Margaritelli](https://www.evilsocket.net/) and they're released under the GPL 3 license. +`bettercap` and `bettercap` are made with ♥ by [Simone Margaritelli](https://www.evilsocket.net/) and they're released under the GPL 3 license. diff --git a/build.sh b/build.sh index 58c44735..23f56396 100755 --- a/build.sh +++ b/build.sh @@ -116,7 +116,7 @@ build_linux_mips64le() { build_macos_amd64() { vm_dep 'osxvm' - DIR=/Users/evilsocket/gocode/src/github.com/evilsocket/bettercap-ng + DIR=/Users/evilsocket/gocode/src/github.com/bettercap/bettercap OUTPUT=$1 echo "@ Updating repo on MacOS VM ..." @@ -132,7 +132,7 @@ build_macos_amd64() { build_windows_amd64() { vm_dep 'winvm' - DIR=c:/Users/evilsocket/gopath/src/github.com/evilsocket/bettercap-ng + DIR=c:/Users/evilsocket/gopath/src/github.com/bettercap/bettercap OUTPUT=$1 echo "@ Updating repo on Windows VM ..." @@ -149,14 +149,14 @@ rm -rf $BUILD_FOLDER mkdir $BUILD_FOLDER cd $BUILD_FOLDER -build_linux_amd64 bettercap-ng_linux_amd64_$VERSION -build_linux_arm7 bettercap-ng_linux_arm7_$VERSION -build_linux_mips bettercap-ng_linux_mips_$VERSION -build_linux_mipsle bettercap-ng_linux_mipsle_$VERSION -build_linux_mips64 bettercap-ng_linux_mips64_$VERSION -build_linux_mips64le bettercap-ng_linux_mips64le_$VERSION -build_macos_amd64 bettercap-ng_macos_amd64_$VERSION -build_windows_amd64 bettercap-ng_windows_amd64_$VERSION.exe +build_linux_amd64 bettercap_linux_amd64_$VERSION +build_linux_arm7 bettercap_linux_arm7_$VERSION +build_linux_mips bettercap_linux_mips_$VERSION +build_linux_mipsle bettercap_linux_mipsle_$VERSION +build_linux_mips64 bettercap_linux_mips64_$VERSION +build_linux_mips64le bettercap_linux_mips64le_$VERSION +build_macos_amd64 bettercap_macos_amd64_$VERSION +build_windows_amd64 bettercap_windows_amd64_$VERSION.exe sha256sum * > checksums.txt echo diff --git a/caplets/beef-active.cap b/caplets/beef-active.cap index 701aa3e6..afb3a2cb 100644 --- a/caplets/beef-active.cap +++ b/caplets/beef-active.cap @@ -1,6 +1,6 @@ # targeting the whole subnet by default, to make it selective: # -# sudo ./bettercap-ng -caplet caplets/beef-active.cap -eval "set arp.spoof.targets 192.168.1.64" +# sudo ./bettercap -caplet caplets/beef-active.cap -eval "set arp.spoof.targets 192.168.1.64" # inject beef hook set http.proxy.script caplets/beef-inject.js diff --git a/caplets/http-req-dump.cap b/caplets/http-req-dump.cap index f95beaef..5085efa7 100644 --- a/caplets/http-req-dump.cap +++ b/caplets/http-req-dump.cap @@ -1,6 +1,6 @@ # targeting the whole subnet by default, to make it selective: # -# sudo ./bettercap-ng -caplet caplets/http-req-dump.cap -eval "set arp.spoof.targets 192.168.1.64" +# sudo ./bettercap -caplet caplets/http-req-dump.cap -eval "set arp.spoof.targets 192.168.1.64" # to make it less verbose # events.stream off diff --git a/caplets/login-man-abuse.cap b/caplets/login-man-abuse.cap index fab079a4..eefbc6b1 100644 --- a/caplets/login-man-abuse.cap +++ b/caplets/login-man-abuse.cap @@ -1,6 +1,6 @@ # targeting the whole subnet by default, to make it selective: # -# sudo ./bettercap-ng -caplet caplets/login-man-abuse.cap -eval "set arp.spoof.targets 192.168.1.53" +# sudo ./bettercap -caplet caplets/login-man-abuse.cap -eval "set arp.spoof.targets 192.168.1.53" set http.proxy.script caplets/login-man-abuse.js http.proxy on diff --git a/caplets/proxy-script-test.js b/caplets/proxy-script-test.js index 5b02bba9..a3dc453e 100644 --- a/caplets/proxy-script-test.js +++ b/caplets/proxy-script-test.js @@ -8,14 +8,14 @@ function onRequest(req, res) { if( req.Path == "/test-page" ){ res.Status = 200; res.ContentType = "text/html"; - res.Headers = "Server: bettercap-ng\r\n" + + res.Headers = "Server: bettercap\r\n" + "Connection: close"; res.Body = "" + "" + "Test Page" + "" + "" + - "
Hello world from bettercap-ng!
" + + "
Hello world from bettercap!
" + "" + ""; } @@ -25,14 +25,14 @@ function onRequest(req, res) { function onResponse(req, res) { if( res.Status == 404 ){ res.ContentType = "text/html"; - res.Headers = "Server: bettercap-ng\r\n" + + res.Headers = "Server: bettercap\r\n" + "Connection: close"; res.Body = "" + "" + "Test 404 Page" + "" + "" + - "
Custom 404 from bettercap-ng.
" + + "
Custom 404 from bettercap.
" + "" + ""; } diff --git a/caplets/web-override.cap b/caplets/web-override.cap index 2548c812..3236fe2b 100644 --- a/caplets/web-override.cap +++ b/caplets/web-override.cap @@ -1,6 +1,6 @@ # targeting the whole subnet by default, to make it selective: # -# sudo ./bettercap-ng -caplet caplets/web-override.cap -eval "set arp.spoof.targets 192.168.1.64" +# sudo ./bettercap -caplet caplets/web-override.cap -eval "set arp.spoof.targets 192.168.1.64" set http.proxy.script caplets/web-override.js http.proxy on diff --git a/caplets/www/index.html b/caplets/www/index.html index f9d8ff63..7dccb061 100644 --- a/caplets/www/index.html +++ b/caplets/www/index.html @@ -4,7 +4,7 @@ You've just been RickRoll'd - + diff --git a/core/banner.go b/core/banner.go index 3733c74f..5bb80dfe 100644 --- a/core/banner.go +++ b/core/banner.go @@ -1,7 +1,7 @@ package core const ( - Name = "bettercap-ng" + Name = "bettercap" Version = "2.0.0RC1" Author = "Simone 'evilsocket' Margaritelli" Website = "https://bettercap.org/" diff --git a/firewall/firewall_darwin.go b/firewall/firewall_darwin.go index d141bad3..520f9a7e 100644 --- a/firewall/firewall_darwin.go +++ b/firewall/firewall_darwin.go @@ -9,8 +9,8 @@ import ( "regexp" "strings" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/network" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/network" ) var ( diff --git a/firewall/firewall_linux.go b/firewall/firewall_linux.go index 9313d8b0..16218969 100644 --- a/firewall/firewall_linux.go +++ b/firewall/firewall_linux.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "os" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/network" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/network" ) type LinuxFirewall struct { diff --git a/firewall/firewall_windows.go b/firewall/firewall_windows.go index e52f824f..6cfd9f80 100644 --- a/firewall/firewall_windows.go +++ b/firewall/firewall_windows.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/network" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/network" ) type WindowsFirewall struct { diff --git a/log/log.go b/log/log.go index 712f1382..f60d9cb8 100644 --- a/log/log.go +++ b/log/log.go @@ -1,8 +1,8 @@ package log import ( - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/session" ) func Debug(format string, args ...interface{}) { diff --git a/main.go b/main.go index 8eea497f..8cc5942a 100644 --- a/main.go +++ b/main.go @@ -5,10 +5,10 @@ import ( "io" "os" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/modules" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/modules" + "github.com/bettercap/bettercap/session" ) var sess *session.Session diff --git a/modules/api_rest.go b/modules/api_rest.go index 3b56ebc4..25fc3398 100644 --- a/modules/api_rest.go +++ b/modules/api_rest.go @@ -6,10 +6,10 @@ import ( "net/http" "time" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/session" - "github.com/evilsocket/bettercap-ng/tls" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/session" + "github.com/bettercap/bettercap/tls" ) type RestAPI struct { diff --git a/modules/api_rest_controller.go b/modules/api_rest_controller.go index a73af485..05457ae4 100644 --- a/modules/api_rest_controller.go +++ b/modules/api_rest_controller.go @@ -6,7 +6,7 @@ import ( "net/http" "strconv" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/session" ) var ( diff --git a/modules/arp_spoof.go b/modules/arp_spoof.go index 4e0c49a1..6b171f2e 100644 --- a/modules/arp_spoof.go +++ b/modules/arp_spoof.go @@ -5,9 +5,9 @@ import ( "net" "time" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/packets" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/packets" + "github.com/bettercap/bettercap/session" "github.com/malfunkt/iprange" ) diff --git a/modules/dhcp6_spoof.go b/modules/dhcp6_spoof.go index de18273e..97856257 100644 --- a/modules/dhcp6_spoof.go +++ b/modules/dhcp6_spoof.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/packets" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/packets" + "github.com/bettercap/bettercap/session" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/modules/dns_spoof.go b/modules/dns_spoof.go index c10db635..63c4b40c 100644 --- a/modules/dns_spoof.go +++ b/modules/dns_spoof.go @@ -6,10 +6,10 @@ import ( "net" "strings" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/packets" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/packets" + "github.com/bettercap/bettercap/session" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/modules/events_stream.go b/modules/events_stream.go index dc4ee561..7512f425 100644 --- a/modules/events_stream.go +++ b/modules/events_stream.go @@ -3,8 +3,8 @@ package modules import ( "strconv" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/session" ) type EventsStream struct { diff --git a/modules/events_view.go b/modules/events_view.go index 68f1ce9c..86d4ea19 100644 --- a/modules/events_view.go +++ b/modules/events_view.go @@ -5,9 +5,9 @@ import ( // "sort" "strings" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/session" ) const eventTimeFormat = "2006-01-02 15:04:05" diff --git a/modules/http_proxy.go b/modules/http_proxy.go index 1861b304..670bfbe3 100644 --- a/modules/http_proxy.go +++ b/modules/http_proxy.go @@ -1,7 +1,7 @@ package modules import ( - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/session" ) type HttpProxy struct { diff --git a/modules/http_proxy_base.go b/modules/http_proxy_base.go index d35b5ab9..429e231b 100644 --- a/modules/http_proxy_base.go +++ b/modules/http_proxy_base.go @@ -15,11 +15,11 @@ import ( "strings" "time" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/firewall" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/session" - btls "github.com/evilsocket/bettercap-ng/tls" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/firewall" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/session" + btls "github.com/bettercap/bettercap/tls" "github.com/elazarl/goproxy" "github.com/inconshreveable/go-vhost" diff --git a/modules/http_proxy_js_response.go b/modules/http_proxy_js_response.go index 5816ad3b..c393e82e 100644 --- a/modules/http_proxy_js_response.go +++ b/modules/http_proxy_js_response.go @@ -9,7 +9,7 @@ import ( "github.com/elazarl/goproxy" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) type JSResponse struct { diff --git a/modules/http_proxy_script.go b/modules/http_proxy_script.go index b164e37c..9fd9df65 100644 --- a/modules/http_proxy_script.go +++ b/modules/http_proxy_script.go @@ -5,8 +5,8 @@ import ( "net/http" "sync" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/session" "github.com/robertkrimen/otto" ) diff --git a/modules/http_proxy_script_builtins.go b/modules/http_proxy_script_builtins.go index e0c4aea4..fc86ca9c 100644 --- a/modules/http_proxy_script_builtins.go +++ b/modules/http_proxy_script_builtins.go @@ -3,7 +3,7 @@ package modules import ( "io/ioutil" - "github.com/evilsocket/bettercap-ng/log" + "github.com/bettercap/bettercap/log" "github.com/robertkrimen/otto" ) diff --git a/modules/http_proxy_script_test.go b/modules/http_proxy_script_test.go index 178bbbb9..ca88c8b0 100644 --- a/modules/http_proxy_script_test.go +++ b/modules/http_proxy_script_test.go @@ -4,8 +4,8 @@ import ( "net/http" "testing" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/session" ) func getScript(src string) *ProxyScript { diff --git a/modules/http_server.go b/modules/http_server.go index 0c7cd039..954ba865 100644 --- a/modules/http_server.go +++ b/modules/http_server.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/session" ) type HttpServer struct { diff --git a/modules/https_proxy.go b/modules/https_proxy.go index 897779d4..8328c161 100644 --- a/modules/https_proxy.go +++ b/modules/https_proxy.go @@ -1,10 +1,10 @@ package modules import ( - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/session" - "github.com/evilsocket/bettercap-ng/tls" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/session" + "github.com/bettercap/bettercap/tls" ) type HttpsProxy struct { diff --git a/modules/mac_changer.go b/modules/mac_changer.go index 9b0aafb0..c3ccd019 100644 --- a/modules/mac_changer.go +++ b/modules/mac_changer.go @@ -6,10 +6,10 @@ import ( "runtime" "strings" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - bnet "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + bnet "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/session" ) type MacChanger struct { diff --git a/modules/net_probe.go b/modules/net_probe.go index 911554d3..2707fec6 100644 --- a/modules/net_probe.go +++ b/modules/net_probe.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/session" "github.com/malfunkt/iprange" ) diff --git a/modules/net_probe_udp.go b/modules/net_probe_udp.go index 904ec6c6..7e8db8fc 100644 --- a/modules/net_probe_udp.go +++ b/modules/net_probe_udp.go @@ -5,7 +5,7 @@ import ( "net" "sync/atomic" - "github.com/evilsocket/bettercap-ng/log" + "github.com/bettercap/bettercap/log" ) func (p *Prober) sendProbeUDP(from net.IP, from_hw net.HardwareAddr, ip net.IP) { diff --git a/modules/net_recon.go b/modules/net_recon.go index 5a3b8241..fc6643e5 100644 --- a/modules/net_recon.go +++ b/modules/net_recon.go @@ -3,9 +3,9 @@ package modules import ( "time" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/session" ) type Discovery struct { diff --git a/modules/net_recon_show.go b/modules/net_recon_show.go index 01816001..ca5bc56e 100644 --- a/modules/net_recon_show.go +++ b/modules/net_recon_show.go @@ -8,9 +8,9 @@ import ( "sync/atomic" "time" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/packets" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/packets" "github.com/dustin/go-humanize" "github.com/olekukonko/tablewriter" diff --git a/modules/net_recon_sort.go b/modules/net_recon_sort.go index aa67d1f9..ecf3a399 100644 --- a/modules/net_recon_sort.go +++ b/modules/net_recon_sort.go @@ -1,9 +1,9 @@ package modules import ( - "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/packets" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/packets" + "github.com/bettercap/bettercap/session" ) type ByAddressSorter []*network.Endpoint diff --git a/modules/net_sniff.go b/modules/net_sniff.go index 09b21e05..548a2ae4 100644 --- a/modules/net_sniff.go +++ b/modules/net_sniff.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/session" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/modules/net_sniff_context.go b/modules/net_sniff_context.go index bb219e39..80277710 100644 --- a/modules/net_sniff_context.go +++ b/modules/net_sniff_context.go @@ -4,9 +4,9 @@ import ( "os" "regexp" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/session" "github.com/google/gopacket/pcap" "github.com/google/gopacket/pcapgo" diff --git a/modules/net_sniff_dns.go b/modules/net_sniff_dns.go index a868a645..949678d5 100644 --- a/modules/net_sniff_dns.go +++ b/modules/net_sniff_dns.go @@ -3,7 +3,7 @@ package modules import ( "strings" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/modules/net_sniff_event.go b/modules/net_sniff_event.go index 4bbd5d9b..b4c28fef 100644 --- a/modules/net_sniff_event.go +++ b/modules/net_sniff_event.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/session" ) type SniffData map[string]interface{} diff --git a/modules/net_sniff_http.go b/modules/net_sniff_http.go index 317aa9e2..8eb5e77d 100644 --- a/modules/net_sniff_http.go +++ b/modules/net_sniff_http.go @@ -3,7 +3,7 @@ package modules import ( "fmt" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" "regexp" "github.com/google/gopacket" diff --git a/modules/net_sniff_krb5.go b/modules/net_sniff_krb5.go index 42488e41..7e4325d0 100644 --- a/modules/net_sniff_krb5.go +++ b/modules/net_sniff_krb5.go @@ -3,8 +3,8 @@ package modules import ( "encoding/asn1" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/packets" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/packets" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/modules/net_sniff_ntlm.go b/modules/net_sniff_ntlm.go index f72db8f0..eb774e41 100644 --- a/modules/net_sniff_ntlm.go +++ b/modules/net_sniff_ntlm.go @@ -4,8 +4,8 @@ import ( "regexp" "strings" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/packets" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/packets" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/modules/net_sniff_parsers.go b/modules/net_sniff_parsers.go index 4da791f3..32c3f1e1 100644 --- a/modules/net_sniff_parsers.go +++ b/modules/net_sniff_parsers.go @@ -3,9 +3,9 @@ package modules import ( "fmt" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/packets" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/packets" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/modules/net_sniff_sni.go b/modules/net_sniff_sni.go index bd1d1fb2..d85054d9 100644 --- a/modules/net_sniff_sni.go +++ b/modules/net_sniff_sni.go @@ -3,7 +3,7 @@ package modules import ( "fmt" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" "regexp" "github.com/google/gopacket" diff --git a/modules/net_sniff_stats.go b/modules/net_sniff_stats.go index c0b5a3fe..815ccffe 100644 --- a/modules/net_sniff_stats.go +++ b/modules/net_sniff_stats.go @@ -1,7 +1,7 @@ package modules import ( - "github.com/evilsocket/bettercap-ng/log" + "github.com/bettercap/bettercap/log" "time" ) diff --git a/modules/net_sniff_views.go b/modules/net_sniff_views.go index 86244375..c1c1137e 100644 --- a/modules/net_sniff_views.go +++ b/modules/net_sniff_views.go @@ -7,8 +7,8 @@ import ( "github.com/google/gopacket/layers" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/session" ) func vTime(t time.Time) string { diff --git a/modules/syn_scan.go b/modules/syn_scan.go index 4b29c867..05bd06cc 100644 --- a/modules/syn_scan.go +++ b/modules/syn_scan.go @@ -6,11 +6,11 @@ import ( "strconv" "time" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/packets" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/packets" + "github.com/bettercap/bettercap/session" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/modules/syn_scan_event.go b/modules/syn_scan_event.go index 95df92e8..0d896b18 100644 --- a/modules/syn_scan_event.go +++ b/modules/syn_scan_event.go @@ -1,8 +1,8 @@ package modules import ( - "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/session" ) type SynScanEvent struct { diff --git a/modules/ticker.go b/modules/ticker.go index 2e4cba5d..9a9d543e 100644 --- a/modules/ticker.go +++ b/modules/ticker.go @@ -3,8 +3,8 @@ package modules import ( "time" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/session" ) type Ticker struct { diff --git a/modules/utils.go b/modules/utils.go index bc7fb28c..9c0b4582 100644 --- a/modules/utils.go +++ b/modules/utils.go @@ -5,10 +5,10 @@ import ( "net" "time" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/packets" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/packets" + "github.com/bettercap/bettercap/session" ) func findMAC(s *session.Session, ip net.IP, probe bool) (net.HardwareAddr, error) { diff --git a/modules/wifi_recon.go b/modules/wifi_recon.go index af92f260..c17ef62e 100644 --- a/modules/wifi_recon.go +++ b/modules/wifi_recon.go @@ -8,11 +8,11 @@ import ( "strconv" "time" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/packets" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/packets" + "github.com/bettercap/bettercap/session" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/modules/wifi_recon_sort.go b/modules/wifi_recon_sort.go index 9ef6d1b1..d650b17e 100644 --- a/modules/wifi_recon_sort.go +++ b/modules/wifi_recon_sort.go @@ -1,7 +1,7 @@ package modules import ( - "github.com/evilsocket/bettercap-ng/network" + "github.com/bettercap/bettercap/network" ) type ByRSSISorter []*network.Station diff --git a/modules/wol.go b/modules/wol.go index b4dbaca8..1542c2d5 100644 --- a/modules/wol.go +++ b/modules/wol.go @@ -5,10 +5,10 @@ import ( "net" "regexp" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/log" - "github.com/evilsocket/bettercap-ng/packets" - "github.com/evilsocket/bettercap-ng/session" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/log" + "github.com/bettercap/bettercap/packets" + "github.com/bettercap/bettercap/session" "github.com/google/gopacket/layers" ) diff --git a/network/aliases.go b/network/aliases.go index 711e7af2..8d2cd28d 100644 --- a/network/aliases.go +++ b/network/aliases.go @@ -8,7 +8,7 @@ import ( "strings" "sync" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) var fileName, _ = core.ExpandPath("~/bettercap.aliases") diff --git a/network/arp.go b/network/arp.go index a1fe517c..3f6ee224 100644 --- a/network/arp.go +++ b/network/arp.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) type ArpTable map[string]string diff --git a/network/lan_endpoint.go b/network/lan_endpoint.go index 86ee6b25..0c3391fd 100644 --- a/network/lan_endpoint.go +++ b/network/lan_endpoint.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) type OnHostResolvedCallback func(e *Endpoint) diff --git a/network/meta.go b/network/meta.go index 8be876c8..86f39ff5 100644 --- a/network/meta.go +++ b/network/meta.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) type Meta struct { diff --git a/network/net.go b/network/net.go index 5f72b9c7..9ec3cc4a 100644 --- a/network/net.go +++ b/network/net.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) const ( diff --git a/network/net_darwin.go b/network/net_darwin.go index ac60d3e3..6f6e80fd 100644 --- a/network/net_darwin.go +++ b/network/net_darwin.go @@ -5,7 +5,7 @@ import ( "net" "regexp" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) const airPortPath = "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport" diff --git a/network/net_linux.go b/network/net_linux.go index 508b4aae..b2543b7b 100644 --- a/network/net_linux.go +++ b/network/net_linux.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) // only matches gateway lines diff --git a/packets/queue.go b/packets/queue.go index 83a139d8..9bfb1048 100644 --- a/packets/queue.go +++ b/packets/queue.go @@ -7,7 +7,7 @@ import ( "sync" "sync/atomic" - "github.com/evilsocket/bettercap-ng/network" + "github.com/bettercap/bettercap/network" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/session/environment.go b/session/environment.go index 4a421308..bcbd5360 100644 --- a/session/environment.go +++ b/session/environment.go @@ -6,7 +6,7 @@ import ( "strconv" "sync" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) type SetCallback func(newValue string) diff --git a/session/events.go b/session/events.go index e9c44deb..26e719f5 100644 --- a/session/events.go +++ b/session/events.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) type Event struct { diff --git a/session/module.go b/session/module.go index 19820838..bea1feab 100644 --- a/session/module.go +++ b/session/module.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) type Module interface { diff --git a/session/module_handler.go b/session/module_handler.go index eaff64b8..35b18027 100644 --- a/session/module_handler.go +++ b/session/module_handler.go @@ -5,7 +5,7 @@ import ( "regexp" "strconv" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) const IPv4Validator = `^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$` diff --git a/session/module_param.go b/session/module_param.go index a83a401d..98e6e0a2 100644 --- a/session/module_param.go +++ b/session/module_param.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" ) type ParamType int diff --git a/session/prompt.go b/session/prompt.go index b5c4b0b3..e93828ff 100644 --- a/session/prompt.go +++ b/session/prompt.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/evilsocket/bettercap-ng/core" + "github.com/bettercap/bettercap/core" "github.com/dustin/go-humanize" ) diff --git a/session/session.go b/session/session.go index faa64a1e..3c5fa90b 100644 --- a/session/session.go +++ b/session/session.go @@ -17,10 +17,10 @@ import ( "github.com/evilsocket/readline" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/firewall" - "github.com/evilsocket/bettercap-ng/network" - "github.com/evilsocket/bettercap-ng/packets" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/firewall" + "github.com/bettercap/bettercap/network" + "github.com/bettercap/bettercap/packets" ) const HistoryFile = "~/bettercap.history" diff --git a/session/session_core_handlers.go b/session/session_core_handlers.go index 02f1ee2c..6ef35674 100644 --- a/session/session_core_handlers.go +++ b/session/session_core_handlers.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/evilsocket/bettercap-ng/core" - "github.com/evilsocket/bettercap-ng/network" + "github.com/bettercap/bettercap/core" + "github.com/bettercap/bettercap/network" "github.com/evilsocket/readline" ) diff --git a/tls/sign.go b/tls/sign.go index 83d3d7c6..ae764285 100644 --- a/tls/sign.go +++ b/tls/sign.go @@ -13,7 +13,7 @@ import ( "sort" "time" - "github.com/evilsocket/bettercap-ng/log" + "github.com/bettercap/bettercap/log" ) func hashSorted(lst []string) []byte {