mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-12 06:59:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename go-micro services

Browse Source
This commit is contained in:
Ralf Haferkamp
2025-01-15 15:11:55 +01:00
parent caa3121edf
commit 213e9663a9
79 changed files with 203 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml
View File

@@ -34,17 +34,17 @@ policies:
endpoint: /webdav/?preview=1
backend: http://localhost:9115
- endpoint: /remote.php/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /dav/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /webdav/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /status.php
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /index.php/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /apps/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /data
backend: http://localhost:9140
- endpoint: /app/

2
deployments/examples/ocis_full/collabora.yml
View File

@@ -9,7 +9,7 @@ services:
ocis:
environment:
# make collabora the secure view app
FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: com.owncloud.api.collaboration.CollaboraOnline
FRONTEND_APP_HANDLER_SECURE_VIEW_APP_ADDR: eu.opencloud.api.collaboration.CollaboraOnline
GRAPH_AVAILABLE_ROLES: "b1e2218d-eef8-4d4c-b82d-0f1a1b48f3b5,a8d5fe5e-96e3-418d-825b-534dbdf22b99,fb6c3e19-e378-47e5-b277-9732f9de6e21,58c63c02-1d89-4572-916a-870abc5a1b7d,2d00ce52-1fc2-4dbc-8b95-a73b73395f5a,1c996275-f1c9-4e71-abdf-a42f6495e960,312c0871-5ef7-4b3a-85b6-0e4074c64049,aa97fe03-7980-45ac-9e50-b325749fd7e6"
collaboration:

12
deployments/examples/ocis_hello/config/ocis/proxy.yaml
View File

@@ -34,17 +34,17 @@ policies:
endpoint: /webdav/?preview=1
backend: http://localhost:9115
- endpoint: /remote.php/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /dav/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /webdav/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /status.php
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /index.php/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /apps/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
- endpoint: /data
backend: http://localhost:9140
- endpoint: /app/

2
pkg/config/defaultconfig.go
View File

@@ -54,7 +54,7 @@ func DefaultConfig() *Config {
Host: "localhost",
},
Reva: &shared.Reva{
Address: "com.owncloud.api.gateway",
Address: "eu.opencloud.api.gateway",
},
Activitylog: activitylog.DefaultConfig(),

2
pkg/shared/reva.go
View File

