sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

webfinger

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2025-01-17 10:08:49 +01:00
parent 9a04b12a8e
commit 5baf3cd4eb
9 changed files with 85 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/webfinger/pkg/relations/owncloud_instance.go
+7 -7
View File
@@ -14,7 +14,7 @@ import (
)
const (
OwnCloudInstanceRel = "http://webfinger.owncloud/rel/server-instance"
OpenCloudInstanceRel = "http://webfinger.opencloud/rel/server-instance"
)
type compiledInstance struct {
@@ -23,14 +23,14 @@ type compiledInstance struct {
hrefTemplate *template.Template
}
type ownCloudInstance struct {
type openCloudInstance struct {
instances []compiledInstance
openCloudURL string
instanceHost string
}
// OwnCloudInstance adds one or more ownCloud instance relations
func OwnCloudInstance(instances []config.Instance, openCloudURL string) (service.RelationProvider, error) {
// OpenCloudInstance adds one or more OpenCloud instance relations
func OpenCloudInstance(instances []config.Instance, openCloudURL string) (service.RelationProvider, error) {
compiledInstances := make([]compiledInstance, 0, len(instances))
var err error
for _, instance := range instances {
@@ -50,14 +50,14 @@ func OwnCloudInstance(instances []config.Instance, openCloudURL string) (service
if err != nil {
return nil, err
}
return &ownCloudInstance{
return &openCloudInstance{
instances: compiledInstances,
openCloudURL: openCloudURL,
instanceHost: u.Host + u.Path,
}, nil
}
func (l *ownCloudInstance) Add(ctx context.Context, jrd *webfinger.JSONResourceDescriptor) {
func (l *openCloudInstance) Add(ctx context.Context, jrd *webfinger.JSONResourceDescriptor) {
if jrd == nil {
jrd = &webfinger.JSONResourceDescriptor{}
}
@@ -74,7 +74,7 @@ func (l *ownCloudInstance) Add(ctx context.Context, jrd *webfinger.JSONResourceD
var tmplWriter strings.Builder
instance.hrefTemplate.Execute(&tmplWriter, claims)
jrd.Links = append(jrd.Links, webfinger.Link{
Rel: OwnCloudInstanceRel,
Rel: OpenCloudInstanceRel,
Href: tmplWriter.String(),
Titles: instance.Titles,
})
services/webfinger/pkg/relations/owncloud_instance_test.go
+9 -9
View File
@@ -9,23 +9,23 @@ import (
"github.com/opencloud-eu/opencloud/services/webfinger/pkg/webfinger"
)
func TestOwnCloudInstanceErr(t *testing.T) {
_, err := OwnCloudInstance([]config.Instance{}, "http://\n\rinvalid")
func TestOpenCloudInstanceErr(t *testing.T) {
_, err := OpenCloudInstance([]config.Instance{}, "http://\n\rinvalid")
if err == nil {
t.Errorf("provider did not err on invalid url: %v", err)
}
_, err = OwnCloudInstance([]config.Instance{{Regex: "("}}, "http://docis.tld")
_, err = OpenCloudInstance([]config.Instance{{Regex: "("}}, "http://opencloud.tld")
if err == nil {
t.Errorf("provider did not err on invalid regex: %v", err)
}
_, err = OwnCloudInstance([]config.Instance{{Href: "{{invalid}}ee"}}, "http://docis.tld")
_, err = OpenCloudInstance([]config.Instance{{Href: "{{invalid}}ee"}}, "http://opencloud.tld")
if err == nil {
t.Errorf("provider did not err on invalid href template: %v", err)
}
}
func TestOwnCloudInstanceAddLink(t *testing.T) {
provider, err := OwnCloudInstance([]config.Instance{{
func TestOpenCloudInstanceAddLink(t *testing.T) {
provider, err := OpenCloudInstance([]config.Instance{{
Claim: "customclaim",
Regex: ".+@.+\\..+",
Href: "https://{{.otherclaim}}.domain.tld",
@@ -33,7 +33,7 @@ func TestOwnCloudInstanceAddLink(t *testing.T) {
"foo": "bar",
},
Break: true,
}}, "http://docis.tld")
}}, "http://opencloud.tld")
if err != nil {
t.Error(err)
}
@@ -52,8 +52,8 @@ func TestOwnCloudInstanceAddLink(t *testing.T) {
if jrd.Links[0].Href != "https://someone.domain.tld" {
t.Errorf("provider returned wrong issuer link href: %v, expected %v", jrd.Links[0].Href, "https://someone.domain.tld")
}
if jrd.Links[0].Rel != OwnCloudInstanceRel {
t.Errorf("provider returned owncloud server instance rel: %v, expected %v", jrd.Links[0].Rel, OwnCloudInstanceRel)
if jrd.Links[0].Rel != OpenCloudInstanceRel {
t.Errorf("provider returned opencloud server instance rel: %v, expected %v", jrd.Links[0].Rel, OpenCloudInstanceRel)
}
if len(jrd.Links[0].Titles) != 1 {
t.Errorf("provider returned wrong number of titles: %v, expected 1", len(jrd.Links[0].Titles))