n/codeberg-pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server synced 2024-09-19 23:28:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: n:cabb541e2f0072c902c1b7958546bc3438bfbca2
Branches Tags
n:main
n:renovate/golangci-golangci-lint-1.x
n:renovate/golang.org-x-exp-digest
n:renovate/docker.io-woodpeckerci-plugin-prettier-0.x
n:renovate/golang-deps-non-major
n:feat/redis-caching
n:fix/memory-problem
n:pages
n:v5.1
n:v5.0
n:v4.6.3
n:v4.6.2
n:v4.6.1
n:v4.6
n:v4.5
n:v4.4
n:v4.3
n:v4.2
n:v4.1
n:v4.0
n:v3.2.1
n:v3.2
n:v3.1
n:v3.0a
n:v3.0
n:v2.5b
n:v2.5a
n:v2.5
n:v2.4
n:v2.3
n:v2.2
n:v2.1
n:v2.0
n:v1.0_php
..
compare: n:33a1f7e0ab44724672335b0f1d4c5685c1a0b93d
Branches Tags
n:renovate/golangci-golangci-lint-1.x
n:renovate/golang.org-x-exp-digest
n:renovate/docker.io-woodpeckerci-plugin-prettier-0.x
n:main
n:renovate/golang-deps-non-major
n:feat/redis-caching
n:fix/memory-problem
n:pages
n:v5.1
n:v5.0
n:v4.6.3
n:v4.6.2
n:v4.6.1
n:v4.6
n:v4.5
n:v4.4
n:v4.3
n:v4.2
n:v4.1
n:v4.0
n:v3.2.1
n:v3.2
n:v3.1
n:v3.0a
n:v3.0
n:v2.5b
n:v2.5a
n:v2.5
n:v2.4
n:v2.3
n:v2.2
n:v2.1
n:v2.0
n:v1.0_php

3 Commits
cabb541e2f ... 33a1f7e0ab

Author SHA1 Message Date
woodpecker-bot
33a1f7e0ab chore(deps): update woodpeckerci/plugin-docker-buildx docker tag to v4.2.0 2024-07-23 19:51:08 +00:00
crapStone
efd1adae0f fix woodpecker pipeline definition (#370) 
use https://woodpecker-ci.org/plugins/Release instead of the old drone plugin

Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/370
Co-authored-by: crapStone <me@crapstone.dev>
Co-committed-by: crapStone <me@crapstone.dev>
 2024-07-23 19:50:54 +00:00
Peter Gerber
bc9111a05f Use correct timestamp format for Last-Modified header (#365) 
HTTP uses GMT [1,2] rather than UTC as timezone for timestamps. However,
the Last-Modified header used UTC which confused at least wget.

Before, UTC was used:

$ wget --no-check-certificate -S --spider https://cb_pages_tests.localhost.mock.directory:4430/images/827679288a.jpg
...
  Last-Modified: Sun, 11 Sep 2022 08:37:42 UTC
...
Last-modified header invalid -- time-stamp ignored.
...

After, GMT is used:

$ wget --no-check-certificate -S --spider https://cb_pages_tests.localhost.mock.directory:4430/images/827679288a.jpg
...
  Last-Modified: Sun, 11 Sep 2022 08:37:42 GMT
...
(no last-modified-header-invalid warning)

[1]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified
[2]: https://www.rfc-editor.org/rfc/rfc9110#name-date-time-formats

Fixes #364

---

Whatt I noticed is that the If-Modified-Since header isn't accepted (neither with GMT nor with UTC):

```
$ wget --header "If-Modified-Since: Sun, 11 Sep 2022 08:37:42 GMT" --no-check-certificate -S --spider https://cb_pages_tests.localhost.mock.directory:4430/images/827679288a.jpg
Spider mode enabled. Check if remote file exists.
--2024-07-15 23:31:41--  https://cb_pages_tests.localhost.mock.directory:4430/images/827679288a.jpg
Resolving cb_pages_tests.localhost.mock.directory (cb_pages_tests.localhost.mock.directory)... 127.0.0.1
Connecting to cb_pages_tests.localhost.mock.directory (cb_pages_tests.localhost.mock.directory)|127.0.0.1|:4430... connected.
WARNING: The certificate of ‘cb_pages_tests.localhost.mock.directory’ is not trusted.
WARNING: The certificate of ‘cb_pages_tests.localhost.mock.directory’ doesn't have a known issuer.
HTTP request sent, awaiting response...
  HTTP/1.1 200 OK
  Allow: GET, HEAD, OPTIONS
  Cache-Control: public, max-age=600
  Content-Length: 124635
  Content-Type: image/jpeg
  Etag: "073af1960852e2a4ef446202c7974768b9881814"
  Last-Modified: Sun, 11 Sep 2022 08:37:42 GMT
  Referrer-Policy: strict-origin-when-cross-origin
  Server: pages-server
  Strict-Transport-Security: max-age=63072000; includeSubdomains; preload
  Date: Mon, 15 Jul 2024 21:31:42 GMT
Length: 124635 (122K) [image/jpeg]
Remote file exists
```

I would have expected a 304 (Not Modified) rather than a 200 (OK). I assume this is simply not supported and on production 304 is returned by a caching proxy in front of pages-server.

Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/365
Reviewed-by: crapStone <codeberg@crapstone.dev>
Co-authored-by: Peter Gerber <peter@arbitrary.ch>
Co-committed-by: Peter Gerber <peter@arbitrary.ch>
 2024-07-23 18:42:24 +00:00
2 changed files with 6 additions and 7 deletions
Show Stats Expand all files Collapse all files

11
.woodpecker/build.yml
View File

@ -18,6 +18,7 @@ steps:
build:
depends_on: vendor
image: codeberg.org/6543/docker-images/golang_just
pull: true
commands:
- go version
- just build
@ -45,6 +46,7 @@ steps:
build-tag:
depends_on: vendor
image: codeberg.org/6543/docker-images/golang_just
pull: true
commands:
- go version
- just build-tag ${CI_COMMIT_TAG##v}
@ -56,6 +58,7 @@ steps:
test:
depends_on: build
image: codeberg.org/6543/docker-images/golang_just
pull: true
commands:
- just test
when:
@ -66,6 +69,7 @@ steps:
integration-tests:
depends_on: build
image: codeberg.org/6543/docker-images/golang_just
pull: true
commands:
- just integration
environment:
@ -80,18 +84,13 @@ steps:
release:
depends_on: build
image: plugins/gitea-release:1.1.0
image: woodpeckerci/plugin-release:0.1.0
settings:
base_url: https://codeberg.org
file_exists: overwrite
files: build/codeberg-pages-server
api_key:
from_secret: bot_token
environment:
- CI_REPO_OWNER=${CI_REPO_OWNER}
- CI_REPO_NAME=${CI_REPO_NAME}
- CI_BUILD_EVENT=${CI_BUILD_EVENT}
- CI_COMMIT_REF=${CI_COMMIT_REF}
when:
- event: ['tag']
branch:

2
server/upstream/header.go
View File

@ -24,5 +24,5 @@ func (o *Options) setHeader(ctx *context.Context, header http.Header) {
} else {
ctx.RespWriter.Header().Set(gitea.ContentTypeHeader, mime)
}
ctx.RespWriter.Header().Set(headerLastModified, o.BranchTimestamp.In(time.UTC).Format(time.RFC1123))
ctx.RespWriter.Header().Set(headerLastModified, o.BranchTimestamp.In(time.UTC).Format(http.TimeFormat))
}