mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2025-12-23 22:29:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1714 from MahdiBaghbani/feature-ocm-wayf

Browse Source 
feat(ocm): add WAYF configuration for reva OCM service
This commit is contained in:
Christian Richter
2025-11-27 12:55:59 +01:00
committed by GitHub
parent 4b5fc32b81 2b68f59b78
commit 444af91cce
5 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
changelog/unreleased/add-ocm-wayf-configuration.md Normal file
View File

@@ -0,0 +1,7 @@
Enhancement: Add WAYF configuration for reva OCM service
Add WAYF configuration support for the Reva OCM service,
enabling federation discovery functionality for Open Cloud Mesh.
This includes configuration for federations file storage and invite accept dialog URL.
https://github.com/opencloud-eu/opencloud/pull/1714

6
services/ocm/pkg/config/config.go
View File

@@ -83,8 +83,10 @@ type GRPCConfig struct {
}
type ScienceMesh struct {
Prefix string `yaml:"prefix" env:"OCM_SCIENCEMESH_PREFIX" desc:"URL path prefix for the ScienceMesh service. Note that the string must not start with '/'." introductionVersion:"1.0.0"`
MeshDirectoryURL string `yaml:"science_mesh_directory_url" env:"OCM_MESH_DIRECTORY_URL" desc:"URL of the mesh directory service." introductionVersion:"1.0.0"`
Prefix string `yaml:"prefix" env:"OCM_SCIENCEMESH_PREFIX" desc:"URL path prefix for the ScienceMesh service. Note that the string must not start with '/'." introductionVersion:"1.0.0"`
MeshDirectoryURL string `yaml:"science_mesh_directory_url" env:"OCM_MESH_DIRECTORY_URL" desc:"URL of the mesh directory service." introductionVersion:"1.0.0"`
DirectoryServiceURLs string `yaml:"directory_service_urls" env:"OCM_DIRECTORY_SERVICE_URLS" desc:"Space delimited URLs of the directory services." introductionVersion:"3.5.0"`
InviteAcceptDialog string `yaml:"invite_accept_dialog" env:"OCM_INVITE_ACCEPT_DIALOG" desc:"/open-cloud-mesh/accept-invite;The frontend URL where to land when receiving an invitation" introductionVersion:"3.5.0"`
}
type OCMD struct {

3
services/ocm/pkg/config/defaults/defaultconfig.go
View File

@@ -90,7 +90,8 @@ func DefaultConfig() *config.Config {
Cluster: "opencloud-cluster",
},
ScienceMesh: config.ScienceMesh{
Prefix: "sciencemesh",
Prefix: "sciencemesh",
InviteAcceptDialog: "/open-cloud-mesh/accept-invite",
},
OCMD: config.OCMD{
Prefix: "ocm",

26
services/ocm/pkg/revaconfig/config.go
View File

@@ -60,21 +60,23 @@ func OCMConfigFromStruct(cfg *config.Config, logger log.Logger) map[string]inter
"wellknown": map[string]interface{}{
"prefix": ".well-known",
"ocmprovider": map[string]interface{}{
"ocm_prefix": cfg.OCMD.Prefix,
"endpoint": cfg.Commons.OpenCloudURL,
"provider": "OpenCloud",
"webdav_root": "/dav/ocm",
"webapp_root": cfg.ScienceMesh.Prefix,
"enable_webapp": false,
"enable_datatx": false,
"ocm_prefix": cfg.OCMD.Prefix,
"endpoint": cfg.Commons.OpenCloudURL,
"provider": "OpenCloud",
"webdav_root": "/dav/ocm",
"webapp_root": cfg.ScienceMesh.Prefix,
"invite_accept_dialog": cfg.ScienceMesh.InviteAcceptDialog,
"enable_webapp": false,
"enable_datatx": false,
},
},
"sciencemesh": map[string]interface{}{
"prefix": cfg.ScienceMesh.Prefix,
"smtp_credentials": map[string]string{},
"gatewaysvc": cfg.Reva.Address,
"mesh_directory_url": cfg.ScienceMesh.MeshDirectoryURL,
"provider_domain": providerDomain,
"prefix": cfg.ScienceMesh.Prefix,
"smtp_credentials": map[string]string{},
"gatewaysvc": cfg.Reva.Address,
"mesh_directory_url": cfg.ScienceMesh.MeshDirectoryURL,
"directory_service_urls": cfg.ScienceMesh.DirectoryServiceURLs,
"provider_domain": providerDomain,
"events": map[string]interface{}{
"natsaddress": cfg.Events.Endpoint,
"natsclusterid": cfg.Events.Cluster,

12
services/proxy/pkg/config/defaults/defaultconfig.go
View File

@@ -172,6 +172,18 @@ func DefaultPolicies() []config.Policy {
Service: "eu.opencloud.web.frontend",
Unprotected: true,
},
// OCM WAYF public endpoints
{
Endpoint: "/sciencemesh/federations",
Service: "eu.opencloud.web.ocm",
Unprotected: true,
},
{
Endpoint: "/sciencemesh/discover",
Service: "eu.opencloud.web.ocm",
Unprotected: true,
},
// General sciencemesh endpoints
{
Endpoint: "/sciencemesh/",
Service: "eu.opencloud.web.ocm",