s83/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2024-11-30 16:05:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename gitea to forge in html error messages (#287)

Browse Source 
closes #286

Reviewed-on: https://codeberg.org/Codeberg/pages-server/pulls/287
Reviewed-by: Andreas Shimokawa <ashimokawa@noreply.codeberg.org>
Co-authored-by: crapStone <crapstone01@gmail.com>
Co-committed-by: crapStone <crapstone01@gmail.com>
This commit is contained in:
crapStone 2024-02-11 12:43:25 +00:00 committed by crapStone
parent a09bee68ad
commit c1fbe861fe
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/certificates/certificates.go
View File

@ -199,7 +199,7 @@ func (c *AcmeClient) retrieveCertFromDB(sni, mainDomainSuffix string, useDnsProv
func (c *AcmeClient) obtainCert(acmeClient *lego.Client, domains []string, renew *certificate.Resource, user string, useDnsProvider bool, mainDomainSuffix string, keyDatabase database.CertDB) (*tls.Certificate, error) { func (c *AcmeClient) obtainCert(acmeClient *lego.Client, domains []string, renew *certificate.Resource, user string, useDnsProvider bool, mainDomainSuffix string, keyDatabase database.CertDB) (*tls.Certificate, error) {
name := strings.TrimPrefix(domains[0], "*") name := strings.TrimPrefix(domains[0], "*")
if useDnsProvider && len(domains[0]) > 0 && domains[0][0] == '*' { if useDnsProvider && domains[0] != "" && domains[0][0] == '*' {
domains = domains[1:] domains = domains[1:]
} }

2
server/handler/try.go
View File

@ -41,7 +41,7 @@ func tryUpstream(ctx *context.Context, giteaClient *gitea.Client,
// Try to request the file from the Gitea API // Try to request the file from the Gitea API
if !options.Upstream(ctx, giteaClient, redirectsCache) { if !options.Upstream(ctx, giteaClient, redirectsCache) {
html.ReturnErrorPage(ctx, "gitea client failed", ctx.StatusCode) html.ReturnErrorPage(ctx, "forge client failed", ctx.StatusCode)
} }
} }

2
server/upstream/domains.go
View File

@ -41,7 +41,7 @@ func (o *Options) CheckCanonicalDomain(giteaClient *gitea.Client, actualDomain,
domain = strings.TrimSpace(domain) domain = strings.TrimSpace(domain)
domain = strings.TrimPrefix(domain, "http://") domain = strings.TrimPrefix(domain, "http://")
domain = strings.TrimPrefix(domain, "https://") domain = strings.TrimPrefix(domain, "https://")
if len(domain) > 0 && !strings.HasPrefix(domain, "#") && !strings.ContainsAny(domain, "\t /") && strings.ContainsRune(domain, '.') { if domain != "" && !strings.HasPrefix(domain, "#") && !strings.ContainsAny(domain, "\t /") && strings.ContainsRune(domain, '.') {
domains = append(domains, domain) domains = append(domains, domain)
} }
if domain == actualDomain { if domain == actualDomain {

8
server/upstream/upstream.go
View File

@ -57,7 +57,7 @@ func (o *Options) Upstream(ctx *context.Context, giteaClient *gitea.Client, redi
log := log.With().Strs("upstream", []string{o.TargetOwner, o.TargetRepo, o.TargetBranch, o.TargetPath}).Logger() log := log.With().Strs("upstream", []string{o.TargetOwner, o.TargetRepo, o.TargetBranch, o.TargetPath}).Logger()
if o.TargetOwner == "" || o.TargetRepo == "" { if o.TargetOwner == "" || o.TargetRepo == "" {
html.ReturnErrorPage(ctx, "gitea client: either repo owner or name info is missing", http.StatusBadRequest) html.ReturnErrorPage(ctx, "forge client: either repo owner or name info is missing", http.StatusBadRequest)
return true return true
} }
@ -153,16 +153,16 @@ func (o *Options) Upstream(ctx *context.Context, giteaClient *gitea.Client, redi
var msg string var msg string
if err != nil { if err != nil {
msg = "gitea client: returned unexpected error" msg = "forge client: returned unexpected error"
log.Error().Err(err).Msg(msg) log.Error().Err(err).Msg(msg)
msg = fmt.Sprintf("%s: '%v'", msg, err) msg = fmt.Sprintf("%s: '%v'", msg, err)
} }
if reader == nil { if reader == nil {
msg = "gitea client: returned no reader" msg = "forge client: returned no reader"
log.Error().Msg(msg) log.Error().Msg(msg)
} }
if statusCode != http.StatusOK { if statusCode != http.StatusOK {
msg = fmt.Sprintf("gitea client: couldn't fetch contents: <code>%d - %s</code>", statusCode, http.StatusText(statusCode)) msg = fmt.Sprintf("forge client: couldn't fetch contents: <code>%d - %s</code>", statusCode, http.StatusText(statusCode))
log.Error().Msg(msg) log.Error().Msg(msg)
} }