perp/shogo
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🎨 Updated code

Browse Source 
Redid printing and commented out filtering.
This commit is contained in:
perp 2023-08-12 00:25:58 +01:00
parent 334eec2130
commit 0f5ca03bd6
1 changed files with 73 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
internal/shodan/search.go
View File

@ -3,7 +3,6 @@ package shodan
import (
"context"
"fmt"
"strconv"
"strings"
"github.com/ns3777k/go-shodan/v4/shodan"
@ -11,21 +10,12 @@ import (
"git.tcp.direct/perp/shogo/internal/utils"
)
// Search query
type Search struct {
Query string // Search query
Page int // Current page
Fields []string // Filter fields
Separator string // Filter separator
Results chan string // Results channel
}
// Return shodan search results
func (s *Search) Search() {
func (s *Shodan) Search() {
// Setup options
options := &shodan.HostQueryOptions{
Query: s.Query,
Page: s.Page,
Query: s.Flags.Query,
Page: s.Flags.Page,
Minify: false,
}
@ -37,11 +27,18 @@ func (s *Search) Search() {
return
}
// Store lines
var lines string
// More than 2 matches
if len(results.Matches) > 2 {
// Go through matches
for match := range results.Matches {
if len(s.Fields) != 0 {
if len(s.Flags.Fields) != 0 {
lines += utils.Title.Sprintf("Filtering has not been implemented yet\n")
break
/*
fields := map[string]string{
"product": results.Matches[match].Product,
"ip_str": results.Matches[match].IP.String(),
@ -74,39 +71,57 @@ func (s *Search) Search() {
}
}
lines := strings.Split(content, "\n")
for line := range lines {
result += strings.TrimRight(lines[line], ":")
data := strings.Split(content, "\n")
for line := range data {
result += strings.TrimRight(data[line], ":")
}
// Print results
fmt.Println(result)
*/
} else {
// Send results
content := fmt.Sprintf("%s: %s\n%s: %s\n%s: %s\n",
lines += fmt.Sprintf("%s: %s\n%s: %s\n%s: %s\n",
utils.Green("IP"), utils.Blue(results.Matches[match].IP.String()),
utils.Blue("Port"), utils.Green(results.Matches[match].Port),
utils.Green("Hostname"), utils.Blue(strings.Join(results.Matches[0].Hostnames, ",")),
)
lines := strings.Split(results.Matches[match].Data, "\n")
data := strings.Split(results.Matches[match].Data, "\n")
green := true
for line := range lines {
values := strings.Split(lines[line], ":")
for line := range data {
values := strings.Split(data[line], ":")
if green {
content += fmt.Sprintf("%s:%s\n", utils.Green(values[0]), utils.Blue(strings.Join(values[1:], "")))
if values[0] != ":" {
for value := range values[1:] {
if values[value] != "" {
lines += fmt.Sprintf("%s:%s\n", utils.Green(values[0]), utils.Blue(strings.Join(values[1:], "")))
green = false
break
}
}
}
} else {
content += fmt.Sprintf("%s:%s\n", utils.Blue(values[0]), utils.Green(strings.Join(values[1:], "")))
if values[0] != ":" {
for value := range values[1:] {
if values[value] != "" {
lines += fmt.Sprintf("%s:%s\n", utils.Blue(values[0]), utils.Green(strings.Join(values[1:], "")))
green = true
break
}
}
}
}
}
lines += "\n"
}
}
}
s.Results <- content
}
}
}
// Remove empty newline
// Send results
lines = strings.TrimRight(lines, "\n")
s.Results <- lines
}
// Todo: Redo filter sorting
// Todo: Redo filter sorting, pages