overflow_backup_2018_0455/overflow_probe
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed log, package

Browse Source
This commit is contained in:
snoop 2017-08-04 11:55:31 +09:00
parent 4e80885df2
commit 31086ce17d
32 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent_api/config_manager/config_test.go
View File

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"io/ioutil" "io/ioutil"
"log" //log "github.com/cihub/seelog"
"testing" "testing"
) )
@ -12,7 +12,7 @@ func TestConfigRead(t *testing.T) {
b, err := ioutil.ReadFile("/root/gowork/src/git.loafle.net/overflow/overflow_probe/agent_api/config_manager/test.json") b, err := ioutil.ReadFile("/root/gowork/src/git.loafle.net/overflow/overflow_probe/agent_api/config_manager/test.json")
if err != nil { if err != nil {
log.Panic(err) t.Fatal(err)
} }
var m = Config{} var m = Config{}
json.Unmarshal(b, &m) json.Unmarshal(b, &m)

4
collector/collector.go
View File

@ -6,7 +6,7 @@ import (
"git.loafle.net/overflow/overflow_probe/crawler/grpc" "git.loafle.net/overflow/overflow_probe/crawler/grpc"
crm "git.loafle.net/overflow/overflow_probe/crawler_manager" crm "git.loafle.net/overflow/overflow_probe/crawler_manager"
s "git.loafle.net/overflow/overflow_probe/scheduler" s "git.loafle.net/overflow/overflow_probe/scheduler"
"log" log "github.com/cihub/seelog"
"strconv" "strconv"
"sync" "sync"
"time" "time"
@ -50,7 +50,7 @@ func (c *Collector) start(started chan bool, conf cm.ConfigManager) {
for _, conf := range c.cm.GetSensors() { for _, conf := range c.cm.GetSensors() {
if err := c.addSensor(conf.Id); err != nil { if err := c.addSensor(conf.Id); err != nil {
log.Println(err) log.Debug(err)
} }
} }
started <- true started <- true

18
config_manager/config_manager.go
View File

@ -3,9 +3,9 @@ package config_manager
import ( import (
"encoding/json" "encoding/json"
"git.loafle.net/overflow/overflow_probe/agent_api/config_manager" "git.loafle.net/overflow/overflow_probe/agent_api/config_manager"
"gopkg.in/yaml.v2" log "github.com/cihub/seelog"
yaml "gopkg.in/yaml.v2"
"io/ioutil" "io/ioutil"
"log"
"os" "os"
"strings" "strings"
"sync" "sync"
@ -66,7 +66,7 @@ func (c *configManager) loadCrawlerConfigAll() error {
root := c.getConfigPath() root := c.getConfigPath()
files, err := ioutil.ReadDir(root) files, err := ioutil.ReadDir(root)
if err != nil { if err != nil {
log.Panic(err) log.Error(err)
} }
for _, file := range files { for _, file := range files {
if file.IsDir() == true { if file.IsDir() == true {
@ -85,7 +85,7 @@ func (c *configManager) loadCrawlerConfig(root string, dir string) {
currentDir := root + separator + dir currentDir := root + separator + dir
files, err := ioutil.ReadDir(currentDir) files, err := ioutil.ReadDir(currentDir)
if err != nil { if err != nil {
log.Panic(err) log.Error(err)
} }
for _, file := range files { for _, file := range files {
@ -96,7 +96,7 @@ func (c *configManager) loadCrawlerConfig(root string, dir string) {
} else { } else {
b, err := ioutil.ReadFile(currentDir + separator + file.Name()) b, err := ioutil.ReadFile(currentDir + separator + file.Name())
if err != nil { if err != nil {
log.Panic(err) log.Error(err)
} }
var m = config_manager.Config{} var m = config_manager.Config{}
json.Unmarshal(b, &m) json.Unmarshal(b, &m)
@ -113,7 +113,7 @@ func (c *configManager) addConfig(tmp string) {
b, err := ioutil.ReadFile(path) b, err := ioutil.ReadFile(path)
if err != nil { if err != nil {
// error process // error process
log.Panic(err) log.Error(err)
} }
// 임시파일을 로드 , Config로 변환 // 임시파일을 로드 , Config로 변환
@ -121,7 +121,7 @@ func (c *configManager) addConfig(tmp string) {
err = json.Unmarshal(b, &m) err = json.Unmarshal(b, &m)
if err != nil { if err != nil {
// error process // error process
log.Panic(err) log.Error(err)
} }
// agent 폴더 / config / crawler / .. / .. / .. / 에 해당하는 파일이 있는지 확인, 있다면 삭제 // agent 폴더 / config / crawler / .. / .. / .. / 에 해당하는 파일이 있는지 확인, 있다면 삭제
@ -133,7 +133,7 @@ func (c *configManager) addConfig(tmp string) {
err = os.Remove(path) err = os.Remove(path)
if err != nil { if err != nil {
// error process // error process
log.Panic(err) log.Error(err)
} }
// Config 맵에 저장 // Config 맵에 저장
@ -162,7 +162,7 @@ func (c *configManager) removeConfig(id string) {
err := os.Remove(path) err := os.Remove(path)
if err != nil { if err != nil {
// error check // error check
log.Panic(err) log.Error(err)
} }
// 해당 id 삭제 // 해당 id 삭제

4
config_manager/config_manager_test.go
View File

@ -7,9 +7,9 @@ import (
"git.loafle.net/overflow/overflow_probe/agent_api/config_manager" "git.loafle.net/overflow/overflow_probe/agent_api/config_manager"
"git.loafle.net/overflow/overflow_probe/agent_api/messages" "git.loafle.net/overflow/overflow_probe/agent_api/messages"
"git.loafle.net/overflow/overflow_probe/agent_api/observer" "git.loafle.net/overflow/overflow_probe/agent_api/observer"
log "github.com/cihub/seelog"
"github.com/google/uuid" "github.com/google/uuid"
"io/ioutil" "io/ioutil"
"log"
"time" "time"
) )
@ -41,7 +41,7 @@ func TestAddConfig(t *testing.T) {
// 원본 테스트 설정 파일 로드 // 원본 테스트 설정 파일 로드
b, err := ioutil.ReadFile("/root/gowork/src/git.loafle.net/overflow/overflow_probe/config_manager/test_agent/test.json") b, err := ioutil.ReadFile("/root/gowork/src/git.loafle.net/overflow/overflow_probe/config_manager/test_agent/test.json")
if err != nil { if err != nil {
log.Panic(err) log.Error(err)
} }
var m = config_manager.Config{} var m = config_manager.Config{}
json.Unmarshal(b, &m) json.Unmarshal(b, &m)

4
crawler/crawler.go
View File

@ -5,7 +5,7 @@ import (
"errors" "errors"
config "git.loafle.net/overflow/overflow_probe/agent_api/config_manager" config "git.loafle.net/overflow/overflow_probe/agent_api/config_manager"
"log" log "github.com/cihub/seelog"
) )
type Internal interface { type Internal interface {
@ -33,7 +33,7 @@ func (c *CrawlerImpl) Init(data []byte) ([]byte, error) {
_, err := c.Add(data) _, err := c.Add(data)
if err != nil { if err != nil {
log.Fatal(err) log.Error(err)
} }
// load all file in path // load all file in path

4
matcher/activedirectory/activedirectory.go
View File

@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

4
matcher/cassandra/cassandra.go
View File

@ -3,8 +3,8 @@ package cassandra
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

2
matcher/dhcp/dhcp.go
View File

@ -6,7 +6,7 @@ package dhcp
// "encoding/binary" // "encoding/binary"
// "fmt" // "fmt"
// log "github.com/cihub/seelog" // log "github.com/cihub/seelog"
// "git.loafle.net/overflow/overflow_probe/commons_go/matcher" // "git.loafle.net/overflow/overflow_probe/matcher"
// "net" // "net"
// "time" // "time"
//) //)

4
matcher/dns/dns.go
View File

@ -3,8 +3,8 @@ package dns
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
type Dns_frame_header struct { type Dns_frame_header struct {

4
matcher/ftp/ftp.go
View File

@ -1,8 +1,8 @@
package ftp package ftp
import ( import (
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
log "github.com/cihub/seelog" log "github.com/cihub/seelog"
) )

4
matcher/http/http.go
View File

@ -1,8 +1,8 @@
package http package http
import ( import (
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
"strings" "strings"
) )

4
matcher/imap/imap.go
View File

@ -1,8 +1,8 @@
package imap package imap
import ( import (
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

4
matcher/ldap/ldap.go
View File

@ -3,8 +3,8 @@ package ldap
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
type LDAPMatcher struct { type LDAPMatcher struct {

6
matcher/matcher.go
View File

@ -12,9 +12,9 @@ import (
//"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/mssql" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/mssql"
//"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/mysql" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/mysql"
//"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/netbios" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/netbios"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/oracle" "git.loafle.net/overflow/overflow_probe/matcher/oracle"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
//"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/pop" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/pop"
//"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/redis" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/redis"
//"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/rmi" //"git.loafle.net/overflow/overflow_probe/collector/core/scan/service/matcher/rmi"

4
matcher/mongodb/mongodb.go
View File

@ -5,8 +5,8 @@ import (
"encoding/binary" "encoding/binary"
"math/rand" "math/rand"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

4
matcher/mssql/mssql.go
View File

@ -3,8 +3,8 @@ package mssql
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

4
matcher/mysql/mysql.go
View File

@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"fmt" "fmt"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
"strconv" "strconv"
"strings" "strings"
) )

4
matcher/netbios/netbios.go
View File

@ -3,8 +3,8 @@ package netbios
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

4
matcher/oracle/oracle.go
View File

@ -3,8 +3,8 @@ package oracle
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
type OracleMatcher struct { type OracleMatcher struct {

4
matcher/pgsql/pgsql.go
View File

@ -3,8 +3,8 @@ package pgsql
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
"strings" "strings"
) )

2
matcher/pgsql/pgsql_test.go
View File

@ -2,7 +2,7 @@ package pgsql
import ( import (
"crypto/tls" "crypto/tls"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"net" "net"
"testing" "testing"
) )

4
matcher/pop/pop.go
View File

@ -1,8 +1,8 @@
package pop package pop
import ( import (
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

4
matcher/redis/redis.go
View File

@ -1,8 +1,8 @@
package redis package redis
import ( import (
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
"strings" "strings"
) )

4
matcher/redis/redisProtected.go
View File

@ -1,8 +1,8 @@
package redis package redis
import ( import (
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

4
matcher/rmi/rmi.go
View File

@ -3,8 +3,8 @@ package rmi
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

4
matcher/smb/smb.go
View File

@ -3,8 +3,8 @@ package smb
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
"strings" "strings"
) )

4
matcher/smtp/smtp.go
View File

@ -1,8 +1,8 @@
package smtp package smtp
import ( import (
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
"strings" "strings"
) )

4
matcher/snmp/snmpv2.go
View File

@ -3,8 +3,8 @@ package snmp
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

4
matcher/snmp/snmpv3.go
View File

@ -3,8 +3,8 @@ package snmp
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
type snmpv3GlobalData struct { type snmpv3GlobalData struct {

4
matcher/ssh/ssh.go
View File

@ -1,8 +1,8 @@
package ssh package ssh
import ( import (
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
"strings" "strings"
) )

4
matcher/telnet/telnet.go
View File

@ -1,8 +1,8 @@
package telnet package telnet
import ( import (
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (

4
matcher/wmi/wmi.go
View File

@ -3,8 +3,8 @@ package wmi
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"git.loafle.net/overflow/overflow_probe/commons_go/matcher/packet" "git.loafle.net/overflow/overflow_probe/matcher/packet"
"git.loafle.net/overflow/overflow_probe/commons_go/model/scaninfo" "git.loafle.net/overflow/overflow_probe/model/scaninfo"
) )
const ( const (