Skip to content

Commit e3b332f

Browse files
earl-warrenmfenniak
authored andcommitted
[v11.0/forgejo] fix: return on error if an LFS token cannot be parsed
Extracted from go-gitea/gitea#35708
1 parent bd89c7f commit e3b332f

File tree

2 files changed

+85
-4
lines changed

2 files changed

+85
-4
lines changed

services/lfs/server.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -579,17 +579,14 @@ func authenticate(ctx *context.Context, repository *repo_model.Repository, autho
579579
}
580580

581581
func handleLFSToken(ctx stdCtx.Context, tokenSHA string, target *repo_model.Repository, mode perm.AccessMode) (*user_model.User, error) {
582-
if !strings.Contains(tokenSHA, ".") {
583-
return nil, nil
584-
}
585582
token, err := jwt.ParseWithClaims(tokenSHA, &Claims{}, func(t *jwt.Token) (any, error) {
586583
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
587584
return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
588585
}
589586
return setting.LFS.JWTSecretBytes, nil
590587
})
591588
if err != nil {
592-
return nil, nil
589+
return nil, errors.New("invalid token")
593590
}
594591

595592
claims, claimsOk := token.Claims.(*Claims)

services/lfs/server_test.go

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
// Copyright 2025 The Gitea Authors. All rights reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
package lfs
5+
6+
import (
7+
"fmt"
8+
"strings"
9+
"testing"
10+
"time"
11+
12+
perm_model "forgejo.org/models/perm"
13+
repo_model "forgejo.org/models/repo"
14+
"forgejo.org/models/unittest"
15+
"forgejo.org/modules/setting"
16+
"forgejo.org/services/contexttest"
17+
18+
_ "forgejo.org/models/forgefed"
19+
20+
"github.com/golang-jwt/jwt/v5"
21+
"github.com/stretchr/testify/assert"
22+
"github.com/stretchr/testify/require"
23+
)
24+
25+
func TestMain(m *testing.M) {
26+
unittest.MainTest(m)
27+
}
28+
29+
type authTokenOptions struct {
30+
Op string
31+
UserID int64
32+
RepoID int64
33+
}
34+
35+
func getLFSAuthTokenWithBearer(opts authTokenOptions) (string, error) {
36+
now := time.Now()
37+
claims := Claims{
38+
RegisteredClaims: jwt.RegisteredClaims{
39+
ExpiresAt: jwt.NewNumericDate(now.Add(setting.LFS.HTTPAuthExpiry)),
40+
NotBefore: jwt.NewNumericDate(now),
41+
},
42+
RepoID: opts.RepoID,
43+
Op: opts.Op,
44+
UserID: opts.UserID,
45+
}
46+
token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
47+
48+
// Sign and get the complete encoded token as a string using the secret
49+
tokenString, err := token.SignedString(setting.LFS.JWTSecretBytes)
50+
if err != nil {
51+
return "", fmt.Errorf("failed to sign LFS JWT token: %w", err)
52+
}
53+
return "Bearer " + tokenString, nil
54+
}
55+
56+
func TestAuthenticate(t *testing.T) {
57+
require.NoError(t, unittest.PrepareTestDatabase())
58+
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
59+
60+
token2, _ := getLFSAuthTokenWithBearer(authTokenOptions{Op: "download", UserID: 2, RepoID: 1})
61+
_, token2, _ = strings.Cut(token2, " ")
62+
ctx, _ := contexttest.MockContext(t, "/")
63+
64+
t.Run("handleLFSToken", func(t *testing.T) {
65+
u, err := handleLFSToken(ctx, "", repo1, perm_model.AccessModeRead)
66+
require.Error(t, err)
67+
assert.Nil(t, u)
68+
69+
u, err = handleLFSToken(ctx, "invalid", repo1, perm_model.AccessModeRead)
70+
require.Error(t, err)
71+
assert.Nil(t, u)
72+
73+
u, err = handleLFSToken(ctx, token2, repo1, perm_model.AccessModeRead)
74+
require.NoError(t, err)
75+
assert.EqualValues(t, 2, u.ID)
76+
})
77+
78+
t.Run("authenticate", func(t *testing.T) {
79+
const prefixBearer = "Bearer "
80+
assert.False(t, authenticate(ctx, repo1, "", true, false))
81+
assert.False(t, authenticate(ctx, repo1, prefixBearer+"invalid", true, false))
82+
assert.True(t, authenticate(ctx, repo1, prefixBearer+token2, true, false))
83+
})
84+
}

0 commit comments

Comments
 (0)