git.iko.soy/typeable/oauth2-proxy
on master help sign in
resolve cipher deprecation and update mapstructures v2

Signed-off-by: Jan Larwig <jan@larwig.com>

commit18fc89812914991648664e707fb55b2f434fa53a authorJan Larwig <jan@larwig.com> dateSat 24 May 2025, 17:05 (1 year ago) parent4c0dd28
4 files changed+2−5
compare with master
unifiedsplit
go.mod−1 go.sum−2 pkg/apis/options/duration.go+1−1 pkg/encryption/cipher.go+1−1
go.mod−1
@@ -19,7 +19,6 @@ require (
1919 github.com/google/uuid v1.6.0
2020 github.com/gorilla/mux v1.8.1
2121 github.com/justinas/alice v1.2.0
22− github.com/mitchellh/mapstructure v1.5.0
2322 github.com/oauth2-proxy/mockoidc v0.0.0-20240214162133-caebfff84d25
2423 github.com/onsi/ginkgo/v2 v2.23.4
2524 github.com/onsi/gomega v1.38.0
go.sum−2
@@ -91,8 +91,6 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
9191github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
9292github.com/matryer/is v1.2.0 h1:92UTHpy8CDwaJ08GqLDzhhuixiBUUD1p3AU6PHddz4A=
9393github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
94−github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
95−github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
9694github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
9795github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
9896github.com/oauth2-proxy/mockoidc v0.0.0-20240214162133-caebfff84d25 h1:9bCMuD3TcnjeqjPT2gSlha4asp8NvgcFRYExCaikCxk=
pkg/apis/options/duration.go+1−1
@@ -4,7 +4,7 @@ import (
44 "reflect"
55 "time"
66
7− "github.com/mitchellh/mapstructure"
7+ "github.com/go-viper/mapstructure/v2"
88)
99
1010// Duration is an alias for time.Duration so that we can ensure the marshalling
pkg/encryption/cipher.go+1−1
@@ -79,7 +79,7 @@ func (c *cfbCipher) Decrypt(ciphertext []byte) ([]byte, error) {
7979
8080 iv, ciphertext := ciphertext[:aes.BlockSize], ciphertext[aes.BlockSize:]
8181 plaintext := make([]byte, len(ciphertext))
82− stream := cipher.NewCFBDecrypter(c.Block, iv) //nolint:staticcheck
82+ stream := cipher.NewCFBEncrypter(c.Block, iv) //nolint:staticcheck
8383 stream.XORKeyStream(plaintext, ciphertext)
8484
8585 return plaintext, nil