mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-09-10 12:57:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: assorted ActivityPub code only refactors (#8274)

Browse source 
Fix parts of issue https://codeberg.org/forgejo/forgejo/issues/8221
and PR https://codeberg.org/forgejo/forgejo/pulls/4767

- PostgreSQL
- TestActivityPubPerson/SignedRequestValidation

```
    --- FAIL: TestActivityPubPerson/SignedRequestValidation (5.01s)
        api_activitypub_person_test.go:51:
            	Error Trace:	/workspace/forgejo/forgejo/tests/integration/api_activitypub_person_test.go:51
            	Error:      	Received unexpected error:
            	            	Get "http://127.0.0.1:3002/api/v1/activitypub/user-id/2": context deadline exceeded (Client.Timeout exceeded while awaiting headers)
            	Test:       	TestActivityPubPerson/SignedRequestValidation
    testlogger.go:411: 2025/06/24 00:12:27 ...eb/routing/logger.go:102:func1() [I] router: completed GET /api/v1/activitypub/user-id/2 for 127.0.0.1:50456, 200 OK in 5032.2ms @ activitypub/person.go:21(activitypub.Person)
```

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8274
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Co-authored-by: Michael Jerger <michael.jerger@meissa-gmbh.de>
Co-committed-by: Michael Jerger <michael.jerger@meissa-gmbh.de>
This commit is contained in:
Michael Jerger 2025-07-25 18:01:43 +02:00 • committed by Earl Warren
commit e271c24100
20 changed files with 741 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

34
routers/api/v1/activitypub/response.go
View file

@ -10,12 +10,46 @@ import (
"forgejo.org/modules/forgefed"
"forgejo.org/modules/log"
"forgejo.org/services/context"
"forgejo.org/services/federation"
ap "github.com/go-ap/activitypub"
"github.com/go-ap/jsonld"
)
// Respond with an ActivityStreams object
func responseServiceResult(ctx *context.APIContext, result federation.ServiceResult) {
ctx.Resp.Header().Add("Content-Type", activitypub.ActivityStreamsContentType)
switch {
case result.StatusOnly():
ctx.Resp.WriteHeader(result.HTTPStatus)
return
case result.WithBytes():
ctx.Resp.WriteHeader(result.HTTPStatus)
if _, err := ctx.Resp.Write(result.Bytes); err != nil {
log.Error("Error writing a response: %v", err)
ctx.Error(http.StatusInternalServerError, "Error writing a response", err)
return
}
case result.WithActivity():
binary, err := jsonld.WithContext(
jsonld.IRI(ap.ActivityBaseURI),
jsonld.IRI(ap.SecurityContextURI),
jsonld.IRI(forgefed.ForgeFedNamespaceURI),
).Marshal(result.Activity)
if err != nil {
ctx.ServerError("Marshal", err)
return
}
ctx.Resp.WriteHeader(result.HTTPStatus)
if _, err = ctx.Resp.Write(binary); err != nil {
log.Error("write to resp err: %v", err)
}
}
}
// Respond with an ActivityStreams object
// Deprecated
func response(ctx *context.APIContext, v any) {
binary, err := jsonld.WithContext(
jsonld.IRI(ap.ActivityBaseURI),