Skip to content

Update artifactlib #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2022
Merged

Update artifactlib #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.16
require (
crawshaw.io/sqlite v0.3.2
github.com/fatih/structs v1.1.0
github.com/forensicanalysis/artifactlib v0.15.2
github.com/forensicanalysis/artifactlib v0.16.1
github.com/forensicanalysis/artifactsgo v0.6.7
github.com/forensicanalysis/forensicstore v0.18.2
github.com/forensicanalysis/fslib v0.15.1
Expand Down
7 changes: 3 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,15 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
github.com/forensicanalysis/artifactlib v0.14.3/go.mod h1:cQMIT+lQV38v7GqCza9OA9cemHPEA+Egti663ohsLBs=
github.com/forensicanalysis/artifactlib v0.15.2 h1:s4OyM97pa706/y1d9ielqrJOrN4RDKQjvj+scowR8VU=
github.com/forensicanalysis/artifactlib v0.15.2/go.mod h1:qgZmk9Hb6+WNoJ4TjNDHI0Q9D6Q/lxy1Yr7dMaaaB3k=
github.com/forensicanalysis/artifactlib v0.16.1 h1:XfrnMhrrcdNXFeNIoYQS6bU7ogqIJI4W8XG/bPOMszo=
github.com/forensicanalysis/artifactlib v0.16.1/go.mod h1:RSyFzcyTMfASZyzZXQfZVYq7J+OmpiQwU5JmBReXJpI=
github.com/forensicanalysis/artifactsgo v0.6.7 h1:vnmGXS6z0FQ8RRZbQJ03cGeUbKO190b5SNOQVcti4Q4=
github.com/forensicanalysis/artifactsgo v0.6.7/go.mod h1:byDLH6tAhXe/SwPnOgsJTgrAXpFIQwEnzhwCreoPjh4=
github.com/forensicanalysis/forensicstore v0.18.2 h1:aaytkMs9yt28oj+khetml/+RyLWk3s7rKE++KLBBkXs=
github.com/forensicanalysis/forensicstore v0.18.2/go.mod h1:CeY47pfGTlSpJvCvSKublTVMLcmC/+sM/AoCoLWvpfw=
github.com/forensicanalysis/fsdoublestar v0.1.0 h1:t0SuwumE5FQtrw1ZkkNhxQbaWn8LywqdnCpEBX0n/Fc=
github.com/forensicanalysis/fsdoublestar v0.1.0/go.mod h1:UpG3oKY5UiFTnbxqp4/1h6WuaDtlPZcL6Hu5yI3DsL0=
github.com/forensicanalysis/fslib v0.14.8/go.mod h1:NUTzwx+QvyMDNmApTc094Jwhf5jJJsos6yLBghPT95s=
github.com/forensicanalysis/fslib v0.15.0/go.mod h1:Ih/gIc8wQEOGCV6nEGOThSCA2yPCQ7y3McOIM6zoSYE=
github.com/forensicanalysis/fslib v0.15.1 h1:mB30Tn2xwW6+nvV6FLbKqz1BYtHJpt3j3oyHpXGrJCQ=
github.com/forensicanalysis/fslib v0.15.1/go.mod h1:cFsrRmnHRJkAE4Gbshk8N1myWx1BB7zT/u9+RnPH22M=
github.com/forensicanalysis/stixgo v0.1.1 h1:17XY2BD8b0wrYTCi+ekxVIFfWoKOw+HwvmN5YJtkoRY=
Expand Down Expand Up @@ -146,8 +145,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/ledongthuc/pdf v0.0.0-20200323191019-23c5852adbd2/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
github.com/looplab/tarjan v0.0.0-20161115091335-9cc6d6cebfb5 h1:vftH1+M/WLO9G/fKoaNF2lXss91zJWSqtWNZcbDi+6A=
github.com/looplab/tarjan v0.0.0-20161115091335-9cc6d6cebfb5/go.mod h1:UdhGtNhHaLG+AAsRpyd4g+zJTgciwo+qwK6FJAoCQFU=
github.com/looplab/tarjan v0.1.0/go.mod h1:3CvPAapzS1ESsE1ql7MXbad+ENQS21SsfatXQpXFqEo=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
Expand Down
12 changes: 1 addition & 11 deletions scripts/yaml2go/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,22 +121,12 @@ func main() {
}

// decode file
var flaws []goartifacts.Flaw
for _, filename := range artifactDefinitionFiles {
ads, typeflaw, err := goartifacts.DecodeFile(filename)
ads, _, err := goartifacts.DecodeFile(filename)
if err != nil {
log.Fatal(err)
}
artifactDefinitionMap[filename] = ads
flaws = append(flaws, typeflaw...)
}

// validate
flaws = append(flaws, goartifacts.ValidateArtifactDefinitions(artifactDefinitionMap)...)
for _, flaw := range flaws {
if flaw.Severity != goartifacts.Common && !strings.Contains(flaw.Message, "Error open default.yaml") {
log.Println(flaw.File, flaw.ArtifactDefinition, ":", flaw.Message)
}
}

err = createGoFile("assets", "artifacts", artifactDefinitions)
Expand Down