Merge branch 'feature-activitypub' into feature-go-ap-inbox-outbox

Changes

6 changed files (+12/-7)

• custom/conf/app.example.ini
  • @@ -2231,10 +2231,12 @@ ;RETRY_BACKOFF = 3
    ;; ;; Allowed domains for migrating, default is blank. Blank means everything will be allowed. ;; Multiple domains could be separated by commas. + ;; Wildcard is supported: "github.com, *.github.com" ;ALLOWED_DOMAINS = ;; ;; Blocklist for migrating, default is blank. Multiple domains could be separated by commas. ;; When ALLOWED_DOMAINS is not blank, this option has a higher priority to deny domains. + ;; Wildcard is supported. ;BLOCKED_DOMAINS = ;; ;; Allow private addresses defined by RFC 1918, RFC 1122, RFC 4632 and RFC 4291 (false by default)
• docs/content/doc/advanced/config-cheat-sheet.en-us.md
  • @@ -1081,8 +1081,8 @@ ## Migrations (`migrations`)
    - `MAX_ATTEMPTS`: **3**: Max attempts per http/https request on migrations. - `RETRY_BACKOFF`: **3**: Backoff time per http/https request retry (seconds) - - `ALLOWED_DOMAINS`: **\<empty\>**: Domains allowlist for migrating repositories, default is blank. It means everything will be allowed. Multiple domains could be separated by commas. - - `BLOCKED_DOMAINS`: **\<empty\>**: Domains blocklist for migrating repositories, default is blank. Multiple domains could be separated by commas. When `ALLOWED_DOMAINS` is not blank, this option has a higher priority to deny domains. + - `ALLOWED_DOMAINS`: **\<empty\>**: Domains allowlist for migrating repositories, default is blank. It means everything will be allowed. Multiple domains could be separated by commas. Wildcard is supported: `github.com, *.github.com`. + - `BLOCKED_DOMAINS`: **\<empty\>**: Domains blocklist for migrating repositories, default is blank. Multiple domains could be separated by commas. When `ALLOWED_DOMAINS` is not blank, this option has a higher priority to deny domains. Wildcard is supported. - `ALLOW_LOCALNETWORKS`: **false**: Allow private addresses defined by RFC 1918, RFC 1122, RFC 4632 and RFC 4291 - `SKIP_TLS_VERIFY`: **false**: Allow skip tls verify
• modules/context/repo.go
  • @@ -942,6 +942,10 @@ ctx.Repo.TagName = refName
    ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetTagCommit(refName) if err != nil { + if git.IsErrNotExist(err) { + ctx.NotFound("GetTagCommit", err) + return + } ctx.ServerError("GetTagCommit", err) return }
• routers/api/v1/activitypub/person.go
  • @@ -45,14 +45,14 @@
    person.Name = ap.NaturalLanguageValuesNew() err := person.Name.Set("en", ap.Content(ctx.ContextUser.FullName)) if err != nil { - ctx.Error(http.StatusInternalServerError, "Set Name", err) + ctx.ServerError("Set Name", err) return } person.PreferredUsername = ap.NaturalLanguageValuesNew() err = person.PreferredUsername.Set("en", ap.Content(ctx.ContextUser.Name)) if err != nil { - ctx.Error(http.StatusInternalServerError, "Set PreferredUsername", err) + ctx.ServerError("Set PreferredUsername", err) return }
  • @@ -77,7 +77,7 @@ person.PublicKey.Owner = ap.IRI(link)
    publicKeyPem, err := activitypub.GetPublicKey(ctx.ContextUser) if err != nil { - ctx.Error(http.StatusInternalServerError, "GetPublicKey", err) + ctx.ServerError("GetPublicKey", err) return } person.PublicKey.PublicKeyPem = publicKeyPem
• routers/api/v1/activitypub/reqsignature.go
  • @@ -74,7 +74,7 @@ // ReqHTTPSignature function
    func ReqHTTPSignature() func(ctx *gitea_context.APIContext) { return func(ctx *gitea_context.APIContext) { if authenticated, err := verifyHTTPSignatures(ctx); err != nil { - ctx.Error(http.StatusInternalServerError, "verifyHttpSignatures", err) + ctx.ServerError("verifyHttpSignatures", err) } else if !authenticated { ctx.Error(http.StatusForbidden, "reqSignature", "request signature verification failed") }
• routers/web/webfinger.go
  • @@ -29,7 +29,6 @@ type webfingerLink struct {
    Rel string `json:"rel,omitempty"` Type string `json:"type,omitempty"` Href string `json:"href,omitempty"` - Template string `json:"template,omitempty"` Titles map[string]string `json:"titles,omitempty"` Properties map[string]interface{} `json:"properties,omitempty"` }