Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b4501fdd89 |
No files matched your search
@@ -70,3 +70,4 @@ vendor/
|
|||||||
# Local dev configs
|
# Local dev configs
|
||||||
config.yml
|
config.yml
|
||||||
config.yaml
|
config.yaml
|
||||||
|
config.dev.yml
|
||||||
@@ -79,15 +79,12 @@ docker-versioned:
|
|||||||
docker-test:
|
docker-test:
|
||||||
@script/test
|
@script/test
|
||||||
|
|
||||||
# Run local dev server in Docker, with debug on and a new random signing
|
# Run local dev server in Docker
|
||||||
# key each run. Log in to the page with the key it prints.
|
|
||||||
devserver: docker-versioned devserver-stop
|
devserver: docker-versioned devserver-stop
|
||||||
@key="$$(head -c 32 /dev/urandom | base64)" && \
|
|
||||||
docker run -d --name pixad-dev -p 8080:8080 \
|
docker run -d --name pixad-dev -p 8080:8080 \
|
||||||
-e PIXA_SIGNING_KEY="$$key" -e PIXA_DEBUG=true \
|
-v $(CURDIR)/config.dev.yml:/etc/pixa/config.yml:ro \
|
||||||
pixa:latest >/dev/null && \
|
pixa:latest
|
||||||
echo "pixad running at http://localhost:8080" && \
|
@echo "pixad running at http://localhost:8080"
|
||||||
echo "signing key: $$key"
|
|
||||||
|
|
||||||
# Stop dev server
|
# Stop dev server
|
||||||
devserver-stop:
|
devserver-stop:
|
||||||
|
|||||||
@@ -377,8 +377,7 @@ session cookie is always marked `Secure`. Over plain HTTP a browser keeps such a
|
|||||||
cookie only for its own machine (`localhost`), if at all.
|
cookie only for its own machine (`localhost`), if at all.
|
||||||
|
|
||||||
A form refused with 403 gets a page that names the cause and what to do about
|
A form refused with 403 gets a page that names the cause and what to do about
|
||||||
it. pixa logs a `form refused` warning with the request ID and the form-token
|
it. pixa logs the cause as a warning with the request ID.
|
||||||
library's reason, such as `origin invalid`.
|
|
||||||
|
|
||||||
The image routes answer the errors listed for them with a JSON body holding
|
The image routes answer the errors listed for them with a JSON body holding
|
||||||
`error`, `status` and `timestamp`.
|
`error`, `status` and `timestamp`.
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ const (
|
|||||||
// state-mutating HTML form routes. The token lives in its own cookie,
|
// state-mutating HTML form routes. The token lives in its own cookie,
|
||||||
// independent of the session cookie, so it also protects the login POST
|
// independent of the session cookie, so it also protects the login POST
|
||||||
// where no session exists yet (login CSRF). key signs that cookie. A
|
// where no session exists yet (login CSRF). key signs that cookie. A
|
||||||
// refused form is answered by the handler that handleFormRefused returns.
|
// refused form gets the page respondFormRefused renders, and log gets a
|
||||||
// log gets a warning with the library's reason, such as "origin invalid".
|
// warning naming the cause.
|
||||||
//
|
//
|
||||||
// When plaintext is true (local HTTP development), requests are marked
|
// When plaintext is true (local HTTP development), requests are marked
|
||||||
// plaintext so the library neither demands an https Referer nor sets a
|
// plaintext so the library neither demands an https Referer nor sets a
|
||||||
@@ -52,7 +52,7 @@ func newCSRFProtect(
|
|||||||
csrf.Path("/"),
|
csrf.Path("/"),
|
||||||
csrf.Secure(!plaintext),
|
csrf.Secure(!plaintext),
|
||||||
csrf.SameSite(csrf.SameSiteStrictMode),
|
csrf.SameSite(csrf.SameSiteStrictMode),
|
||||||
csrf.ErrorHandler(handleFormRefused(plaintext, log)),
|
csrf.ErrorHandler(respondFormRefused(plaintext, log)),
|
||||||
)
|
)
|
||||||
|
|
||||||
if !plaintext {
|
if !plaintext {
|
||||||
@@ -68,11 +68,11 @@ func newCSRFProtect(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// handleFormRefused returns the handler the CSRF middleware calls when it
|
// respondFormRefused returns the handler the CSRF middleware calls when it
|
||||||
// refuses a request. It logs the library's reason with the request ID and
|
// refuses a request. It logs the library's reason with the request ID and
|
||||||
// answers 403 with a page naming the cause and what to do. A reason that is
|
// answers 403 with a page naming the cause and what to do. A reason that is
|
||||||
// not a refusal, such as a failure to make a token, answers 500.
|
// not a refusal, such as a failure to make a token, answers 500.
|
||||||
func handleFormRefused(plaintext bool, log *slog.Logger) http.Handler {
|
func respondFormRefused(plaintext bool, log *slog.Logger) http.Handler {
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
reason := csrf.FailureReason(r)
|
reason := csrf.FailureReason(r)
|
||||||
requestID := middleware.GetReqID(r.Context())
|
requestID := middleware.GetReqID(r.Context())
|
||||||
|
|||||||
Reference in new issue
Block a user