Update of package golang-utils

0xrawsec · Sep 26, 2021 · 1e96558 · 1e96558
1 parent 0b635fe
commit 1e96558
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/evtx/chunk.go b/evtx/chunk.go
@@ -116,8 +116,8 @@ func (c *Chunk) ParseChunkHeader(reader io.ReadSeeker) {
 }
 
 // Less implement datastructs.Sortable
-func (c Chunk) Less(s *datastructs.Sortable) bool {
-	other := (*s).(Chunk)
+func (c Chunk) Less(s datastructs.Sortable) bool {
+	other := s.(Chunk)
 	return c.Header.NumFirstRecLog < other.Header.NumFirstRecLog
 }
 
@@ -258,7 +258,7 @@ func (c *Chunk) Events() (cgem chan *GoEvtxMap) {
 func (c Chunk) String() string {
 	templateOffsets := make([]int32, len(c.TemplateTable))
 	i := 0
-	for to, _ := range c.TemplateTable {
+	for to := range c.TemplateTable {
 		templateOffsets[i] = to
 		i++
 	}

diff --git a/evtx/parser.go b/evtx/parser.go
@@ -284,7 +284,7 @@ func ParseValueReader(vd ValueDescriptor, reader io.ReadSeeker) (Element, error)
 		elt, err = Parse(reader, nil, true)
 		if err != nil {
 			//panic(err)
-			log.LogError(err)
+			log.Error(err)
 			log.DebugDontPanic(err)
 		}
 		return elt, err

diff --git a/evtx/structs.go b/evtx/structs.go
@@ -521,7 +521,7 @@ func (ti *TemplateInstance) ElementToGoEvtx(elt Element) GoEvtxElement {
 			if !ModeCarving {
 				panic(err)
 			} else {
-				log.LogError(err)
+				log.Error(err)
 				return nil
 			}
 		}
@@ -532,7 +532,7 @@ func (ti *TemplateInstance) ElementToGoEvtx(elt Element) GoEvtxElement {
 		if !ModeCarving {
 			panic(err)
 		} else {
-			log.LogError(err)
+			log.Error(err)
 			return nil
 		}
 	}

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/0xrawsec/golang-evtx
 go 1.12
 
 require (
-	github.com/0xrawsec/golang-utils v1.2.0
+	github.com/0xrawsec/golang-utils v1.3.0
 	github.com/0xrawsec/golang-win32 v1.0.6
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/segmentio/kafka-go v0.2.2

diff --git a/go.sum b/go.sum
@@ -4,6 +4,8 @@ github.com/0xrawsec/golang-utils v1.1.3 h1:ESJhyY4aGuiP4hmDcDNjoL/cc7SWDZVfgg4dE
 github.com/0xrawsec/golang-utils v1.1.3/go.mod h1:DADTtCFY10qXjWmUVhhJqQIZdSweaHH4soYUDEi8mj0=
 github.com/0xrawsec/golang-utils v1.2.0 h1:wzPUcLLcx2NPV9txupkn7+KXOUuVG4zaKZ/Y5s7GJZQ=
 github.com/0xrawsec/golang-utils v1.2.0/go.mod h1:DADTtCFY10qXjWmUVhhJqQIZdSweaHH4soYUDEi8mj0=
+github.com/0xrawsec/golang-utils v1.3.0 h1:fMgwKu5M2PXFwEfwN9B2T1bfg7LPCaV9fL6Xs/nf2Ps=
+github.com/0xrawsec/golang-utils v1.3.0/go.mod h1:DADTtCFY10qXjWmUVhhJqQIZdSweaHH4soYUDEi8mj0=
 github.com/0xrawsec/golang-win32 v1.0.6 h1:wVvfd+trSeUkG6m5TFzeBtWHSHetfhPO3b5MVjTgsWk=
 github.com/0xrawsec/golang-win32 v1.0.6/go.mod h1:MAxVU7dr8lujwknuhf4TwjYm8tVEELi2zwx1zDTu/RM=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=

diff --git a/tools/evtxdump/evtxdump.go b/tools/evtxdump/evtxdump.go
@@ -82,10 +82,10 @@ type stats struct {
 }
 
 // stats contstructor
-func newStats() stats {
+func newStats() *stats {
 	s := stats{}
 	s.ChannelStats = make(map[string]eventIDStat)
-	return s
+	return &s
 }
 
 // update stats in a stat sturcture
@@ -162,13 +162,13 @@ func carveFile(datafile string, offset int64, limit int) {
 	chunkCnt := 0
 	f, err := os.Open(datafile)
 	if err != nil {
-		log.LogErrorAndExit(err)
+		log.Abort(ExitFail, err)
 	}
 	defer f.Close()
 	f.Seek(offset, os.SEEK_SET)
 	dup, err := os.Open(datafile)
 	if err != nil {
-		log.LogErrorAndExit(err)
+		log.Abort(ExitFail, err)
 	}
 	defer dup.Close()
 	dup.Seek(offset, os.SEEK_SET)
@@ -177,7 +177,7 @@ func carveFile(datafile string, offset int64, limit int) {
 		log.Infof("Parsing Chunk @ Offset: %d (0x%08[1]x)", offset)
 		chunk, err := fetchChunkFromReader(dup, offset)
 		if err != nil {
-			log.LogError(err)
+			log.Error(err)
 		}
 		for e := range chunk.Events() {
 			printEvent(e)
@@ -281,7 +281,7 @@ func main() {
 		defer func() {
 			f, err := os.Create(memprofile)
 			if err != nil {
-				log.LogErrorAndExit(err)
+				log.Abort(ExitFail, err)
 			}
 			pprof.WriteHeapProfile(f)
 			f.Close()
@@ -291,11 +291,11 @@ func main() {
 	if cpuprofile != "" {
 		f, err := os.Create(cpuprofile)
 		if err != nil {
-			log.LogErrorAndExit(err)
+			log.Abort(ExitFail, err)
 		}
 		err = pprof.StartCPUProfile(f)
 		if err != nil {
-			log.LogErrorAndExit(err)
+			log.Abort(ExitFail, err)
 		}
 		defer func() {
 			pprof.StopCPUProfile()

diff --git a/tools/evtxmon/evtxmon.go b/tools/evtxmon/evtxmon.go
@@ -242,7 +242,7 @@ func main() {
 		stop := make(chan bool, 1)
 		ef, err := evtx.Open(evtxfile)
 		if err != nil && err != evtx.ErrDirtyFile {
-			log.LogErrorAndExit(err)
+			log.Abort(ExitFailure, err)
 		}
 
 		if statsFlag {