@@ -5,7 +5,7 @@ import (
)
var defaultRevaConfig = Reva{
Address: "com.owncloud.api.gateway",
Address: "eu.opencloud.api.gateway",
}
func DefaultRevaConfig() *Reva {

4
services/activitylog/pkg/command/server.go
View File

@@ -109,8 +109,8 @@ func Server(cfg *config.Config) *cli.Command {
return err
}
hClient := ehsvc.NewEventHistoryService("com.owncloud.api.eventhistory", grpcClient)
vClient := settingssvc.NewValueService("com.owncloud.api.settings", grpcClient)
hClient := ehsvc.NewEventHistoryService("eu.opencloud.api.eventhistory", grpcClient)
vClient := settingssvc.NewValueService("eu.opencloud.api.settings", grpcClient)
{
svc, err := http.Server(

2
services/activitylog/pkg/config/defaults/defaultconfig.go
View File

@@ -42,7 +42,7 @@ func DefaultConfig() *config.Config {
HTTP: config.HTTP{
Addr: "127.0.0.1:9195",
Root: "/",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
CORS: config.CORS{
AllowedOrigins: []string{"*"},
AllowedMethods: []string{"GET"},

4
services/app-provider/pkg/config/defaults/defaultconfig.go
View File

@@ -25,14 +25,14 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9164",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{
Name: "app-provider",
},
Reva: shared.DefaultRevaConfig(),
ExternalAddr: "com.owncloud.api.app-provider",
ExternalAddr: "eu.opencloud.api.app-provider",
Driver: "",
Drivers: config.Drivers{
WOPI: config.WOPIDriver{

2
services/app-registry/pkg/config/defaults/defaultconfig.go
View File

@@ -25,7 +25,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9242",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{

2
services/auth-app/pkg/command/server.go
View File

@@ -128,7 +128,7 @@ func Server(cfg *config.Config) *cli.Command {
return err
}
rClient := settingssvc.NewRoleService("com.owncloud.api.settings", grpcClient)
rClient := settingssvc.NewRoleService("eu.opencloud.api.settings", grpcClient)
server, err := http.Server(
http.Logger(logger),
http.Context(ctx),

4
services/auth-app/pkg/config/defaults/defaultconfig.go
View File

@@ -27,12 +27,12 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9246",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
HTTP: config.HTTP{
Addr: "127.0.0.1:9247",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
Root: "/",
CORS: config.CORS{
AllowedOrigins: []string{"*"},

2
services/auth-basic/pkg/config/defaults/defaultconfig.go
View File

@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9146",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{

2
services/auth-bearer/pkg/config/defaults/defaultconfig.go
View File

@@ -25,7 +25,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9148",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{

2
services/auth-machine/pkg/config/defaults/defaultconfig.go
View File

@@ -25,7 +25,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9166",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{

2
services/auth-service/pkg/config/defaults/defaultconfig.go
View File

@@ -25,7 +25,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9199",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{

4
services/collaboration/pkg/config/defaults/defaultconfig.go
View File

@@ -43,11 +43,11 @@ func DefaultConfig() *config.Config {
GRPC: config.GRPC{
Addr: "127.0.0.1:9301",
Protocol: "tcp",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
},
HTTP: config.HTTP{
Addr: "127.0.0.1:9300",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
},
Debug: config.Debug{
Addr: "127.0.0.1:9304",

2
services/eventhistory/pkg/config/defaults/defaultconfig.go
View File

@@ -41,7 +41,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9274",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
},
}
}

2
services/frontend/pkg/command/events.go
View File

@@ -80,7 +80,7 @@ func ListenForEvents(ctx context.Context, cfg *config.Config, l log.Logger) erro
return err
}
valueService := settingssvc.NewValueService("com.owncloud.api.settings", grpcClient)
valueService := settingssvc.NewValueService("eu.opencloud.api.settings", grpcClient)
wg := sync.WaitGroup{}
for i := 0; i < cfg.MaxConcurrency; i++ {

4
services/frontend/pkg/config/defaults/defaultconfig.go
View File

@@ -27,7 +27,7 @@ func DefaultConfig() *config.Config {
},
HTTP: config.HTTPConfig{
Addr: "127.0.0.1:9140",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
Protocol: "tcp",
Prefix: "",
CORS: config.CORS{
@@ -94,7 +94,7 @@ func DefaultConfig() *config.Config {
},
AppHandler: config.AppHandler{
Prefix: "app",
SecureViewAppAddr: "com.owncloud.api.collaboration",
SecureViewAppAddr: "eu.opencloud.api.collaboration",
},
Archiver: config.Archiver{
Insecure: false,

14
services/gateway/README.md
View File

@@ -42,7 +42,7 @@ The scheme for this setup is the following. Note that there is, except storage,
|------|------|------|
| OC_GRPC_PROTOCOL or <br> `<service>`_GRPC_PROTOCOL | tcp | unix |
| `<service>`_GRPC_ADDR | 127.0.0.1:`<port>` | /var/run/ocis/`<service>`.sock |
| GATEWAY_`<service>`_ENDPOINT | com.owncloud.api.`<service>` | unix:/var/run/ocis/`<service>`.sock <br> dns: ... <br> kubernetes: ... |
| GATEWAY_`<service>`_ENDPOINT | eu.opencloud.api.`<service>` | unix:/var/run/ocis/`<service>`.sock <br> dns: ... <br> kubernetes: ... |
```console
USERS_GRPC_PROTOCOL=unix"
@@ -108,7 +108,7 @@ In order to add another storage provider the CS3 storage registry that is runnin
```json
{
"com.owncloud.api.storage-users": {
"eu.opencloud.api.storage-users": {
"providerid": "{storage-users-mount-uuid}",
"spaces": {
"personal": {
@@ -121,7 +121,7 @@ In order to add another storage provider the CS3 storage registry that is runnin
}
}
},
"com.owncloud.api.storage-shares": {
"eu.opencloud.api.storage-shares": {
"providerid": "a0ca6a90-a365-4782-871e-d44447bbc668",
"spaces": {
"virtual": {
@@ -136,7 +136,7 @@ In order to add another storage provider the CS3 storage registry that is runnin
}
}
},
"com.owncloud.api.storage-publiclink": {
"eu.opencloud.api.storage-publiclink": {
"providerid": "7993447f-687f-490d-875c-ac95e89a62a4",
"spaces": {
"grant": {
@@ -148,7 +148,7 @@ In order to add another storage provider the CS3 storage registry that is runnin
}
}
},
"com.owncloud.api.ocm": {
"eu.opencloud.api.ocm": {
"providerid": "89f37a33-858b-45fa-8890-a1f2b27d90e1",
"spaces": {
"grant": {
@@ -160,7 +160,7 @@ In order to add another storage provider the CS3 storage registry that is runnin
}
}
},
"com.owncloud.api.storage-hello": {
"eu.opencloud.api.storage-hello": {
"providerid": "hello-storage-id",
"spaces": {
"project": {
@@ -172,4 +172,4 @@ In order to add another storage provider the CS3 storage registry that is runnin
}
```
In the above replace `{storage-users-mount-uuid}` with the mount UUID that was generated for the storage-users service. You can find it in the `config.yaml` generated on by `ocis init`. The last entry `com.owncloud.api.storage-hello` and its `providerid` `"hello-storage-id"` are an example for in additional storage provider, in this case running `hellofs`, an example minimal storage driver.
In the above replace `{storage-users-mount-uuid}` with the mount UUID that was generated for the storage-users service. You can find it in the `config.yaml` generated on by `ocis init`. The last entry `eu.opencloud.api.storage-hello` and its `providerid` `"hello-storage-id"` are an example for in additional storage provider, in this case running `hellofs`, an example minimal storage driver.

28
services/gateway/pkg/config/defaults/defaultconfig.go
View File

@@ -27,7 +27,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9142",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{
@@ -51,19 +51,19 @@ func DefaultConfig() *config.Config {
FrontendPublicURL: "https://localhost:9200",
AppRegistryEndpoint: "com.owncloud.api.app-registry",
AuthAppEndpoint: "com.owncloud.api.auth-app",
AuthBasicEndpoint: "com.owncloud.api.auth-basic",
AuthMachineEndpoint: "com.owncloud.api.auth-machine",
AuthServiceEndpoint: "com.owncloud.api.auth-service",
GroupsEndpoint: "com.owncloud.api.groups",
PermissionsEndpoint: "com.owncloud.api.settings",
SharingEndpoint: "com.owncloud.api.sharing",
StoragePublicLinkEndpoint: "com.owncloud.api.storage-publiclink",
StorageSharesEndpoint: "com.owncloud.api.storage-shares",
StorageUsersEndpoint: "com.owncloud.api.storage-users",
UsersEndpoint: "com.owncloud.api.users",
OCMEndpoint: "com.owncloud.api.ocm",
AppRegistryEndpoint: "eu.opencloud.api.app-registry",
AuthAppEndpoint: "eu.opencloud.api.auth-app",
AuthBasicEndpoint: "eu.opencloud.api.auth-basic",
AuthMachineEndpoint: "eu.opencloud.api.auth-machine",
AuthServiceEndpoint: "eu.opencloud.api.auth-service",
GroupsEndpoint: "eu.opencloud.api.groups",
PermissionsEndpoint: "eu.opencloud.api.settings",
SharingEndpoint: "eu.opencloud.api.sharing",
StoragePublicLinkEndpoint: "eu.opencloud.api.storage-publiclink",
StorageSharesEndpoint: "eu.opencloud.api.storage-shares",
StorageUsersEndpoint: "eu.opencloud.api.storage-users",
UsersEndpoint: "eu.opencloud.api.users",
OCMEndpoint: "eu.opencloud.api.ocm",
StorageRegistry: config.StorageRegistry{
Driver: "spaces",

4
services/graph/pkg/config/defaults/defaultconfig.go
View File

@@ -42,7 +42,7 @@ func DefaultConfig() *config.Config {
},
HTTP: config.HTTP{
Addr: "127.0.0.1:9120",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
Root: "/graph",
CORS: config.CORS{
AllowedOrigins: []string{"*"},
@@ -65,7 +65,7 @@ func DefaultConfig() *config.Config {
},
Reva: shared.DefaultRevaConfig(),
Spaces: config.Spaces{
StorageUsersAddress: "com.owncloud.api.storage-users",
StorageUsersAddress: "eu.opencloud.api.storage-users",
WebDavBase: "https://localhost:9200",
WebDavPath: "/dav/spaces/",
DefaultQuota: "1000000000",

8
services/graph/pkg/server/http/server.go
View File

@@ -95,8 +95,8 @@ func Server(opts ...Option) (http.Service, error) {
account.Logger(options.Logger),
account.JWTSecret(options.Config.TokenManager.JWTSecret),
))
roleService = settingssvc.NewRoleService("com.owncloud.api.settings", grpcClient)
valueService = settingssvc.NewValueService("com.owncloud.api.settings", grpcClient)
roleService = settingssvc.NewRoleService("eu.opencloud.api.settings", grpcClient)
valueService = settingssvc.NewValueService("eu.opencloud.api.settings", grpcClient)
gatewaySelector, err = pool.GatewaySelector(
options.Config.Reva.Address,
append(
@@ -126,7 +126,7 @@ func Server(opts ...Option) (http.Service, error) {
keyCloakClient = keycloak.New(kcc.BasePath, kcc.ClientID, kcc.ClientSecret, kcc.ClientRealm, kcc.InsecureSkipVerify)
}
hClient := ehsvc.NewEventHistoryService("com.owncloud.api.eventhistory", grpcClient)
hClient := ehsvc.NewEventHistoryService("eu.opencloud.api.eventhistory", grpcClient)
var handle svc.Service
handle, err = svc.NewService(
@@ -140,7 +140,7 @@ func Server(opts ...Option) (http.Service, error) {
svc.WithValueService(valueService),
svc.WithRequireAdminMiddleware(requireAdminMiddleware),
svc.WithGatewaySelector(gatewaySelector),
svc.WithSearchService(searchsvc.NewSearchProviderService("com.owncloud.api.search", grpcClient)),
svc.WithSearchService(searchsvc.NewSearchProviderService("eu.opencloud.api.search", grpcClient)),
svc.KeycloakClient(keyCloakClient),
svc.EventHistoryClient(hClient),
svc.TraceProvider(options.TraceProvider),

4
services/graph/pkg/service/v0/application_test.go
View File

@@ -50,11 +50,11 @@ var _ = Describe("Applications", func() {
identityBackend = &identitymocks.Backend{}
roleService = &mocks.RoleService{}
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

4
services/graph/pkg/service/v0/approleassignments_test.go
View File

@@ -60,11 +60,11 @@ var _ = Describe("AppRoleAssignments", func() {
identityBackend = &identitymocks.Backend{}
roleService = &mocks.RoleService{}
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

4
services/graph/pkg/service/v0/driveitems_test.go
View File

@@ -61,11 +61,11 @@ var _ = Describe("Driveitems", func() {
BeforeEach(func() {
eventsPublisher.On("Publish", mock.Anything, mock.Anything, mock.Anything).Return(nil)
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

4
services/graph/pkg/service/v0/educationclasses_test.go
View File

@@ -53,11 +53,11 @@ var _ = Describe("EducationClass", func() {
BeforeEach(func() {
eventsPublisher.On("Publish", mock.Anything, mock.Anything, mock.Anything).Return(nil)
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

4
services/graph/pkg/service/v0/educationschools_test.go
View File

@@ -54,11 +54,11 @@ var _ = Describe("Schools", func() {
)
BeforeEach(func() {
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

4
services/graph/pkg/service/v0/educationuser_test.go
View File

@@ -58,11 +58,11 @@ var _ = Describe("EducationUsers", func() {
BeforeEach(func() {
eventsPublisher.On("Publish", mock.Anything, mock.Anything, mock.Anything).Return(nil)
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

2
services/graph/pkg/service/v0/graph_suite_test.go
View File

@@ -12,7 +12,7 @@ import (
func init() {
r := registry.GetRegistry(registry.Inmemory())
service := registry.BuildGRPCService("com.owncloud.api.gateway", "", "", "")
service := registry.BuildGRPCService("eu.opencloud.api.gateway", "", "", "")
service.Nodes = []*mRegistry.Node{{
Address: "any",
}}

4
services/graph/pkg/service/v0/graph_test.go
View File

@@ -68,11 +68,11 @@ var _ = Describe("Graph", func() {
cfg.Commons = &shared.Commons{}
cfg.GRPCClientTLS = &shared.GRPCClientTLS{}
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

4
services/graph/pkg/service/v0/groups_test.go
View File

@@ -59,11 +59,11 @@ var _ = Describe("Groups", func() {
BeforeEach(func() {
eventsPublisher.On("Publish", mock.Anything, mock.Anything, mock.Anything).Return(nil)
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

4
services/graph/pkg/service/v0/password_test.go
View File

@@ -51,11 +51,11 @@ var _ = Describe("Users changing their own password", func() {
cfg.TokenManager.JWTSecret = "loremipsum"
cfg.GRPCClientTLS = &shared.GRPCClientTLS{}
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

2
services/graph/pkg/service/v0/service.go
View File

@@ -170,7 +170,7 @@ func NewService(opts ...Option) (Graph, error) { //nolint:maintidx
if err != nil {
return svc, err
}
svc.permissionsService = settingssvc.NewPermissionService("com.owncloud.api.settings", grpcClient)
svc.permissionsService = settingssvc.NewPermissionService("eu.opencloud.api.settings", grpcClient)
} else {
svc.permissionsService = options.PermissionService
}

4
services/graph/pkg/service/v0/sharedbyme_test.go
View File

@@ -143,7 +143,7 @@ var _ = Describe("sharedbyme", func() {
rr = httptest.NewRecorder()
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewayClient.On("Stat",
@@ -228,7 +228,7 @@ var _ = Describe("sharedbyme", func() {
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

4
services/graph/pkg/service/v0/sharedwithme_test.go
View File

@@ -48,11 +48,11 @@ var _ = Describe("SharedWithMe", func() {
)
BeforeEach(func() {
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

4
services/graph/pkg/service/v0/users_test.go
View File

@@ -66,11 +66,11 @@ var _ = Describe("Users", func() {
BeforeEach(func() {
eventsPublisher.On("Publish", mock.Anything, mock.Anything, mock.Anything).Return(nil)
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

2
services/groups/pkg/config/defaults/defaultconfig.go
View File

@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9160",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{

2
services/idp/pkg/config/defaults/defaultconfig.go
View File

@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
HTTP: config.HTTP{
Addr: "127.0.0.1:9130",
Root: "/",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
TLSCert: filepath.Join(defaults.BaseDataPath(), "idp", "server.crt"),
TLSKey: filepath.Join(defaults.BaseDataPath(), "idp", "server.key"),
TLS: false,

2
services/invitations/pkg/config/defaults/defaultconfig.go
View File

@@ -24,7 +24,7 @@ func DefaultConfig() *config.Config {
HTTP: config.HTTP{
Addr: "127.0.0.1:9265",
Root: "/graph/v1.0",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
CORS: config.CORS{
AllowedOrigins: []string{"https://localhost:9200"},
},

4
services/notifications/pkg/command/server.go
View File

@@ -120,8 +120,8 @@ func Server(cfg *config.Config) *cli.Command {
if err != nil {
logger.Fatal().Err(err).Str("addr", cfg.Notifications.RevaGateway).Msg("could not get reva gateway selector")
}
valueService := settingssvc.NewValueService("com.owncloud.api.settings", grpcClient)
historyClient := ehsvc.NewEventHistoryService("com.owncloud.api.eventhistory", grpcClient)
valueService := settingssvc.NewValueService("eu.opencloud.api.settings", grpcClient)
historyClient := ehsvc.NewEventHistoryService("eu.opencloud.api.eventhistory", grpcClient)
notificationStore := store.Create(
store.Store(cfg.Store.Store),

2
services/notifications/pkg/service/notification_suite_test.go
View File

@@ -12,7 +12,7 @@ import (
func init() {
r := registry.GetRegistry(registry.Inmemory())
service := registry.BuildGRPCService("com.owncloud.api.gateway", "", "", "")
service := registry.BuildGRPCService("eu.opencloud.api.gateway", "", "", "")
service.Nodes = []*mRegistry.Node{{
Address: "any",
}}

8
services/notifications/pkg/service/service_test.go
View File

@@ -55,11 +55,11 @@ var _ = Describe("Notifications", func() {
)
BeforeEach(func() {
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},
@@ -263,11 +263,11 @@ var _ = Describe("Notifications X-Site Scripting", func() {
)
BeforeEach(func() {
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

2
services/ocdav/pkg/config/defaults/defaultconfig.go
View File

@@ -26,7 +26,7 @@ func DefaultConfig() *config.Config {
},
HTTP: config.HTTPConfig{
Addr: "127.0.0.1:9350",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
Protocol: "tcp",
Prefix: "",
CORS: config.CORS{

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

@@ -29,7 +29,7 @@ func DefaultConfig() *config.Config {
},
HTTP: config.HTTPConfig{
Addr: "127.0.0.1:9280",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
Protocol: "tcp",
Prefix: "",
CORS: config.CORS{
@@ -79,7 +79,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9282",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
},
Reva: shared.DefaultRevaConfig(),
Service: config.Service{

4
services/ocs/README.md
View File

@@ -12,7 +12,7 @@ To authenticate presigned URLs the proxy service needs to read the signing keys
Possible stores that can be configured via `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE` are:
- `nats-js-kv`: Stores data using key-value-store feature of [nats jetstream](https://docs.nats.io/nats-concepts/jetstream/key-value-store)
- `redis-sentinel`: Stores data in a configured Redis Sentinel cluster.
- `ocisstoreservice`: Stores data in the legacy ocis store service. Requires setting `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` to `com.owncloud.api.store`.
- `ocisstoreservice`: Stores data in the legacy ocis store service. Requires setting `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` to `eu.opencloud.api.store`.
The `memory` store cannot be used as it does not share the memory from the ocs service signing key memory store, even in a single process.
@@ -21,4 +21,4 @@ Make sure to configure the same store in the proxy service.
Store specific notes:
- When using `redis-sentinel`, the Redis master to use is configured via e.g. `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` in the form of `<sentinel-host>:<sentinel-port>/<redis-master>` like `10.10.0.200:26379/mymaster`.
- When using `nats-js-kv` it is recommended to set `PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` to the same value as `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES`. That way the proxy uses the same nats instance as the ocs service.
- When using `ocisstoreservice` the `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` must be set to the service name `com.owncloud.api.store`. It does not support TTL and stores the presigning keys indefinitely. Also, the store service needs to be started.
- When using `ocisstoreservice` the `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` must be set to the service name `eu.opencloud.api.store`. It does not support TTL and stores the presigning keys indefinitely. Also, the store service needs to be started.

2
services/ocs/pkg/config/defaults/defaultconfig.go
View File

@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
HTTP: config.HTTP{
Addr: "127.0.0.1:9110",
Root: "/ocs",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
CORS: config.CORS{
AllowedOrigins: []string{"*"},
AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"},

2
services/policies/pkg/config/defaults/defaultconfig.go
View File

@@ -29,7 +29,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPC{
Addr: "127.0.0.1:9125",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
},
Events: config.Events{
Endpoint: "127.0.0.1:9233",

16
services/proxy/README.md
View File

@@ -15,7 +15,7 @@ The following request authentication schemes are implemented:
## Configuring Routes
The proxy handles routing to all endpoints that ocis offers. The currently availabe default routes can be found [in the code](https://github.com/owncloud/ocis/blob/master/services/proxy/pkg/config/defaults/defaultconfig.go). Changing or adding routes can be necessary when writing own ocis extensions.
The proxy handles routing to all endpoints that ocis offers. The currently availabe default routes can be found [in the code](https://github.eu.opencloud.ocis/blob/master/services/proxy/pkg/config/defaults/defaultconfig.go). Changing or adding routes can be necessary when writing own ocis extensions.
Due to the complexity when defining routes, these can only be defined in the yaml file but not via environment variables.
@@ -26,9 +26,9 @@ policies:
- name: ocis
routes:
- endpoint: /
service: com.owncloud.web.web
service: eu.opencloud.web.web
- endpoint: /dav/
service: com.owncloud.web.ocdav
service: eu.opencloud.web.ocdav
```
For adding _additional_ routes to the default routes use:
@@ -38,7 +38,7 @@ additional_policies:
- name: ocis
routes:
- endpoint: /custom/endpoint
service: com.owncloud.custom.custom
service: eu.opencloud.custom.custom
```
A route has the following configurable parameters:
@@ -140,14 +140,14 @@ These issued JWT tokens are immutable and integrity-protected. Which means, any
* Infinite Scale can't differentiate between a group being renamed in the IDP and users being reassigned to a different group.
* Infinite Scale does not get aware when a group is being deleted in the IDP, a new claim will not hold any information from the deleted group. Infinite Scale does not track a claim history to compare.
* Infinite Scale does not get aware when a group is being deleted in the IDP, a new claim will not hold any information from the deleted group. Infinite Scale does not track a claim history to compare.
#### Impacts
For shares or space memberships based on groups, a renamed or deleted group will impact accessing the resource:
* There is no user notification about the inability accessing the resource.
* The user will only experience rejected access.
* The user will only experience rejected access.
* This also applies for connected apps like the Desktop, iOS or Android app!
To give access for rejected users on a resource, one with rights to share must update the group information.
@@ -266,7 +266,7 @@ Store specific notes:
To authenticate presigned URLs the proxy service needs to read signing keys from a store that is populated by the ocs service. Possible stores are:
- `nats-js-kv`: Stores data using key-value-store feature of [nats jetstream](https://docs.nats.io/nats-concepts/jetstream/key-value-store)
- `redis-sentinel`: Stores data in a configured Redis Sentinel cluster.
- `ocisstoreservice`: Stores data in the legacy ocis store service. Requires setting `PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` to `com.owncloud.api.store`.
- `ocisstoreservice`: Stores data in the legacy ocis store service. Requires setting `PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` to `eu.opencloud.api.store`.
The `memory` store cannot be used as it does not share the memory from the ocs service signing key memory store, even in a single process.
@@ -276,7 +276,7 @@ Store specific notes:
- When using `redis-sentinel`, the Redis master to use is configured via e.g. `OC_CACHE_STORE_NODES` in the form of `<sentinel-host>:<sentinel-port>/<redis-master>` like `10.10.0.200:26379/mymaster`.
- When using `nats-js-kv` it is recommended to set `OCS_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` to the same value as `PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES`. That way the ocs uses the same nats instance as the proxy service.
- When using the `nats-js-kv` store, it is possible to set `PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_DISABLE_PERSISTENCE` to instruct nats to not persist signing key data on disc.
- When using `ocisstoreservice` the `PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` must be set to the service name `com.owncloud.api.store`. It does not support TTL and stores the presigning keys indefinitely. Also, the store service needs to be started.
- When using `ocisstoreservice` the `PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES` must be set to the service name `eu.opencloud.api.store`. It does not support TTL and stores the presigning keys indefinitely. Also, the store service needs to be started.
## Special Settings

4
services/proxy/pkg/command/server.go
View File

@@ -247,8 +247,8 @@ func loadMiddlewares(logger log.Logger, cfg *config.Config,
userProvider backend.UserBackend, publisher events.Publisher,
gatewaySelector pool.Selectable[gateway.GatewayAPIClient], serviceSelector selector.Selector) alice.Chain {
rolesClient := settingssvc.NewRoleService("com.owncloud.api.settings", cfg.GrpcClient)
policiesProviderClient := policiessvc.NewPoliciesProviderService("com.owncloud.api.policies", cfg.GrpcClient)
rolesClient := settingssvc.NewRoleService("eu.opencloud.api.settings", cfg.GrpcClient)
policiesProviderClient := policiessvc.NewPoliciesProviderService("eu.opencloud.api.policies", cfg.GrpcClient)
var roleAssigner userroles.UserRoleAssigner
switch cfg.RoleAssignment.Driver {

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

@@ -31,7 +31,7 @@ func DefaultConfig() *config.Config {
HTTP: config.HTTP{
Addr: "0.0.0.0:9200",
Root: "/",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
TLSCert: path.Join(defaults.BaseDataPath(), "proxy", "server.crt"),
TLSKey: path.Join(defaults.BaseDataPath(), "proxy", "server.key"),
TLS: true,
@@ -111,79 +111,79 @@ func DefaultPolicies() []config.Policy {
Routes: []config.Route{
{
Endpoint: "/",
Service: "com.owncloud.web.web",
Service: "eu.opencloud.web.web",
Unprotected: true,
},
{
Endpoint: "/.well-known/ocm",
Service: "com.owncloud.web.ocm",
Service: "eu.opencloud.web.ocm",
Unprotected: true,
},
{
Endpoint: "/.well-known/webfinger",
Service: "com.owncloud.web.webfinger",
Service: "eu.opencloud.web.webfinger",
Unprotected: true,
},
{
Endpoint: "/.well-known/openid-configuration",
Service: "com.owncloud.web.idp",
Service: "eu.opencloud.web.idp",
Unprotected: true,
},
{
Endpoint: "/branding/logo",
Service: "com.owncloud.web.web",
Service: "eu.opencloud.web.web",
},
{
Endpoint: "/konnect/",
Service: "com.owncloud.web.idp",
Service: "eu.opencloud.web.idp",
Unprotected: true,
},
{
Endpoint: "/signin/",
Service: "com.owncloud.web.idp",
Service: "eu.opencloud.web.idp",
Unprotected: true,
},
{
Endpoint: "/archiver",
Service: "com.owncloud.web.frontend",
Service: "eu.opencloud.web.frontend",
},
{
// reroute oc10 notifications endpoint to userlog service
Endpoint: "/ocs/v2.php/apps/notifications/api/v1/notifications/sse",
Service: "com.owncloud.sse.sse",
Service: "eu.opencloud.sse.sse",
},
{
// reroute oc10 notifications endpoint to userlog service
Endpoint: "/ocs/v2.php/apps/notifications/api/v1/notifications",
Service: "com.owncloud.web.userlog",
Service: "eu.opencloud.web.userlog",
},
{
Type: config.RegexRoute,
Endpoint: "/ocs/v[12].php/cloud/user/signing-key", // only `user/signing-key` is left in ocis-ocs
Service: "com.owncloud.web.ocs",
Service: "eu.opencloud.web.ocs",
},
{
Type: config.RegexRoute,
Endpoint: "/ocs/v[12].php/config",
Service: "com.owncloud.web.frontend",
Service: "eu.opencloud.web.frontend",
Unprotected: true,
},
{
Endpoint: "/sciencemesh/",
Service: "com.owncloud.web.ocm",
Service: "eu.opencloud.web.ocm",
},
{
Endpoint: "/ocm/",
Service: "com.owncloud.web.ocm",
Service: "eu.opencloud.web.ocm",
},
{
Endpoint: "/ocs/",
Service: "com.owncloud.web.frontend",
Service: "eu.opencloud.web.frontend",
},
{
Type: config.QueryRoute,
Endpoint: "/remote.php/?preview=1",
Service: "com.owncloud.web.webdav",
Service: "eu.opencloud.web.webdav",
},
// TODO the actual REPORT goes to /dav/files/{username}, which is user specific ... how would this work in a spaces world?
// TODO what paths are returned? the href contains the full path so it should be possible to return urls from other spaces?
@@ -193,81 +193,81 @@ func DefaultPolicies() []config.Policy {
Type: config.RegexRoute,
Method: "REPORT",
Endpoint: "(/remote.php)?/(web)?dav",
Service: "com.owncloud.web.webdav",
Service: "eu.opencloud.web.webdav",
},
{
Type: config.QueryRoute,
Endpoint: "/dav/?preview=1",
Service: "com.owncloud.web.webdav",
Service: "eu.opencloud.web.webdav",
},
{
Type: config.QueryRoute,
Endpoint: "/webdav/?preview=1",
Service: "com.owncloud.web.webdav",
Service: "eu.opencloud.web.webdav",
},
{
Endpoint: "/remote.php/",
Service: "com.owncloud.web.ocdav",
Service: "eu.opencloud.web.ocdav",
},
{
Endpoint: "/dav/",
Service: "com.owncloud.web.ocdav",
Service: "eu.opencloud.web.ocdav",
},
{
Endpoint: "/webdav/",
Service: "com.owncloud.web.ocdav",
Service: "eu.opencloud.web.ocdav",
},
{
Endpoint: "/status",
Service: "com.owncloud.web.ocdav",
Service: "eu.opencloud.web.ocdav",
Unprotected: true,
},
{
Endpoint: "/status.php",
Service: "com.owncloud.web.ocdav",
Service: "eu.opencloud.web.ocdav",
Unprotected: true,
},
{
Endpoint: "/index.php/",
Service: "com.owncloud.web.ocdav",
Service: "eu.opencloud.web.ocdav",
},
{
Endpoint: "/apps/",
Service: "com.owncloud.web.ocdav",
Service: "eu.opencloud.web.ocdav",
},
{
Endpoint: "/data",
Service: "com.owncloud.web.frontend",
Service: "eu.opencloud.web.frontend",
Unprotected: true,
},
{
Endpoint: "/app/list",
Service: "com.owncloud.web.frontend",
Service: "eu.opencloud.web.frontend",
Unprotected: true,
},
{
Endpoint: "/app/", // /app or /apps? ocdav only handles /apps
Service: "com.owncloud.web.frontend",
Service: "eu.opencloud.web.frontend",
},
{
Endpoint: "/graph/v1beta1/extensions/org.libregraph/activities",
Service: "com.owncloud.web.activitylog",
Service: "eu.opencloud.web.activitylog",
},
{
Endpoint: "/graph/v1.0/invitations",
Service: "com.owncloud.web.invitations",
Service: "eu.opencloud.web.invitations",
},
{
Endpoint: "/graph/",
Service: "com.owncloud.web.graph",
Service: "eu.opencloud.web.graph",
},
{
Endpoint: "/api/v0/settings",
Service: "com.owncloud.web.settings",
Service: "eu.opencloud.web.settings",
},
{
Endpoint: "/auth-app/tokens",
Service: "com.owncloud.web.auth-app",
Service: "eu.opencloud.web.auth-app",
},
},
},

4
services/proxy/pkg/middleware/app_auth_test.go
View File

@@ -17,12 +17,12 @@ import (
var _ = Describe("Authenticating requests", Label("AppAuthAuthenticator"), func() {
var authenticator Authenticator
BeforeEach(func() {
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
authenticator = AppAuthAuthenticator{
Logger: log.NewLogger(),
RevaGatewaySelector: pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return mockGatewayClient{
AuthenticateFunc: func(authType, clientID, clientSecret string) (string, rpcv1beta1.Code) {

4
services/proxy/pkg/middleware/authentication_test.go
View File

@@ -72,7 +72,7 @@ var _ = Describe("Authenticating requests", Label("Authentication"), func() {
ub.On("Authenticate", mock.Anything, mock.Anything, mock.Anything).Return(nil, "", backend.ErrAccountNotFound)
BeforeEach(func() {
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
logger := log.NewLogger()
authenticators = []Authenticator{
@@ -91,7 +91,7 @@ var _ = Describe("Authenticating requests", Label("Authentication"), func() {
Logger: logger,
RevaGatewaySelector: pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return mockGatewayClient{
AuthenticateFunc: func(authType, clientID, clientSecret string) (string, rpcv1beta1.Code) {

4
services/proxy/pkg/middleware/policies_test.go
View File

@@ -146,12 +146,12 @@ func prepare(q string) (http.Handler, *mocks.PoliciesProviderService, *cs3mocks.
gatewayClient := &cs3mocks.GatewayAPIClient{}
gatewaySelector := pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},
)
defer pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
defer pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
// mocked policiesProviderService
policiesProviderService := &mocks.PoliciesProviderService{}

4
services/proxy/pkg/middleware/public_share_auth_test.go
View File

@@ -18,12 +18,12 @@ import (
var _ = Describe("Authenticating requests", Label("PublicShareAuthenticator"), func() {
var authenticator Authenticator
BeforeEach(func() {
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
authenticator = PublicShareAuthenticator{
Logger: log.NewLogger(),
RevaGatewaySelector: pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return mockGatewayClient{
AuthenticateFunc: func(authType, clientID, clientSecret string) (string, rpcv1beta1.Code) {

2
services/proxy/pkg/user/backend/cs3.go
View File

@@ -427,7 +427,7 @@ func (c cs3backend) updateLibregraphUser(userid string, user libregraph.UserUpda
func (c cs3backend) setupLibregraphClient(_ context.Context, cs3token string) (*libregraph.APIClient, error) {
// Use micro registry to resolve next graph service endpoint
next, err := c.graphSelector.Select("com.owncloud.web.graph")
next, err := c.graphSelector.Select("eu.opencloud.web.graph")
if err != nil {
c.logger.Debug().Err(err).Msg("setupLibregraphClient: error during Select")
return nil, err

2
services/search/pkg/command/index.go
View File

@@ -56,7 +56,7 @@ func Index(cfg *config.Config) *cli.Command {
return err
}
c := searchsvc.NewSearchProviderService("com.owncloud.api.search", grpcClient)
c := searchsvc.NewSearchProviderService("eu.opencloud.api.search", grpcClient)
_, err = c.IndexSpace(context.Background(), &searchsvc.IndexSpaceRequest{
SpaceId: ctx.String("space"),
}, func(opts *client.CallOptions) { opts.RequestTimeout = 10 * time.Minute })

2
services/search/pkg/config/defaults/defaultconfig.go
View File

@@ -27,7 +27,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9220",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
},
Service: config.Service{
Name: "search",

2
services/search/pkg/search/search_suite_test.go
View File

@@ -12,7 +12,7 @@ import (
func init() {
r := registry.GetRegistry(registry.Inmemory())
service := registry.BuildGRPCService("com.owncloud.api.gateway", "", "", "")
service := registry.BuildGRPCService("eu.opencloud.api.gateway", "", "", "")
service.Nodes = []*mRegistry.Node{{
Address: "any",
}}

4
services/search/pkg/search/service_test.go
View File

@@ -76,11 +76,11 @@ var _ = Describe("Searchprovider", func() {
)
BeforeEach(func() {
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

8
services/settings/pkg/config/defaults/defaultconfig.go
View File

@@ -34,7 +34,7 @@ func DefaultConfig() *config.Config {
},
HTTP: config.HTTP{
Addr: "127.0.0.1:9190",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
Root: "/",
CORS: config.CORS{
AllowedOrigins: []string{"*"},
@@ -45,12 +45,12 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9191",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
},
SetupDefaultAssignments: false,
Metadata: config.Metadata{
GatewayAddress: "com.owncloud.api.storage-system",
StorageAddress: "com.owncloud.api.storage-system",
GatewayAddress: "eu.opencloud.api.storage-system",
StorageAddress: "eu.opencloud.api.storage-system",
SystemUserIDP: "internal",
Cache: &config.Cache{
Store: "memory",

10
services/sharing/pkg/config/defaults/defaultconfig.go
View File

@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9150",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{
@@ -41,11 +41,11 @@ func DefaultConfig() *config.Config {
File: filepath.Join(defaults.BaseDataPath(), "storage", "shares.json"),
},
CS3: config.UserSharingCS3Driver{
ProviderAddr: "com.owncloud.api.storage-system",
ProviderAddr: "eu.opencloud.api.storage-system",
SystemUserIDP: "internal",
},
JSONCS3: config.UserSharingJSONCS3Driver{
ProviderAddr: "com.owncloud.api.storage-system",
ProviderAddr: "eu.opencloud.api.storage-system",
SystemUserIDP: "internal",
MaxConcurrency: 1,
},
@@ -62,11 +62,11 @@ func DefaultConfig() *config.Config {
File: filepath.Join(defaults.BaseDataPath(), "storage", "publicshares.json"),
},
CS3: config.PublicSharingCS3Driver{
ProviderAddr: "com.owncloud.api.storage-system", // system storage
ProviderAddr: "eu.opencloud.api.storage-system", // system storage
SystemUserIDP: "internal",
},
JSONCS3: config.PublicSharingJSONCS3Driver{
ProviderAddr: "com.owncloud.api.storage-system", // system storage
ProviderAddr: "eu.opencloud.api.storage-system", // system storage
SystemUserIDP: "internal",
},
// TODO implement and add owncloudsql publicshare driver

2
services/sse/pkg/config/defaults/defaultconfig.go
View File

@@ -31,7 +31,7 @@ func DefaultConfig() *config.Config {
HTTP: config.HTTP{
Addr: "127.0.0.1:9135",
Root: "/",
Namespace: "com.owncloud.sse",
Namespace: "eu.opencloud.sse",
CORS: config.CORS{
AllowedOrigins: []string{"*"},
AllowedMethods: []string{"GET"},

2
services/storage-publiclink/pkg/config/defaults/defaultconfig.go
View File

@@ -25,7 +25,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9178",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{

4
services/storage-shares/pkg/config/defaults/defaultconfig.go
View File

@@ -25,7 +25,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9154",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{
@@ -34,7 +34,7 @@ func DefaultConfig() *config.Config {
Reva: shared.DefaultRevaConfig(),
MountID: "7639e57c-4433-4a12-8201-722fd0009154",
ReadOnly: false,
SharesProviderEndpoint: "com.owncloud.api.sharing",
SharesProviderEndpoint: "eu.opencloud.api.sharing",
}
}

4
services/storage-system/pkg/config/defaults/defaultconfig.go
View File

@@ -29,12 +29,12 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9215",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
HTTP: config.HTTPConfig{
Addr: "127.0.0.1:9216",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
Protocol: "tcp",
},
Service: config.Service{

12
services/storage-users/pkg/config/defaults/defaultconfig.go
View File

@@ -29,12 +29,12 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9157",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
HTTP: config.HTTPConfig{
Addr: "127.0.0.1:9158",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
Protocol: "tcp",
Prefix: "data",
CORS: config.CORS{
@@ -103,7 +103,7 @@ func DefaultConfig() *config.Config {
DBHost: "",
DBPort: 3306,
DBName: "owncloud",
UsersProviderEndpoint: "com.owncloud.api.users",
UsersProviderEndpoint: "eu.opencloud.api.users",
},
S3NG: config.S3NGDriver{
Propagator: "sync",
@@ -118,7 +118,7 @@ func DefaultConfig() *config.Config {
PersonalSpacePathTemplate: "",
GeneralSpaceAliasTemplate: "{{.SpaceType}}/{{.SpaceName | replace \" \" \"-\" | lower}}",
GeneralSpacePathTemplate: "",
PermissionsEndpoint: "com.owncloud.api.settings",
PermissionsEndpoint: "eu.opencloud.api.settings",
MaxAcquireLockCycles: 20,
MaxConcurrency: 5,
LockCycleDurationFactor: 30,
@@ -133,7 +133,7 @@ func DefaultConfig() *config.Config {
PersonalSpacePathTemplate: "",
GeneralSpaceAliasTemplate: "{{.SpaceType}}/{{.SpaceName | replace \" \" \"-\" | lower}}",
GeneralSpacePathTemplate: "",
PermissionsEndpoint: "com.owncloud.api.settings",
PermissionsEndpoint: "eu.opencloud.api.settings",
MaxAcquireLockCycles: 20,
MaxConcurrency: 5,
LockCycleDurationFactor: 30,
@@ -144,7 +144,7 @@ func DefaultConfig() *config.Config {
Root: filepath.Join(defaults.BaseDataPath(), "storage", "users"),
PersonalSpacePathTemplate: "users/{{.User.Username}}",
GeneralSpacePathTemplate: "projects/{{.SpaceId}}",
PermissionsEndpoint: "com.owncloud.api.settings",
PermissionsEndpoint: "eu.opencloud.api.settings",
AsyncUploads: true,
ScanDebounceDelay: 1 * time.Second,
},

2
services/storage-users/pkg/task/task_suite_test.go
View File

@@ -12,7 +12,7 @@ import (
func init() {
r := registry.GetRegistry(registry.Inmemory())
service := registry.BuildGRPCService("com.owncloud.api.gateway", "", "", "")
service := registry.BuildGRPCService("eu.opencloud.api.gateway", "", "", "")
service.Nodes = []*mRegistry.Node{{
Address: "any",
}}

4
services/storage-users/pkg/task/trash_bin_test.go
View File

@@ -48,11 +48,11 @@ var _ = Describe("trash", func() {
)
BeforeEach(func() {
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

4
services/thumbnails/pkg/config/defaults/defaultconfig.go
View File

@@ -29,13 +29,13 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9185",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
MaxConcurrentRequests: 0,
},
HTTP: config.HTTP{
Addr: "127.0.0.1:9186",
Root: "/thumbnails",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
CORS: config.CORS{
AllowedOrigins: []string{"*"},
AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"},

6
services/userlog/pkg/command/server.go
View File

@@ -105,9 +105,9 @@ func Server(cfg *config.Config) *cli.Command {
return fmt.Errorf("could not get reva client selector: %s", err)
}
hClient := ehsvc.NewEventHistoryService("com.owncloud.api.eventhistory", grpcClient)
vClient := settingssvc.NewValueService("com.owncloud.api.settings", grpcClient)
rClient := settingssvc.NewRoleService("com.owncloud.api.settings", grpcClient)
hClient := ehsvc.NewEventHistoryService("eu.opencloud.api.eventhistory", grpcClient)
vClient := settingssvc.NewValueService("eu.opencloud.api.settings", grpcClient)
rClient := settingssvc.NewRoleService("eu.opencloud.api.settings", grpcClient)
{
server, err := http.Server(

2
services/userlog/pkg/config/defaults/defaultconfig.go
View File

@@ -45,7 +45,7 @@ func DefaultConfig() *config.Config {
HTTP: config.HTTP{
Addr: "127.0.0.1:9210",
Root: "/",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
CORS: config.CORS{
AllowedOrigins: []string{"*"},
AllowedMethods: []string{"GET"},

2
services/userlog/pkg/service/service_suit_test.go
View File

@@ -12,7 +12,7 @@ import (
func init() {
r := registry.GetRegistry(registry.Inmemory())
service := registry.BuildGRPCService("com.owncloud.api.gateway", "", "", "")
service := registry.BuildGRPCService("eu.opencloud.api.gateway", "", "", "")
service.Nodes = []*mRegistry.Node{{
Address: "any",
}}

4
services/userlog/pkg/service/service_test.go
View File

@@ -59,11 +59,11 @@ var _ = Describe("UserlogService", func() {
sto = store.Create()
bus = testBus(make(chan events.Event))
pool.RemoveSelector("GatewaySelector" + "com.owncloud.api.gateway")
pool.RemoveSelector("GatewaySelector" + "eu.opencloud.api.gateway")
gatewayClient = &cs3mocks.GatewayAPIClient{}
gatewaySelector = pool.GetSelector[gateway.GatewayAPIClient](
"GatewaySelector",
"com.owncloud.api.gateway",
"eu.opencloud.api.gateway",
func(cc grpc.ClientConnInterface) gateway.GatewayAPIClient {
return gatewayClient
},

2
services/users/pkg/config/defaults/defaultconfig.go
View File

@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
},
GRPC: config.GRPCConfig{
Addr: "127.0.0.1:9144",
Namespace: "com.owncloud.api",
Namespace: "eu.opencloud.api",
Protocol: "tcp",
},
Service: config.Service{

4
services/web/pkg/config/defaults/defaultconfig.go
View File

@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
HTTP: config.HTTP{
Addr: "127.0.0.1:9100",
Root: "/",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
CacheTTL: 604800, // 7 days
CORS: config.CORS{
@@ -84,7 +84,7 @@ func DefaultConfig() *config.Config {
AppsPath: filepath.Join(defaults.BaseDataPath(), "web/assets/apps"),
ThemesPath: filepath.Join(defaults.BaseDataPath(), "web/assets/themes"),
},
GatewayAddress: "com.owncloud.api.gateway",
GatewayAddress: "eu.opencloud.api.gateway",
Web: config.Web{
ThemeServer: "https://localhost:9200",
ThemePath: "/themes/opencloud/theme.json",

2
services/webdav/pkg/config/defaults/defaultconfig.go
View File

@@ -28,7 +28,7 @@ func DefaultConfig() *config.Config {
HTTP: config.HTTP{
Addr: "127.0.0.1:9115",
Root: "/",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
CORS: config.CORS{
AllowedOrigins: []string{"*"},
AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"},

4
services/webdav/pkg/service/v0/service.go
View File

@@ -83,8 +83,8 @@ func NewService(opts ...Option) (Service, error) {
config: conf,
log: options.Logger,
mux: m,
searchClient: searchsvc.NewSearchProviderService("com.owncloud.api.search", conf.GrpcClient),
thumbnailsClient: thumbnailssvc.NewThumbnailService("com.owncloud.api.thumbnails", conf.GrpcClient),
searchClient: searchsvc.NewSearchProviderService("eu.opencloud.api.search", conf.GrpcClient),
thumbnailsClient: thumbnailssvc.NewThumbnailService("eu.opencloud.api.thumbnails", conf.GrpcClient),
gatewaySelector: gatewaySelector,
}

2
services/webfinger/pkg/config/defaults/defaultconfig.go
View File

@@ -27,7 +27,7 @@ func DefaultConfig() *config.Config {
HTTP: config.HTTP{
Addr: "127.0.0.1:9275",
Root: "/",
Namespace: "com.owncloud.web",
Namespace: "eu.opencloud.web",
CORS: config.CORS{
AllowedOrigins: []string{"https://localhost:9200"},
AllowCredentials: false,