diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2024-02-16 23:18:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-16 15:18:30 +0000 |
| commit | 45c15387b292c25b5d0572b2eb3f85414156372a (patch) | |
| tree | cb3052845543958872adcab501c87871502a525e /services | |
| parent | 7132a0ba75d6fe734d9f950f217a5ceb81375328 (diff) | |
| download | gitea-45c15387b292c25b5d0572b2eb3f85414156372a.tar.gz gitea-45c15387b292c25b5d0572b2eb3f85414156372a.zip | |
Refactor JWT secret generating & decoding code (#29172)
Old code is not consistent for generating & decoding the JWT secrets.
Now, the callers only need to use 2 consistent functions:
NewJwtSecretWithBase64 and DecodeJwtSecretBase64
And remove a non-common function Base64FixedDecode from util.go
Diffstat (limited to 'services')
| -rw-r--r-- | services/auth/source/oauth2/jwtsigningkey.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/auth/source/oauth2/jwtsigningkey.go b/services/auth/source/oauth2/jwtsigningkey.go index eca0b8b7e1..2afe557b0d 100644 --- a/services/auth/source/oauth2/jwtsigningkey.go +++ b/services/auth/source/oauth2/jwtsigningkey.go @@ -18,6 +18,7 @@ import ( "path/filepath" "strings" + "code.gitea.io/gitea/modules/generate" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" @@ -336,7 +337,7 @@ func InitSigningKey() error { // loadSymmetricKey checks if the configured secret is valid. // If it is not valid, it will return an error. func loadSymmetricKey() (any, error) { - return util.Base64FixedDecode(base64.RawURLEncoding, []byte(setting.OAuth2.JWTSecretBase64), 32) + return generate.DecodeJwtSecretBase64(setting.OAuth2.JWTSecretBase64) } // loadOrCreateAsymmetricKey checks if the configured private key exists. |