pages/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2025-04-25 14:26:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle serve raw case

Browse source
This commit is contained in:
6543 2022-09-18 21:56:56 +02:00
parent 8dac935cd8
commit 40478215d0
No known key found for this signature in database
GPG key ID: B8BE6D610E61C862
4 changed files with 56 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

43
server/gitea/client.go
View file

@ -5,8 +5,10 @@ import (
"errors"
"fmt"
"io"
"mime"
"net/http"
"net/url"
"path"
"strconv"
"strings"
"time"
@ -41,6 +43,9 @@ type Client struct {
followSymlinks bool
supportLFS bool
forbiddenMimeTypes map[string]bool
defaultMimeType string
}
func NewClient(giteaRoot, giteaAPIToken string, respCache cache.SetGetKey, followSymlinks, supportLFS bool) (*Client, error) {
@ -52,12 +57,29 @@ func NewClient(giteaRoot, giteaAPIToken string, respCache cache.SetGetKey, follo
stdClient := http.Client{Timeout: 10 * time.Second}
// TODO: pass down
var (
forbiddenMimeTypes map[string]bool
defaultMimeType string
)
if forbiddenMimeTypes == nil {
forbiddenMimeTypes = make(map[string]bool)
}
if defaultMimeType == "" {
defaultMimeType = "application/octet-stream"
}
sdk, err := gitea.NewClient(giteaRoot, gitea.SetHTTPClient(&stdClient), gitea.SetToken(giteaAPIToken))
return &Client{
sdkClient: sdk,
responseCache: respCache,
sdkClient: sdk,
responseCache: respCache,
followSymlinks: followSymlinks,
supportLFS: supportLFS,
forbiddenMimeTypes: forbiddenMimeTypes,
defaultMimeType: defaultMimeType,
}, err
}
@ -127,6 +149,10 @@ func (client *Client) ServeRawContent(targetOwner, targetRepo, ref, resource str
// now we are sure it's content
{
// Set the MIME type
mimeType := client.getMimeTypeByExtension(resource)
resp.Response.Header.Set(contentTypeHeader, mimeType)
contentLeng, err2 := strconv.ParseInt(resp.Header.Get(contentLengthHeader), 20, 64)
if err2 != nil {
log.Error().Err(err2).Msg("could not parse content length")
@ -140,7 +166,7 @@ func (client *Client) ServeRawContent(targetOwner, targetRepo, ref, resource str
// TODO: at the sime time !!!
/*
we need a "go"
we create a new type that implement an writer witch write to cache based on key etc ...
// TODO: cache is half-empty if request is cancelled - does the ctx.Err() below do the trick?
// err = res.BodyWriteTo(io.MultiWriter(ctx.Response().BodyWriter(), &cacheBodyWriter))
*/
@ -149,7 +175,7 @@ func (client *Client) ServeRawContent(targetOwner, targetRepo, ref, resource str
if err := client.responseCache.Set(cacheKey, FileResponse{
Exists: true,
ETag: resp.Header.Get(eTagHeader),
MimeType: resp.Header.Get(contentTypeHeader),
MimeType: mimeType,
Body: body,
}, fileCacheTimeout); err != nil {
log.Error().Err(err).Msg("could not save content in cache")
@ -224,3 +250,12 @@ func (client *Client) GiteaGetRepoDefaultBranch(repoOwner, repoName string) (str
}
return branch, nil
}
func (client *Client) getMimeTypeByExtension(resource string) string {
mimeType := mime.TypeByExtension(path.Ext(resource))
mimeTypeSplit := strings.SplitN(mimeType, ";", 2)
if client.forbiddenMimeTypes[mimeTypeSplit[0]] || mimeType == "" {
mimeType = client.defaultMimeType
}
return mimeType
}