deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-17 21:16:33 +02:00
Code Issues Releases Wiki Activity

Stop using deprecated "jwt.StandardClaims".

Browse source
This commit is contained in:
Joachim Bauch 2022-07-07 17:12:21 +02:00
parent 8a97fa7f5e
commit 924fce6713
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api_proxy.go
View file

@ -127,7 +127,7 @@ func (r *ProxyServerMessage) CloseAfterSend(session Session) bool {
// Type "hello" // Type "hello"
type TokenClaims struct { type TokenClaims struct {
jwt.StandardClaims jwt.RegisteredClaims
} }
type HelloProxyClientMessage struct { type HelloProxyClientMessage struct {

4
mcu_proxy.go
View file

@ -951,8 +951,8 @@ func (c *mcuProxyConnection) sendHello() error {
msg.Hello.ResumeId = c.sessionId msg.Hello.ResumeId = c.sessionId
} else { } else {
claims := &TokenClaims{ claims := &TokenClaims{
jwt.StandardClaims{ jwt.RegisteredClaims{
IssuedAt: time.Now().Unix(), IssuedAt: jwt.NewNumericDate(time.Now()),
Issuer: c.proxy.tokenId, Issuer: c.proxy.tokenId,
}, },
} }

2
proxy/proxy_server.go
View file

@ -890,7 +890,7 @@ func (s *ProxyServer) NewSession(hello *signaling.HelloProxyClientMessage) (*Pro
} }
minIssuedAt := time.Now().Add(-maxTokenAge) minIssuedAt := time.Now().Add(-maxTokenAge)
if issuedAt := time.Unix(claims.IssuedAt, 0); issuedAt.Before(minIssuedAt) { if issuedAt := claims.IssuedAt; issuedAt != nil && issuedAt.Before(minIssuedAt) {
statsTokenErrorsTotal.WithLabelValues("expired").Inc() statsTokenErrorsTotal.WithLabelValues("expired").Inc()
return nil, TokenExpired return nil, TokenExpired
} }

4
proxy/proxy_server_test.go
View file

@ -96,8 +96,8 @@ func TestTokenInFuture(t *testing.T) {
server, key := newProxyServerForTest(t) server, key := newProxyServerForTest(t)
claims := &signaling.TokenClaims{ claims := &signaling.TokenClaims{
StandardClaims: jwt.StandardClaims{ RegisteredClaims: jwt.RegisteredClaims{
IssuedAt: time.Now().Add(time.Hour).Unix(), IssuedAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
Issuer: TokenIdForTest, Issuer: TokenIdForTest,
}, },
} }