Skip to content

Commit

Permalink
Fix security vulnerability in gopkg.yaml.v1 by upgrading to v3
Browse files Browse the repository at this point in the history
(even though it is only used during testing)
  • Loading branch information
middelink committed Feb 7, 2023
1 parent dd6973d commit e9bec52
Show file tree
Hide file tree
Showing 27 changed files with 3,212 additions and 1,680 deletions.
10 changes: 1 addition & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,7 @@ language: go

matrix:
include:
- go: "1.10.x"
script:
- go vet -v .
- $HOME/gopath/bin/goveralls -service=travis-ci
- go: "1.11.x"
script:
- go vet -v -mod=vendor .
- $HOME/gopath/bin/goveralls -service=travis-ci
- go: "1.12.x"
- go: "1.20.x"
script:
- go vet -v -mod=vendor .
- $HOME/gopath/bin/goveralls -service=travis-ci
Expand Down
2 changes: 1 addition & 1 deletion config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

func TestFlagOverride(t *testing.T) {
Expand Down
9 changes: 6 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
module github.com/middelink/mikrotik-fwban

go 1.15
go 1.20

require (
github.com/go-routeros/routeros v0.0.0-20190727190637-9419d2537732
github.com/google/gops v0.3.5
github.com/howeyc/fsnotify v0.9.0
github.com/jeromer/syslogparser v0.0.0-20180622150051-323c7ad120db
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.2.2
launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gopkg.in/gcfg.v1 v1.2.3 h1:m8OOJ4ccYHnx2f4gQwpno8nAX5OGOh7RLaaz0pj3Ogs=
gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54=
launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM=
12 changes: 0 additions & 12 deletions vendor/gopkg.in/yaml.v2/.travis.yml

This file was deleted.

201 changes: 0 additions & 201 deletions vendor/gopkg.in/yaml.v2/LICENSE

This file was deleted.

0 comments on commit e9bec52

Please sign in to comment.