diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b000bcc..c51f908 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,12 +8,12 @@ - mac ```bash -brew install make go nmap ansible git +brew install make go ansible git ``` - debian ```bash -sudo apt update && sudo apt install -y make golang nmap ansible git +sudo apt update && sudo apt install -y make golang ansible git ``` When building from source you may want to add the following lines to one of your diff --git a/README.md b/README.md index 805c32f..132a88b 100644 --- a/README.md +++ b/README.md @@ -13,16 +13,16 @@ managing kubernetes clusters via a terminal ui application. ## Runtime Dependencies -Ops has two external runtime dependencies, namely [nmap] and [ansible]. +Ops has one external runtime dependencies, [ansible]. - mac ```bash -brew install nmap ansible +brew install ansible ``` - debian ```bash -sudo apt update && sudo apt install -y nmap ansible +sudo apt update && sudo apt install -y ansible ``` ## Build Dependencies @@ -54,7 +54,6 @@ PATH="${GOPATH}/bin:$PATH" - dependencies - golang - ansible - - nmap - git ```bash @@ -66,7 +65,6 @@ go install github.com/robgonnella/ops@latest - golang - make - ansible - - nmap - git ```bash @@ -77,7 +75,6 @@ make install - use pre-built binaries: https://github.com/robgonnella/ops/releases - dependencies - - nmap - ansible ## Usage @@ -129,14 +126,11 @@ ops --help - [tview] is used to build the frontend. This is a wonderful open source terminal ui library provided by [rivo]! -- [nmap] is used on the backend to perform arp scanning of networks to find - and track devices. - [ansible] is also used on the backend to gather additional details about a device where ssh is granted [rivo]: https://github.com/rivo [tview]: https://github.com/rivo/tview [ansible]: https://docs.ansible.com/ -[nmap]: https://nmap.org/ [k9s]: https://github.com/derailed/k9s [derailed]: https://github.com/derailed diff --git a/go.mod b/go.mod index b8de6a1..9b97712 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/gdamore/tcell/v2 v2.6.0 github.com/golang/mock v1.6.0 github.com/imdario/mergo v0.3.16 + github.com/projectdiscovery/mapcidr v1.1.2 github.com/rivo/tview v0.0.0-20230621164836-6cc0565babaf github.com/rs/zerolog v1.29.1 github.com/spf13/cobra v1.7.0 @@ -21,31 +22,39 @@ require ( require ( github.com/apenella/go-common-utils/data v0.0.0-20210528133155-34ba915e28c8 // indirect github.com/apenella/go-common-utils/error v0.0.0-20210528133155-34ba915e28c8 // indirect + github.com/aymerick/douceur v0.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fatih/color v1.13.0 // indirect + github.com/fatih/color v1.14.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/gdamore/encoding v1.0.0 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect + github.com/gorilla/css v1.0.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/magiconair/properties v1.8.7 // indirect - github.com/mattn/go-colorable v0.1.12 // indirect - github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect github.com/mattn/go-sqlite3 v1.14.17 // indirect + github.com/microcosm-cc/bluemonday v1.0.23 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/projectdiscovery/blackrock v0.0.1 // indirect + github.com/projectdiscovery/utils v0.0.32 // indirect github.com/rivo/uniseg v0.4.4 // indirect + github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect github.com/spf13/afero v1.9.5 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/subosito/gotenv v1.4.2 // indirect + golang.org/x/net v0.10.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.9.0 // indirect golang.org/x/term v0.9.0 // indirect diff --git a/go.sum b/go.sum index 1f91ad4..eb6565c 100644 --- a/go.sum +++ b/go.sum @@ -53,6 +53,8 @@ github.com/apenella/go-common-utils/error v0.0.0-20210528133155-34ba915e28c8/go. github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= +github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= @@ -87,8 +89,9 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= +github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -171,6 +174,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= +github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -236,17 +241,22 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/microcosm-cc/bluemonday v1.0.23 h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY= +github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4= github.com/microsoft/go-mssqldb v0.17.0 h1:Fto83dMZPnYv1Zwx5vHHxpNraeEaUlQ/hhHLgZiaenE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -269,11 +279,18 @@ github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZ github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/projectdiscovery/blackrock v0.0.1 h1:lHQqhaaEFjgf5WkuItbpeCZv2DUIE45k0VbGJyft6LQ= +github.com/projectdiscovery/blackrock v0.0.1/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss= +github.com/projectdiscovery/mapcidr v1.1.2 h1:Mmq/nPqvVc7fjvH/kJVK0IBOny/LrJIxZ4tQsLPCrsA= +github.com/projectdiscovery/mapcidr v1.1.2/go.mod h1:Aoq0x/wJl6KDbtQ8OcPkjIDCqx2iEyx5ty1nzso8wXM= +github.com/projectdiscovery/utils v0.0.32 h1:TjUxFmRG9hiV6jauYsnIRiy08lTgGHGi8avstedNGXw= +github.com/projectdiscovery/utils v0.0.32/go.mod h1:SaOpcZ2dJ47NE3t4R/YC2XpUyRZC6v5k8sj2TFro6+k= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -299,6 +316,8 @@ github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d h1:hrujxIzL1woJ7AwssoOcM/tq5JjjG2yYOc8odClEiXA= +github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -444,6 +463,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -514,6 +535,7 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= diff --git a/internal/app-info/info.go b/internal/app-info/info.go index 78f2a78..8187b70 100644 --- a/internal/app-info/info.go +++ b/internal/app-info/info.go @@ -5,4 +5,4 @@ package app_info const NAME = "ops" // VERSION app version -const VERSION = "v0.1.5" +const VERSION = "v0.2.0" diff --git a/internal/discovery/net.go b/internal/discovery/net.go new file mode 100644 index 0000000..933de8e --- /dev/null +++ b/internal/discovery/net.go @@ -0,0 +1,117 @@ +package discovery + +import ( + "crypto/sha1" + "encoding/hex" + "errors" + "net" + "regexp" + "strings" + "sync" + "time" + + "github.com/projectdiscovery/mapcidr" + "github.com/robgonnella/ops/internal/logger" + "github.com/robgonnella/ops/internal/server" +) + +var cidrSuffix = regexp.MustCompile(`\/\d{2}$`) + +type NetScanner struct { + canceled bool + targets []string + semaphore chan struct{} + log logger.Logger +} + +func NewNetScanner(targets []string) *NetScanner { + return &NetScanner{ + canceled: false, + targets: targets, + semaphore: make(chan struct{}, 1000), + log: logger.New(), + } +} + +func (s *NetScanner) Scan() ([]*DiscoveryResult, error) { + if s.canceled { + return nil, errors.New("network scanner is in a canceled state") + } + + s.log.Info().Msg("Scanning network...") + + results := []*DiscoveryResult{} + + ipList := []string{} + + wg := &sync.WaitGroup{} + + for _, t := range s.targets { + if cidrSuffix.MatchString(t) { + ips, err := mapcidr.IPAddresses(t) + + if err != nil { + return nil, err + } + + ipList = append(ipList, ips...) + } else { + ipList = append(ipList, t) + } + } + + for _, ip := range ipList { + s.semaphore <- struct{}{} // acquire + wg.Add(1) + go func(i string, w *sync.WaitGroup, res []*DiscoveryResult) { + r := s.scanIP(i) + results = append(results, r) + <-s.semaphore // release + w.Done() + }(ip, wg, results) + } + + wg.Wait() + + return results, nil +} + +func (s *NetScanner) Stop() { + s.canceled = true +} + +func (s *NetScanner) scanIP(ip string) *DiscoveryResult { + hashedIP := sha1.Sum([]byte(ip)) + id := hex.EncodeToString(hashedIP[:]) + + r := DiscoveryResult{ + ID: id, + Hostname: "", + IP: ip, + OS: "", + Status: server.StatusOffline, + } + + s.log.Info().Str("ip", ip).Msg("Scanning target") + + timeOut := time.Millisecond * 200 + conn, err := net.DialTimeout("tcp", ip+":22", timeOut) + + if err != nil { + r.Ports = []Port{{ID: 22, Status: PortClosed}} + + s.log.Error().Err(err).Msg("network scanning error") + + if _, ok := err.(*net.OpError); ok { + if strings.HasSuffix(err.Error(), "connect: connection refused") { + r.Status = server.StatusOnline + } + } + } else { + defer conn.Close() + r.Status = server.StatusOnline + r.Ports = []Port{{ID: 22, Status: PortOpen}} + } + + return &r +} diff --git a/internal/ui/launch.go b/internal/ui/launch.go index 699a6f3..aa14cca 100644 --- a/internal/ui/launch.go +++ b/internal/ui/launch.go @@ -41,6 +41,32 @@ func NewUI() *UI { func (u *UI) Launch() error { log := logger.New() + userIP, cidr, err := util.GetNetworkInfo() + + if err != nil { + log.Fatal().Err(err).Msg("failed to get default network info") + } + + hostname, err := util.Hostname() + + if err != nil { + log.Fatal().Err(err).Msg("failed to get hostname for current device") + } + + appCore, err := util.CreateNewAppCore(*cidr) + + if err != nil { + log.Fatal().Err(err).Msg("failed to create app core") + } + + allConfigs, err := appCore.GetConfigs() + + if err != nil { + log.Fatal().Err(err).Msg("failed to retrieve configs") + } + + u.view = newView(*hostname, *userIP, allConfigs, appCore) + level := zerolog.GlobalLevel() if level != zerolog.Disabled { @@ -74,35 +100,5 @@ func (u *UI) Launch() error { defer restoreStdout() - userIP, cidr, err := util.GetNetworkInfo() - - if err != nil { - restoreStdout() - log.Fatal().Err(err).Msg("failed to get default network info") - } - - hostname, err := util.Hostname() - - if err != nil { - restoreStdout() - log.Fatal().Err(err).Msg("failed to get hostname for current device") - } - - appCore, err := util.CreateNewAppCore(*cidr) - - if err != nil { - restoreStdout() - log.Fatal().Err(err).Msg("failed to create app core") - } - - allConfigs, err := appCore.GetConfigs() - - if err != nil { - restoreStdout() - log.Fatal().Err(err).Msg("failed to retrieve configs") - } - - u.view = newView(*hostname, *userIP, allConfigs, appCore) - return u.view.run() } diff --git a/internal/util/core.go b/internal/util/core.go index ada6d66..4834348 100644 --- a/internal/util/core.go +++ b/internal/util/core.go @@ -83,11 +83,7 @@ func CreateNewAppCore(defaultCIDR string) (*core.Core, error) { serverRepo := server.NewSqliteRepo(db) serverService := server.NewService(*conf, serverRepo) - netScanner, err := discovery.NewNmapScanner(conf.Targets) - - if err != nil { - return nil, err - } + netScanner := discovery.NewNetScanner(conf.Targets) detailScanner := discovery.NewAnsibleIpScanner(*conf)