lilfade/Activity-Relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix Retrieve Actor.

Browse Source
This commit is contained in:
Naoki Kosaka 2020-05-10 13:59:15 +09:00
parent 67251952a2
commit 0f5e4d46ce
2 changed files with 76 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
decode.go
View File

@ -9,10 +9,10 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"github.com/go-fed/httpsig"
"github.com/spf13/viper" "github.com/spf13/viper"
activitypub "github.com/yukimochi/Activity-Relay/ActivityPub" activitypub "github.com/yukimochi/Activity-Relay/ActivityPub"
keyloader "github.com/yukimochi/Activity-Relay/KeyLoader" keyloader "github.com/yukimochi/Activity-Relay/KeyLoader"
"github.com/yukimochi/httpsig"
) )
func decodeActivity(request *http.Request) (*activitypub.Activity, *activitypub.Actor, []byte, error) { func decodeActivity(request *http.Request) (*activitypub.Activity, *activitypub.Actor, []byte, error) {
@ -27,12 +27,12 @@ func decodeActivity(request *http.Request) (*activitypub.Activity, *activitypub.
return nil, nil, nil, err return nil, nil, nil, err
} }
KeyID := verifier.KeyId() KeyID := verifier.KeyId()
remoteActor := new(activitypub.Actor) keyOwnerActor := new(activitypub.Actor)
err = remoteActor.RetrieveRemoteActor(KeyID, fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", viper.GetString("relay_servicename"), version, hostURL.Host), actorCache) err = keyOwnerActor.RetrieveRemoteActor(KeyID, fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", viper.GetString("relay_servicename"), version, hostURL.Host), actorCache)
if err != nil { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err
} }
PubKey, err := keyloader.ReadPublicKeyRSAfromString(remoteActor.PublicKey.PublicKeyPem) PubKey, err := keyloader.ReadPublicKeyRSAfromString(keyOwnerActor.PublicKey.PublicKeyPem)
if PubKey == nil { if PubKey == nil {
return nil, nil, nil, errors.New("Failed parse PublicKey from string") return nil, nil, nil, errors.New("Failed parse PublicKey from string")
} }
@ -55,11 +55,18 @@ func decodeActivity(request *http.Request) (*activitypub.Activity, *activitypub.
return nil, nil, nil, errors.New("Digest header is mismatch") return nil, nil, nil, errors.New("Digest header is mismatch")
} }
// Parse Activity
var activity activitypub.Activity var activity activitypub.Activity
err = json.Unmarshal(body, &activity) err = json.Unmarshal(body, &activity)
if err != nil { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err
} }
return &activity, remoteActor, body, nil var remoteActor activitypub.Actor
err = remoteActor.RetrieveRemoteActor(activity.Actor, fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", viper.GetString("relay_servicename"), version, hostURL.Host), actorCache)
if err != nil {
return nil, nil, nil, err
}
return &activity, &remoteActor, body, nil
} }

133
decode_test.go
View File

