diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-01-14 23:03:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-14 16:03:31 +0100 |
| commit | 35c3553870e35b2e7cfcc599645791acda6afcef (patch) | |
| tree | 0ad600c2d1cd94ef12566482832768c9efcf8a69 /services/auth/source | |
| parent | 8808293247bebd20482c3c625c64937174503781 (diff) | |
| download | gitea-35c3553870e35b2e7cfcc599645791acda6afcef.tar.gz gitea-35c3553870e35b2e7cfcc599645791acda6afcef.zip | |
Support webauthn (#17957)
Migrate from U2F to Webauthn
Co-authored-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'services/auth/source')
| -rw-r--r-- | services/auth/source/oauth2/jwtsigningkey.go | 2 | ||||
| -rw-r--r-- | services/auth/source/oauth2/token.go | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/services/auth/source/oauth2/jwtsigningkey.go b/services/auth/source/oauth2/jwtsigningkey.go index 3102be5f14..187c6999e0 100644 --- a/services/auth/source/oauth2/jwtsigningkey.go +++ b/services/auth/source/oauth2/jwtsigningkey.go @@ -25,7 +25,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" ini "gopkg.in/ini.v1" ) diff --git a/services/auth/source/oauth2/token.go b/services/auth/source/oauth2/token.go index c9a45340a1..944b8da387 100644 --- a/services/auth/source/oauth2/token.go +++ b/services/auth/source/oauth2/token.go @@ -10,7 +10,7 @@ import ( "code.gitea.io/gitea/modules/timeutil" - "github.com/golang-jwt/jwt" + "github.com/golang-jwt/jwt/v4" ) // ___________ __ @@ -37,6 +37,7 @@ type Token struct { GrantID int64 `json:"gnt"` Type TokenType `json:"tt"` Counter int64 `json:"cnt,omitempty"` + // FIXME: Migrate to registered claims jwt.StandardClaims } @@ -69,6 +70,7 @@ func (token *Token) SignToken(signingKey JWTSigningKey) (string, error) { // OIDCToken represents an OpenID Connect id_token type OIDCToken struct { + // FIXME: Migrate to RegisteredClaims jwt.StandardClaims Nonce string `json:"nonce,omitempty"` |