overflow_cloud/container_discovery
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ing

Browse Source
This commit is contained in:
crusader 2018-06-21 19:54:31 +09:00
parent 78ba6b1138
commit 5f80794d28
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gopkg.lock generated
View File

@ -79,7 +79,7 @@
"telnet", "telnet",
"wmi" "wmi"
] ]
revision = "f5a697e4d15125f4fcae754a56b71e5b1d00e57c" revision = "297c909956a0892b9e547370384012cbe2992b9d"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -115,7 +115,7 @@
"service/container/discovery", "service/container/discovery",
"service/probe" "service/probe"
] ]
revision = "292dd88aae9a1eb66fe5c1d45cbac20799cce3a0" revision = "7e2ff26648aefbafaee2ca28c1a958332ae4c6f9"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -131,7 +131,7 @@
branch = "master" branch = "master"
name = "git.loafle.net/overflow/crawler-go" name = "git.loafle.net/overflow/crawler-go"
packages = ["."] packages = ["."]
revision = "02d2885e33e86e64bccda0b237c416b2b385a625" revision = "bae05dbc820773ec5b584cb39614216dd408a7f7"
[[projects]] [[projects]]
name = "github.com/BurntSushi/toml" name = "github.com/BurntSushi/toml"

2
crawler/crawler.go
View File

@ -14,7 +14,7 @@ func init() {
} }
func addCrawler(c crawler.Crawler) { func addCrawler(c crawler.Crawler) {
crawlers[c.Name()] = c crawlers[c.Key()] = c
} }
func GetCrawlers() map[string]crawler.Crawler { func GetCrawlers() map[string]crawler.Crawler {

2
crawler/discovery/discovery-crawler.go
View File

@ -8,7 +8,7 @@ import (
type DiscoveryCrawler struct { type DiscoveryCrawler struct {
} }
func (c *DiscoveryCrawler) Name() string { func (c *DiscoveryCrawler) Key() string {
return "DISCOVERY" return "DISCOVERY"
} }

10
internal/discoverer/ipv4/service.go
View File

@ -21,9 +21,10 @@ func ScanService(port *ocmd.Port, ds *ocmd.DiscoverService, resultChan chan inte
case ocmm.MetaPortTypeEnumTCP: case ocmm.MetaPortTypeEnumTCP:
if !scanServiceTCP(port, ds, resultChan, errChan, stopChan) { if !scanServiceTCP(port, ds, resultChan, errChan, stopChan) {
if dName, ok := layers.TCPPortNames[layers.TCPPort(portNumber)]; ok { if dName, ok := layers.TCPPortNames[layers.TCPPort(portNumber)]; ok {
sName := fmt.Sprintf("Not Supported Service. Perhaps %s[%d]", dName, portNumber) description := fmt.Sprintf("Not Supported Service. Perhaps %s[%d]", dName, portNumber)
s := &ocmd.Service{ s := &ocmd.Service{
Name: sName, Key: ocmm.MetaTargetServiceTypeEnumUNKNOWN.String(),
Description: description,
DiscoveredDate: occu.NowPtr(), DiscoveredDate: occu.NowPtr(),
Port: port, Port: port,
MetaCryptoType: ocmm.ToMetaCryptoType(ocmm.MetaCryptoTypeEnumUNKNOWN), MetaCryptoType: ocmm.ToMetaCryptoType(ocmm.MetaCryptoTypeEnumUNKNOWN),
@ -35,9 +36,10 @@ func ScanService(port *ocmd.Port, ds *ocmd.DiscoverService, resultChan chan inte
case ocmm.MetaPortTypeEnumUDP: case ocmm.MetaPortTypeEnumUDP:
if !scanServiceUDP(port, ds, resultChan, errChan, stopChan) { if !scanServiceUDP(port, ds, resultChan, errChan, stopChan) {
if dName, ok := layers.UDPPortNames[layers.UDPPort(portNumber)]; ok { if dName, ok := layers.UDPPortNames[layers.UDPPort(portNumber)]; ok {
sName := fmt.Sprintf("Not Supported Service. Perhaps %s[%d]", dName, portNumber) description := fmt.Sprintf("Not Supported Service. Perhaps %s[%d]", dName, portNumber)
s := &ocmd.Service{ s := &ocmd.Service{
Name: sName, Key: ocmm.MetaTargetServiceTypeEnumUNKNOWN.String(),
Description: description,
DiscoveredDate: occu.NowPtr(), DiscoveredDate: occu.NowPtr(),
Port: port, Port: port,
MetaCryptoType: ocmm.ToMetaCryptoType(ocmm.MetaCryptoTypeEnumUNKNOWN), MetaCryptoType: ocmm.ToMetaCryptoType(ocmm.MetaCryptoTypeEnumUNKNOWN),

8
internal/discoverer/ipv4/service_tcp.go
View File

@ -103,7 +103,7 @@ LOOP:
if 0 == packetCount { if 0 == packetCount {
s = &ocmd.Service{ s = &ocmd.Service{
Name: m.Name(), Key: m.Key(),
MetaCryptoType: sc.MetaCryptoType(), MetaCryptoType: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(), DiscoveredDate: occu.NowPtr(),
} }
@ -155,7 +155,7 @@ LOOP:
if found { if found {
s = &ocmd.Service{ s = &ocmd.Service{
Name: m.Name(), Key: m.Key(),
MetaCryptoType: sc.MetaCryptoType(), MetaCryptoType: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(), DiscoveredDate: occu.NowPtr(),
} }
@ -213,7 +213,7 @@ LOOP:
if nil != err { if nil != err {
if !m.HasResponse(j) { if !m.HasResponse(j) {
s = &ocmd.Service{ s = &ocmd.Service{
Name: m.Name(), Key: m.Key(),
MetaCryptoType: sc.MetaCryptoType(), MetaCryptoType: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(), DiscoveredDate: occu.NowPtr(),
} }
@ -227,7 +227,7 @@ LOOP:
if m.Match(info, j, csm.NewPacket(buf, rn)) { if m.Match(info, j, csm.NewPacket(buf, rn)) {
if packetCount-1 == j { if packetCount-1 == j {
s = &ocmd.Service{ s = &ocmd.Service{
Name: m.Name(), Key: m.Key(),
MetaCryptoType: sc.MetaCryptoType(), MetaCryptoType: sc.MetaCryptoType(),
DiscoveredDate: occu.NowPtr(), DiscoveredDate: occu.NowPtr(),
} }

2
internal/discoverer/ipv4/service_udp.go
View File

@ -27,7 +27,7 @@ func scanServiceUDP(port *ocmd.Port, ds *ocmd.DiscoverService, resultChan chan i
if m.Match(mi, 0, p) { if m.Match(mi, 0, p) {
s := &ocmd.Service{ s := &ocmd.Service{
Name: m.Name(), Key: m.Key(),
Port: port, Port: port,
MetaCryptoType: ocmm.ToMetaCryptoType(ocmm.MetaCryptoTypeEnumNONE), MetaCryptoType: ocmm.ToMetaCryptoType(ocmm.MetaCryptoTypeEnumNONE),
DiscoveredDate: occu.NowPtr(), DiscoveredDate: occu.NowPtr(),

4
internal/matcher/matcher.go
View File

@ -96,9 +96,9 @@ func GetUDPMatchers() []csm.UDPMatcher {
return UDPMatchers return UDPMatchers
} }
func GetMatcherByName(name string) csm.Matcher { func GetMatcherByKey(key string) csm.Matcher {
for _, m := range AllMatchers { for _, m := range AllMatchers {
if m.Name() == name { if m.Key() == key {
return m return m
} }
} }