pages/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2025-01-18 16:47:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix workarounds

Browse source
This commit is contained in:
crapStone 2024-11-27 22:55:18 +01:00
parent e3ec4f948c
commit 40196377e3
No known key found for this signature in database
GPG key ID: 22D4BF0CF7CC29C8
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.woodpecker/build.yml
View file

@ -124,8 +124,6 @@ steps:
services: services:
pebble_acme: pebble_acme:
image: ghcr.io/letsencrypt/pebble:2.6.0 image: ghcr.io/letsencrypt/pebble:2.6.0
ports:
- 14000 # ACME port
environment: environment:
PEBBLE_VA_NOSLEEP: '1' PEBBLE_VA_NOSLEEP: '1'
PEBBLE_VA_ALWAYS_VALID: '1' PEBBLE_VA_ALWAYS_VALID: '1'

2
integration/main_test.go
View file

@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
func startServer(ctx context.Context) error { func startServer(ctx context.Context) error {
args := []string{"integration"} args := []string{"integration"}
setEnvIfNotSet("ACME_API", "https://acme.mock.directory") setEnvIfNotSet("ACME_API", "https://localhost:14000/dir")
setEnvIfNotSet("PAGES_DOMAIN", "localhost.mock.directory") setEnvIfNotSet("PAGES_DOMAIN", "localhost.mock.directory")
setEnvIfNotSet("RAW_DOMAIN", "raw.localhost.mock.directory") setEnvIfNotSet("RAW_DOMAIN", "raw.localhost.mock.directory")
setEnvIfNotSet("PAGES_BRANCHES", "pages,main,master") setEnvIfNotSet("PAGES_BRANCHES", "pages,main,master")

5
server/acme/client.go
View file

@ -3,6 +3,7 @@ package acme
import ( import (
"errors" "errors"
"fmt" "fmt"
"strings"
"codeberg.org/codeberg/pages/config" "codeberg.org/codeberg/pages/config"
"codeberg.org/codeberg/pages/server/cache" "codeberg.org/codeberg/pages/server/cache"
@ -13,8 +14,8 @@ var ErrAcmeMissConfig = errors.New("ACME client has wrong config")
func CreateAcmeClient(cfg config.ACMEConfig, enableHTTPServer bool, challengeCache cache.ICache) (*certificates.AcmeClient, error) { func CreateAcmeClient(cfg config.ACMEConfig, enableHTTPServer bool, challengeCache cache.ICache) (*certificates.AcmeClient, error) {
// check config // check config
if (!cfg.AcceptTerms || (cfg.DNSProvider == "" && !cfg.NoDNS01)) && cfg.APIEndpoint != "https://acme.mock.directory" { if (!cfg.AcceptTerms || (cfg.DNSProvider == "" && !cfg.NoDNS01)) && (cfg.APIEndpoint != "https://acme.mock.directory" || strings.HasPrefix(cfg.APIEndpoint, "https://localhost")) {
return nil, fmt.Errorf("%w: you must set $ACME_ACCEPT_TERMS and $DNS_PROVIDER or $NO_DNS_01, unless $ACME_API is set to https://acme.mock.directory", ErrAcmeMissConfig) return nil, fmt.Errorf("%w: you must set $ACME_ACCEPT_TERMS and $DNS_PROVIDER or $NO_DNS_01, unless $ACME_API is set to https://acme.mock.directory or starts with https://localhost", ErrAcmeMissConfig)
} }
if cfg.EAB_HMAC != "" && cfg.EAB_KID == "" { if cfg.EAB_HMAC != "" && cfg.EAB_KID == "" {
return nil, fmt.Errorf("%w: ACME_EAB_HMAC also needs ACME_EAB_KID to be set", ErrAcmeMissConfig) return nil, fmt.Errorf("%w: ACME_EAB_HMAC also needs ACME_EAB_KID to be set", ErrAcmeMissConfig)