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

Reject invalid follow. (#2)

Browse Source 
* Reject UnAcceptable follow.
Check unfollow acceptable.

* Add test.
This commit is contained in:
Naoki Kosaka 2018-11-25 11:40:18 +09:00 committed by GitHub
parent 8b23ec4d86
commit eb93b37654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
handle.go
View File

@ -125,6 +125,14 @@ func followAcceptable(activity *activitypub.Activity, actor *activitypub.Actor)
}
}
func unFollowAcceptable(activity *activitypub.Activity, actor *activitypub.Actor) error {
if contains(activity.Object, "https://www.w3.org/ns/activitystreams#Public") {
return nil
} else {
return errors.New("Unfollow only allowed for https://www.w3.org/ns/activitystreams#Public")
}
}
func suitableFollow(activity *activitypub.Activity, actor *activitypub.Actor) bool {
domain, _ := url.Parse(activity.Actor)
blocked, _ := redClient.HExists("relay:config:blockedDomain", domain.Host).Result()
@ -171,8 +179,10 @@ func handleInbox(w http.ResponseWriter, r *http.Request, activityDecoder func(*h
case "Follow":
err = followAcceptable(activity, actor)
if err != nil {
w.WriteHeader(400)
w.Write([]byte(err.Error()))
resp := activitypub.GenerateActivityResponse(hostname, domain, "Reject", *activity)
jsonData, _ := json.Marshal(&resp)
go pushRegistorJob(actor.Inbox, jsonData)
fmt.Println("Reject Follow Request : ", err.Error(), activity.Actor)
} else {
if suitableFollow(activity, actor) {
if relConfig.ManuallyAccept {
@ -201,14 +211,24 @@ func handleInbox(w http.ResponseWriter, r *http.Request, activityDecoder func(*h
w.WriteHeader(202)
w.Write(nil)
}
w.WriteHeader(202)
w.Write(nil)
case "Undo":
nestedActivity, _ := activitypub.DescribeNestedActivity(activity.Object)
if nestedActivity.Type == "Follow" && nestedActivity.Actor == activity.Actor {
redClient.Del("relay:subscription:" + domain.Host)
fmt.Println("Accept Unfollow Request : ", activity.Actor)
err = unFollowAcceptable(nestedActivity, actor)
if err != nil {
fmt.Println("Reject Unfollow Request : ", err.Error())
w.WriteHeader(400)
w.Write([]byte(err.Error()))
} else {
redClient.Del("relay:subscription:" + domain.Host)
fmt.Println("Accept Unfollow Request : ", activity.Actor)
w.WriteHeader(202)
w.Write(nil)
w.WriteHeader(202)
w.Write(nil)
}
} else {
err = relayAcceptable(activity, actor)
if err != nil {

36
handle_test.go
View File

@ -185,6 +185,11 @@ func mockActivity(req string) activitypub.Activity {
var activity activitypub.Activity
json.Unmarshal([]byte(body), &activity)
return activity
case "UnfollowAsActor":
body := "{\"@context\":\"https://www.w3.org/ns/activitystreams\",\"id\":\"https://mastodon.test.yukimochi.io/c125e836-e622-478e-a22d-2d9fbf2f496f\",\"type\":\"Undo\",\"actor\":\"https://mastodon.test.yukimochi.io/users/yukimochi\",\"object\":{\"@context\":\"https://www.w3.org/ns/activitystreams\",\"id\":\"https://hacked.test.yukimochi.io/c125e836-e622-478e-a22d-2d9fbf2f496f\",\"type\":\"Follow\",\"actor\":\"https://mastodon.test.yukimochi.io/users/yukimochi\",\"object\":\"https://relay.yukimochi.example.org/actor\"}}"
var activity activitypub.Activity
json.Unmarshal([]byte(body), &activity)
return activity
case "Create":
body := "{\"@context\":[\"https://www.w3.org/ns/activitystreams\",\"https://w3id.org/security/v1\",{\"manuallyApprovesFollowers\":\"as:manuallyApprovesFollowers\",\"sensitive\":\"as:sensitive\",\"movedTo\":{\"@id\":\"as:movedTo\",\"@type\":\"@id\"},\"Hashtag\":\"as:Hashtag\",\"ostatus\":\"http://ostatus.org#\",\"atomUri\":\"ostatus:atomUri\",\"inReplyToAtomUri\":\"ostatus:inReplyToAtomUri\",\"conversation\":\"ostatus:conversation\",\"toot\":\"http://joinmastodon.org/ns#\",\"Emoji\":\"toot:Emoji\",\"focalPoint\":{\"@container\":\"@list\",\"@id\":\"toot:focalPoint\"},\"featured\":{\"@id\":\"toot:featured\",\"@type\":\"@id\"},\"schema\":\"http://schema.org#\",\"PropertyValue\":\"schema:PropertyValue\",\"value\":\"schema:value\"}],\"id\":\"https://mastodon.test.yukimochi.io/users/yukimochi/statuses/101075045564444857/activity\",\"type\":\"Create\",\"actor\":\"https://mastodon.test.yukimochi.io/users/yukimochi\",\"published\":\"2018-11-15T11:07:26Z\",\"to\":[\"https://www.w3.org/ns/activitystreams#Public\"],\"cc\":[\"https://mastodon.test.yukimochi.io/users/yukimochi/followers\"],\"object\":{\"id\":\"https://mastodon.test.yukimochi.io/users/yukimochi/statuses/101075045564444857\",\"type\":\"Note\",\"summary\":null,\"inReplyTo\":null,\"published\":\"2018-11-15T11:07:26Z\",\"url\":\"https://mastodon.test.yukimochi.io/@yukimochi/101075045564444857\",\"attributedTo\":\"https://mastodon.test.yukimochi.io/users/yukimochi\",\"to\":[\"https://www.w3.org/ns/activitystreams#Public\"],\"cc\":[\"https://mastodon.test.yukimochi.io/users/yukimochi/followers\"],\"sensitive\":false,\"atomUri\":\"https://mastodon.test.yukimochi.io/users/yukimochi/statuses/101075045564444857\",\"inReplyToAtomUri\":null,\"conversation\":\"tag:mastodon.test.yukimochi.io,2018-11-15:objectId=68:objectType=Conversation\",\"content\":\"<p>Actvity-Relay</p>\",\"contentMap\":{\"en\":\"<p>Actvity-Relay</p>\"},\"attachment\":[],\"tag\":[]},\"signature\":{\"type\":\"RsaSignature2017\",\"creator\":\"https://mastodon.test.yukimochi.io/users/yukimochi#main-key\",\"created\":\"2018-11-15T11:07:26Z\",\"signatureValue\":\"mMgl2GgVPgb1Kw6a2iDIZc7r0j3ob+Cl9y+QkCxIe6KmnUzb15e60UuhkE5j3rJnoTwRKqOFy1PMkSxlYW6fPG/5DBxW9I4kX+8sw8iH/zpwKKUOnXUJEqfwRrNH2ix33xcs/GkKPdedY6iAPV9vGZ10MSMOdypfYgU9r+UI0sTaaC2iMXH0WPnHQuYAI+Q1JDHIbDX5FH1WlDL6+8fKAicf3spBMxDwPHGPK8W2jmDLWdN2Vz4ffsCtWs5BCuqOKZrtTW0Rdd4HWzo40MnRXvBjv7yNlnnKzokANBqiOLWT7kNfK0+Vtnt6c/bNX64KBro53KR7wL3ZBvPVuv5rdQ==\"}}"
var activity activitypub.Activity
@ -400,8 +405,8 @@ func TestHandleInboxInvalidFollow(t *testing.T) {
if err != nil {
t.Fatalf("Failed - " + err.Error())
}
if r.StatusCode != 400 {
t.Fatalf("Failed - StatusCode is not 400")
if r.StatusCode != 202 {
t.Fatalf("Failed - StatusCode is not 202")
}
res, _ := redClient.Exists("relay:subscription:" + domain.Host).Result()
if res != 0 {
@ -492,6 +497,33 @@ func TestHandleInboxInvalidUnfollow(t *testing.T) {
redClient.Del("relay:subscription:" + domain.Host).Result()
}
func TestHandleInboxUnfollowAsActor(t *testing.T) {
activity := mockActivity("UnfollowAsActor")
actor := mockActor("Person")
domain, _ := url.Parse(activity.Actor)
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
handleInbox(w, r, mockActivityDecoderProvider(&activity, &actor))
}))
defer s.Close()
redClient.HSet("relay:subscription:"+domain.Host, "inbox_url", "https://mastodon.test.yukimochi.io/inbox").Result()
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")
}
res, _ := redClient.Exists("relay:subscription:" + domain.Host).Result()
if res != 1 {
t.Fatalf("Failed - Block actor unfollow not succeed.")
}
redClient.Del("relay:subscription:" + domain.Host).Result()
}
func TestHandleInboxValidCreate(t *testing.T) {
activity := mockActivity("Create")
actor := mockActor("Person")