fix(security): replace deprecated libraries. (#479)

* fix(security): replace deprecated libraries. * fix(security): vulnerable docker/runc * fix(security): freeze docker/runc * fix(security): fix docker * fix(test): remove integration test pulling docker deps. * feat(crypto): remove hpke.
zntrio · Apr 9, 2024 · f41a878 · f41a878
1 parent d03ed51
commit f41a878
Show file tree

Hide file tree

Showing 42 changed files with 230 additions and 2,457 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -25,7 +25,7 @@ jobs:
       contents: read
 
     steps:
-    - 
+    -
       name: Harden Runner
       uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
       with:
@@ -58,7 +58,7 @@ jobs:
       name: Set up Go
       uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
-        go-version: "1.21"
+        go-version: "1.22"
     -
       name: Build Harp
       run: |

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -54,7 +54,7 @@ jobs:
         name: Install Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: "1.20"
+          go-version: "1.22"
       -
         name: Checkout code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -72,8 +72,8 @@ jobs:
       fail-fast: true
       matrix:
         go-version:
-          - "1.20"
           - "1.21"
+          - "1.22"
     permissions:
       actions: write
     runs-on: ubuntu-latest
@@ -151,7 +151,7 @@ jobs:
         name: Install Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       -
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       -
@@ -192,7 +192,7 @@ jobs:
         name: Install Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: '1.21' # test only the latest go version to speed up CI
+          go-version: '1.22' # test only the latest go version to speed up CI
       -
         name: Cache Go modules
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
@@ -237,7 +237,7 @@ jobs:
         name: Install Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: '1.21' # test only the latest go version to speed up CI
+          go-version: '1.22' # test only the latest go version to speed up CI
       -
         name: Cache Go modules
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
@@ -282,7 +282,7 @@ jobs:
         name: Install Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: '1.21' # test only the latest go version to speed up CI
+          go-version: '' # test only the latest go version to speed up CI
       -
         name: Cache Go modules
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2

diff --git a/.github/workflows/releaser.yml b/.github/workflows/releaser.yml
@@ -39,7 +39,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           check-latest: true
       -
         name: Cache Go modules

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -700,22 +700,22 @@ Contents of probable licence file $GOMODCACHE/github.com/essentialkaos/branca@v1
 
 Copyright (c) 2018 Essential Kaos
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do 
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
 so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all 
+The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
 --------------------------------------------------------------------------------
@@ -7233,12 +7233,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 --------------------------------------------------------------------------------
-Module  : gopkg.in/square/go-jose.v2
+Module  : github.com/go-jose/go-jose/v3
 Version : v2.6.0
 Time    : 2021-06-05T20:43:59Z
 Licence : Apache-2.0
 
-Contents of probable licence file $GOMODCACHE/gopkg.in/square/go-jose.v2@v2.6.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/go-jose/go-jose/v3@v2.6.0/LICENSE:
 
 
                                  Apache License
@@ -8324,13 +8324,13 @@ Copyright (c) 2012, Neal van Veen ([email protected])
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met: 
+modification, are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
+   list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright notice,
    this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution. 
+   and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -8344,7 +8344,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The views and conclusions contained in the software and documentation are those
-of the authors and should not be interpreted as representing official policies, 
+of the authors and should not be interpreted as representing official policies,
 either expressed or implied, of the FreeBSD Project.
 
 
@@ -11556,13 +11556,13 @@ Copyright (c) 2010-2013 Gustavo Niemeyer <[email protected]>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met: 
+modification, are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
+   list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright notice,
    this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution. 
+   and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -12619,7 +12619,7 @@ Mozilla Public License Version 2.0
     means any form of the work other than Source Code Form.
 
 1.7. "Larger Work"
-    means a work that combines Covered Software with other material, in 
+    means a work that combines Covered Software with other material, in
     a separate file or files, that is not Covered Software.
 
 1.8. "License"
@@ -27126,19 +27126,19 @@ Licence : BSD-2-Clause
 Contents of probable licence file $GOMODCACHE/gopkg.in/[email protected]/LICENSE:
 
 Gocheck - A rich testing framework for Go
- 
+
 Copyright (c) 2010-2013 Gustavo Niemeyer <[email protected]>
 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met: 
+modification, are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
+   list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright notice,
    this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution. 
+   and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -27585,6 +27585,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-
-
diff --git a/cmd/harp/internal/cmd/keygen_jwk.go b/cmd/harp/internal/cmd/keygen_jwk.go
@@ -6,9 +6,9 @@
 package cmd
 
 import (
+	"github.com/go-jose/go-jose/v3"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
-	"gopkg.in/square/go-jose.v2"
 	"zntr.io/harp/v2/pkg/sdk/cmdutil"
 	"zntr.io/harp/v2/pkg/sdk/log"
 	"zntr.io/harp/v2/pkg/tasks/keygen"

diff --git a/docs/dependencies.asciidoc b/docs/dependencies.asciidoc
@@ -84,7 +84,7 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://golang.org/x/term[$$golang.org/x/term$$] | v0.15.0 | BSD-3-Clause
 | link:https://google.golang.org/grpc[$$google.golang.org/grpc$$] | v1.60.0 | Apache-2.0
 | link:https://google.golang.org/protobuf[$$google.golang.org/protobuf$$] | v1.31.0 | BSD-3-Clause
-| link:https://gopkg.in/square/go-jose.v2[$$gopkg.in/square/go-jose.v2$$] | v2.6.0 | Apache-2.0
+| link:https://github.com/go-jose/go-jose/v3[$$github.com/go-jose/go-jose/v3$$] | v2.6.0 | Apache-2.0
 | link:https://gopkg.in/yaml.v3[$$gopkg.in/yaml.v3$$] | v3.0.1 | MIT
 | link:https://sigs.k8s.io/yaml[$$sigs.k8s.io/yaml$$] | v1.4.0 | Apache-2.0
 | link:https://zntr.io/paseto[$$zntr.io/paseto$$] | v1.2.0 | Apache-2.0
@@ -253,4 +253,3 @@ This page lists the third-party dependencies used to build {n}.
 | link:https://gopkg.in/yaml.v2[$$gopkg.in/yaml.v2$$] | v2.4.0 | Apache-2.0
 | link:https://gotest.tools/v3[$$gotest.tools/v3$$] | v3.3.0 | Apache-2.0
 |===
-