test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Cleanup, handle invalid usernames for ActivityPub person GET request 

Signed-off-by: Anthony Wang <ta180m@pm.me>
This commit is contained in:
Anthony Wang 2022-03-24 18:44:44 -05:00
parent ebef769703
commit 46973f99fa
No known key found for this signature in database
GPG Key ID: BC96B00AEC5F2D76
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
routers/api/v1/activitypub/person.go
View File

@ -35,6 +35,9 @@ func Person(ctx *context.APIContext) {
// "$ref": "#/responses/ActivityPub" // "$ref": "#/responses/ActivityPub"
user := user.GetUserByParamsName(ctx, "username") user := user.GetUserByParamsName(ctx, "username")
if user == nil {
return
}
username := ctx.Params("username") username := ctx.Params("username")
person := streams.NewActivityStreamsPerson() person := streams.NewActivityStreamsPerson()

3
routers/api/v1/activitypub/reqsignature.go
View File

@ -13,6 +13,7 @@ import (
"io" "io"
"net/http" "net/http"
"net/url" "net/url"
"time"
"code.gitea.io/gitea/modules/activitypub" "code.gitea.io/gitea/modules/activitypub"
gitea_context "code.gitea.io/gitea/modules/context" gitea_context "code.gitea.io/gitea/modules/context"
@ -99,7 +100,7 @@ func fetch(iri *url.URL) (b []byte, err error) {
if err != nil { if err != nil {
return 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 var resp *http.Response
client := &http.Client{} client := &http.Client{}
resp, err = client.Do(req) resp, err = client.Do(req)

4
routers/api/v1/api.go
View File

@ -599,9 +599,7 @@ func Routes(sessioner func(http.Handler) http.Handler) *web.Route {
if setting.Federation.Enabled { if setting.Federation.Enabled {
m.Get("/nodeinfo", misc.NodeInfo) m.Get("/nodeinfo", misc.NodeInfo)
m.Group("/activitypub", func() { m.Group("/activitypub", func() {
m.Group("/user/{username}", func() { m.Get("/user/{username}", activitypub.Person)
m.Get("", activitypub.Person)
})
m.Post("/user/{username}/inbox", activitypub.ReqSignature(), activitypub.PersonInbox) m.Post("/user/{username}/inbox", activitypub.ReqSignature(), activitypub.PersonInbox)
}) })
} }