add: [init] first code push - not functional
parent
a580fc433a
commit
4c95d22db2
|
@ -1,15 +1,5 @@
|
||||||
# Binaries for programs and plugins
|
# Log files
|
||||||
*.exe
|
*.log
|
||||||
*.exe~
|
|
||||||
*.dll
|
|
||||||
*.so
|
|
||||||
*.dylib
|
|
||||||
|
|
||||||
# Test binary, built with `go test -c`
|
# Binary
|
||||||
*.test
|
analyzer-d4-log
|
||||||
|
|
||||||
# Output of the go coverage tool, specifically when used with LiteIDE
|
|
||||||
*.out
|
|
||||||
|
|
||||||
# Dependency directories (remove the comment below to include it)
|
|
||||||
# vendor/
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
127.0.0.1:8080
|
|
@ -0,0 +1 @@
|
||||||
|
localhost:6380/2
|
|
@ -0,0 +1 @@
|
||||||
|
0894517855f047d2a77b4473d3a9cc5b
|
|
@ -0,0 +1,8 @@
|
||||||
|
module github.com/D4-project/analyzer-d4-log
|
||||||
|
|
||||||
|
go 1.13
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/D4-project/d4-golang-utils v0.0.0-20200108150548-740f16240125
|
||||||
|
github.com/gomodule/redigo v2.0.0+incompatible
|
||||||
|
)
|
|
@ -0,0 +1,5 @@
|
||||||
|
github.com/D4-project/d4-golang-utils v0.0.0-20200108150548-740f16240125 h1:iv+hcdT+M0XJIDEoCtvk9HVvI8PgvbQNBtbEfCczCRI=
|
||||||
|
github.com/D4-project/d4-golang-utils v0.0.0-20200108150548-740f16240125/go.mod h1:2rq8KBQnNNDocwc/49cnpaqoQA/komoSHKom7ynvqJc=
|
||||||
|
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
|
||||||
|
github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
|
||||||
|
github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
|
|
@ -0,0 +1 @@
|
||||||
|
package logparser
|
|
@ -0,0 +1,77 @@
|
||||||
|
package logparser
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
"regexp"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
var expected = map[int]map[string]string{
|
||||||
|
0: map[string]string{
|
||||||
|
"date": "Jan 22 11:59:37",
|
||||||
|
"host": "sigmund",
|
||||||
|
"username": "git",
|
||||||
|
"src": "106.12.14.144",
|
||||||
|
},
|
||||||
|
1: map[string]string{
|
||||||
|
"date": "Jan 22 11:37:19",
|
||||||
|
"host": "sigmund",
|
||||||
|
"username": "gestion",
|
||||||
|
"src": "159.89.153.54",
|
||||||
|
},
|
||||||
|
2: map[string]string{
|
||||||
|
"date": "Jan 22 11:34:46",
|
||||||
|
"host": "sigmund",
|
||||||
|
"username": "atpco",
|
||||||
|
"src": "177.152.124.21",
|
||||||
|
},
|
||||||
|
3: map[string]string{
|
||||||
|
"date": "Jan 22 11:33:07",
|
||||||
|
"host": "sigmund",
|
||||||
|
"username": "ki",
|
||||||
|
"src": "49.233.183.158",
|
||||||
|
},
|
||||||
|
4: map[string]string{
|
||||||
|
"date": "Jan 22 11:29:16",
|
||||||
|
"host": "sigmund",
|
||||||
|
"username": "admin",
|
||||||
|
"src": "185.56.8.191",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSshdParser(t *testing.T) {
|
||||||
|
// Opening sshd test file
|
||||||
|
fmt.Println("[+] Testing the sshd log parser")
|
||||||
|
f, err := os.Open("./test.log")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("Error opening test file: %v", err)
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
scanner := bufio.NewScanner(f)
|
||||||
|
c := 0
|
||||||
|
for scanner.Scan() {
|
||||||
|
re := regexp.MustCompile(`^(?P<date>[[:alpha:]]{3}\s\d{2}\s\d{2}:\d{2}:\d{2}) (?P<host>[[:word:]]+) sshd\[[[:alnum:]]+\]: Invalid user (?P<username>[[:word:]]+) from (?P<src>.*$)`)
|
||||||
|
n1 := re.SubexpNames()
|
||||||
|
r2 := re.FindAllStringSubmatch(scanner.Text(), -1)[0]
|
||||||
|
|
||||||
|
// Build the group map for the line
|
||||||
|
md := map[string]string{}
|
||||||
|
for i, n := range r2 {
|
||||||
|
// fmt.Printf("%d. match='%s'\tname='%s'\n", i, n, n1[i])
|
||||||
|
md[n1[i]] = n
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check against the expected map
|
||||||
|
for _, n := range n1 {
|
||||||
|
if n != "" {
|
||||||
|
if md[n] != expected[c][n] {
|
||||||
|
t.Errorf("%v = '%v'; want '%v'", n, md[n], expected[c][n])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c++
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,5 @@
|
||||||
|
Jan 22 11:59:37 sigmund sshd[26514]: Invalid user git from 106.12.14.144
|
||||||
|
Jan 22 11:37:19 sigmund sshd[26143]: Invalid user gestion from 159.89.153.54
|
||||||
|
Jan 22 11:34:46 sigmund sshd[26125]: Invalid user atpco from 177.152.124.21
|
||||||
|
Jan 22 11:33:07 sigmund sshd[26109]: Invalid user ki from 49.233.183.158
|
||||||
|
Jan 22 11:29:16 sigmund sshd[26091]: Invalid user admin from 185.56.8.191
|
|
@ -0,0 +1,108 @@
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"flag"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
"os/signal"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
config "github.com/D4-project/d4-golang-utils/config"
|
||||||
|
"github.com/gomodule/redigo/redis"
|
||||||
|
)
|
||||||
|
|
||||||
|
type (
|
||||||
|
conf struct {
|
||||||
|
redisHost string
|
||||||
|
redisPort string
|
||||||
|
redisDB int
|
||||||
|
redisQueue string
|
||||||
|
httpHost string
|
||||||
|
httpPort string
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// Setting up flags
|
||||||
|
var (
|
||||||
|
confdir = flag.String("c", "conf.sample", "configuration directory")
|
||||||
|
cr redis.Conn
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
sortie := make(chan os.Signal, 1)
|
||||||
|
signal.Notify(sortie, os.Interrupt, os.Kill)
|
||||||
|
// Signal goroutine
|
||||||
|
go func() {
|
||||||
|
<-sortie
|
||||||
|
fmt.Println("Exiting.")
|
||||||
|
log.Println("Exit")
|
||||||
|
os.Exit(0)
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Setting up log file
|
||||||
|
f, err := os.OpenFile("analyzer-d4-log.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatalf("error opening file: %v", err)
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
log.SetOutput(f)
|
||||||
|
log.Println("Init")
|
||||||
|
|
||||||
|
// Usage and flags
|
||||||
|
flag.Usage = func() {
|
||||||
|
fmt.Printf("analyzer-d4-log:\n\n")
|
||||||
|
fmt.Printf(" Generate statistics about logs collected through d4 in\n")
|
||||||
|
fmt.Printf(" HTML format. Optionally serves the results over HTTP.\n")
|
||||||
|
fmt.Printf("\n")
|
||||||
|
flag.PrintDefaults()
|
||||||
|
fmt.Printf("\n")
|
||||||
|
fmt.Printf("The configuration directory should hold the following files\n")
|
||||||
|
fmt.Printf("to specify the settings to use:\n\n")
|
||||||
|
fmt.Printf(" mandatory: redis - host:port/db\n")
|
||||||
|
fmt.Printf(" mandatory: redis_queue - uuid\n")
|
||||||
|
fmt.Printf(" optional: http_server - host:port\n\n")
|
||||||
|
fmt.Printf("See conf.sample for an example.\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Config
|
||||||
|
c := conf{}
|
||||||
|
flag.Parse()
|
||||||
|
if flag.NFlag() == 0 || *confdir == "" {
|
||||||
|
flag.Usage()
|
||||||
|
os.Exit(1)
|
||||||
|
} else {
|
||||||
|
*confdir = strings.TrimSuffix(*confdir, "/")
|
||||||
|
*confdir = strings.TrimSuffix(*confdir, "\\")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse Redis Config
|
||||||
|
tmp := config.ReadConfigFile(*confdir, "redis")
|
||||||
|
ss := strings.Split(string(tmp), "/")
|
||||||
|
if len(ss) <= 1 {
|
||||||
|
log.Fatal("Missing Database in Redis config: should be host:port/database_name")
|
||||||
|
}
|
||||||
|
c.redisDB, _ = strconv.Atoi(ss[1])
|
||||||
|
var ret bool
|
||||||
|
ret, ss[0] = config.IsNet(ss[0])
|
||||||
|
if !ret {
|
||||||
|
sss := strings.Split(string(ss[0]), ":")
|
||||||
|
c.redisHost = sss[0]
|
||||||
|
c.redisPort = sss[1]
|
||||||
|
}
|
||||||
|
c.redisQueue = string(config.ReadConfigFile(*confdir, "redis_queue"))
|
||||||
|
initRedis(c.redisHost, c.redisPort, c.redisDB)
|
||||||
|
defer cr.Close()
|
||||||
|
|
||||||
|
log.Println("Exit")
|
||||||
|
}
|
||||||
|
|
||||||
|
func initRedis(host string, port string, d int) {
|
||||||
|
err := errors.New("")
|
||||||
|
cr, err = redis.Dial("tcp", host+":"+port, redis.DialDatabase(d))
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue