Cleanup, handle invalid usernames for ActivityPub person GET request Signed-off-by: Anthony Wang <ta180m@pm.me>

Changes

3 changed files (+6/-4)

• routers/api/v1/activitypub/person.go
  • @@ -35,6 +35,9 @@ func Person(ctx *context.APIContext) {
    // "$ref": "#/responses/ActivityPub" user := user.GetUserByParamsName(ctx, "username") + if user == nil { + return + } username := ctx.Params("username") person := streams.NewActivityStreamsPerson()
• routers/api/v1/activitypub/reqsignature.go
  • @@ -13,6 +13,7 @@ import (
    "io" "net/http" "net/url" + "time" "code.gitea.io/gitea/modules/activitypub" gitea_context "code.gitea.io/gitea/modules/context"
  • @@ -99,7 +100,7 @@ func fetch(iri *url.URL) (b []byte, err error) {
    if err != nil { return } - req.Header.Add("Date", fmt.Sprintf("%s GMT", clock.Now().UTC().Format("Mon, 02 Jan 2006 15:04:05"))) + req.Header.Add("Date", fmt.Sprintf("%s GMT", clock.Now().UTC().Format(time.RFC1123))) var resp *http.Response client := &http.Client{} resp, err = client.Do(req)
• routers/api/v1/api.go
  • @@ -599,9 +599,7 @@ func Routes(sessioner func(http.Handler) http.Handler) *web.Route {
    if setting.Federation.Enabled { m.Get("/nodeinfo", misc.NodeInfo) m.Group("/activitypub", func() { - m.Group("/user/{username}", func() { - m.Get("", activitypub.Person) - }) + m.Get("/user/{username}", activitypub.Person) m.Post("/user/{username}/inbox", activitypub.ReqSignature(), activitypub.PersonInbox) }) }