This commit is contained in:
insanity@loafle.com 2017-08-09 11:45:34 +09:00
parent 39ddbbaf56
commit ac55bd8435
5 changed files with 216 additions and 220 deletions

View File

@ -81,12 +81,12 @@ func (c *Collector) collect(id string) {
out, err := dc.Get(context.Background(), in) out, err := dc.Get(context.Background(), in)
finishedAt := time.Now().Unix() finishedAt := time.Now().Unix()
if err != nil { if err != nil {
log.Error("Cannot collect [ID: %s] [Crawler : %s] - [Err : %s]\n", conf.Id, conf.Crawler.Name, err.Error()) log.Errorf("Cannot collect [ID: %s] [Crawler : %s] - [Err : %s]\n", conf.Id, conf.Crawler.Name, err.Error())
return return
} }
out.StartDate = startAt out.StartDate = startAt
out.EndDate = finishedAt out.EndDate = finishedAt
log.Error("COLLECTED. [ID: %s] [Crawler : %s] [Result : %s]\n", conf.Id, conf.Crawler.Name, out.GetData()) log.Infof("COLLECTED. [ID: %s] [Crawler : %s] [Result : %s]\n", conf.Id, conf.Crawler.Name, out.GetData())
c.dataCh <- out c.dataCh <- out
}() }()
} }

View File

@ -1,74 +1,73 @@
package cassandra package cassandra
// import (
//import ( "crypto/tls"
// "crypto/tls" "git.loafle.net/overflow/overflow_probe/matcher/packet"
// "git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/packet" "net"
// "net" "testing"
// "testing" )
//)
// func TestCassandra(t *testing.T) {
//func TestCassandra(t *testing.T) {
// m := NewCassandraMatcher()
// m := NewCassandraMatcher()
// conn, err := net.Dial("tcp", "192.168.1.16:19041")
// conn, err := net.Dial("tcp", "192.168.1.104:9042") if err != nil {
// if err != nil { t.Error(err)
// t.Error(err) return
// return }
// } defer conn.Close()
// defer conn.Close()
// for i := 0; i < m.PacketCount(); i++ {
// for i := 0; i < m.PacketCount(); i++ {
// pack := m.Packet(i)
// pack := m.Packet(i) conn.Write(pack.Buffer)
// conn.Write(pack.Buffer) bytes := make([]byte, 1024)
// bytes := make([]byte, 1024) n, _ := conn.Read(bytes)
// n, _ := conn.Read(bytes) p := packet.NewPacket(bytes, n)
// p := packet.NewPacket(bytes, n)
// if m.Match(i, p, nil) {
// if m.Match(i, p, nil) { t.Log("Cassandra found")
// t.Log("Cassandra found") return
// return }
// }
// t.Error("Cassandra not found")
// t.Error("Cassandra not found") }
// }
// }
//}
// func TestCassandraTLS(t *testing.T) {
//func TestCassandraTLS(t *testing.T) {
// m := NewCassandraMatcher()
// m := NewCassandraMatcher()
// conn, err := tls.Dial(
// conn, err := tls.Dial( "tcp",
// "tcp", "192.168.1.16:19042",
// "192.168.1.104:9042", &tls.Config{
// &tls.Config{ InsecureSkipVerify: true,
// InsecureSkipVerify: true, ServerName: "192.168.1.16",
// ServerName: "192.168.1.104", },
// }, )
// ) if err != nil {
// if err != nil { t.Fatal(err)
// t.Fatal(err) }
// }
// defer conn.Close()
// defer conn.Close()
// for i := 0; i < m.PacketCount(); i++ {
// for i := 0; i < m.PacketCount(); i++ {
// pack := m.Packet(i)
// pack := m.Packet(i) conn.Write(pack.Buffer)
// conn.Write(pack.Buffer) bytes := make([]byte, 1024)
// bytes := make([]byte, 1024) n, _ := conn.Read(bytes)
// n, _ := conn.Read(bytes) p := packet.NewPacket(bytes, n)
// p := packet.NewPacket(bytes, n)
// if m.Match(i, p, nil) {
// if m.Match(i, p, nil) { t.Log("Cassandra found")
// t.Log("Cassandra found") return
// return }
// }
// t.Error("Cassandra not found")
// t.Error("Cassandra not found") }
// }
// }
//}

View File

