From 58f331004f4b50138434884e7f96382fdcf0fc2f Mon Sep 17 00:00:00 2001 From: Jinsoo Heo Date: Sat, 15 Aug 2026 11:53:13 +0900 Subject: [PATCH] security: [sc-19289] bump vulnerable dependencies golang.org/x/crypto v0.31.0 -> v0.52.0, clearing 7 open critical alerts. x/sys moves with it. go directive 1.24.0 -> 1.25.13. x/crypto v0.52.0 only requires 1.25.0, but Go 1.25.0 is itself affected by GO-2026-5856 (crypto/tls, fixed 1.25.12) and GO-2026-6091 (html/template, fixed 1.25.13). 1.25.13 is the lowest 1.25 patch clearing both, so the bump does not ship a knowingly vulnerable stdlib. CI matrix 1.24.x -> 1.25.x to match the directive. Lint had to move too: v1.64 cannot target a 1.25 module. .golangci.yml converted to v2 with `golangci-lint migrate`, which succeeded cleanly here (217 lines -> 123). The action itself is bumped as well, since the older one passes an out-format flag that v2 removed. Verified: go build, go vet, go test and golangci-lint v2.12.2 all pass, the last with 0 issues. --- .github/workflows/tests.yml | 8 +- .golangci.yml | 291 ++++++++++++------------------------ go.mod | 6 +- go.sum | 8 +- 4 files changed, 110 insertions(+), 203 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e7644b3..72eebeb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: name: Code Linting & Unit Tests strategy: matrix: - go-version: [ 1.24.x ] + go-version: [ 1.25.x ] os: [ ubuntu-latest ] runs-on: ${{ matrix.os }} steps: @@ -25,9 +25,11 @@ jobs: with: go-version: ${{ matrix.go-version }} - name: Linting Code - uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 + # The older action invokes the linter with an out-format flag that + # golangci-lint v2 removed, so the action has to move with the version. + uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0 with: - version: v1.64 + version: v2.12.2 args: --timeout=10m0s - name: Build All Binaries run: go build ./... diff --git a/.golangci.yml b/.golangci.yml index 10ac4f2..96272e3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,218 +1,123 @@ -# Copied and modified from https://github.com/golangci/golangci-lint/blob/v1.27.0/.golangci.example.yml - -# options for analysis running +version: "2" run: - # include test files or not, default is true - tests: false - - # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules": - # If invoked with -mod=readonly, the go command is disallowed from the implicit - # automatic updating of go.mod described above. Instead, it fails when any changes - # to go.mod are needed. This setting is most useful to check that go.mod does - # not need updates, such as in a continuous integration and testing system. - # If invoked with -mod=vendor, the go command assumes that the vendor - # directory holds the correct copies of dependencies and ignores - # the dependency descriptions in go.mod. modules-download-mode: readonly - + tests: false output: - # The formats used to render issues. - # Formats: - # - `colored-line-number` - # - `line-number` - # - `json` - # - `colored-tab` - # - `tab` - # - `html` - # - `checkstyle` - # - `code-climate` - # - `junit-xml` - # - `junit-xml-extended` - # - `github-actions` - # - `teamcity` - # - `sarif` - # Output path can be either `stdout`, `stderr` or path to the file to write to. - # - # For the CLI flag (`--out-format`), multiple formats can be specified by separating them by comma. - # The output can be specified for each of them by separating format name and path by colon symbol. - # Example: "--out-format=checkstyle:report.xml,json:stdout,colored-line-number" - # The CLI flag (`--out-format`) override the configuration file. - # - # Default: - # formats: - # - format: colored-line-number - # path: stdout formats: - - format: colored-line-number - -# all available settings of specific linters -linters-settings: - dogsled: - # checks assignments with too many blank identifiers; default is 2 - max-blank-identifiers: 2 - dupl: - # tokens count to trigger issue, 150 by default - threshold: 150 - errcheck: - # report about not checking of errors in type assertions: `a := b.(MyStruct)`; - # default is false: such cases aren't reported by default. - check-type-assertions: false - - # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`; - # default is false: such cases aren't reported by default. - check-blank: false - - # path to a file containing a list of functions to exclude from checking - # see https://github.com/kisielk/errcheck#excluding-functions for details - #exclude: /path/to/file.txt - funlen: - lines: 200 - statements: 50 - gocyclo: - # minimal code complexity to report, 30 by default (but we recommend 10-20) - min-complexity: 20 - godot: - # check all top-level comments, not only declarations - check-all: false - goimports: - # put imports beginning with prefix after 3rd-party packages; - # it's a comma-separated list of prefixes - local-prefixes: github.com/chronicleprotocol/suite - # TODO: replace `make test-license` with goheader - #goheader: - # template-path: ./LICENSE_HEADER - govet: - disable: - - shadow # disabled due to false-positives which can't be ignored using "nolint" - # settings per analyzer - settings: - printf: # analyzer name, run `go tool vet help` to see all analyzers - funcs: # run `go tool vet help printf` to see available settings for `printf` analyzer - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf - - # enable or disable analyzers by name - enable: - - atomicalign - enable-all: false - disable-all: false - lll: - # max line length, lines longer will be reported. Default is 120. - # '\t' is counted as 1 character by default, and can be changed with the tab-width option - line-length: 150 - # tab width in spaces. Default to 1. - tab-width: 1 - nakedret: - # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 - max-func-lines: 30 - unparam: - # Inspect exported functions, default is false. Set to true if no external program/library imports your code. - # XXX: if you enable this setting, unparam will report a lot of false-positives in text editors: - # if it's called for subdir of a project it can't find external interfaces. All text editor integrations - # with golangci-lint call it on a directory with the changed file. - check-exported: false - unused: - # Mark all exported fields as used. - # default: true - exported-fields-are-used: false - whitespace: - multi-if: true # Enforces newlines (or comments) after every multi-line if statement - multi-func: false # Enforces newlines (or comments) after every multi-line function signature - + text: + path: stdout linters: - # please, do not use `enable-all`: it's deprecated and will be removed soon. - # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint - disable-all: true + default: none enable: - bodyclose - #- depguard - dogsled - #- dupl - errcheck - #- funlen - goconst - gocritic - #- gocyclo - - gofmt - #- goheader - #- goimports - #- revive - #- mnd - goprintffuncname - gosec - - gosimple - govet - ineffassign - #- interfacer - lll - nakedret - nolintlint - #- rowserrcheck - staticcheck - #- structcheck - - stylecheck - - typecheck - unconvert - unparam - unused - whitespace - - # don't enable: - # - misspell - # - gochecknoinits - # - asciicheck - # - exhaustive - # - gochecknoglobals - # - gocognit - # - godot - # - godox - # - goerr113 - # - prealloc - # - testpackage - # - wsl - + settings: + dogsled: + max-blank-identifiers: 2 + dupl: + threshold: 150 + errcheck: + check-type-assertions: false + check-blank: false + funlen: + lines: 200 + statements: 50 + gocyclo: + min-complexity: 20 + govet: + enable: + - atomicalign + disable: + - shadow + enable-all: false + disable-all: false + settings: + printf: + funcs: + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf + lll: + line-length: 150 + tab-width: 1 + nakedret: + max-func-lines: 30 + unparam: + check-exported: false + unused: + exported-fields-are-used: false + whitespace: + multi-if: true + multi-func: false + exclusions: + generated: lax + presets: + - comments + - common-false-positives + - legacy + - std-error-handling + rules: + - linters: + - dupl + - errcheck + - funlen + - gosec + - lll + - mnd + - scopelint + - unused + path: /mocks/ + - linters: + - dupl + path: exchange/ + - path: cmd/ + text: logging is allowed only by pkg/log + - path: pkg/log/ + text: logging is allowed only by pkg/log + - path: (.+)\.go$ + text: .*github.com/chronicleprotocol/suite/pkg/ethereum.*is deprecated.* + - path: (.+)\.go$ + text: .*Use ethereumv2 package instead.* + paths: + - bin + - testdata + - testutil + - e2e + - third_party$ + - builtin$ + - examples$ issues: - exclude: - - '.*github.com/chronicleprotocol/suite/pkg/ethereum.*is deprecated.*' - - '.*Use ethereumv2 package instead.*' - exclude-rules: - - path: /mocks/ - linters: - - dupl - - funlen - - mnd - - lll - - scopelint - - unused - - errcheck - - gosec - - path: exchange/ - linters: - - dupl - - path: cmd/ - text: "logging is allowed only by pkg/log" - - path: pkg/log/ - text: "logging is allowed only by pkg/log" - # Which dirs to exclude: issues from them won't be reported. - # Can use regexp here: `generated.*`, regexp is applied on full path, - # including the path prefix if one is set. - # Default dirs are skipped independently of this option's value (see exclude-dirs-use-default). - # "/" will be replaced by current OS file path separator to properly work on Windows. - # Default: [] - exclude-dirs: - - bin - - testdata - - testutil - - e2e - - # Show only new issues: if there are unstaged changes or untracked files, - # only those changes are analyzed, else only changes in HEAD~ are analyzed. - # It's a super-useful option for integration of golangci-lint into existing - # large codebase. It's not practical to fix all existing issues at the moment - # of integration: much better don't allow issues in new code. - # Default is false. new: true - # Show only new issues created after git revision `REV` - # new-from-rev: "" \ No newline at end of file +formatters: + enable: + - gofmt + settings: + goimports: + local-prefixes: + - github.com/chronicleprotocol/suite + exclusions: + generated: lax + paths: + - bin + - testdata + - testutil + - e2e + - third_party$ + - builtin$ + - examples$ diff --git a/go.mod b/go.mod index 5e6c7a8..e7dd415 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/chronicleprotocol/challenger -go 1.24.0 +go 1.25.13 require ( github.com/defiweb/go-eth v0.7.0 @@ -33,8 +33,8 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/tyler-smith/go-bip39 v1.1.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect - golang.org/x/crypto v0.31.0 // indirect - golang.org/x/sys v0.36.0 // indirect + golang.org/x/crypto v0.52.0 // indirect + golang.org/x/sys v0.45.0 // indirect google.golang.org/protobuf v1.36.8 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.10 // indirect diff --git a/go.sum b/go.sum index cc1b839..95b3c8d 100644 --- a/go.sum +++ b/go.sum @@ -128,8 +128,8 @@ go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= +golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -146,8 +146,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= -golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=