added artifacts
This commit is contained in:
@@ -0,0 +1,224 @@
|
||||
package federation
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"xorm.io/xorm"
|
||||
|
||||
"github.com/forgeo/forgebucket/internal/models"
|
||||
)
|
||||
|
||||
// RepoAPID returns the ActivityPub actor ID for a repository.
|
||||
// Format: {instanceURL}/repos/{owner}/{name}
|
||||
func RepoAPID(instanceURL, owner, name string) string {
|
||||
return strings.TrimRight(instanceURL, "/") + "/repos/" + owner + "/" + name
|
||||
}
|
||||
|
||||
// RepoActorJSON builds the JSON-LD actor document for a ForgeFed Repository actor.
|
||||
func RepoActorJSON(owner, name, description, instanceURL string) map[string]any {
|
||||
apid := RepoAPID(instanceURL, owner, name)
|
||||
return map[string]any{
|
||||
"@context": []any{
|
||||
"https://www.w3.org/ns/activitystreams",
|
||||
"https://w3id.org/security/v1",
|
||||
map[string]string{
|
||||
"Repository": "https://www.w3.org/ns/activitystreams#Repository",
|
||||
},
|
||||
},
|
||||
"id": apid,
|
||||
"type": "Repository",
|
||||
"preferredUsername": name,
|
||||
"name": owner + "/" + name,
|
||||
"summary": description,
|
||||
"inbox": apid + "/inbox",
|
||||
"outbox": apid + "/outbox",
|
||||
"followers": apid + "/followers",
|
||||
"following": apid + "/following",
|
||||
}
|
||||
}
|
||||
|
||||
// HandleCreatePullRequest processes an incoming Create activity whose object
|
||||
// is a PullRequest (per the ForgeFed vocabulary). It creates a local PR record
|
||||
// in the target repository for the cross-instance proposal.
|
||||
func HandleCreatePullRequest(db *xorm.Engine, body []byte, instanceURL string) error {
|
||||
var activity struct {
|
||||
Actor string `json:"actor"`
|
||||
Object struct {
|
||||
Type string `json:"type"`
|
||||
Summary string `json:"summary"`
|
||||
Content string `json:"content"`
|
||||
Source *struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
} `json:"source"`
|
||||
Target *struct {
|
||||
ID string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
} `json:"target"`
|
||||
} `json:"object"`
|
||||
}
|
||||
if err := json.Unmarshal(body, &activity); err != nil {
|
||||
return fmt.Errorf("parse activity: %w", err)
|
||||
}
|
||||
|
||||
if activity.Object.Type != "PullRequest" {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Extract target repository info from the object's target.
|
||||
targetID := activity.Object.Target.ID
|
||||
targetParts := strings.Split(strings.TrimRight(targetID, "/"), "/")
|
||||
if len(targetParts) < 2 {
|
||||
return fmt.Errorf("cannot parse target repo APID: %s", targetID)
|
||||
}
|
||||
// Last two segments should be owner/repo-name.
|
||||
repoOwner := targetParts[len(targetParts)-2]
|
||||
repoName := targetParts[len(targetParts)-1]
|
||||
|
||||
// Resolve the target repository.
|
||||
var repo models.Repository
|
||||
found, err := db.Where("name = ?", repoName).
|
||||
Join("INNER", "user", "repository.owner_id = user.id AND user.username = ?", repoOwner).
|
||||
Get(&repo)
|
||||
if err != nil {
|
||||
return fmt.Errorf("database error: %w", err)
|
||||
}
|
||||
if !found {
|
||||
return fmt.Errorf("target repo %s/%s not found on this instance", repoOwner, repoName)
|
||||
}
|
||||
|
||||
// Resolve or create a FederationActor for the repo owner (needed for key ops).
|
||||
var ownerUser models.User
|
||||
if found, _ := db.Where("username = ?", repoOwner).Get(&ownerUser); !found {
|
||||
return fmt.Errorf("owner user %s not found", repoOwner)
|
||||
}
|
||||
localActor, err := GetOrCreate(db, ownerUser.ID, repoOwner, instanceURL)
|
||||
if err != nil {
|
||||
return fmt.Errorf("get actor: %w", err)
|
||||
}
|
||||
|
||||
// Determine the PR title and body.
|
||||
title := activity.Object.Summary
|
||||
if title == "" {
|
||||
title = fmt.Sprintf("Cross-instance PR from %s", activity.Actor)
|
||||
}
|
||||
|
||||
bodyContent := activity.Object.Content
|
||||
if bodyContent == "" {
|
||||
bodyContent = fmt.Sprintf("Pull request proposed via ActivityPub from %s", activity.Actor)
|
||||
}
|
||||
|
||||
// Create the PR. For cross-instance PRs, authorID is set to the target
|
||||
// repo owner (we can't create a user for the remote actor automatically).
|
||||
// The RemoteSource field records the source repository APID.
|
||||
pr := &models.PullRequest{
|
||||
RepoID: repo.ID,
|
||||
AuthorID: ownerUser.ID,
|
||||
Title: title,
|
||||
Body: bodyContent,
|
||||
SourceBranch: "refs/for/main",
|
||||
TargetBranch: "main",
|
||||
Status: models.PRStatusOpen,
|
||||
RemoteSource: activity.Actor,
|
||||
}
|
||||
|
||||
// Try to extract source branch from the source repo.
|
||||
if activity.Object.Source != nil {
|
||||
sourceID := activity.Object.Source.ID
|
||||
if sourceID != "" {
|
||||
pr.RemoteSource = sourceID
|
||||
}
|
||||
if activity.Object.Source.Name != "" {
|
||||
pr.SourceBranch = activity.Object.Source.Name
|
||||
}
|
||||
}
|
||||
|
||||
if _, err := db.Insert(pr); err != nil {
|
||||
return fmt.Errorf("insert PR: %w", err)
|
||||
}
|
||||
|
||||
// Persist the outbound Accept for the PR activity so the remote knows
|
||||
// we received it (we auto-accept all incoming PRs).
|
||||
accept := map[string]any{
|
||||
"@context": "https://www.w3.org/ns/activitystreams",
|
||||
"id": localActor.APID + "/activities/accept-pr-" + fmt.Sprint(time.Now().UnixNano()),
|
||||
"type": "Accept",
|
||||
"actor": localActor.APID,
|
||||
}
|
||||
acceptJSON, _ := json.Marshal(accept)
|
||||
db.Insert(&models.FederationActivity{ //nolint:errcheck
|
||||
ActorAPID: localActor.APID,
|
||||
Type: "Accept",
|
||||
ObjectJSON: string(acceptJSON),
|
||||
Direction: "outbound",
|
||||
RemoteActor: activity.Actor,
|
||||
Published: time.Now().UTC(),
|
||||
})
|
||||
|
||||
log.Printf("forgefed: created PR %d from cross-instance actor %s", pr.ID, activity.Actor)
|
||||
return nil
|
||||
}
|
||||
|
||||
// SendCreatePullRequest delivers a Create(PullRequest) activity to a remote
|
||||
// instance's inbox. The remote inbox URL is derived from the forked-from repo's
|
||||
// APID by appending /inbox.
|
||||
func SendCreatePullRequest(db *xorm.Engine, localActor *models.FederationActor, pr *models.PullRequest, remoteAPID, instanceURL string) error {
|
||||
// Build the Create(PullRequest) activity.
|
||||
activity := map[string]any{
|
||||
"@context": "https://www.w3.org/ns/activitystreams",
|
||||
"id": localActor.APID + "/activities/create-pr-" + fmt.Sprint(time.Now().UnixNano()),
|
||||
"type": "Create",
|
||||
"actor": localActor.APID,
|
||||
"object": map[string]any{
|
||||
"type": "PullRequest",
|
||||
"id": localActor.APID + "/pull-requests/" + fmt.Sprint(pr.ID),
|
||||
"summary": pr.Title,
|
||||
"content": pr.Body,
|
||||
"source": map[string]any{
|
||||
"type": "Repository",
|
||||
"id": localActor.APID,
|
||||
},
|
||||
"target": map[string]any{
|
||||
"type": "Repository",
|
||||
"id": remoteAPID,
|
||||
},
|
||||
},
|
||||
"to": []string{remoteAPID + "/inbox", "https://www.w3.org/ns/activitystreams#Public"},
|
||||
}
|
||||
|
||||
remoteInbox := strings.TrimSuffix(remoteAPID, "/") + "/inbox"
|
||||
if err := DeliverActivity(localActor, activity, remoteInbox); err != nil {
|
||||
return fmt.Errorf("deliver PR to %s: %w", remoteInbox, err)
|
||||
}
|
||||
|
||||
actJSON, _ := json.Marshal(activity)
|
||||
db.Insert(&models.FederationActivity{ //nolint:errcheck
|
||||
ActorAPID: localActor.APID,
|
||||
Type: "Create",
|
||||
ObjectJSON: string(actJSON),
|
||||
Direction: "outbound",
|
||||
RemoteActor: remoteAPID,
|
||||
Published: time.Now().UTC(),
|
||||
})
|
||||
|
||||
log.Printf("forgefed: sent Create(PullRequest) for PR %d to %s", pr.ID, remoteInbox)
|
||||
return nil
|
||||
}
|
||||
|
||||
// IsCreatePullRequest checks whether the given body is a Create(PullRequest) activity.
|
||||
func IsCreatePullRequest(body []byte) bool {
|
||||
var check struct {
|
||||
Type string `json:"type"`
|
||||
Object struct {
|
||||
Type string `json:"type"`
|
||||
} `json:"object"`
|
||||
}
|
||||
if err := json.Unmarshal(body, &check); err != nil {
|
||||
return false
|
||||
}
|
||||
return check.Type == "Create" && check.Object.Type == "PullRequest"
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
package federation
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestRepoAPID(t *testing.T) {
|
||||
apid := RepoAPID("https://example.com", "alice", "myrepo")
|
||||
expected := "https://example.com/repos/alice/myrepo"
|
||||
if apid != expected {
|
||||
t.Errorf("got %q, want %q", apid, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRepoAPID_TrailingSlash(t *testing.T) {
|
||||
apid := RepoAPID("https://example.com/", "bob", "app")
|
||||
expected := "https://example.com/repos/bob/app"
|
||||
if apid != expected {
|
||||
t.Errorf("got %q, want %q", apid, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRepoActorJSON(t *testing.T) {
|
||||
doc := RepoActorJSON("alice", "myrepo", "A cool repo", "https://example.com")
|
||||
if doc["type"] != "Repository" {
|
||||
t.Errorf("type = %v, want Repository", doc["type"])
|
||||
}
|
||||
if doc["preferredUsername"] != "myrepo" {
|
||||
t.Errorf("preferredUsername = %v", doc["preferredUsername"])
|
||||
}
|
||||
if doc["name"] != "alice/myrepo" {
|
||||
t.Errorf("name = %v", doc["name"])
|
||||
}
|
||||
if doc["summary"] != "A cool repo" {
|
||||
t.Errorf("summary = %v", doc["summary"])
|
||||
}
|
||||
|
||||
inbox, ok := doc["inbox"].(string)
|
||||
if !ok || inbox != "https://example.com/repos/alice/myrepo/inbox" {
|
||||
t.Errorf("inbox = %v", inbox)
|
||||
}
|
||||
outbox, ok := doc["outbox"].(string)
|
||||
if !ok || outbox != "https://example.com/repos/alice/myrepo/outbox" {
|
||||
t.Errorf("outbox = %v", outbox)
|
||||
}
|
||||
}
|
||||
|
||||
func TestIsCreatePullRequest(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
body []byte
|
||||
want bool
|
||||
}{
|
||||
{
|
||||
name: "valid Create(PullRequest)",
|
||||
body: []byte(`{"type":"Create","object":{"type":"PullRequest","summary":"fix bug"}}`),
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "Create with non-PR object",
|
||||
body: []byte(`{"type":"Create","object":{"type":"Note"}}`),
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "Follow activity",
|
||||
body: []byte(`{"type":"Follow","object":"https://example.com/users/alice"}`),
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "invalid JSON",
|
||||
body: []byte(`not json`),
|
||||
want: false,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if got := IsCreatePullRequest(tt.body); got != tt.want {
|
||||
t.Errorf("IsCreatePullRequest() = %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestExtractInstanceURL(t *testing.T) {
|
||||
tests := []struct {
|
||||
apid string
|
||||
want string
|
||||
}{
|
||||
{"https://example.com/users/alice", "https://example.com"},
|
||||
{"http://localhost:8080/users/bob", "http://localhost:8080"},
|
||||
{"https://forge.example.org/users/charlie", "https://forge.example.org"},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.apid, func(t *testing.T) {
|
||||
if got := extractInstanceURL(tt.apid); got != tt.want {
|
||||
t.Errorf("extractInstanceURL() = %q, want %q", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"xorm.io/xorm"
|
||||
@@ -39,6 +40,16 @@ func Receive(db *xorm.Engine, localActor *models.FederationActor, body []byte) e
|
||||
handleAccept(db, localActor, activity)
|
||||
case "Undo":
|
||||
handleUndo(db, localActor, activity)
|
||||
case "Create":
|
||||
if IsCreatePullRequest(body) {
|
||||
// Derive instanceURL from the local actor's APID.
|
||||
instanceURL := extractInstanceURL(localActor.APID)
|
||||
if err := HandleCreatePullRequest(db, body, instanceURL); err != nil {
|
||||
log.Printf("federation: handle Create(PullRequest): %v", err)
|
||||
}
|
||||
} else {
|
||||
log.Printf("federation: received Create activity from %s (non-PR, skipped)", actorAPID)
|
||||
}
|
||||
default:
|
||||
log.Printf("federation: received unhandled activity type %q from %s", actType, actorAPID)
|
||||
}
|
||||
@@ -111,3 +122,13 @@ func mustJSON(v any) string {
|
||||
b, _ := json.Marshal(v)
|
||||
return string(b)
|
||||
}
|
||||
|
||||
func extractInstanceURL(apid string) string {
|
||||
// apid is like "https://example.com/users/alice"
|
||||
// Return "https://example.com"
|
||||
parts := strings.SplitN(apid, "/", 4)
|
||||
if len(parts) >= 3 {
|
||||
return parts[0] + "//" + parts[2]
|
||||
}
|
||||
return apid
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user