@ -2,38 +2,17 @@ package main
import ( import (
"bytes" "bytes"
"fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/http/httptest"
"os" "os"
"strconv"
"testing" "testing"
state "github.com/yukimochi/Activity-Relay/State" state "github.com/yukimochi/Activity-Relay/State"
) )
func TestHandleInboxNoSignure(t *testing.T) { func TestDecodeActivity(t *testing.T) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
handleInbox(w, r, decodeActivity)
}))
defer s.Close()
req, _ := http.NewRequest("POST", s.URL, nil)
client := new(http.Client)
r, err := client.Do(req)
if err != nil {
t.Fatalf("Failed - " + err.Error())
}
if r.StatusCode != 400 {
t.Fatalf("Failed - StatusCode is not 400")
}
}
func TestHandleInboxWithRemoteActor(t *testing.T) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
handleInbox(w, r, decodeActivity)
}))
defer s.Close()
relayState.AddSubscription(state.Subscription{ relayState.AddSubscription(state.Subscription{
Domain: "innocent.yukimochi.io", Domain: "innocent.yukimochi.io",
InboxURL: "https://innocent.yukimochi.io/inbox", InboxURL: "https://innocent.yukimochi.io/inbox",
@ -41,30 +20,29 @@ func TestHandleInboxWithRemoteActor(t *testing.T) {
file, _ := os.Open("./misc/create.json") file, _ := os.Open("./misc/create.json")
body, _ := ioutil.ReadAll(file) body, _ := ioutil.ReadAll(file)
req, _ := http.NewRequest("POST", s.URL+"/inbox", bytes.NewReader(body)) length := strconv.Itoa(len(body))
req, _ := http.NewRequest("POST", "/inbox", bytes.NewReader(body))
req.Host = "relay.01.cloudgarage.yukimochi.io" req.Host = "relay.01.cloudgarage.yukimochi.io"
req.Header.Set("date", "Sun, 23 Dec 2018 07:39:37 GMT") req.Header.Add("content-length", length)
req.Header.Set("digest", "SHA-256=mxgIzbPwBuNYxmjhQeH0vWeEedQGqR1R7zMwR/XTfX8=") req.Header.Add("content-type", "application/activity+json")
req.Header.Set("content-type", "application/activity+json") req.Header.Add("date", "Sun, 23 Dec 2018 07:39:37 GMT")
req.Header.Set("signature", `keyId="https://innocent.yukimochi.io/users/YUKIMOCHI#main-key",algorithm="rsa-sha256",headers="(request-target) host date digest content-type",signature="MhxXhL21RVp8VmALER2U/oJlWldJAB2COiU2QmwGopLD2pw1c32gQvg0PaBRHfMBBOsidZuRRnj43Kn488zW2xV3n3DYWcGscSh527/hhRzcpLVX2kBqbf/WeQzJmfJVuOX4SzivVhnnUB8PvlPj5LRHpw4n/ctMTq37strKDl9iZg9rej1op1YFJagDxm3iPzAhnv8lzO4RI9dstt2i/sN5EfjXai97oS7EgI//Kj1wJCRk9Pw1iTsGfPTkbk/aVZwDt7QGGvGDdO0JJjsCqtIyjojoyD9hFY9GzMqvTwVIYJrh54AUHq2i80veybaOBbCFcEaK0RpKoLs101r5Uw=="`) req.Header.Add("digest", "SHA-256=mxgIzbPwBuNYxmjhQeH0vWeEedQGqR1R7zMwR/XTfX8=")
client := new(http.Client) req.Header.Add("signature", `keyId="https://innocent.yukimochi.io/users/YUKIMOCHI#main-key",algorithm="rsa-sha256",headers="(request-target) host date digest content-type",signature="MhxXhL21RVp8VmALER2U/oJlWldJAB2COiU2QmwGopLD2pw1c32gQvg0PaBRHfMBBOsidZuRRnj43Kn488zW2xV3n3DYWcGscSh527/hhRzcpLVX2kBqbf/WeQzJmfJVuOX4SzivVhnnUB8PvlPj5LRHpw4n/ctMTq37strKDl9iZg9rej1op1YFJagDxm3iPzAhnv8lzO4RI9dstt2i/sN5EfjXai97oS7EgI//Kj1wJCRk9Pw1iTsGfPTkbk/aVZwDt7QGGvGDdO0JJjsCqtIyjojoyD9hFY9GzMqvTwVIYJrh54AUHq2i80veybaOBbCFcEaK0RpKoLs101r5Uw=="`)
r, err := client.Do(req)
activity, actor, _, err := decodeActivity(req)
if err != nil { if err != nil {
t.Fatalf("Failed - " + err.Error()) t.Fatalf("Failed - " + err.Error())
} }
if r.StatusCode != 202 {
t.Fatalf("Failed - StatusCode is not 202") if activity.Actor != actor.ID {
fmt.Println(actor.ID)
t.Fatalf("Failed - retrieved actor is invalid")
} }
relayState.DelSubscription("innocent.yukimochi.io") relayState.DelSubscription("innocent.yukimochi.io")
} }
func TestHandleInboxWithNotfoundRemoteActor(t *testing.T) { func TestDecodeActivityWithNoSignature(t *testing.T) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
handleInbox(w, r, decodeActivity)
}))
defer s.Close()
relayState.AddSubscription(state.Subscription{ relayState.AddSubscription(state.Subscription{
Domain: "innocent.yukimochi.io", Domain: "innocent.yukimochi.io",
InboxURL: "https://innocent.yukimochi.io/inbox", InboxURL: "https://innocent.yukimochi.io/inbox",
@ -72,30 +50,23 @@ func TestHandleInboxWithNotfoundRemoteActor(t *testing.T) {
file, _ := os.Open("./misc/create.json") file, _ := os.Open("./misc/create.json")
body, _ := ioutil.ReadAll(file) body, _ := ioutil.ReadAll(file)
req, _ := http.NewRequest("POST", s.URL+"/inbox", bytes.NewReader(body)) length := strconv.Itoa(len(body))
req, _ := http.NewRequest("POST", "/inbox", bytes.NewReader(body))
req.Host = "relay.01.cloudgarage.yukimochi.io" req.Host = "relay.01.cloudgarage.yukimochi.io"
req.Header.Set("date", "Sun, 23 Dec 2018 07:39:37 GMT") req.Header.Add("content-length", length)
req.Header.Set("digest", "SHA-256=mxgIzbPwBuNYxmjhQeH0vWeEedQGqR1R7zMwR/XTfX8=") req.Header.Add("content-type", "application/activity+json")
req.Header.Set("content-type", "application/activity+json") req.Header.Add("date", "Sun, 23 Dec 2018 07:39:37 GMT")
req.Header.Set("signature", `keyId="https://innocent.yukimochi.io/users/admin#main-key",algorithm="rsa-sha256",headers="(request-target) host date digest content-type",signature="MhxXhL21RVp8VmALER2U/oJlWldJAB2COiU2QmwGopLD2pw1c32gQvg0PaBRHfMBBOsidZuRRnj43Kn488zW2xV3n3DYWcGscSh527/hhRzcpLVX2kBqbf/WeQzJmfJVuOX4SzivVhnnUB8PvlPj5LRHpw4n/ctMTq37strKDl9iZg9rej1op1YFJagDxm3iPzAhnv8lzO4RI9dstt2i/sN5EfjXai97oS7EgI//Kj1wJCRk9Pw1iTsGfPTkbk/aVZwDt7QGGvGDdO0JJjsCqtIyjojoyD9hFY9GzMqvTwVIYJrh54AUHq2i80veybaOBbCFcEaK0RpKoLs101r5Uw=="`) req.Header.Add("digest", "SHA-256=mxgIzbPwBuNYxmjhQeH0vWeEedQGqR1R7zMwR/XTfX8=")
client := new(http.Client)
r, err := client.Do(req) _, _, _, err := decodeActivity(req)
if err != nil { if err.Error() != "neither \"Signature\" nor \"Authorization\" have signature parameters" {
t.Fatalf("Failed - " + err.Error()) t.Fatalf("Failed - Accept request without signature")
}
if r.StatusCode != 400 {
t.Fatalf("Failed - StatusCode is not 400")
} }
relayState.DelSubscription("innocent.yukimochi.io") relayState.DelSubscription("innocent.yukimochi.io")
} }
func TestHandleInboxInvalidDigestWithRemoteActor(t *testing.T) { func TestDecodeActivityWithNotFoundKeyId(t *testing.T) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
handleInbox(w, r, decodeActivity)
}))
defer s.Close()
relayState.AddSubscription(state.Subscription{ relayState.AddSubscription(state.Subscription{
Domain: "innocent.yukimochi.io", Domain: "innocent.yukimochi.io",
InboxURL: "https://innocent.yukimochi.io/inbox", InboxURL: "https://innocent.yukimochi.io/inbox",
@ -103,19 +74,43 @@ func TestHandleInboxInvalidDigestWithRemoteActor(t *testing.T) {
file, _ := os.Open("./misc/create.json") file, _ := os.Open("./misc/create.json")
body, _ := ioutil.ReadAll(file) body, _ := ioutil.ReadAll(file)
req, _ := http.NewRequest("POST", s.URL+"/inbox", bytes.NewReader(body)) length := strconv.Itoa(len(body))
req, _ := http.NewRequest("POST", "/inbox", bytes.NewReader(body))
req.Host = "relay.01.cloudgarage.yukimochi.io" req.Host = "relay.01.cloudgarage.yukimochi.io"
req.Header.Set("date", "Sun, 23 Dec 2018 07:39:37 GMT") req.Header.Add("content-length", length)
req.Header.Set("digest", "SHA-256=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx") req.Header.Add("content-type", "application/activity+json")
req.Header.Set("content-type", "application/activity+json") req.Header.Add("date", "Sun, 23 Dec 2018 07:39:37 GMT")
req.Header.Set("signature", `keyId="https://innocent.yukimochi.io/users/YUKIMOCHI#main-key",algorithm="rsa-sha256",headers="(request-target) host date digest content-type",signature="MhxXhL21RVp8VmALER2U/oJlWldJAB2COiU2QmwGopLD2pw1c32gQvg0PaBRHfMBBOsidZuRRnj43Kn488zW2xV3n3DYWcGscSh527/hhRzcpLVX2kBqbf/WeQzJmfJVuOX4SzivVhnnUB8PvlPj5LRHpw4n/ctMTq37strKDl9iZg9rej1op1YFJagDxm3iPzAhnv8lzO4RI9dstt2i/sN5EfjXai97oS7EgI//Kj1wJCRk9Pw1iTsGfPTkbk/aVZwDt7QGGvGDdO0JJjsCqtIyjojoyD9hFY9GzMqvTwVIYJrh54AUHq2i80veybaOBbCFcEaK0RpKoLs101r5Uw=="`) req.Header.Add("digest", "SHA-256=mxgIzbPwBuNYxmjhQeH0vWeEedQGqR1R7zMwR/XTfX8=")
client := new(http.Client) req.Header.Add("signature", `keyId="https://innocent.yukimochi.io/users/admin#main-key",algorithm="rsa-sha256",headers="(request-target) host date digest content-type",signature="MhxXhL21RVp8VmALER2U/oJlWldJAB2COiU2QmwGopLD2pw1c32gQvg0PaBRHfMBBOsidZuRRnj43Kn488zW2xV3n3DYWcGscSh527/hhRzcpLVX2kBqbf/WeQzJmfJVuOX4SzivVhnnUB8PvlPj5LRHpw4n/ctMTq37strKDl9iZg9rej1op1YFJagDxm3iPzAhnv8lzO4RI9dstt2i/sN5EfjXai97oS7EgI//Kj1wJCRk9Pw1iTsGfPTkbk/aVZwDt7QGGvGDdO0JJjsCqtIyjojoyD9hFY9GzMqvTwVIYJrh54AUHq2i80veybaOBbCFcEaK0RpKoLs101r5Uw=="`)
r, err := client.Do(req)
if err != nil { _, _, _, err := decodeActivity(req)
t.Fatalf("Failed - " + err.Error()) if err.Error() != "404 Not Found" {
} t.Fatalf("Failed - Accept notfound KeyId")
if r.StatusCode != 400 { }
t.Fatalf("Failed - StatusCode is not 400")
relayState.DelSubscription("innocent.yukimochi.io")
}
func TestDecodeActivityWithInvalidDigest(t *testing.T) {
relayState.AddSubscription(state.Subscription{
Domain: "innocent.yukimochi.io",
InboxURL: "https://innocent.yukimochi.io/inbox",
})
file, _ := os.Open("./misc/create.json")
body, _ := ioutil.ReadAll(file)
length := strconv.Itoa(len(body))
req, _ := http.NewRequest("POST", "/inbox", bytes.NewReader(body))
req.Host = "relay.01.cloudgarage.yukimochi.io"
req.Header.Add("content-length", length)
req.Header.Add("content-type", "application/activity+json")
req.Header.Add("date", "Sun, 23 Dec 2018 07:39:37 GMT")
req.Header.Add("digest", "SHA-256=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
req.Header.Add("signature", `keyId="https://innocent.yukimochi.io/users/YUKIMOCHI#main-key",algorithm="rsa-sha256",headers="(request-target) host date digest content-type",signature="MhxXhL21RVp8VmALER2U/oJlWldJAB2COiU2QmwGopLD2pw1c32gQvg0PaBRHfMBBOsidZuRRnj43Kn488zW2xV3n3DYWcGscSh527/hhRzcpLVX2kBqbf/WeQzJmfJVuOX4SzivVhnnUB8PvlPj5LRHpw4n/ctMTq37strKDl9iZg9rej1op1YFJagDxm3iPzAhnv8lzO4RI9dstt2i/sN5EfjXai97oS7EgI//Kj1wJCRk9Pw1iTsGfPTkbk/aVZwDt7QGGvGDdO0JJjsCqtIyjojoyD9hFY9GzMqvTwVIYJrh54AUHq2i80veybaOBbCFcEaK0RpKoLs101r5Uw=="`)
_, _, _, err := decodeActivity(req)
if err.Error() != "crypto/rsa: verification error" {
t.Fatalf("Failed - Accept unvalid digest")
} }
relayState.DelSubscription("innocent.yukimochi.io") relayState.DelSubscription("innocent.yukimochi.io")