just fix bcaceda711

dont cache if ContentLength greater fileCacheSizeLimit (#108 )
Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/108 Reviewed-by: Otto <otto@codeberg.org>
2022-07-15 21:39:42 +02:00 · 2022-07-15 21:21:26 +02:00 · 2022-07-15 21:06:05 +02:00 · 2022-07-15 17:18:25 +02:00 · 2022-07-12 15:32:48 +02:00 · 2022-07-08 13:39:24 +02:00
8 changed files with 38 additions and 7 deletions
--- a/4
+++ b/4
@@ -21,6 +21,10 @@ lint: tool-golangci tool-gofumpt
 fmt: tool-gofumpt
    gofumpt -w --extra .

+clean:
+    go clean ./...
+    rm -rf build/
+
 tool-golangci:
    @hash golangci-lint> /dev/null 2>&1; if [ $? -ne 0 ]; then \
    go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest; \
--- a/README.md
+++ b/README.md
@@ -18,7 +18,8 @@ Mapping custom domains is not static anymore, but can be done with DNS:
 first line will be the canonical domain/URL; all other occurrences will be redirected to it.

 2) add a CNAME entry to your domain, pointing to `[[{branch}.]{repo}.]{owner}.codeberg.page` (repo defaults to
-"pages", "branch" defaults to the default branch if "repo" is "pages", or to "pages" if "repo" is something else):
+"pages", "branch" defaults to the default branch if "repo" is "pages", or to "pages" if "repo" is something else.
+If the branch name contains slash characters, you need to replace "/" in the branch name to "~"):
 	`www.example.org. IN CNAME main.pages.example.codeberg.page.`

 3) if a CNAME is set for "www.example.org", you can redirect there from the naked domain by adding an ALIAS record
--- a/html/404.html
+++ b/html/404.html
@@ -23,11 +23,11 @@
 <body>
    <i class="fa fa-search text-primary" style="font-size: 96px;"></i>
    <h1 class="mb-0 text-primary">
-		This page was not found!
+		Page not found!
    </h1>
    <h5 class="text-center" style="max-width: 25em;">
-    	Sorry, this page doesn't exist or is inaccessible for other reasons (%status).<br/>
-		We hope this is not our fault ;) - Make sure to check the <a href="https://docs.codeberg.org/codeberg-pages/troubleshooting/" target="_blank">troubleshooting section in the Docs</a>!
+    	Sorry, but this page couldn't be found or is inaccessible (%status).<br/>
+		We hope this isn't a problem on our end ;) - Make sure to check the <a href="https://docs.codeberg.org/codeberg-pages/troubleshooting/" target="_blank">troubleshooting section in the Docs</a>!
    </h5>
    <small class="text-muted">
        <img src="https://design.codeberg.org/logo-kit/icon.svg" class="align-top">