@ -1,55 +1,54 @@
package mongodb package mongodb
// import (
//import ( "crypto/tls"
// "crypto/tls" "git.loafle.net/overflow/overflow_probe/matcher/packet"
// "git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/packet" "net"
// "net" "testing"
// "testing" )
//)
// func TestMongoNor(t *testing.T) {
//func TestMongoNor(t *testing.T) {
// conn, _ := net.Dial("tcp", "192.168.1.16:37017")
// conn, _ := net.Dial("tcp", "192.168.1.105:27017")
// defer conn.Close()
// defer conn.Close()
// MongoRun(conn, t)
// MongoRun(conn, t)
// }
//} func TestMongoTLS(t *testing.T) {
//func TestMongoTLS(t *testing.T) { conn, _ := tls.Dial(
// conn, _ := tls.Dial( "tcp",
// "tcp", "192.168.1.16:47017",
// "192.168.1.105:27017", &tls.Config{
// &tls.Config{ InsecureSkipVerify: true,
// InsecureSkipVerify: true, ServerName: "192.168.1.16",
// ServerName: "192.168.1.105", },
// }, )
// )
// defer conn.Close()
// defer conn.Close()
// MongoRun(conn, t)
// MongoRun(conn, t) }
//}
// func MongoRun(conn net.Conn, t *testing.T) {
//func MongoRun(conn net.Conn, t *testing.T) {
// m := NewMongoDBMatcher()
// m := NewMongoDBMatcher()
// for i := 0; i < m.PacketCount(); i++ {
// for i := 0; i < m.PacketCount(); i++ {
// pack := m.Packet(i)
// pack := m.Packet(i) conn.Write(pack.Buffer)
// conn.Write(pack.Buffer) bytes := make([]byte, 1024)
// bytes := make([]byte, 1024) n, _ := conn.Read(bytes)
// n, _ := conn.Read(bytes) p := packet.NewPacket(bytes, n)
// p := packet.NewPacket(bytes, n)
// if m.Match(i, p, nil) {
// if m.Match(i, p, nil) { t.Log("MongoDB found")
// t.Log("MongoDB found") return
// return }
// }
// t.Error("MongoDB not found")
// t.Error("MongoDB not found") }
// }
// }
//}

View File

@ -1,64 +1,63 @@
package mssql package mssql
import (
"git.loafle.net/overflow/overflow_probe/matcher/packet"
"net"
"testing"
)
/*
192.168.1.106:1433 - normal
192.168.1.103:1433 - ssl
*/
func TestSqlNor(t *testing.T) {
conn, _ := net.Dial("tcp", "192.168.1.16:11433")
defer conn.Close()
sqlServerRun(conn, t)
}
//func TestSqlTLS(t *testing.T) {
// conn, err := tls.Dial(
// "tcp",
// "192.168.1.103:7680",
// &tls.Config{
// InsecureSkipVerify: true,
// ServerName: "192.168.1.103",
// },
// )
// //
//import ( // if err != nil {
// "git.loafle.net/overflow/overflow_probe/collector/discovery/scan/matcher/packet" // t.Log(err)
// "net" // return
// "testing" // }
//)
//
///*
//192.168.1.106:1433 - normal
//192.168.1.103:1433 - ssl
//*/
//func TestSqlNor(t *testing.T) {
//
// conn, _ := net.Dial("tcp", "192.168.1.103:1433")
// //
// defer conn.Close() // defer conn.Close()
// //
// sqlServerRun(conn, t) // sqlServerRun(conn, t)
//
//}
//
////func TestSqlTLS(t *testing.T) {
//// conn, err := tls.Dial(
//// "tcp",
//// "192.168.1.103:7680",
//// &tls.Config{
//// InsecureSkipVerify: true,
//// ServerName: "192.168.1.103",
//// },
//// )
////
//// if err != nil {
//// t.Log(err)
//// return
//// }
////
//// defer conn.Close()
////
//// sqlServerRun(conn, t)
////}
//
//func sqlServerRun(conn net.Conn, t *testing.T) {
//
// m := NewMSSqlMatcher()
//
// for i := 0; i < m.PacketCount(); i++ {
//
// pack := m.Packet(i)
// conn.Write(pack.Buffer)
// bytes := make([]byte, 1024)
// n, _ := conn.Read(bytes)
// p := packet.NewPacket(bytes, n)
//
// if m.Match(i, p, nil) {
// t.Log(m.ServiceName())
// return
// }
//
// t.Error("MSSQL not found")
// }
//
//} //}
func sqlServerRun(conn net.Conn, t *testing.T) {
m := NewMSSqlMatcher()
for i := 0; i < m.PacketCount(); i++ {
pack := m.Packet(i)
conn.Write(pack.Buffer)
bytes := make([]byte, 1024)
n, _ := conn.Read(bytes)
p := packet.NewPacket(bytes, n)
if m.Match(i, p, nil) {
t.Log(m.ServiceName())
return
}
t.Error("MSSQL not found")
}
}

View File

@ -1,38 +1,37 @@
package redis package redis
// import (
//import ( "git.loafle.net/overflow/overflow_probe/matcher/packet"
// "git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/packet" "net"
// "net" "testing"
// "testing" )
//)
// const (
//const ( ADDR string = "192.168.1.16:26379"
// ADDR string = "192.168.1.215:6379" )
//)
// func TestRedisMatcher(t *testing.T) {
//func TestRedisMatcher(t *testing.T) {
// m := NewRedisMatcher()
// m := NewRedisMatcher()
// conn, _ := net.Dial("tcp", ADDR)
// conn, _ := net.Dial("tcp", ADDR) defer conn.Close()
// defer conn.Close()
// for i := 0; i < m.PacketCount(); i++ {
// for i := 0; i < m.PacketCount(); i++ {
// pack := m.Packet(i)
// pack := m.Packet(i) conn.Write(pack.Buffer)
// conn.Write(pack.Buffer) bytes := make([]byte, 1024)
// bytes := make([]byte, 1024) n, _ := conn.Read(bytes)
// n, _ := conn.Read(bytes)
// p := packet.NewPacket(bytes, n)
// p := packet.NewPacket(bytes, n)
// if m.Match(i, p, nil) {
// if m.Match(i, p, nil) { t.Log("Redis found.")
// t.Log("Redis found.") return
// return }
// }
// t.Error("Redis not found")
// t.Error("Redis not found") }
// }
// }
//}