aboutsummaryrefslogtreecommitdiffstats
path: root/routers/api
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2022-05-09 16:54:51 +0100
committerGitHub <noreply@github.com>2022-05-09 17:54:51 +0200
commit9f5ddca57c38f566fb18c9add339fc9f5aeb25de (patch)
treee9cba2540901589f98410b7d3ad23078a7dff11b /routers/api
parente435283c0ffe437f35898f92dc5572c8df83163e (diff)
downloadgitea-9f5ddca57c38f566fb18c9add339fc9f5aeb25de.tar.gz
gitea-9f5ddca57c38f566fb18c9add339fc9f5aeb25de.zip
Set the LastModified header for raw files (#18356)
Although the use of LastModified dates for caching of git objects should be discouraged (as it is not native to git - and there are a LOT of ways this could be incorrect) - LastModified dates can be a helpful somewhat more human way of caching for simple cases. This PR adds this header and handles the If-Modified-Since header to the /raw/ routes. Fix #18354 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'routers/api')
-rw-r--r--routers/api/v1/repo/file.go43
1 files changed, 39 insertions, 4 deletions
diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go
index b8b72f95eb..2a4c4ad979 100644
--- a/routers/api/v1/repo/file.go
+++ b/routers/api/v1/repo/file.go
@@ -9,13 +9,16 @@ import (
"encoding/base64"
"fmt"
"net/http"
+ "path"
"time"
"code.gitea.io/gitea/models"
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit"
+ "code.gitea.io/gitea/modules/cache"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/git"
+ "code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/routers/common"
@@ -62,18 +65,50 @@ func GetRawFile(ctx *context.APIContext) {
return
}
- blob, err := ctx.Repo.Commit.GetBlobByPath(ctx.Repo.TreePath)
+ blob, lastModified := getBlobForEntry(ctx)
+ if ctx.Written() {
+ return
+ }
+
+ if err := common.ServeBlob(ctx.Context, blob, lastModified); err != nil {
+ ctx.Error(http.StatusInternalServerError, "ServeBlob", err)
+ }
+}
+
+func getBlobForEntry(ctx *context.APIContext) (blob *git.Blob, lastModified time.Time) {
+ entry, err := ctx.Repo.Commit.GetTreeEntryByPath(ctx.Repo.TreePath)
if err != nil {
if git.IsErrNotExist(err) {
ctx.NotFound()
} else {
- ctx.Error(http.StatusInternalServerError, "GetBlobByPath", err)
+ ctx.Error(http.StatusInternalServerError, "GetTreeEntryByPath", err)
}
return
}
- if err = common.ServeBlob(ctx.Context, blob); err != nil {
- ctx.Error(http.StatusInternalServerError, "ServeBlob", err)
+
+ if entry.IsDir() || entry.IsSubModule() {
+ ctx.NotFound("getBlobForEntry", nil)
+ return
}
+
+ var c *git.LastCommitCache
+ if setting.CacheService.LastCommit.Enabled && ctx.Repo.CommitsCount >= setting.CacheService.LastCommit.CommitsCount {
+ c = git.NewLastCommitCache(ctx.Repo.Repository.FullName(), ctx.Repo.GitRepo, setting.LastCommitCacheTTLSeconds, cache.GetCache())
+ }
+
+ info, _, err := git.Entries([]*git.TreeEntry{entry}).GetCommitsInfo(ctx, ctx.Repo.Commit, path.Dir("/" + ctx.Repo.TreePath)[1:], c)
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "GetCommitsInfo", err)
+ return
+ }
+
+ if len(info) == 1 {
+ // Not Modified
+ lastModified = info[0].Commit.Committer.When
+ }
+ blob = entry.Blob()
+
+ return
}
// GetArchive get archive of a repository