--- a/integration/get_test.go
+++ b/integration/get_test.go
@@ -49,6 +49,18 @@ func TestGetContent(t *testing.T) {
 	assert.EqualValues(t, "text/html; charset=utf-8", resp.Header.Get("Content-Type"))
 	assert.True(t, getSize(resp.Body) > 1000)
 	assert.Len(t, resp.Header.Get("ETag"), 42)
+
+	// access branch name contains '/'
+	resp, err = getTestHTTPSClient().Get("https://blumia.localhost.mock.directory:4430/pages-server-integration-tests/@docs~main/")
+	assert.NoError(t, err)
+	if !assert.EqualValues(t, http.StatusOK, resp.StatusCode) {
+		t.FailNow()
+	}
+	assert.EqualValues(t, "text/html; charset=utf-8", resp.Header.Get("Content-Type"))
+	assert.True(t, getSize(resp.Body) > 100)
+	assert.Len(t, resp.Header.Get("ETag"), 42)
+
+	// TODO: test get of non cachable content (content size > fileCacheSizeLimit)
 }

 func TestCustomDomain(t *testing.T) {
--- a/server/gitea/client.go
+++ b/server/gitea/client.go
@@ -82,7 +82,6 @@ func (client *Client) ServeRawContent(uri string) (*fasthttp.Response, error) {
 	if err != nil {
 		return nil, err
 	}
-	// resp.SetBodyStream(&strings.Reader{}, -1)

 	if err != nil {
 		return nil, err
--- a/server/handler.go
+++ b/server/handler.go
@@ -89,6 +89,10 @@ func Handler(mainDomainSuffix, rawDomain []byte,
 				return false
 			}

+			// Replace "~" to "/" so we can access branch that contains slash character
+			// Branch name cannot contain "~" so doing this is okay
+			branch = strings.ReplaceAll(branch, "~", "/")
+
 			// Check if the branch exists, otherwise treat it as a file path
 			branchTimestampResult := upstream.GetBranchTimestamp(giteaClient, targetOwner, repo, branch, branchTimestampCache)
 			if branchTimestampResult == nil {
--- a/server/setup.go
+++ b/server/setup.go
@@ -5,12 +5,20 @@ import (
 	"net/http"
 	"time"

+	"github.com/rs/zerolog/log"
+
 	"github.com/valyala/fasthttp"

 	"codeberg.org/codeberg/pages/server/cache"
 	"codeberg.org/codeberg/pages/server/utils"
 )

+type fasthttpLogger struct{}
+
+func (fasthttpLogger) Printf(format string, args ...interface{}) {
+	log.Printf("[FASTHTTP] "+format, args...)
+}
+
 func SetupServer(handler fasthttp.RequestHandler) *fasthttp.Server {
 	// Enable compression by wrapping the handler with the compression function provided by FastHTTP
 	compressedHandler := fasthttp.CompressHandlerBrotliLevel(handler, fasthttp.CompressBrotliBestSpeed, fasthttp.CompressBestSpeed)
@@ -21,7 +29,7 @@ func SetupServer(handler fasthttp.RequestHandler) *fasthttp.Server {
 		NoDefaultServerHeader:        true,
 		NoDefaultDate:                true,
 		ReadTimeout:                  30 * time.Second, // needs to be this high for ACME certificates with ZeroSSL & HTTP-01 challenge
-		Concurrency:                  1024 * 32,        // TODO: adjust bottlenecks for best performance with Gitea!
+		Logger:                       fasthttpLogger{},
 	}
 }

--- a/server/upstream/upstream.go
+++ b/server/upstream/upstream.go
@@ -181,6 +181,9 @@ func (o *Options) Upstream(ctx *fasthttp.RequestCtx, giteaClient *gitea.Client,
 	var cacheBodyWriter bytes.Buffer
 	if res != nil {
 		if res.Header.ContentLength() > fileCacheSizeLimit {
+			// fasthttp else will set "Content-Length: 0"
+			ctx.Response.SetBodyStream(&strings.Reader{}, -1)
+
 			err = res.BodyWriteTo(ctx.Response.BodyWriter())
 		} else {
 			// TODO: cache is half-empty if request is cancelled - does the ctx.Err() below do the trick?
@@ -196,7 +199,7 @@ func (o *Options) Upstream(ctx *fasthttp.RequestCtx, giteaClient *gitea.Client,
 	}
 	log.Debug().Msg("response")

-	if res != nil && ctx.Err() == nil {
+	if res != nil && res.Header.ContentLength() <= fileCacheSizeLimit && ctx.Err() == nil {
 		cachedResponse.Exists = true
 		cachedResponse.MimeType = mimeType
 		cachedResponse.Body = cacheBodyWriter.Bytes()
Author	SHA1	Message	Date
6543	8207586a48	just fix `bcaceda711`	2022-07-15 21:39:42 +02:00
6543	bcaceda711	dont cache if ContentLength greater fileCacheSizeLimit (#108 ) Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/108 Reviewed-by: Otto <otto@codeberg.org>	2022-07-15 21:21:26 +02:00
6543	5411c96ef3	Tell fasthttp to not set "Content-Length: 0" on non cached content (#107 ) fix #97 Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/107	2022-07-15 21:06:05 +02:00
Jeremy	baf4e7e326	Make the 404 page more readable and natural (#104 ) Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/104 Reviewed-by: 6543 <6543@noreply.codeberg.org> Co-authored-by: Jeremy <jtbx@noreply.codeberg.org> Co-committed-by: Jeremy <jtbx@noreply.codeberg.org>	2022-07-15 17:18:25 +02:00
Gusted	fd24b4a2bc	Pass logger to fasthttp (#98 ) - Use a logger with `FASTHTTP` prefix as fasthttp's logger so it's easy to see what fasthttp is logging in console/journal. Co-authored-by: Gusted <williamzijl7@hotmail.com> Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/98 Reviewed-by: 6543 <6543@noreply.codeberg.org> Co-authored-by: Gusted <gusted@noreply.codeberg.org> Co-committed-by: Gusted <gusted@noreply.codeberg.org>	2022-07-12 15:32:48 +02:00
Gary Wang	9076bc3f75	Support access branch that contains slash character (#102 ) So we can access branch that contain slash like `branch/name` with `username.codeberg.page/repo/@branch~name/`. Branch name cannot contain `~` character but it can be in a HTTP URL, so replace the `~` from URL to `/` could be a valid solution to me. Resolve #101 Co-authored-by: Gary Wang <wzc782970009@gmail.com> Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/102 Reviewed-by: 6543 <6543@noreply.codeberg.org> Co-authored-by: Gary Wang <blumia@noreply.codeberg.org> Co-committed-by: Gary Wang <blumia@noreply.codeberg.org>	2022-07-08 13:39:24 +02:00
Gusted	48a49f69a7	Increase concurrent connections to default value (#99 ) Use the default value of `256 * 1024` for the concurrency limit, this will mean that the server will be able to handle more connections. Co-authored-by: Gusted <williamzijl7@hotmail.com> Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/99 Reviewed-by: 6543 <6543@noreply.codeberg.org> Co-authored-by: Gusted <gusted@noreply.codeberg.org> Co-committed-by: Gusted <gusted@noreply.codeberg.org>	2022-07-03 13:20:02 +02:00