diff --git a/.woodpecker.yml b/.woodpecker.yml
index 6c11ce7..271aaca 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,7 +3,7 @@ branches: main
pipeline:
# use vendor to cache dependencies
vendor:
- image: golang
+ image: golang:1.18
commands:
- go mod vendor
@@ -16,11 +16,11 @@ pipeline:
- golangci-lint run --timeout 5m
test:
- image: golang
+ image: golang:1.18
commands:
- go test ./...
build:
- image: golang
+ image: golang:1.18
commands:
- go build
diff --git a/go.mod b/go.mod
index 615bb12..38a289a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module codeberg.org/codeberg/pages
-go 1.16
+go 1.18
require (
github.com/OrlovEvgeny/go-mcache v0.0.0-20200121124330-1a8195b34f3a
@@ -13,3 +13,114 @@ require (
github.com/valyala/fasthttp v1.31.0
github.com/valyala/fastjson v1.6.3
)
+
+require (
+ cloud.google.com/go v0.54.0 // indirect
+ github.com/Azure/azure-sdk-for-go v32.4.0+incompatible // indirect
+ github.com/Azure/go-autorest v14.2.0+incompatible // indirect
+ github.com/Azure/go-autorest/autorest v0.11.19 // indirect
+ github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
+ github.com/Azure/go-autorest/autorest/azure/auth v0.5.8 // indirect
+ github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect
+ github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
+ github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
+ github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
+ github.com/Azure/go-autorest/logger v0.2.1 // indirect
+ github.com/Azure/go-autorest/tracing v0.6.0 // indirect
+ github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87 // indirect
+ github.com/akamai/AkamaiOPEN-edgegrid-golang v1.1.1 // indirect
+ github.com/aliyun/alibaba-cloud-sdk-go v1.61.1183 // indirect
+ github.com/andybalholm/brotli v1.0.2 // indirect
+ github.com/aws/aws-sdk-go v1.39.0 // indirect
+ github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
+ github.com/cenkalti/backoff/v4 v4.1.1 // indirect
+ github.com/cloudflare/cloudflare-go v0.20.0 // indirect
+ github.com/cpu/goacmedns v0.1.1 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/deepmap/oapi-codegen v1.6.1 // indirect
+ github.com/dimchansky/utfbom v1.1.1 // indirect
+ github.com/dnsimple/dnsimple-go v0.70.1 // indirect
+ github.com/exoscale/egoscale v0.67.0 // indirect
+ github.com/fatih/structs v1.1.0 // indirect
+ github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
+ github.com/go-errors/errors v1.0.1 // indirect
+ github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect
+ github.com/gofrs/uuid v3.2.0+incompatible // indirect
+ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+ github.com/golang/protobuf v1.5.2 // indirect
+ github.com/google/go-querystring v1.1.0 // indirect
+ github.com/google/uuid v1.1.1 // indirect
+ github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+ github.com/gophercloud/gophercloud v0.16.0 // indirect
+ github.com/gophercloud/utils v0.0.0-20210216074907-f6de111f2eae // indirect
+ github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+ github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
+ github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df // indirect
+ github.com/infobloxopen/infoblox-go-client v1.1.1 // indirect
+ github.com/jarcoal/httpmock v1.0.6 // indirect
+ github.com/jmespath/go-jmespath v0.4.0 // indirect
+ github.com/json-iterator/go v1.1.7 // indirect
+ github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 // indirect
+ github.com/klauspost/compress v1.13.4 // indirect
+ github.com/kolo/xmlrpc v0.0.0-20200310150728-e0350524596b // indirect
+ github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+ github.com/labbsr0x/bindman-dns-webhook v1.0.2 // indirect
+ github.com/labbsr0x/goh v1.0.1 // indirect
+ github.com/linode/linodego v0.31.1 // indirect
+ github.com/liquidweb/go-lwApi v0.0.5 // indirect
+ github.com/liquidweb/liquidweb-cli v0.6.9 // indirect
+ github.com/liquidweb/liquidweb-go v1.6.3 // indirect
+ github.com/mattn/go-isatty v0.0.12 // indirect
+ github.com/miekg/dns v1.1.43 // indirect
+ github.com/mitchellh/go-homedir v1.1.0 // indirect
+ github.com/mitchellh/mapstructure v1.4.1 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.1 // indirect
+ github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04 // indirect
+ github.com/nrdcg/auroradns v1.0.1 // indirect
+ github.com/nrdcg/desec v0.6.0 // indirect
+ github.com/nrdcg/dnspod-go v0.4.0 // indirect
+ github.com/nrdcg/freemyip v0.2.0 // indirect
+ github.com/nrdcg/goinwx v0.8.1 // indirect
+ github.com/nrdcg/namesilo v0.2.1 // indirect
+ github.com/nrdcg/porkbun v0.1.1 // indirect
+ github.com/oracle/oci-go-sdk v24.3.0+incompatible // indirect
+ github.com/ovh/go-ovh v1.1.0 // indirect
+ github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+ github.com/pkg/errors v0.9.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/pquerna/otp v1.3.0 // indirect
+ github.com/russross/blackfriday/v2 v2.0.1 // indirect
+ github.com/sacloud/libsacloud v1.36.2 // indirect
+ github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210127161313-bd30bebeac4f // indirect
+ github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+ github.com/sirupsen/logrus v1.4.2 // indirect
+ github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9 // indirect
+ github.com/softlayer/softlayer-go v1.0.3 // indirect
+ github.com/softlayer/xmlrpc v0.0.0-20200409220501-5f089df7cb7e // indirect
+ github.com/spf13/cast v1.3.1 // indirect
+ github.com/stretchr/objx v0.3.0 // indirect
+ github.com/transip/gotransip/v6 v6.6.1 // indirect
+ github.com/valyala/bytebufferpool v1.0.0 // indirect
+ github.com/vinyldns/go-vinyldns v0.0.0-20200917153823-148a5f6b8f14 // indirect
+ github.com/vultr/govultr/v2 v2.7.1 // indirect
+ go.opencensus.io v0.22.3 // indirect
+ go.uber.org/ratelimit v0.0.0-20180316092928-c15da0234277 // indirect
+ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
+ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
+ golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
+ golang.org/x/text v0.3.6 // indirect
+ golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect
+ google.golang.org/api v0.20.0 // indirect
+ google.golang.org/appengine v1.6.5 // indirect
+ google.golang.org/genproto v0.0.0-20200305110556-506484158171 // indirect
+ google.golang.org/grpc v1.27.1 // indirect
+ google.golang.org/protobuf v1.26.0 // indirect
+ gopkg.in/ini.v1 v1.62.0 // indirect
+ gopkg.in/ns1/ns1-go.v2 v2.6.2 // indirect
+ gopkg.in/square/go-jose.v2 v2.6.0 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+)
diff --git a/go.sum b/go.sum
index d04f727..a443641 100644
--- a/go.sum
+++ b/go.sum
@@ -486,7 +486,6 @@ github.com/transip/gotransip/v6 v6.6.1 h1:nsCU1ErZS5G0FeOpgGXc4FsWvBff9GPswSMggs
github.com/transip/gotransip/v6 v6.6.1/go.mod h1:pQZ36hWWRahCUXkFWlx9Hs711gLd8J4qdgLdRzmtY+g=
github.com/uber-go/atomic v1.3.2 h1:Azu9lPBWRNKzYXSIwRfgRuDuS0YKsK4NFhiQv98gkxo=
github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g=
-github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU=
github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
diff --git a/server/handler.go b/server/handler.go
index 8b2cf2e..21e7e0c 100644
--- a/server/handler.go
+++ b/server/handler.go
@@ -139,7 +139,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
if tryBranch(targetRepo, pathElements[2][1:], pathElements[3:],
giteaRoot+"/"+targetOwner+"/"+targetRepo+"/src/branch/%b/%p",
) {
- log.Debug().Msg("tryBranch, now trying upstream")
+ log.Debug().Msg("tryBranch, now trying upstream 1")
tryUpstream(ctx, giteaClient, mainDomainSuffix, trimmedHost,
targetOptions, targetOwner, targetRepo, targetBranch, targetPath,
canonicalDomainCache, branchTimestampCache, fileResponseCache)
@@ -154,7 +154,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
tryBranch(targetRepo, "", pathElements[2:],
giteaRoot+"/"+targetOwner+"/"+targetRepo+"/src/branch/%b/%p",
)
- log.Debug().Msg("tryBranch, now trying upstream")
+ log.Debug().Msg("tryBranch, now trying upstream 2")
tryUpstream(ctx, giteaClient, mainDomainSuffix, trimmedHost,
targetOptions, targetOwner, targetRepo, targetBranch, targetPath,
canonicalDomainCache, branchTimestampCache, fileResponseCache)
@@ -188,7 +188,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
if tryBranch(pathElements[0], pathElements[1][1:], pathElements[2:],
"/"+pathElements[0]+"/%p",
) {
- log.Debug().Msg("tryBranch, now trying upstream")
+ log.Debug().Msg("tryBranch, now trying upstream 3")
tryUpstream(ctx, giteaClient, mainDomainSuffix, trimmedHost,
targetOptions, targetOwner, targetRepo, targetBranch, targetPath,
canonicalDomainCache, branchTimestampCache, fileResponseCache)
@@ -203,7 +203,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
if strings.HasPrefix(pathElements[0], "@") {
log.Debug().Msg("main domain preparations, now trying with specified branch")
if tryBranch("pages", pathElements[0][1:], pathElements[1:], "/%p") {
- log.Debug().Msg("tryBranch, now trying upstream")
+ log.Debug().Msg("tryBranch, now trying upstream 4")
tryUpstream(ctx, giteaClient, mainDomainSuffix, trimmedHost,
targetOptions, targetOwner, targetRepo, targetBranch, targetPath,
canonicalDomainCache, branchTimestampCache, fileResponseCache)
@@ -218,7 +218,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
// example.codeberg.page/pages/... is not allowed here.
log.Debug().Msg("main domain preparations, now trying with specified repo")
if pathElements[0] != "pages" && tryBranch(pathElements[0], "pages", pathElements[1:], "") {
- log.Debug().Msg("tryBranch, now trying upstream")
+ log.Debug().Msg("tryBranch, now trying upstream 5")
tryUpstream(ctx, giteaClient, mainDomainSuffix, trimmedHost,
targetOptions, targetOwner, targetRepo, targetBranch, targetPath,
canonicalDomainCache, branchTimestampCache, fileResponseCache)
@@ -229,7 +229,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
// example.codeberg.page/index.html
log.Debug().Msg("main domain preparations, now trying with default repo/branch")
if tryBranch("pages", "", pathElements, "") {
- log.Debug().Msg("tryBranch, now trying upstream")
+ log.Debug().Msg("tryBranch, now trying upstream 6")
tryUpstream(ctx, giteaClient, mainDomainSuffix, trimmedHost,
targetOptions, targetOwner, targetRepo, targetBranch, targetPath,
canonicalDomainCache, branchTimestampCache, fileResponseCache)
@@ -276,7 +276,7 @@ func Handler(mainDomainSuffix, rawDomain []byte,
return
}
- log.Debug().Msg("tryBranch, now trying upstream")
+ log.Debug().Msg("tryBranch, now trying upstream 7")
tryUpstream(ctx, giteaClient, mainDomainSuffix, trimmedHost,
targetOptions, targetOwner, targetRepo, targetBranch, targetPath,
canonicalDomainCache, branchTimestampCache, fileResponseCache)