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

merge ocdav into frontend

Browse Source 
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
This commit is contained in:
Jörn Friedrich Dreyer
2026-01-07 15:04:34 +01:00
parent 6082e0c4df
commit c99342318f
36 changed files with 111 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/proxy/README.md
+1 -1
View File
@@ -28,7 +28,7 @@ policies:
- endpoint: /
service: eu.opencloud.web.web
- endpoint: /dav/
service: eu.opencloud.web.ocdav
service: eu.opencloud.web.frontend
```
For adding _additional_ routes to the default routes use:
services/proxy/pkg/config/defaults/defaultconfig.go
+8 -8
View File
@@ -223,33 +223,33 @@ func DefaultPolicies() []config.Policy {
},
{
Endpoint: "/remote.php/",
Service: "eu.opencloud.web.ocdav",
Service: "eu.opencloud.web.frontend",
},
{
Endpoint: "/dav/",
Service: "eu.opencloud.web.ocdav",
Service: "eu.opencloud.web.frontend",
},
{
Endpoint: "/webdav/",
Service: "eu.opencloud.web.ocdav",
Service: "eu.opencloud.web.frontend",
},
{
Endpoint: "/status",
Service: "eu.opencloud.web.ocdav",
Service: "eu.opencloud.web.frontend",
Unprotected: true,
},
{
Endpoint: "/status.php",
Service: "eu.opencloud.web.ocdav",
Service: "eu.opencloud.web.frontend",
Unprotected: true,
},
{
Endpoint: "/index.php/",
Service: "eu.opencloud.web.ocdav",
Service: "eu.opencloud.web.frontend",
},
{
Endpoint: "/apps/",
Service: "eu.opencloud.web.ocdav",
Service: "eu.opencloud.web.frontend",
},
{
Endpoint: "/data",
@@ -262,7 +262,7 @@ func DefaultPolicies() []config.Policy {
Unprotected: true,
},
{
Endpoint: "/app/", // /app or /apps? ocdav only handles /apps
Endpoint: "/app/", // /app or /apps? frontend only handles /apps
Service: "eu.opencloud.web.frontend",
},
{
services/proxy/pkg/router/router_test.go
+2 -2
View File
@@ -127,7 +127,7 @@ func TestRouter(t *testing.T) {
Name: "default",
Routes: []config.Route{
{Type: config.PrefixRoute, Endpoint: "/web/unprotected/demo/", Backend: "http://web", Unprotected: true},
{Type: config.PrefixRoute, Endpoint: "/dav", Backend: "http://ocdav"},
{Type: config.PrefixRoute, Endpoint: "/dav", Backend: "http://frontend"},
{Type: config.PrefixRoute, Method: "REPORT", Endpoint: "/dav", Backend: "http://opencloud-webdav"},
},
},
@@ -138,7 +138,7 @@ func TestRouter(t *testing.T) {
router := New(sel, policySelectorCfg, policies, log.NewLogger())
table := []matchertest{
{method: "PROPFIND", endpoint: "/dav/files/demo/", target: "ocdav"},
{method: "PROPFIND", endpoint: "/dav/files/demo/", target: "frontend"},
{method: "REPORT", endpoint: "/dav/files/demo/", target: "opencloud-webdav"},
{method: "GET", endpoint: "/web/unprotected/demo/", target: "web", unprotected: true},
}