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

Words typo in codes fixed.

Browse Source
This commit is contained in:
Naoki Kosaka
2021-06-20 17:26:15 +09:00
parent 4dd69d0dac
commit f05921420f
20 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/decode.go
View File

@ -26,11 +26,11 @@ func decodeActivity(request *http.Request) (*models.Activity, *models.Actor, []b
}
KeyID := verifier.KeyId()
keyOwnerActor := new(models.Actor)
err = keyOwnerActor.RetrieveRemoteActor(KeyID, fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", globalConfig.ServerServicename(), version, globalConfig.ServerHostname().Host), actorCache)
err = keyOwnerActor.RetrieveRemoteActor(KeyID, fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", globalConfig.ServerServiceName(), version, globalConfig.ServerHostname().Host), actorCache)
if err != nil {
return nil, nil, nil, err
}
PubKey, err := models.ReadPublicKeyRSAfromString(keyOwnerActor.PublicKey.PublicKeyPem)
PubKey, err := models.ReadPublicKeyRSAFromString(keyOwnerActor.PublicKey.PublicKeyPem)
if PubKey == nil {
return nil, nil, nil, errors.New("Failed parse PublicKey from string")
}
@ -47,9 +47,9 @@ func decodeActivity(request *http.Request) (*models.Activity, *models.Actor, []b
hash := sha256.New()
hash.Write(body)
b := hash.Sum(nil)
calcurateDigest := "SHA-256=" + base64.StdEncoding.EncodeToString(b)
calculatedDigest := "SHA-256=" + base64.StdEncoding.EncodeToString(b)
if givenDigest != calcurateDigest {
if givenDigest != calculatedDigest {
return nil, nil, nil, errors.New("Digest header is mismatch")
}
@ -61,7 +61,7 @@ func decodeActivity(request *http.Request) (*models.Activity, *models.Actor, []b
}
var remoteActor models.Actor
err = remoteActor.RetrieveRemoteActor(activity.Actor, fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", globalConfig.ServerServicename(), version, globalConfig.ServerHostname().Host), actorCache)
err = remoteActor.RetrieveRemoteActor(activity.Actor, fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", globalConfig.ServerServiceName(), version, globalConfig.ServerHostname().Host), actorCache)
if err != nil {
return nil, nil, nil, err
}

26
api/handle.go
View File

@ -20,13 +20,13 @@ func handleWebfinger(writer http.ResponseWriter, request *http.Request) {
} else {
request := resource[0]
if request == WebfingerResource.Subject {
wfresource, err := json.Marshal(&WebfingerResource)
webfingerResource, err := json.Marshal(&WebfingerResource)
if err != nil {
panic(err)
}
writer.Header().Add("Content-Type", "application/json")
writer.WriteHeader(200)
writer.Write(wfresource)
writer.Write(webfingerResource)
} else {
writer.WriteHeader(404)
writer.Write(nil)
@ -39,13 +39,13 @@ func handleNodeinfoLink(writer http.ResponseWriter, request *http.Request) {
writer.WriteHeader(400)
writer.Write(nil)
} else {
linksresource, err := json.Marshal(&Nodeinfo.NodeinfoLinks)
linksResource, err := json.Marshal(&Nodeinfo.NodeinfoLinks)
if err != nil {
panic(err)
}
writer.Header().Add("Content-Type", "application/json")
writer.WriteHeader(200)
writer.Write(linksresource)
writer.Write(linksResource)
}
}
@ -58,13 +58,13 @@ func handleNodeinfo(writer http.ResponseWriter, request *http.Request) {
Nodeinfo.Nodeinfo.Usage.Users.Total = userCount
Nodeinfo.Nodeinfo.Usage.Users.ActiveMonth = userCount
Nodeinfo.Nodeinfo.Usage.Users.ActiveHalfyear = userCount
linksresource, err := json.Marshal(&Nodeinfo.Nodeinfo)
linksResource, err := json.Marshal(&Nodeinfo.Nodeinfo)
if err != nil {
panic(err)
}
writer.Header().Add("Content-Type", "application/json")
writer.WriteHeader(200)
writer.Write(linksresource)
writer.Write(linksResource)
}
}
@ -132,9 +132,9 @@ func pushRelayJob(sourceInbox string, body []byte) {
}
}
func pushRegistorJob(inboxURL string, body []byte) {
func pushRegisterJob(inboxURL string, body []byte) {
job := &tasks.Signature{
Name: "registor",
Name: "register",
RetryCount: 2,
Args: []tasks.Arg{
{
@ -181,13 +181,13 @@ func suitableFollow(activity *models.Activity, actor *models.Actor) bool {
func relayAcceptable(activity *models.Activity, actor *models.Actor) error {
if !contains(activity.To, "https://www.w3.org/ns/activitystreams#Public") && !contains(activity.Cc, "https://www.w3.org/ns/activitystreams#Public") {
return errors.New("Activity should contain https://www.w3.org/ns/activitystreams#Public as receiver")
return errors.New("activity should contain https://www.w3.org/ns/activitystreams#Public as receiver")
}
domain, _ := url.Parse(activity.Actor)
if contains(relayState.Subscriptions, domain.Host) {
return nil
}
return errors.New("To use the relay service, Subscribe me in advance")
return errors.New("to use the relay service, Subscribe me in advance")
}
func suitableRelay(activity *models.Activity, actor *models.Actor) bool {
@ -216,7 +216,7 @@ func handleInbox(writer http.ResponseWriter, request *http.Request, activityDeco
if err != nil {
resp := activity.GenerateResponse(globalConfig.ServerHostname(), "Reject")
jsonData, _ := json.Marshal(&resp)
go pushRegistorJob(actor.Inbox, jsonData)
go pushRegisterJob(actor.Inbox, jsonData)
fmt.Println("Reject Follow Request : ", err.Error(), activity.Actor)
writer.WriteHeader(202)
@ -235,7 +235,7 @@ func handleInbox(writer http.ResponseWriter, request *http.Request, activityDeco
} else {
resp := activity.GenerateResponse(globalConfig.ServerHostname(), "Accept")
jsonData, _ := json.Marshal(&resp)
go pushRegistorJob(actor.Inbox, jsonData)
go pushRegisterJob(actor.Inbox, jsonData)
relayState.AddSubscription(models.Subscription{
Domain: domain.Host,
InboxURL: actor.Endpoints.SharedInbox,
@ -247,7 +247,7 @@ func handleInbox(writer http.ResponseWriter, request *http.Request, activityDeco
} else {
resp := activity.GenerateResponse(globalConfig.ServerHostname(), "Reject")
jsonData, _ := json.Marshal(&resp)
go pushRegistorJob(actor.Inbox, jsonData)
go pushRegisterJob(actor.Inbox, jsonData)
fmt.Println("Reject Follow Request : ", activity.Actor)
}

12
api/handle_test.go
View File

@ -42,13 +42,13 @@ func TestHandleWebfingerGet(t *testing.T) {
defer r.Body.Close()
data, _ := ioutil.ReadAll(r.Body)
var wfresource models.WebfingerResource
err = json.Unmarshal(data, &wfresource)
var webfingerResource models.WebfingerResource
err = json.Unmarshal(data, &webfingerResource)
if err != nil {
t.Fatalf("WebfingerResource response is not valid.")
}
domain, _ := url.Parse(wfresource.Links[0].Href)
domain, _ := url.Parse(webfingerResource.Links[0].Href)
if domain.Host != globalConfig.ServerHostname().Host {
t.Fatalf("WebfingerResource's Host not valid.")
}
@ -305,7 +305,7 @@ func mockActivity(req string) models.Activity {
json.Unmarshal(body, &activity)
return activity
default:
panic("No assined request.")
panic("No assigned request.")
}
}
@ -330,7 +330,7 @@ func mockActor(req string) models.Actor {
json.Unmarshal(body, &actor)
return actor
default:
panic("No assined request.")
panic("No assigned request.")
}
}
@ -642,7 +642,7 @@ func TestHandleInboxValidCreate(t *testing.T) {
relayState.RedisClient.Del("relay:subscription:example.org").Result()
}
func TestHandleInboxlimitedCreate(t *testing.T) {
func TestHandleInboxLimitedCreate(t *testing.T) {
activity := mockActivity("Create")
actor := mockActor("Person")
domain, _ := url.Parse(activity.Actor)