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

24
server/upstream/helper.go
View file

@ -1,10 +1,6 @@
package upstream
import (
"mime"
"path"
"strings"
"github.com/rs/zerolog/log"
"codeberg.org/codeberg/pages/server/gitea"
@ -34,23 +30,3 @@ func GetBranchTimestamp(giteaClient *gitea.Client, owner, repo, branch string) *
log.Debug().Msgf("Succesfully fetched latest commit's timestamp from branch: %#v", timestamp)
return timestamp
}
func (o *Options) getMimeTypeByExtension() string {
if o.ForbiddenMimeTypes == nil {
o.ForbiddenMimeTypes = make(map[string]bool)
}
mimeType := mime.TypeByExtension(path.Ext(o.TargetPath))
mimeTypeSplit := strings.SplitN(mimeType, ";", 2)
if o.ForbiddenMimeTypes[mimeTypeSplit[0]] || mimeType == "" {
if o.DefaultMimeType != "" {
mimeType = o.DefaultMimeType
} else {
mimeType = "application/octet-stream"
}
}
return mimeType
}
func (o *Options) generateUriClientArgs() (targetOwner, targetRepo, ref, resource string) {
return o.TargetOwner, o.TargetRepo, o.TargetBranch, o.TargetPath
}

26
server/upstream/upstream.go
View file

@ -19,6 +19,8 @@ const (
headerETag = "ETag"
headerLastModified = "Last-Modified"
headerIfModifiedSince = "If-Modified-Since"
rawMime = "text/plain; charset=utf-8"
)
// upstreamIndexPages lists pages that may be considered as index pages for directories.
@ -41,13 +43,13 @@ type Options struct {
// Used for debugging purposes.
Host string
DefaultMimeType string
ForbiddenMimeTypes map[string]bool
TryIndexPages bool
BranchTimestamp time.Time
TryIndexPages bool
BranchTimestamp time.Time
// internal
appendTrailingSlash bool
redirectIfExists string
ServeRaw bool
}
// Upstream requests a file from the Gitea API at GiteaRoot and writes it to the request context.
@ -80,7 +82,10 @@ func (o *Options) Upstream(ctx *context.Context, giteaClient *gitea.Client) (fin
}
log.Debug().Msg("preparations")
reader, res, err := giteaClient.ServeRawContent(o.generateUriClientArgs())
reader, res, err := giteaClient.ServeRawContent(o.TargetOwner, o.TargetRepo, o.TargetBranch, o.TargetPath)
if reader != nil {
defer reader.Close()
}
log.Debug().Msg("acquisition")
// Handle errors
@ -142,13 +147,14 @@ func (o *Options) Upstream(ctx *context.Context, giteaClient *gitea.Client) (fin
}
log.Debug().Msg("error handling")
// Set the MIME type
mimeType := o.getMimeTypeByExtension()
ctx.Response().Header.Set(headerContentType, mimeType)
// Set ETag
// Set ETag & MIME
if res != nil {
ctx.Response().Header.Set(headerETag, res.Header.Get(headerETag))
if o.ServeRaw {
ctx.Response().Header.Set(headerContentType, res.Header.Get(headerContentType))
} else {
ctx.Response().Header.Set(headerContentType, rawMime)
}
}
if ctx.Response().StatusCode != http.StatusNotFound {