suwako
/
activity
1
0
フォーク 0
コード イシュー プルリクエスト パッケージ プロジェクト リリース Wiki アクティビティ

Use *url.URL instead of url.URL. 

He who fights with monsters should be careful lest he thereby become a monster.
And if thou gaze long into an abyss, the abyss will also gaze into thee.
このコミットが含まれているのは:
Cory Slep 2018-05-29 21:57:39 +02:00
親 b8a27ed6f7
コミット ba40dc50b4
16個のファイルの変更、28807行の追加、28713行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

30
pub/fed.go
ファイルの表示

@ -163,7 +163,7 @@ func (f *federator) PostInbox(c context.Context, w http.ResponseWriter, r *http.
if err != nil {
return true, err
}
var iris []url.URL
var iris []*url.URL
for i := 0; i < ao.ActorLen(); i++ {
if ao.IsActorObject(i) {
obj := ao.GetActorObject(i)
@ -182,7 +182,7 @@ func (f *federator) PostInbox(c context.Context, w http.ResponseWriter, r *http.
if err = f.FederateAPI.Unblocked(c, iris); err != nil {
return true, err
}
if err = f.getPostInboxResolver(c, *r.URL).Deserialize(m); err != nil {
if err = f.getPostInboxResolver(c, r.URL).Deserialize(m); err != nil {
if err == errObjectRequired || err == errTargetRequired {
w.WriteHeader(http.StatusBadRequest)
return true, nil
@ -244,7 +244,7 @@ func (f *federator) PostOutbox(c context.Context, w http.ResponseWriter, r *http
authorized := true
if verifier := f.SocialAPI.GetSocialAPIVerifier(c); verifier != nil {
// Use custom Social API method to authenticate and authorize.
authenticated, authorized, err := verifier.VerifyForOutbox(r, *r.URL)
authenticated, authorized, err := verifier.VerifyForOutbox(r, r.URL)
if err != nil {
return true, err
} else if authenticated && !authorized {
@ -262,7 +262,7 @@ func (f *federator) PostOutbox(c context.Context, w http.ResponseWriter, r *http
w.WriteHeader(http.StatusBadRequest)
return true, nil
}
pk, algo, err := f.SocialAPI.GetPublicKeyForOutbox(c, v.KeyId(), *r.URL)
pk, algo, err := f.SocialAPI.GetPublicKeyForOutbox(c, v.KeyId(), r.URL)
if err != nil {
return true, err
}
@ -316,7 +316,7 @@ func (f *federator) PostOutbox(c context.Context, w http.ResponseWriter, r *http
if err != nil {
return true, err
}
if err := f.deliver(obj, *r.URL); err != nil {
if err := f.deliver(obj, r.URL); err != nil {
return true, err
}
}
@ -386,14 +386,14 @@ func (f *federator) handleClientCreate(ctx context.Context, deliverable *bool, t
if c.IsActorObject(i) {
obj := c.GetActorObject(i)
id := obj.GetId()
createActorIds[(&id).String()] = obj
createActorIds[id.String()] = obj
} else if c.IsActorLink(i) {
l := c.GetActorLink(i)
href := l.GetHref()
createActorIds[(&href).String()] = l
createActorIds[href.String()] = l
} else if c.IsActorIRI(i) {
iri := c.GetActorIRI(i)
createActorIds[(&iri).String()] = iri
createActorIds[iri.String()] = iri
}
}
var obj []vocab.ObjectType
@ -412,14 +412,14 @@ func (f *federator) handleClientCreate(ctx context.Context, deliverable *bool, t
if o.IsAttributedToObject(i) {
at := o.GetAttributedToObject(i)
id := o.GetId()
objectAttributedToIds[k][(&id).String()] = at
objectAttributedToIds[k][id.String()] = at
} else if o.IsAttributedToLink(i) {
at := o.GetAttributedToLink(i)
href := at.GetHref()
objectAttributedToIds[k][(&href).String()] = at
objectAttributedToIds[k][href.String()] = at
} else if o.IsAttributedToIRI(i) {
iri := o.GetAttributedToIRI(i)
objectAttributedToIds[k][(&iri).String()] = iri
objectAttributedToIds[k][iri.String()] = iri
}
}
}
@ -430,7 +430,7 @@ func (f *federator) handleClientCreate(ctx context.Context, deliverable *bool, t
obj[i].AppendAttributedToObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
obj[i].AppendAttributedToLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
obj[i].AppendAttributedToIRI(vIRI)
}
}
@ -443,7 +443,7 @@ func (f *federator) handleClientCreate(ctx context.Context, deliverable *bool, t
c.AppendActorObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
c.AppendActorLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
c.AppendActorIRI(vIRI)
}
}
@ -761,7 +761,7 @@ func (f *federator) handleClientBlock(c context.Context, deliverable *bool) func
}
}
func (f *federator) getPostInboxResolver(c context.Context, inboxURL url.URL) *streams.Resolver {
func (f *federator) getPostInboxResolver(c context.Context, inboxURL *url.URL) *streams.Resolver {
return &streams.Resolver{
CreateCallback: f.handleCreate(c),
UpdateCallback: f.handleUpdate(c),
@ -856,7 +856,7 @@ func (f *federator) handleDelete(c context.Context) func(s *streams.Delete) erro
}
}
func (f *federator) handleFollow(c context.Context, inboxURL url.URL) func(s *streams.Follow) error {
func (f *federator) handleFollow(c context.Context, inboxURL *url.URL) func(s *streams.Follow) error {
return func(s *streams.Follow) error {
// Permit either human-triggered or automatically triggering
// 'Accept'/'Reject'.

860
pub/fed_test.go
ファイルの表示

ファイル差分が大きすぎるため省略します 差分を読み込み

10
pub/handlers.go
ファイルの表示

@ -31,7 +31,7 @@ func serveActivityPubObject(c context.Context, a Application, clock Clock, w htt
if !handled {
return
}
id := *r.URL
id := r.URL
if !a.Owns(c, id) {
w.WriteHeader(http.StatusNotFound)
return
@ -76,7 +76,7 @@ func serveActivityPubObject(c context.Context, a Application, clock Clock, w htt
} else { // Signed request
var publicKey crypto.PublicKey
var algo httpsig.Algorithm
var user url.URL
var user *url.URL
publicKey, algo, user, err = a.GetPublicKey(c, v.KeyId())
if err != nil {
return
@ -87,15 +87,15 @@ func serveActivityPubObject(c context.Context, a Application, clock Clock, w htt
err = nil
return
} else if err == nil {
verifiedUser = &user
verifiedUser = user
} // Else failed HTTP Signature verification but we still allow access.
}
}
var pObj PubObject
if verifiedUser != nil {
pObj, err = a.GetAsVerifiedUser(c, *r.URL, *verifiedUser, Read)
pObj, err = a.GetAsVerifiedUser(c, r.URL, verifiedUser, Read)
} else {
pObj, err = a.Get(c, *r.URL, Read)
pObj, err = a.Get(c, r.URL, Read)
}
if err != nil {
return

146
pub/handlers_test.go
ファイルの表示

@ -25,20 +25,20 @@ func TestServeActivityPubObject(t *testing.T) {
name: "unsigned request",
app: &MockApplication{
t: t,
get: func(c context.Context, id url.URL, rw RWType) (PubObject, error) {
get: func(c context.Context, id *url.URL, rw RWType) (PubObject, error) {
if rw != Read {
t.Fatalf("expected RWType of %d, got %d", Read, rw)
} else if s := (&id).String(); s != noteURIString {
} else if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote, nil
},
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -49,7 +49,7 @@ func TestServeActivityPubObject(t *testing.T) {
expectedCode: http.StatusOK,
expectedObjFn: func() vocab.Serializer {
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote
@ -61,28 +61,28 @@ func TestServeActivityPubObject(t *testing.T) {
input: Sign(ActivityPubRequest(httptest.NewRequest("GET", noteURIString, nil))),
app: &MockApplication{
t: t,
getPublicKey: func(c context.Context, publicKeyId string) (crypto.PublicKey, httpsig.Algorithm, url.URL, error) {
getPublicKey: func(c context.Context, publicKeyId string) (crypto.PublicKey, httpsig.Algorithm, *url.URL, error) {
if publicKeyId != testPublicKeyId {
t.Fatalf("(%q) expected %s, got %s", testPublicKeyId, publicKeyId)
}
return testPrivateKey.Public(), httpsig.RSA_SHA256, *samIRI, nil
return testPrivateKey.Public(), httpsig.RSA_SHA256, samIRI, nil
},
getAsVerifiedUser: func(c context.Context, id, user url.URL, rw RWType) (PubObject, error) {
getAsVerifiedUser: func(c context.Context, id, user *url.URL, rw RWType) (PubObject, error) {
if rw != Read {
t.Fatalf("expected RWType of %d, got %d", Read, rw)
} else if s := (&id).String(); s != noteURIString {
} else if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
} else if u := (&user).String(); u != samIRIString {
} else if u := user.String(); u != samIRIString {
t.Fatalf("(%q) expected %s, got %s", samIRIString, u)
}
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote, nil
},
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -92,7 +92,7 @@ func TestServeActivityPubObject(t *testing.T) {
expectedCode: http.StatusOK,
expectedObjFn: func() vocab.Serializer {
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote
@ -104,8 +104,8 @@ func TestServeActivityPubObject(t *testing.T) {
input: ActivityPubRequest(httptest.NewRequest("GET", noteURIString, nil)),
app: &MockApplication{
t: t,
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return false
@ -124,14 +124,14 @@ func TestServeActivityPubObject(t *testing.T) {
input: BadSignature(ActivityPubRequest(httptest.NewRequest("GET", noteURIString, nil))),
app: &MockApplication{
t: t,
getPublicKey: func(c context.Context, publicKeyId string) (crypto.PublicKey, httpsig.Algorithm, url.URL, error) {
getPublicKey: func(c context.Context, publicKeyId string) (crypto.PublicKey, httpsig.Algorithm, *url.URL, error) {
if publicKeyId != testPublicKeyId {
t.Fatalf("(%q) expected %s, got %s", testPublicKeyId, publicKeyId)
}
return testPrivateKey.Public(), httpsig.RSA_SHA256, *samIRI, nil
return testPrivateKey.Public(), httpsig.RSA_SHA256, samIRI, nil
},
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -176,20 +176,20 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
name: "unsigned request",
app: &MockApplication{
t: t,
get: func(c context.Context, id url.URL, rw RWType) (PubObject, error) {
get: func(c context.Context, id *url.URL, rw RWType) (PubObject, error) {
if rw != Read {
t.Fatalf("expected RWType of %d, got %d", Read, rw)
} else if s := (&id).String(); s != noteURIString {
} else if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote, nil
},
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -200,7 +200,7 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
expectedCode: http.StatusOK,
expectedObjFn: func() vocab.Serializer {
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote
@ -212,28 +212,28 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
input: Sign(ActivityPubRequest(httptest.NewRequest("GET", noteURIString, nil))),
app: &MockApplication{
t: t,
getPublicKey: func(c context.Context, publicKeyId string) (crypto.PublicKey, httpsig.Algorithm, url.URL, error) {
getPublicKey: func(c context.Context, publicKeyId string) (crypto.PublicKey, httpsig.Algorithm, *url.URL, error) {
if publicKeyId != testPublicKeyId {
t.Fatalf("(%q) expected %s, got %s", testPublicKeyId, publicKeyId)
}
return testPrivateKey.Public(), httpsig.RSA_SHA256, *samIRI, nil
return testPrivateKey.Public(), httpsig.RSA_SHA256, samIRI, nil
},
getAsVerifiedUser: func(c context.Context, id, user url.URL, rw RWType) (PubObject, error) {
getAsVerifiedUser: func(c context.Context, id, user *url.URL, rw RWType) (PubObject, error) {
if rw != Read {
t.Fatalf("expected RWType of %d, got %d", Read, rw)
} else if s := (&id).String(); s != noteURIString {
} else if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
} else if u := (&user).String(); u != samIRIString {
} else if u := user.String(); u != samIRIString {
t.Fatalf("(%q) expected %s, got %s", samIRIString, u)
}
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote, nil
},
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -243,7 +243,7 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
expectedCode: http.StatusOK,
expectedObjFn: func() vocab.Serializer {
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote
@ -255,8 +255,8 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
input: ActivityPubRequest(httptest.NewRequest("GET", noteURIString, nil)),
app: &MockApplication{
t: t,
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return false
@ -275,14 +275,14 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
input: BadSignature(ActivityPubRequest(httptest.NewRequest("GET", noteURIString, nil))),
app: &MockApplication{
t: t,
getPublicKey: func(c context.Context, publicKeyId string) (crypto.PublicKey, httpsig.Algorithm, url.URL, error) {
getPublicKey: func(c context.Context, publicKeyId string) (crypto.PublicKey, httpsig.Algorithm, *url.URL, error) {
if publicKeyId != testPublicKeyId {
t.Fatalf("(%q) expected %s, got %s", testPublicKeyId, publicKeyId)
}
return testPrivateKey.Public(), httpsig.RSA_SHA256, *samIRI, nil
return testPrivateKey.Public(), httpsig.RSA_SHA256, samIRI, nil
},
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -295,22 +295,22 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
name: "unsigned request passes verifier",
app: &MockApplication{
t: t,
getAsVerifiedUser: func(c context.Context, id, user url.URL, rw RWType) (PubObject, error) {
getAsVerifiedUser: func(c context.Context, id, user *url.URL, rw RWType) (PubObject, error) {
if rw != Read {
t.Fatalf("expected RWType of %d, got %d", Read, rw)
} else if s := (&id).String(); s != noteURIString {
} else if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
} else if u := (&user).String(); u != samIRIString {
} else if u := user.String(); u != samIRIString {
t.Fatalf("(%q) expected %s, got %s", samIRIString, u)
}
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote, nil
},
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -327,7 +327,7 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
expectedCode: http.StatusOK,
expectedObjFn: func() vocab.Serializer {
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote
@ -339,22 +339,22 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
input: Sign(ActivityPubRequest(httptest.NewRequest("GET", noteURIString, nil))),
app: &MockApplication{
t: t,
getAsVerifiedUser: func(c context.Context, id, user url.URL, rw RWType) (PubObject, error) {
getAsVerifiedUser: func(c context.Context, id, user *url.URL, rw RWType) (PubObject, error) {
if rw != Read {
t.Fatalf("expected RWType of %d, got %d", Read, rw)
} else if s := (&id).String(); s != noteURIString {
} else if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
} else if u := (&user).String(); u != samIRIString {
} else if u := user.String(); u != samIRIString {
t.Fatalf("(%q) expected %s, got %s", samIRIString, u)
}
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote, nil
},
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -370,7 +370,7 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
expectedCode: http.StatusOK,
expectedObjFn: func() vocab.Serializer {
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote
@ -381,8 +381,8 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
name: "verifier authed unauthz",
app: &MockApplication{
t: t,
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -403,8 +403,8 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
name: "verifier unauthed unauthz",
app: &MockApplication{
t: t,
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -425,8 +425,8 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
name: "verifier unauthed authz unsigned fails",
app: &MockApplication{
t: t,
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -448,28 +448,28 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
input: Sign(ActivityPubRequest(httptest.NewRequest("GET", noteURIString, nil))),
app: &MockApplication{
t: t,
getPublicKey: func(c context.Context, publicKeyId string) (crypto.PublicKey, httpsig.Algorithm, url.URL, error) {
getPublicKey: func(c context.Context, publicKeyId string) (crypto.PublicKey, httpsig.Algorithm, *url.URL, error) {
if publicKeyId != testPublicKeyId {
t.Fatalf("(%q) expected %s, got %s", testPublicKeyId, publicKeyId)
}
return testPrivateKey.Public(), httpsig.RSA_SHA256, *samIRI, nil
return testPrivateKey.Public(), httpsig.RSA_SHA256, samIRI, nil
},
getAsVerifiedUser: func(c context.Context, id, user url.URL, rw RWType) (PubObject, error) {
getAsVerifiedUser: func(c context.Context, id, user *url.URL, rw RWType) (PubObject, error) {
if rw != Read {
t.Fatalf("expected RWType of %d, got %d", Read, rw)
} else if s := (&id).String(); s != noteURIString {
} else if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
} else if u := (&user).String(); u != samIRIString {
} else if u := user.String(); u != samIRIString {
t.Fatalf("(%q) expected %s, got %s", samIRIString, u)
}
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote, nil
},
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true
@ -485,7 +485,7 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
expectedCode: http.StatusOK,
expectedObjFn: func() vocab.Serializer {
testNote = &vocab.Note{}
testNote.SetId(*noteIRI)
testNote.SetId(noteIRI)
testNote.AppendNameString(noteName)
testNote.AppendContentString("This is a simple note")
return testNote
@ -496,8 +496,8 @@ func TestServeActivityPubObjectWithVerificationMethod(t *testing.T) {
name: "verifier unauthed authz unsigned fails with bad impl returning user",
app: &MockApplication{
t: t,
owns: func(c context.Context, id url.URL) bool {
if s := (&id).String(); s != noteURIString {
owns: func(c context.Context, id *url.URL) bool {
if s := id.String(); s != noteURIString {
t.Fatalf("(%q) expected %s, got %s", noteURIString, s)
}
return true

50
pub/interfaces.go
ファイルの表示

@ -65,7 +65,7 @@ type SocialAPIVerifier interface {
// (false, true, <nil>) => authentication failed: must pass HTTP Signature verification or will be Permission Denied
// (false, false, <nil>) => authentication failed: deny access (Bad request)
// (<any>, <any>, error) => an internal error occurred during validation
VerifyForOutbox(r *http.Request, outbox url.URL) (authn, authz bool, err error)
VerifyForOutbox(r *http.Request, outbox *url.URL) (authn, authz bool, err error)
}
// Application is provided by users of this library in order to implement a
@ -76,16 +76,16 @@ type SocialAPIVerifier interface {
// order to properly handle the request.
type Application interface {
// Owns returns true if the provided id is owned by this server.
Owns(c context.Context, id url.URL) bool
Owns(c context.Context, id *url.URL) bool
// Get fetches the ActivityStream representation of the given id.
Get(c context.Context, id url.URL, rw RWType) (PubObject, error)
Get(c context.Context, id *url.URL, rw RWType) (PubObject, error)
// GetAsVerifiedUser fetches the ActivityStream representation of the
// given id with the provided IRI representing the authenticated user
// making the request.
GetAsVerifiedUser(c context.Context, id, authdUser url.URL, rw RWType) (PubObject, error)
GetAsVerifiedUser(c context.Context, id, authdUser *url.URL, rw RWType) (PubObject, error)
// Has determines if the server already knows about the object or
// Activity specified by the given id.
Has(c context.Context, id url.URL) (bool, error)
Has(c context.Context, id *url.URL) (bool, error)
// Set should write or overwrite the value of the provided object for
// its 'id'.
Set(c context.Context, o PubObject) error
@ -100,11 +100,11 @@ type Application interface {
// NewId takes in a client id token and returns an ActivityStreams IRI
// id for a new Activity posted to the outbox. The object is provided
// as a Typer so clients can use it to decide how to generate the IRI.
NewId(c context.Context, t Typer) url.URL
NewId(c context.Context, t Typer) *url.URL
// GetPublicKey fetches the public key for a user based on the public
// key id. It also determines which algorithm to use to verify the
// signature.
GetPublicKey(c context.Context, publicKeyId string) (pubKey crypto.PublicKey, algo httpsig.Algorithm, user url.URL, err error)
GetPublicKey(c context.Context, publicKeyId string) (pubKey crypto.PublicKey, algo httpsig.Algorithm, user *url.URL, err error)
}
// RWType indicates the kind of reading being done.
@ -128,7 +128,7 @@ type SocialAPI interface {
CanRemove(c context.Context, o vocab.ObjectType, t vocab.ObjectType) bool
// AddToOutboxResolver(c context.Context) (*streams.Resolver, error)
// ActorIRI returns the actor's IRI associated with the given request.
ActorIRI(c context.Context, r *http.Request) (url.URL, error)
ActorIRI(c context.Context, r *http.Request) (*url.URL, error)
// GetSocialAPIVerifier returns the authentication mechanism used for
// incoming ActivityPub client requests. It is optional and allowed to
// return null.
@ -143,7 +143,7 @@ type SocialAPI interface {
// Note that a key difference from Application's GetPublicKey is that
// this function must make sure that the actor whose boxIRI is passed in
// matches the public key id that is requested, or return an error.
GetPublicKeyForOutbox(c context.Context, publicKeyId string, boxIRI url.URL) (crypto.PublicKey, httpsig.Algorithm, error)
GetPublicKeyForOutbox(c context.Context, publicKeyId string, boxIRI *url.URL) (crypto.PublicKey, httpsig.Algorithm, error)
}
// FederateAPI is provided by users of this library and designed to handle
@ -167,7 +167,7 @@ type FederateAPI interface {
//
// If nil error is returned, then the received activity is processed as
// a normal unblocked interaction.
Unblocked(c context.Context, actorIRIs []url.URL) error
Unblocked(c context.Context, actorIRIs []*url.URL) error
// FilterForwarding is invoked when a received activity needs to be
// forwarded to specific inboxes owned by this server in order to avoid
// the ghost reply problem. The IRIs provided are collections owned by
@ -178,7 +178,7 @@ type FederateAPI interface {
// vulnerable to becoming a spam bot for a malicious federate peer.
// Typical implementations will filter the iris down to be only the
// follower collections owned by the actors targeted in the activity.
FilterForwarding(c context.Context, activity vocab.ActivityType, iris []url.URL) ([]url.URL, error)
FilterForwarding(c context.Context, activity vocab.ActivityType, iris []*url.URL) ([]*url.URL, error)
// NewSigner returns a new httpsig.Signer for which deliveries can be
// signed by the actor delivering the Activity. Let me take this moment
// to really level with you, dear anonymous reader-of-documentation. You
@ -201,7 +201,7 @@ type FederateAPI interface {
// PrivateKey fetches the private key and its associated public key ID.
// The given URL is the inbox or outbox for the actor whose key is
// needed.
PrivateKey(boxIRI url.URL) (privKey crypto.PrivateKey, pubKeyId string, err error)
PrivateKey(boxIRI *url.URL) (privKey crypto.PrivateKey, pubKeyId string, err error)
}
// SocialApp is an implementation only for the Social API part of the
@ -296,15 +296,15 @@ type Callbacker interface {
type Deliverer interface {
// Do schedules a message to be sent to a specific URL endpoint by
// using toDo.
Do(b []byte, to url.URL, toDo func(b []byte, u url.URL) error)
Do(b []byte, to *url.URL, toDo func(b []byte, u *url.URL) error)
}
// PubObject is an ActivityPub Object.
type PubObject interface {
vocab.Serializer
Typer
GetId() url.URL
SetId(url.URL)
GetId() *url.URL
SetId(*url.URL)
HasId() bool
AppendType(interface{})
RemoveType(int)
@ -319,7 +319,7 @@ type Typer interface {
// typeIder is a Typer with additional generic capabilities.
type typeIder interface {
Typer
SetId(v url.URL)
SetId(v *url.URL)
Serialize() (m map[string]interface{}, e error)
}
@ -327,7 +327,7 @@ type typeIder interface {
// strict than what we include here, only for our internal use.
type actor interface {
IsInboxAnyURI() (ok bool)
GetInboxAnyURI() (v url.URL)
GetInboxAnyURI() (v *url.URL)
IsInboxOrderedCollection() (ok bool)
GetInboxOrderedCollection() (v vocab.OrderedCollectionType)
}
@ -338,7 +338,7 @@ var _ actor = &vocab.Object{}
// representing the author or originator of the object.
type actorObject interface {
IsInboxAnyURI() (ok bool)
GetInboxAnyURI() (v url.URL)
GetInboxAnyURI() (v *url.URL)
IsInboxOrderedCollection() (ok bool)
GetInboxOrderedCollection() (v vocab.OrderedCollectionType)
AttributedToLen() (l int)
@ -347,14 +347,14 @@ type actorObject interface {
IsAttributedToLink(index int) (ok bool)
GetAttributedToLink(index int) (v vocab.LinkType)
IsAttributedToIRI(index int) (ok bool)
GetAttributedToIRI(index int) (v url.URL)
GetAttributedToIRI(index int) (v *url.URL)
ActorLen() (l int)
IsActorObject(index int) (ok bool)
GetActorObject(index int) (v vocab.ObjectType)
IsActorLink(index int) (ok bool)
GetActorLink(index int) (v vocab.LinkType)
IsActorIRI(index int) (ok bool)
GetActorIRI(index int) (v url.URL)
GetActorIRI(index int) (v *url.URL)
}
// deliverableObject is an object that is able to be sent to recipients via the
@ -367,7 +367,7 @@ type deliverableObject interface {
IsToLink(index int) (ok bool)
GetToLink(index int) (v vocab.LinkType)
IsToIRI(index int) (ok bool)
GetToIRI(index int) (v url.URL)
GetToIRI(index int) (v *url.URL)
BtoLen() (l int)
IsBtoObject(index int) (ok bool)
GetBtoObject(index int) (v vocab.ObjectType)
@ -376,7 +376,7 @@ type deliverableObject interface {
GetBtoLink(index int) (v vocab.LinkType)
RemoveBtoLink(index int)
IsBtoIRI(index int) (ok bool)
GetBtoIRI(index int) (v url.URL)
GetBtoIRI(index int) (v *url.URL)
RemoveBtoIRI(index int)
CcLen() (l int)
IsCcObject(index int) (ok bool)
@ -384,7 +384,7 @@ type deliverableObject interface {
IsCcLink(index int) (ok bool)
GetCcLink(index int) (v vocab.LinkType)
IsCcIRI(index int) (ok bool)
GetCcIRI(index int) (v url.URL)
GetCcIRI(index int) (v *url.URL)
BccLen() (l int)
IsBccObject(index int) (ok bool)
GetBccObject(index int) (v vocab.ObjectType)
@ -393,7 +393,7 @@ type deliverableObject interface {
GetBccLink(index int) (v vocab.LinkType)
RemoveBccLink(index int)
IsBccIRI(index int) (ok bool)
GetBccIRI(index int) (v url.URL)
GetBccIRI(index int) (v *url.URL)
RemoveBccIRI(index int)
AudienceLen() (l int)
IsAudienceObject(index int) (ok bool)
@ -401,5 +401,5 @@ type deliverableObject interface {
IsAudienceLink(index int) (ok bool)
GetAudienceLink(index int) (v vocab.LinkType)
IsAudienceIRI(index int) (ok bool)
GetAudienceIRI(index int) (v url.URL)
GetAudienceIRI(index int) (v *url.URL)
}

276
pub/internal.go
ファイルの表示

@ -92,7 +92,7 @@ func addResponseHeaders(h http.Header, c Clock, responseContent []byte) {
// ActivityStream representation.
//
// creds is allowed to be nil.
func dereference(c HttpClient, u url.URL, agent string, creds *creds, clock Clock) ([]byte, error) {
func dereference(c HttpClient, u *url.URL, agent string, creds *creds, clock Clock) ([]byte, error) {
// TODO: (section 7.1) The server MUST dereference the collection (with the user's credentials)
req, err := http.NewRequest("GET", u.String(), nil)
if err != nil {
@ -130,7 +130,7 @@ type creds struct {
// body set to the provided bytes.
//
// creds is able to be nil.
func postToOutbox(c HttpClient, b []byte, to url.URL, agent string, creds *creds, clock Clock) error {
func postToOutbox(c HttpClient, b []byte, to *url.URL, agent string, creds *creds, clock Clock) error {
byteCopy := make([]byte, 0, len(b))
copy(b, byteCopy)
buf := bytes.NewBuffer(byteCopy)
@ -163,7 +163,7 @@ func postToOutbox(c HttpClient, b []byte, to url.URL, agent string, creds *creds
// wrapInCreate will automatically wrap the provided object in a Create
// activity. This will copy over the 'to', 'bto', 'cc', 'bcc', and 'audience'
// properties. It will also copy over the published time if present.
func (f *federator) wrapInCreate(o vocab.ObjectType, actor url.URL) *vocab.Create {
func (f *federator) wrapInCreate(o vocab.ObjectType, actor *url.URL) *vocab.Create {
c := &vocab.Create{}
c.AppendObject(o)
c.AppendActorIRI(actor)
@ -236,13 +236,13 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
for j := 0; j < o.ToLen(); j++ {
if o.IsToObject(j) {
id := o.GetToObject(j).GetId()
to[i][(&id).String()] = o.GetToObject(j)
to[i][id.String()] = o.GetToObject(j)
} else if o.IsToLink(j) {
id := o.GetToLink(j).GetHref()
to[i][(&id).String()] = o.GetToLink(j)
to[i][id.String()] = o.GetToLink(j)
} else if o.IsToIRI(j) {
id := o.GetToIRI(j)
to[i][(&id).String()] = id
to[i][id.String()] = id
}
}
}
@ -250,13 +250,13 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
for i := 0; i < a.ToLen(); i++ {
if a.IsToObject(i) {
id := a.GetToObject(i).GetId()
toActivity[(&id).String()] = a.GetToObject(i)
toActivity[id.String()] = a.GetToObject(i)
} else if a.IsToLink(i) {
id := a.GetToLink(i).GetHref()
toActivity[(&id).String()] = a.GetToLink(i)
toActivity[id.String()] = a.GetToLink(i)
} else if a.IsToIRI(i) {
id := a.GetToIRI(i)
toActivity[(&id).String()] = id
toActivity[id.String()] = id
}
}
bto := make([]map[string]interface{}, a.ObjectLen())
@ -269,13 +269,13 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
for j := 0; j < o.BtoLen(); j++ {
if o.IsBtoObject(j) {
id := o.GetBtoObject(j).GetId()
bto[i][(&id).String()] = o.GetBtoObject(j)
bto[i][id.String()] = o.GetBtoObject(j)
} else if o.IsBtoLink(j) {
id := o.GetBtoLink(j).GetHref()
bto[i][(&id).String()] = o.GetBtoLink(j)
bto[i][id.String()] = o.GetBtoLink(j)
} else if o.IsBtoIRI(j) {
id := o.GetBtoIRI(j)
bto[i][(&id).String()] = id
bto[i][id.String()] = id
}
}
}
@ -283,13 +283,13 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
for i := 0; i < a.BtoLen(); i++ {
if a.IsBtoObject(i) {
id := a.GetBtoObject(i).GetId()
btoActivity[(&id).String()] = a.GetBtoObject(i)
btoActivity[id.String()] = a.GetBtoObject(i)
} else if a.IsBtoLink(i) {
id := a.GetBtoLink(i).GetHref()
btoActivity[(&id).String()] = a.GetBtoLink(i)
btoActivity[id.String()] = a.GetBtoLink(i)
} else if a.IsBtoIRI(i) {
id := a.GetBtoIRI(i)
btoActivity[(&id).String()] = id
btoActivity[id.String()] = id
}
}
cc := make([]map[string]interface{}, a.ObjectLen())
@ -302,13 +302,13 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
for j := 0; j < o.CcLen(); j++ {
if o.IsCcObject(j) {
id := o.GetCcObject(j).GetId()
cc[i][(&id).String()] = o.GetCcObject(j)
cc[i][id.String()] = o.GetCcObject(j)
} else if o.IsCcLink(j) {
id := o.GetCcLink(j).GetHref()
cc[i][(&id).String()] = o.GetCcLink(j)
cc[i][id.String()] = o.GetCcLink(j)
} else if o.IsCcIRI(j) {
id := o.GetCcIRI(j)
cc[i][(&id).String()] = id
cc[i][id.String()] = id
}
}
}
@ -316,13 +316,13 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
for i := 0; i < a.CcLen(); i++ {
if a.IsCcObject(i) {
id := a.GetCcObject(i).GetId()
ccActivity[(&id).String()] = a.GetCcObject(i)
ccActivity[id.String()] = a.GetCcObject(i)
} else if a.IsCcLink(i) {
id := a.GetCcLink(i).GetHref()
ccActivity[(&id).String()] = a.GetCcLink(i)
ccActivity[id.String()] = a.GetCcLink(i)
} else if a.IsCcIRI(i) {
id := a.GetCcIRI(i)
ccActivity[(&id).String()] = id
ccActivity[id.String()] = id
}
}
bcc := make([]map[string]interface{}, a.ObjectLen())
@ -335,13 +335,13 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
for j := 0; j < o.BccLen(); j++ {
if o.IsBccObject(j) {
id := o.GetBccObject(j).GetId()
bcc[i][(&id).String()] = o.GetBccObject(j)
bcc[i][id.String()] = o.GetBccObject(j)
} else if o.IsBccLink(j) {
id := o.GetBccLink(j).GetHref()
bcc[i][(&id).String()] = o.GetBccLink(j)
bcc[i][id.String()] = o.GetBccLink(j)
} else if o.IsBccIRI(j) {
id := o.GetBccIRI(j)
bcc[i][(&id).String()] = id
bcc[i][id.String()] = id
}
}
}
@ -349,13 +349,13 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
for i := 0; i < a.BccLen(); i++ {
if a.IsBccObject(i) {
id := a.GetBccObject(i).GetId()
bccActivity[(&id).String()] = a.GetBccObject(i)
bccActivity[id.String()] = a.GetBccObject(i)
} else if a.IsBccLink(i) {
id := a.GetBccLink(i).GetHref()
bccActivity[(&id).String()] = a.GetBccLink(i)
bccActivity[id.String()] = a.GetBccLink(i)
} else if a.IsBccIRI(i) {
id := a.GetBccIRI(i)
bccActivity[(&id).String()] = id
bccActivity[id.String()] = id
}
}
audience := make([]map[string]interface{}, a.ObjectLen())
@ -368,13 +368,13 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
for j := 0; j < o.AudienceLen(); j++ {
if o.IsAudienceObject(j) {
id := o.GetAudienceObject(j).GetId()
audience[i][(&id).String()] = o.GetAudienceObject(j)
audience[i][id.String()] = o.GetAudienceObject(j)
} else if o.IsAudienceLink(j) {
id := o.GetAudienceLink(j).GetHref()
audience[i][(&id).String()] = o.GetAudienceLink(j)
audience[i][id.String()] = o.GetAudienceLink(j)
} else if o.IsAudienceIRI(j) {
id := o.GetAudienceIRI(j)
audience[i][(&id).String()] = id
audience[i][id.String()] = id
}
}
}
@ -382,13 +382,13 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
for i := 0; i < a.AudienceLen(); i++ {
if a.IsAudienceObject(i) {
id := a.GetAudienceObject(i).GetId()
audienceActivity[(&id).String()] = a.GetAudienceObject(i)
audienceActivity[id.String()] = a.GetAudienceObject(i)
} else if a.IsAudienceLink(i) {
id := a.GetAudienceLink(i).GetHref()
audienceActivity[(&id).String()] = a.GetAudienceLink(i)
audienceActivity[id.String()] = a.GetAudienceLink(i)
} else if a.IsAudienceIRI(i) {
id := a.GetAudienceIRI(i)
audienceActivity[(&id).String()] = id
audienceActivity[id.String()] = id
}
}
// Next, add activity recipients to all objects if not already present
@ -399,7 +399,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
a.GetObject(i).AppendToObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
a.GetObject(i).AppendToLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
a.GetObject(i).AppendToIRI(vIRI)
}
}
@ -412,7 +412,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
a.GetObject(i).AppendBtoObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
a.GetObject(i).AppendBtoLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
a.GetObject(i).AppendBtoIRI(vIRI)
}
}
@ -425,7 +425,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
a.GetObject(i).AppendCcObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
a.GetObject(i).AppendCcLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
a.GetObject(i).AppendCcIRI(vIRI)
}
}
@ -438,7 +438,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
a.GetObject(i).AppendBccObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
a.GetObject(i).AppendBccLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
a.GetObject(i).AppendBccIRI(vIRI)
}
}
@ -451,7 +451,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
a.GetObject(i).AppendAudienceObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
a.GetObject(i).AppendAudienceLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
a.GetObject(i).AppendAudienceIRI(vIRI)
}
}
@ -466,7 +466,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
a.AppendToObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
a.AppendToLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
a.AppendToIRI(vIRI)
}
}
@ -477,7 +477,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
a.AppendBtoObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
a.AppendBtoLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
a.AppendBtoIRI(vIRI)
}
}
@ -488,7 +488,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
a.AppendCcObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
a.AppendCcLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
a.AppendCcIRI(vIRI)
}
}
@ -499,7 +499,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
a.AppendBccObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
a.AppendBccLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
a.AppendBccIRI(vIRI)
}
}
@ -510,7 +510,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
a.AppendAudienceObject(vObj)
} else if vLink, ok := v.(vocab.LinkType); ok {
a.AppendAudienceLink(vLink)
} else if vIRI, ok := v.(url.URL); ok {
} else if vIRI, ok := v.(*url.URL); ok {
a.AppendAudienceIRI(vIRI)
}
}
@ -523,7 +523,7 @@ func (f *federator) sameRecipients(a vocab.ActivityType) error {
// deliver will complete the peer-to-peer sending of a federated message to
// another server.
func (f *federator) deliver(obj vocab.ActivityType, boxIRI url.URL) error {
func (f *federator) deliver(obj vocab.ActivityType, boxIRI *url.URL) error {
recipients, err := f.prepare(boxIRI, obj)
if err != nil {
return err
@ -542,7 +542,7 @@ func (f *federator) deliver(obj vocab.ActivityType, boxIRI url.URL) error {
// deliverToRecipients will take a prepared Activity and send it to specific
// recipients without examining the activity.
func (f *federator) deliverToRecipients(obj vocab.ActivityType, recipients []url.URL, creds *creds) error {
func (f *federator) deliverToRecipients(obj vocab.ActivityType, recipients []*url.URL, creds *creds) error {
m, err := obj.Serialize()
if err != nil {
return err
@ -553,7 +553,7 @@ func (f *federator) deliverToRecipients(obj vocab.ActivityType, recipients []url
return err
}
for _, to := range recipients {
f.deliverer.Do(b, to, func(b []byte, u url.URL) error {
f.deliverer.Do(b, to, func(b []byte, u *url.URL) error {
return postToOutbox(f.Client, b, u, f.Agent, creds, f.Clock)
})
}
@ -563,9 +563,9 @@ func (f *federator) deliverToRecipients(obj vocab.ActivityType, recipients []url
// prepare takes a deliverableObject and returns a list of the proper recipient
// target URIs. Additionally, the deliverableObject will have any hidden
// hidden recipients ("bto" and "bcc") stripped from it.
func (c *federator) prepare(boxIRI url.URL, o deliverableObject) ([]url.URL, error) {
func (c *federator) prepare(boxIRI *url.URL, o deliverableObject) ([]*url.URL, error) {
// Get inboxes of recipients
var r []url.URL
var r []*url.URL
r = append(r, getToIRIs(o)...)
r = append(r, getBToIRIs(o)...)
r = append(r, getCcIRIs(o)...)
@ -607,7 +607,7 @@ func (c *federator) prepare(boxIRI url.URL, o deliverableObject) ([]url.URL, err
// resolveInboxes takes a list of Actor id URIs and returns them as concrete
// instances of actorObject. It applies recursively when it encounters a target
// that is a Collection or OrderedCollection.
func (c *federator) resolveInboxes(boxIRI url.URL, r []url.URL, depth int, max int) ([]actor, error) {
func (c *federator) resolveInboxes(boxIRI *url.URL, r []*url.URL, depth int, max int) ([]actor, error) {
if depth >= max {
return nil, nil
}
@ -619,7 +619,7 @@ func (c *federator) resolveInboxes(boxIRI url.URL, r []url.URL, depth int, max i
if err != nil {
return nil, err
}
var uris []url.URL
var uris []*url.URL
if co != nil {
uris := getURIsInItemer(co.Raw())
actors, err := c.resolveInboxes(boxIRI, uris, depth+1, max)
@ -669,7 +669,7 @@ func (c *federator) resolveInboxes(boxIRI url.URL, r []url.URL, depth int, max i
return a, nil
}
func (c *federator) dereferenceForResolvingInboxes(u, boxIRI url.URL, cr *creds) (actor actor, co *streams.Collection, oc *streams.OrderedCollection, cp *streams.CollectionPage, ocp *streams.OrderedCollectionPage, cred *creds, err error) {
func (c *federator) dereferenceForResolvingInboxes(u, boxIRI *url.URL, cr *creds) (actor actor, co *streams.Collection, oc *streams.OrderedCollection, cp *streams.CollectionPage, ocp *streams.OrderedCollectionPage, cred *creds, err error) {
// To pass back to calling function, since may be set recursively:
cred = cr
var resp []byte
@ -711,8 +711,8 @@ func (c *federator) dereferenceForResolvingInboxes(u, boxIRI url.URL, cr *creds)
}
// getInboxes extracts the 'inbox' IRIs from actors.
func getInboxes(a []actor) ([]url.URL, error) {
var u []url.URL
func getInboxes(a []actor) ([]*url.URL, error) {
var u []*url.URL
for _, actor := range a {
if actor.IsInboxAnyURI() {
u = append(u, actor.GetInboxAnyURI())
@ -729,8 +729,8 @@ func getInboxes(a []actor) ([]url.URL, error) {
// getActorAttributedToURI attempts to find the URIs for the "actor" and
// "attributedTo" originators on the object.
func getActorsAttributedToURI(a actorObject) []url.URL {
var u []url.URL
func getActorsAttributedToURI(a actorObject) []*url.URL {
var u []*url.URL
for i := 0; i < a.AttributedToLen(); i++ {
if a.IsAttributedToObject(i) {
obj := a.GetAttributedToObject(i)
@ -790,16 +790,17 @@ func stripHiddenRecipients(o deliverableObject) {
// dedupeIRIs will deduplicate final inbox IRIs. The ignore list is applied to
// the final list
func dedupeIRIs(recipients, ignored []url.URL) (out []url.URL) {
ignoredMap := make(map[url.URL]bool, len(ignored))
func dedupeIRIs(recipients, ignored []*url.URL) (out []*url.URL) {
ignoredMap := make(map[string]bool, len(ignored))
for _, elem := range ignored {
ignoredMap[elem] = true
ignoredMap[elem.String()] = true
}
outMap := make(map[url.URL]bool, len(recipients))
outMap := make(map[string]bool, len(recipients))
for _, k := range recipients {
if !ignoredMap[k] && !outMap[k] {
kStr := k.String()
if !ignoredMap[kStr] && !outMap[kStr] {
out = append(out, k)
outMap[k] = true
outMap[kStr] = true
}
}
return
@ -816,13 +817,11 @@ func (f *federator) dedupeOrderedItems(oc vocab.OrderedCollectionType) (vocab.Or
if oc.IsOrderedItemsObject(i) {
removeFn = oc.RemoveOrderedItemsObject
iri := oc.GetOrderedItemsObject(i).GetId()
pIri := &iri
id = pIri.String()
id = iri.String()
} else if oc.IsOrderedItemsLink(i) {
removeFn = oc.RemoveOrderedItemsLink
iri := oc.GetOrderedItemsLink(i).GetId()
pIri := &iri
id = pIri.String()
id = iri.String()
} else if oc.IsOrderedItemsIRI(i) {
removeFn = oc.RemoveOrderedItemsIRI
b, err := dereference(f.Client, oc.GetOrderedItemsIRI(i), f.Agent, nil, f.Clock)
@ -830,13 +829,12 @@ func (f *federator) dedupeOrderedItems(oc vocab.OrderedCollectionType) (vocab.Or
if err := json.Unmarshal(b, &m); err != nil {
return oc, err
}
var iri url.URL
var iri *url.URL
var hasIri bool
if err = toIdResolver(&hasIri, &iri).Deserialize(m); err != nil {
return oc, err
}
pIri := &iri
id = pIri.String()
id = iri.String()
}
if seen[id] {
removeFn(i)
@ -849,7 +847,7 @@ func (f *federator) dedupeOrderedItems(oc vocab.OrderedCollectionType) (vocab.Or
}
// filterURLs removes urls whose strings match the provided filter
func filterURLs(u []url.URL, fn func(s string) bool) []url.URL {
func filterURLs(u []*url.URL, fn func(s string) bool) []*url.URL {
i := 0
for i < len(u) {
if fn(u[i].String()) {
@ -861,8 +859,8 @@ func filterURLs(u []url.URL, fn func(s string) bool) []url.URL {
return u
}
func getToIRIs(o deliverableObject) []url.URL {
var r []url.URL
func getToIRIs(o deliverableObject) []*url.URL {
var r []*url.URL
for i := 0; i < o.ToLen(); i++ {
if o.IsToObject(i) {
obj := o.GetToObject(i)
@ -881,8 +879,8 @@ func getToIRIs(o deliverableObject) []url.URL {
return r
}
func getBToIRIs(o deliverableObject) []url.URL {
var r []url.URL
func getBToIRIs(o deliverableObject) []*url.URL {
var r []*url.URL
for i := 0; i < o.BtoLen(); i++ {
if o.IsBtoObject(i) {
obj := o.GetBtoObject(i)
@ -901,8 +899,8 @@ func getBToIRIs(o deliverableObject) []url.URL {
return r
}
func getCcIRIs(o deliverableObject) []url.URL {
var r []url.URL
func getCcIRIs(o deliverableObject) []*url.URL {
var r []*url.URL
for i := 0; i < o.CcLen(); i++ {
if o.IsCcObject(i) {
obj := o.GetCcObject(i)
@ -921,8 +919,8 @@ func getCcIRIs(o deliverableObject) []url.URL {
return r
}
func getBccIRIs(o deliverableObject) []url.URL {
var r []url.URL
func getBccIRIs(o deliverableObject) []*url.URL {
var r []*url.URL
for i := 0; i < o.BccLen(); i++ {
if o.IsBccObject(i) {
obj := o.GetBccObject(i)
@ -941,8 +939,8 @@ func getBccIRIs(o deliverableObject) []url.URL {
return r
}
func getAudienceIRIs(o deliverableObject) []url.URL {
var r []url.URL
func getAudienceIRIs(o deliverableObject) []*url.URL {
var r []*url.URL
for i := 0; i < o.AudienceLen(); i++ {
if o.IsAudienceObject(i) {
obj := o.GetAudienceObject(i)
@ -1077,13 +1075,16 @@ type itemer interface {
IsItemsLink(index int) (ok bool)
GetItemsLink(index int) (v vocab.LinkType)
IsItemsIRI(index int) (ok bool)
GetItemsIRI(index int) (v url.URL)
GetItemsIRI(index int) (v *url.URL)
}
var _ itemer = &vocab.Collection{}
var _ itemer = &vocab.CollectionPage{}
// getURIsInItemer will extract 'items' from the provided Collection or
// CollectionPage.
func getURIsInItemer(i itemer) []url.URL {
var u []url.URL
func getURIsInItemer(i itemer) []*url.URL {
var u []*url.URL
for j := 0; j < i.ItemsLen(); j++ {
if i.IsItemsObject(j) {
obj := i.GetItemsObject(j)
@ -1109,13 +1110,16 @@ type orderedItemer interface {
IsOrderedItemsLink(index int) (ok bool)
GetOrderedItemsLink(index int) (v vocab.LinkType)
IsOrderedItemsIRI(index int) (ok bool)
GetOrderedItemsIRI(index int) (v url.URL)
GetOrderedItemsIRI(index int) (v *url.URL)
}
var _ orderedItemer = &vocab.OrderedCollection{}
var _ orderedItemer = &vocab.OrderedCollectionPage{}
// getURIsInOrderedItemer will extract 'items' from the provided
// OrderedCollection or OrderedCollectionPage.
func getURIsInOrderedItemer(i orderedItemer) []url.URL {
var u []url.URL
func getURIsInOrderedItemer(i orderedItemer) []*url.URL {
var u []*url.URL
for j := 0; j < i.OrderedItemsLen(); j++ {
if i.IsOrderedItemsObject(j) {
obj := i.GetOrderedItemsObject(j)
@ -1139,10 +1143,10 @@ type activityWithObject interface {
IsObject(index int) (ok bool)
GetObject(index int) (v vocab.ObjectType)
IsObjectIRI(index int) (ok bool)
GetObjectIRI(index int) (v url.URL)
GetObjectIRI(index int) (v *url.URL)
}
func getObjectIds(a activityWithObject) (u []url.URL, e error) {
func getObjectIds(a activityWithObject) (u []*url.URL, e error) {
for i := 0; i < a.ObjectLen(); i++ {
if a.IsObject(i) {
obj := a.GetObject(i)
@ -1163,10 +1167,10 @@ type activityWithTarget interface {
IsTargetObject(index int) (ok bool)
GetTargetObject(index int) (v vocab.ObjectType)
IsTargetIRI(index int) (ok bool)
GetTargetIRI(index int) (v url.URL)
GetTargetIRI(index int) (v *url.URL)
}
func getTargetIds(a activityWithTarget) (u []url.URL, e error) {
func getTargetIds(a activityWithTarget) (u []*url.URL, e error) {
for i := 0; i < a.TargetLen(); i++ {
if a.IsTargetObject(i) {
obj := a.GetTargetObject(i)
@ -1182,14 +1186,14 @@ func getTargetIds(a activityWithTarget) (u []url.URL, e error) {
return
}
func removeCollectionItemWithId(c vocab.CollectionType, iri url.URL) {
func removeCollectionItemWithId(c vocab.CollectionType, iri *url.URL) {
for i := 0; i < c.ItemsLen(); i++ {
if c.IsItemsObject(i) {
o := c.GetItemsObject(i)
if !o.HasId() {
continue
}
if o.GetId() == iri {
if *o.GetId() == *iri {
c.RemoveItemsObject(i)
return
}
@ -1198,12 +1202,12 @@ func removeCollectionItemWithId(c vocab.CollectionType, iri url.URL) {
if !l.HasHref() {
continue
}
if l.GetHref() == iri {
if *l.GetHref() == *iri {
c.RemoveItemsLink(i)
return
}
} else if c.IsItemsIRI(i) {
if c.GetItemsIRI(i) == iri {
if *c.GetItemsIRI(i) == *iri {
c.RemoveItemsIRI(i)
return
}
@ -1211,14 +1215,14 @@ func removeCollectionItemWithId(c vocab.CollectionType, iri url.URL) {
}
}
func removeOrderedCollectionItemWithId(c vocab.OrderedCollectionType, iri url.URL) {
func removeOrderedCollectionItemWithId(c vocab.OrderedCollectionType, iri *url.URL) {
for i := 0; i < c.OrderedItemsLen(); i++ {
if c.IsOrderedItemsObject(i) {
o := c.GetOrderedItemsObject(i)
if !o.HasId() {
continue
}
if o.GetId() == iri {
if *o.GetId() == *iri {
c.RemoveOrderedItemsObject(i)
return
}
@ -1227,12 +1231,12 @@ func removeOrderedCollectionItemWithId(c vocab.OrderedCollectionType, iri url.UR
if !l.HasHref() {
continue
}
if l.GetHref() == iri {
if *l.GetHref() == *iri {
c.RemoveOrderedItemsLink(i)
return
}
} else if c.IsOrderedItemsIRI(i) {
if c.GetOrderedItemsIRI(i) == iri {
if *c.GetOrderedItemsIRI(i) == *iri {
c.RemoveOrderedItemsIRI(i)
return
}
@ -1241,7 +1245,7 @@ func removeOrderedCollectionItemWithId(c vocab.OrderedCollectionType, iri url.UR
}
// toTombstone creates a Tombstone for the given object.
func toTombstone(obj vocab.ObjectType, id url.URL, now time.Time) vocab.TombstoneType {
func toTombstone(obj vocab.ObjectType, id *url.URL, now time.Time) vocab.TombstoneType {
tomb := &vocab.Tombstone{}
tomb.SetId(id)
for i := 0; i < obj.TypeLen(); i++ {
@ -1269,7 +1273,7 @@ type getActorCollectionFn func(actor vocab.ObjectType, lc *vocab.CollectionType,
func (f *federator) addAllObjectsToActorCollection(ctx context.Context, getter getActorCollectionFn, c vocab.ActivityType, prepend bool) error {
for i := 0; i < c.ActorLen(); i++ {
var iri url.URL
var iri *url.URL
if c.IsActorObject(i) {
obj := c.GetActorObject(i)
if !obj.HasId() {
@ -1306,7 +1310,7 @@ func (f *federator) addAllObjectsToActorCollection(ctx context.Context, getter g
return err
}
// Duplication detection
var iriSet map[url.URL]bool
var iriSet map[string]bool
if lc != nil {
iriSet, err = getIRISetFromItems(lc)
} else if loc != nil {
@ -1319,7 +1323,7 @@ func (f *federator) addAllObjectsToActorCollection(ctx context.Context, getter g
for i := 0; i < c.ObjectLen(); i++ {
if c.IsObjectIRI(i) {
iri := c.GetObjectIRI(i)
if iriSet[iri] {
if iriSet[iri.String()] {
continue
}
if lc != nil {
@ -1341,7 +1345,7 @@ func (f *federator) addAllObjectsToActorCollection(ctx context.Context, getter g
return fmt.Errorf("object at index %d has no id", i)
}
iri := obj.GetId()
if iriSet[iri] {
if iriSet[iri.String()] {
continue
}
if lc != nil {
@ -1380,7 +1384,7 @@ type getObjectCollectionFn func(object vocab.ObjectType, lc *vocab.CollectionTyp
func (f *federator) addAllActorsToObjectCollection(ctx context.Context, getter getObjectCollectionFn, c vocab.ActivityType, prepend bool) (bool, error) {
ownsAny := false
for i := 0; i < c.ObjectLen(); i++ {
var iri url.URL
var iri *url.URL
if c.IsObject(i) {
obj := c.GetObject(i)
if !obj.HasId() {
@ -1412,7 +1416,7 @@ func (f *federator) addAllActorsToObjectCollection(ctx context.Context, getter g
return ownsAny, err
}
// Duplication detection
var iriSet map[url.URL]bool
var iriSet map[string]bool
if lc != nil {
iriSet, err = getIRISetFromItems(lc)
} else if loc != nil {
@ -1425,7 +1429,7 @@ func (f *federator) addAllActorsToObjectCollection(ctx context.Context, getter g
for i := 0; i < c.ActorLen(); i++ {
if c.IsActorIRI(i) {
iri := c.GetActorIRI(i)
if iriSet[iri] {
if iriSet[iri.String()] {
continue
}
if lc != nil {
@ -1447,7 +1451,7 @@ func (f *federator) addAllActorsToObjectCollection(ctx context.Context, getter g
return ownsAny, fmt.Errorf("actor object at index %d has no id", i)
}
iri := obj.GetId()
if iriSet[iri] {
if iriSet[iri.String()] {
continue
}
if lc != nil {
@ -1469,7 +1473,7 @@ func (f *federator) addAllActorsToObjectCollection(ctx context.Context, getter g
return ownsAny, fmt.Errorf("actor link at index %d has no id", i)
}
iri := l.GetHref()
if iriSet[iri] {
if iriSet[iri.String()] {
continue
}
if lc != nil {
@ -1504,7 +1508,7 @@ func (f *federator) addAllActorsToObjectCollection(ctx context.Context, getter g
}
func (f *federator) ownsAnyObjects(c context.Context, a vocab.ActivityType) (bool, error) {
var iris []url.URL
var iris []*url.URL
for i := 0; i < a.ObjectLen(); i++ {
if a.IsObject(i) {
obj := a.GetObject(i)
@ -1545,7 +1549,7 @@ func (f *federator) addToInbox(c context.Context, r *http.Request, m map[string]
if err != nil {
return err
}
if !iriSet[activity.GetId()] {
if !iriSet[activity.GetId().String()] {
inbox.PrependOrderedItemsObject(activity)
return f.App.Set(c, inbox)
}
@ -1575,11 +1579,11 @@ func (f *federator) inboxForwarding(c context.Context, m map[string]interface{})
}
// 2. The values of 'to', 'cc', or 'audience' are Collections owned by
// this server.
var r []url.URL
var r []*url.URL
r = append(r, getToIRIs(a)...)
r = append(r, getCcIRIs(a)...)
r = append(r, getAudienceIRIs(a)...)
var myIRIs []url.URL
var myIRIs []*url.URL
col := make(map[string]vocab.CollectionType, 0)
oCol := make(map[string]vocab.OrderedCollectionType, 0)
for _, iri := range r {
@ -1593,10 +1597,10 @@ func (f *federator) inboxForwarding(c context.Context, m map[string]interface{})
return err
}
if c, ok := obj.(vocab.CollectionType); ok {
col[(&iri).String()] = c
col[iri.String()] = c
myIRIs = append(myIRIs, iri)
} else if oc, ok := obj.(vocab.OrderedCollectionType); ok {
oCol[(&iri).String()] = oc
oCol[iri.String()] = oc
myIRIs = append(myIRIs, iri)
}
}
@ -1629,9 +1633,9 @@ func (f *federator) inboxForwarding(c context.Context, m map[string]interface{})
if err != nil {
return err
}
recipients := make([]url.URL, 0, len(toSend))
recipients := make([]*url.URL, 0, len(toSend))
for _, iri := range toSend {
if c, ok := col[(&iri).String()]; ok {
if c, ok := col[iri.String()]; ok {
for i := 0; i < c.ItemsLen(); i++ {
if c.IsItemsObject(i) {
obj := c.GetItemsObject(i)
@ -1647,7 +1651,7 @@ func (f *federator) inboxForwarding(c context.Context, m map[string]interface{})
recipients = append(recipients, c.GetItemsIRI(i))
}
}
} else if oc, ok := oCol[(&iri).String()]; ok {
} else if oc, ok := oCol[iri.String()]; ok {
for i := 0; i < oc.OrderedItemsLen(); i++ {
if oc.IsOrderedItemsObject(i) {
obj := oc.GetOrderedItemsObject(i)
@ -1690,7 +1694,7 @@ func (f *federator) hasInboxForwardingValues(c context.Context, depth, maxDepth
return f.ownsAnyIRIs(c, iris)
}
func (f *federator) ownsAnyIRIs(c context.Context, iris []url.URL) bool {
func (f *federator) ownsAnyIRIs(c context.Context, iris []*url.URL) bool {
for _, iri := range iris {
if f.App.Owns(c, iri) {
return true
@ -1740,25 +1744,25 @@ func (f *federator) ensureActivityOriginMatchesObjects(a vocab.ActivityType) err
}
func (f *federator) ensureActivityActorsMatchObjectActors(a vocab.ActivityType) error {
actorSet := make(map[url.URL]bool, a.ActorLen())
actorSet := make(map[string]bool, a.ActorLen())
for i := 0; i < a.ActorLen(); i++ {
if a.IsActorObject(i) {
obj := a.GetActorObject(i)
if !obj.HasId() {
return fmt.Errorf("actor object at index %d has no id", i)
}
actorSet[obj.GetId()] = true
actorSet[obj.GetId().String()] = true
} else if a.IsActorLink(i) {
l := a.GetActorLink(i)
if !l.HasHref() {
return fmt.Errorf("actor link at index %d has no href", i)
}
actorSet[l.GetHref()] = true
actorSet[l.GetHref().String()] = true
} else if a.IsActorIRI(i) {
actorSet[a.GetActorIRI(i)] = true
actorSet[a.GetActorIRI(i).String()] = true
}
}
objectActors := make(map[url.URL]bool, a.ObjectLen())
objectActors := make(map[string]bool, a.ObjectLen())
for i := 0; i < a.ObjectLen(); i++ {
if a.IsObject(i) {
obj := a.GetObject(i)
@ -1775,15 +1779,15 @@ func (f *federator) ensureActivityActorsMatchObjectActors(a vocab.ActivityType)
if !obj.HasId() {
return fmt.Errorf("actor object at index (%d,%d) has no id", i, j)
}
objectActors[obj.GetId()] = true
objectActors[obj.GetId().String()] = true
} else if objectActivity.IsActorLink(j) {
l := objectActivity.GetActorLink(j)
if !l.HasHref() {
return fmt.Errorf("actor link at index (%d,%d) has no href", i, j)
}
objectActors[l.GetHref()] = true
objectActors[l.GetHref().String()] = true
} else if objectActivity.IsActorIRI(j) {
objectActors[objectActivity.GetActorIRI(j)] = true
objectActors[objectActivity.GetActorIRI(j).String()] = true
}
}
} else if a.IsObjectIRI(i) {
@ -1800,7 +1804,7 @@ func (f *federator) ensureActivityActorsMatchObjectActors(a vocab.ActivityType)
return nil
}
func getInboxForwardingValues(o vocab.ObjectType) (objs []vocab.ObjectType, l []vocab.LinkType, iri []url.URL) {
func getInboxForwardingValues(o vocab.ObjectType) (objs []vocab.ObjectType, l []vocab.LinkType, iri []*url.URL) {
// 'inReplyTo'
for i := 0; i < o.InReplyToLen(); i++ {
if o.IsInReplyToObject(i) {
@ -1891,45 +1895,45 @@ func recursivelyApplyDeletes(m, hasNils map[string]interface{}) {
}
}
func getIRISetFromItems(c vocab.CollectionType) (map[url.URL]bool, error) {
r := make(map[url.URL]bool, c.ItemsLen())
func getIRISetFromItems(c vocab.CollectionType) (map[string]bool, error) {
r := make(map[string]bool, c.ItemsLen())
for i := 0; i < c.ItemsLen(); i++ {
if c.IsItemsObject(i) {
obj := c.GetItemsObject(i)
if !obj.HasId() {
return r, fmt.Errorf("items object at index %d has no id", i)
}
r[obj.GetId()] = true
r[obj.GetId().String()] = true
} else if c.IsItemsLink(i) {
l := c.GetItemsLink(i)
if !l.HasHref() {
return r, fmt.Errorf("items link at index %d has no href", i)
}
r[l.GetHref()] = true
r[l.GetHref().String()] = true
} else if c.IsItemsIRI(i) {
r[c.GetItemsIRI(i)] = true
r[c.GetItemsIRI(i).String()] = true
}
}
return r, nil
}
func getIRISetFromOrderedItems(c vocab.OrderedCollectionType) (map[url.URL]bool, error) {
r := make(map[url.URL]bool, c.OrderedItemsLen())
func getIRISetFromOrderedItems(c vocab.OrderedCollectionType) (map[string]bool, error) {
r := make(map[string]bool, c.OrderedItemsLen())
for i := 0; i < c.OrderedItemsLen(); i++ {
if c.IsOrderedItemsObject(i) {
obj := c.GetOrderedItemsObject(i)
if !obj.HasId() {
return r, fmt.Errorf("items object at index %d has no id", i)
}
r[obj.GetId()] = true
r[obj.GetId().String()] = true
} else if c.IsOrderedItemsLink(i) {
l := c.GetOrderedItemsLink(i)
if !l.HasHref() {
return r, fmt.Errorf("items link at index %d has no href", i)
}
r[l.GetHref()] = true
r[l.GetHref().String()] = true
} else if c.IsOrderedItemsIRI(i) {
r[c.GetOrderedItemsIRI(i)] = true
r[c.GetOrderedItemsIRI(i).String()] = true
}
}
return r, nil

2
pub/resolvers.go
ファイルの表示

@ -84,7 +84,7 @@ func toActorCollectionResolver(a *actor, c **streams.Collection, oc **streams.Or
return r
}
func toIdResolver(ok *bool, u *url.URL) *streams.Resolver {
func toIdResolver(ok *bool, u **url.URL) *streams.Resolver {
return &streams.Resolver{
AnyObjectCallback: func(i vocab.ObjectType) error {
*ok = i.HasId()

6544
streams/streams.go
ファイルの表示

ファイル差分が大きすぎるため省略します 差分を読み込み

10
streams/streams_test.go
ファイルの表示

@ -242,17 +242,17 @@ func TestNulls(t *testing.T) {
t.Fatal(err)
}
expectedSamActor := &vocab.Person{}
expectedSamActor.SetInboxAnyURI(*samIRIInbox)
expectedSamActor.SetId(*samIRI)
expectedSamActor.SetInboxAnyURI(samIRIInbox)
expectedSamActor.SetId(samIRI)
expectedNote := &vocab.Note{}
expectedNote.SetId(*noteIRI)
expectedNote.SetId(noteIRI)
expectedNote.AppendNameString("A Note")
expectedNote.AppendContentString("This is a simple note")
expectedNote.AppendToObject(expectedSamActor)
expectedUpdate := &vocab.Update{}
expectedUpdate.AppendActorIRI(*sallyIRI)
expectedUpdate.AppendActorIRI(sallyIRI)
expectedUpdate.AppendSummaryString("Sally updated her note")
expectedUpdate.SetId(*activityIRI)
expectedUpdate.SetId(activityIRI)
expectedUpdate.AppendObject(expectedNote)
tables := []struct {
name string

8
tools/defs/defs.go
ファイルの表示

@ -1308,7 +1308,7 @@ var (
SerializeFn: &FunctionDef{
Name: "anyURISerialize",
Comment: "anyURISerialize turns a URI into a string",
Args: []*FunctionVarDef{{"u", "url.URL"}},
Args: []*FunctionVarDef{{"u", "*url.URL"}},
Return: []*FunctionVarDef{{"s", "string"}},
Body: func() string {
var b bytes.Buffer
@ -1895,7 +1895,7 @@ var IriValueType = &ValueType{
SerializeFn: &FunctionDef{
Name: "IRISerialize",
Comment: "IRISerialize turns an IRI into a string",
Args: []*FunctionVarDef{{"u", "url.URL"}},
Args: []*FunctionVarDef{{"u", "*url.URL"}},
Return: []*FunctionVarDef{{"s", "string"}},
Body: func() string {
var b bytes.Buffer
@ -1923,6 +1923,10 @@ func HasAnyURI(r []RangeReference) bool {
return false
}
func IsIRIValueTypeString(v *ValueType) bool {
return v.DefinitionType == "*url.URL"
}
func IsIRIValueType(v *ValueType) bool {
return v == IriValueType
}

10
tools/streams/gen/as.go
ファイルの表示

@ -295,7 +295,7 @@ func generateFunctionalPropertyHelper(p *defs.PropertyType, this *defs.StructDef
}
func generateFunctionalIRI(p *defs.PropertyType, this *defs.StructDef) {
kind := deref(defs.IriValueType.DefinitionType)
kind := defs.IriValueType.DefinitionType
titleName := strings.Title(p.Name)
onlyType := len(p.Range) == 1
iri := "IRI"
@ -569,6 +569,9 @@ func generateFunctionalPropertyValue(p *defs.PropertyType, this *defs.StructDef,
additionalTitleName = ""
}
kind := deref(value.DefinitionType)
if defs.IsIRIValueTypeString(value) {
kind = value.DefinitionType
}
titleName := strings.Title(p.Name)
this.F = append(this.F, []*defs.MemberFunctionDef{
{
@ -705,7 +708,7 @@ func generateNonFunctionalPropertyHelper(p *defs.PropertyType, this *defs.Struct
}
func generateNonFunctionalIRI(p *defs.PropertyType, this *defs.StructDef) {
kind := deref(defs.IriValueType.DefinitionType)
kind := defs.IriValueType.DefinitionType
titleName := strings.Title(p.Name)
onlyType := len(p.Range) == 1
iri := "IRI"
@ -1098,6 +1101,9 @@ func generateNonFunctionalPropertyValue(p *defs.PropertyType, this *defs.StructD
additionalTitleName = ""
}
kind := deref(value.DefinitionType)
if defs.IsIRIValueTypeString(value) {
kind = value.DefinitionType
}
titleName := strings.Title(p.Name)
this.F = append(this.F, []*defs.MemberFunctionDef{
{

4
tools/vocab/gen/generate_definitions.go
ファイルの表示

@ -75,7 +75,7 @@ func Deserialize(r defs.RangeReference, mapName, field string, slice bool) strin
} else if r.V != nil {
var b bytes.Buffer
b.WriteString("// Begin generation by RangeReference.Deserialize for Value\n")
deserializeCode(&b, fmt.Sprintf("tmp, err := %s(v)\n", r.V.DeserializeFn.Name), mapName, "interface{}", field, slice, true)
deserializeCode(&b, fmt.Sprintf("tmp, err := %s(v)\n", r.V.DeserializeFn.Name), mapName, "interface{}", field, slice, false)
b.WriteString("// End generation by RangeReference.Deserialize for Value\n")
return b.String()
} else {
@ -95,7 +95,7 @@ func Serialize(r defs.RangeReference, mapName, field string, slice bool) string
return b.String()
} else if r.V != nil {
deref := "*"
if slice {
if slice || isIRIType(Type(r)) {
deref = ""
}
var b bytes.Buffer

54
tools/vocab/gen/generate_property_definitions.go
ファイルの表示

@ -329,7 +329,11 @@ func generateFunctionalSingleTypeDefinition(t *defs.PropertyType, this *defs.Str
}
titleName := strings.Title(t.Name)
isPtrType := isPtrType(member.Type)
isIRI := isIRIType(member.Type)
returnType := deref(member.Type)
if isIRI {
returnType = member.Type
}
this.M = append(this.M, member)
this.F = append(this.F, &defs.MemberFunctionDef{
Name: fmt.Sprintf("Has%s", titleName),
@ -347,7 +351,7 @@ func generateFunctionalSingleTypeDefinition(t *defs.PropertyType, this *defs.Str
Body: func() string {
var b bytes.Buffer
b.WriteString(fmt.Sprintf("return "))
if isPtrType {
if isPtrType && !isIRI {
b.WriteString("*")
}
b.WriteString(fmt.Sprintf("t.%s\n", member.Name))
@ -361,7 +365,7 @@ func generateFunctionalSingleTypeDefinition(t *defs.PropertyType, this *defs.Str
Body: func() string {
var b bytes.Buffer
b.WriteString(fmt.Sprintf("t.%s = ", member.Name))
if isPtrType {
if isPtrType && !isIRI {
b.WriteString("&")
}
b.WriteString("v\n")
@ -437,9 +441,16 @@ func generateFunctionalSingleTypeDefinition(t *defs.PropertyType, this *defs.Str
}
func generateNonFunctionalSingleTypeDefinition(t *defs.PropertyType, this *defs.StructDef, i *defs.InterfaceDef) (fd []*defs.FunctionDef, sd []*defs.StructDef, s, d string) {
isIRI := isIRIType(Type(t.Range[0]))
memberType := deref(Type(t.Range[0]))
returnType := memberType
if isIRI {
memberType = Type(t.Range[0])
returnType = memberType
}
member := &defs.StructMember{
Name: cleanName(t.Name),
Type: fmt.Sprintf("[]%s", deref(Type(t.Range[0]))),
Type: fmt.Sprintf("[]%s", memberType),
Comment: fmt.Sprintf("The '%s' value holds a single type and any number of values", t.Name),
}
titleName := strings.Title(t.Name)
@ -457,7 +468,7 @@ func generateNonFunctionalSingleTypeDefinition(t *defs.PropertyType, this *defs.
Comment: fmt.Sprintf("Get%s returns the value for the specified index", titleName),
P: this,
Args: []*defs.FunctionVarDef{{"index", "int"}},
Return: []*defs.FunctionVarDef{{"v", deSlice(member.Type)}},
Return: []*defs.FunctionVarDef{{"v", returnType}},
Body: func() string {
var b bytes.Buffer
b.WriteString(fmt.Sprintf("return t.%s[index]\n", member.Name))
@ -467,7 +478,7 @@ func generateNonFunctionalSingleTypeDefinition(t *defs.PropertyType, this *defs.
Name: fmt.Sprintf("Append%s", titleName),
Comment: fmt.Sprintf("Append%s adds a value to the back of %s", titleName, t.Name),
P: this,
Args: []*defs.FunctionVarDef{{"v", deSlice(member.Type)}},
Args: []*defs.FunctionVarDef{{"v", returnType}},
Body: func() string {
var b bytes.Buffer
b.WriteString(fmt.Sprintf("t.%s = append(t.%s, v)\n", member.Name, member.Name))
@ -477,7 +488,7 @@ func generateNonFunctionalSingleTypeDefinition(t *defs.PropertyType, this *defs.
Name: fmt.Sprintf("Prepend%s", titleName),
Comment: fmt.Sprintf("Prepend%s adds a value to the front of %s", titleName, t.Name),
P: this,
Args: []*defs.FunctionVarDef{{"v", deSlice(member.Type)}},
Args: []*defs.FunctionVarDef{{"v", returnType}},
Body: func() string {
var b bytes.Buffer
b.WriteString(fmt.Sprintf("t.%s = append(%s{v}, t.%s...)\n", member.Name, member.Type, member.Name))
@ -540,17 +551,17 @@ func generateNonFunctionalSingleTypeDefinition(t *defs.PropertyType, this *defs.
Name: fmt.Sprintf("Get%s", titleName),
Comment: fmt.Sprintf("Get%s returns the value for the specified index", titleName),
Args: []*defs.FunctionVarDef{{"index", "int"}},
Return: []*defs.FunctionVarDef{{"v", deSlice(member.Type)}},
Return: []*defs.FunctionVarDef{{"v", returnType}},
},
{
Name: fmt.Sprintf("Append%s", titleName),
Comment: fmt.Sprintf("Append%s adds a value to the back of %s", titleName, t.Name),
Args: []*defs.FunctionVarDef{{"v", deSlice(member.Type)}},
Args: []*defs.FunctionVarDef{{"v", returnType}},
},
{
Name: fmt.Sprintf("Prepend%s", titleName),
Comment: fmt.Sprintf("Prepend%s adds a value to the front of %s", titleName, t.Name),
Args: []*defs.FunctionVarDef{{"v", deSlice(member.Type)}},
Args: []*defs.FunctionVarDef{{"v", returnType}},
},
{
Name: fmt.Sprintf("Remove%s", titleName),
@ -605,7 +616,11 @@ func generateFunctionalMultiTypeDefinition(t *defs.PropertyType, this *defs.Stru
Comment: fmt.Sprintf("Stores possible %s type for %s property", Type(r), t.Name),
}
intermed.M = append(intermed.M, member)
isIRI := isIRIType(member.Type)
retKind := deref(member.Type)
if isIRI {
retKind = member.Type
}
typeExtensionName := strings.Title(Name(r))
if defs.IsOnlyOtherPropertyBesidesIRI(idx, t.Range) {
typeExtensionName = ""
@ -628,7 +643,7 @@ func generateFunctionalMultiTypeDefinition(t *defs.PropertyType, this *defs.Stru
Body: func() string {
var b bytes.Buffer
b.WriteString("return ")
if isPtrType(Type(r)) {
if isPtrType(Type(r)) && !isIRI {
b.WriteString("*")
}
b.WriteString(fmt.Sprintf("t.%s.%s\n", thisIntermed.Name, member.Name))
@ -643,7 +658,7 @@ func generateFunctionalMultiTypeDefinition(t *defs.PropertyType, this *defs.Stru
Body: func() string {
var b bytes.Buffer
b.WriteString(fmt.Sprintf("t.%s = &%s{%s:", thisIntermed.Name, intermed.Typename, member.Name))
if isPtrType(Type(r)) {
if isPtrType(Type(r)) && !isIRI {
b.WriteString("&")
}
b.WriteString("v}\n")
@ -712,7 +727,11 @@ func generateNonFunctionalMultiTypeDefinition(t *defs.PropertyType, this *defs.S
Comment: fmt.Sprintf("Stores possible %s type for %s property", Type(r), t.Name),
}
intermed.M = append(intermed.M, member)
isIRI := isIRIType(member.Type)
retKind := deref(member.Type)
if isIRI {
retKind = member.Type
}
typeExtensionName := strings.Title(Name(r))
if defs.IsOnlyOtherPropertyBesidesIRI(idx, t.Range) {
typeExtensionName = ""
@ -753,7 +772,7 @@ func generateNonFunctionalMultiTypeDefinition(t *defs.PropertyType, this *defs.S
Body: func() string {
var b bytes.Buffer
b.WriteString("return ")
if isPtrType(Type(r)) {
if isPtrType(Type(r)) && !isIRI {
b.WriteString("*")
}
b.WriteString(fmt.Sprintf("t.%s[index].%s\n", thisIntermed.Name, member.Name))
@ -768,7 +787,7 @@ func generateNonFunctionalMultiTypeDefinition(t *defs.PropertyType, this *defs.S
Body: func() string {
var b bytes.Buffer
b.WriteString(fmt.Sprintf("t.%s = append(t.%s, &%s{%s:", thisIntermed.Name, thisIntermed.Name, intermed.Typename, member.Name))
if isPtrType(Type(r)) {
if isPtrType(Type(r)) && !isIRI {
b.WriteString("&")
}
b.WriteString("v})\n")
@ -783,7 +802,7 @@ func generateNonFunctionalMultiTypeDefinition(t *defs.PropertyType, this *defs.S
Body: func() string {
var b bytes.Buffer
b.WriteString(fmt.Sprintf("t.%s = append([]*%s{&%s{%s:", thisIntermed.Name, intermed.Typename, intermed.Typename, member.Name))
if isPtrType(Type(r)) {
if isPtrType(Type(r)) && !isIRI {
b.WriteString("&")
}
b.WriteString(fmt.Sprintf("v}}, t.%s...)\n", thisIntermed.Name))
@ -966,12 +985,17 @@ func generateIntermediateTypeDefinition(t *defs.PropertyType, parentTitle string
Body: func() string {
var b bytes.Buffer
for _, r := range t.Range {
isIRI := isIRIType(Type(r))
deref := "*"
if isIRI {
deref = ""
}
b.WriteString(fmt.Sprintf("if t.%s != nil {\n", cleanName(Name(r))))
if r.T != nil {
b.WriteString(fmt.Sprintf("i, err = t.%s.Serialize()\n", cleanName(Name(r))))
b.WriteString("return\n")
} else if r.V != nil {
b.WriteString(fmt.Sprintf("i = %s(*t.%s)\n", r.V.SerializeFn.Name, cleanName(Name(r))))
b.WriteString(fmt.Sprintf("i = %s(%st.%s)\n", r.V.SerializeFn.Name, deref, cleanName(Name(r))))
b.WriteString("return\n")
} else {
b.WriteString(fmt.Sprintf("i = t.%s\n", cleanName(Name(r))))

4
tools/vocab/gen/util.go
ファイルの表示

@ -36,6 +36,10 @@ func deref(k string) string {
return k
}
func isIRIType(k string) bool {
return k == "*url.URL"
}
func deserializeCode(b *bytes.Buffer, parseCode, varName, typeName, field string, slice, derefAppend bool) {
if slice {
sliceDeserializeCode(b, parseCode, varName, typeName, field, derefAppend)

49498
vocab/vocab.go
ファイルの表示

ファイル差分が大きすぎるため省略します 差分を読み込み

14
vocab/vocab_test.go
ファイルの表示

@ -24,12 +24,12 @@ func GetJSONDiff(str1, str2 []byte) ([]string, error) {
return deep.Equal(i1, i2), nil
}
func MustParseURL(s string) url.URL {
func MustParseURL(s string) *url.URL {
u, err := url.Parse(s)
if err != nil {
panic(err)
}
return *u
return u
}
var (
@ -1117,17 +1117,17 @@ func TestReserializationAbility(t *testing.T) {
t.Fatal(err)
}
expectedSamActor := &Person{}
expectedSamActor.SetInboxAnyURI(*samIRIInbox)
expectedSamActor.SetId(*samIRI)
expectedSamActor.SetInboxAnyURI(samIRIInbox)
expectedSamActor.SetId(samIRI)
expectedNote := &Note{}
expectedNote.SetId(*noteIRI)
expectedNote.SetId(noteIRI)
expectedNote.AppendNameString("A Note")
expectedNote.AppendContentString("This is a simple note")
expectedNote.AppendToObject(expectedSamActor)
expectedUpdate := &Update{}
expectedUpdate.AppendActorIRI(*sallyIRI)
expectedUpdate.AppendActorIRI(sallyIRI)
expectedUpdate.AppendSummaryString("Sally updated her note")
expectedUpdate.SetId(*activityIRI)
expectedUpdate.SetId(activityIRI)
expectedUpdate.AppendObject(expectedNote)
tables := []struct {
name string