From 38d7933409931af374aca392d399c975e041b848 Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Fri, 16 Aug 2024 15:56:28 +0200 Subject: [PATCH 1/3] feat: enable app-store web app per default --- deployments/examples/ocis_full/config/ocis/csp.yaml | 2 ++ deployments/examples/ocis_keycloak/config/ocis/csp.yaml | 2 ++ services/proxy/pkg/config/csp.yaml | 2 ++ services/web/pkg/config/defaults/defaultconfig.go | 2 +- tests/config/drone/ocis-config.json | 3 ++- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/deployments/examples/ocis_full/config/ocis/csp.yaml b/deployments/examples/ocis_full/config/ocis/csp.yaml index ffb8bcdec..d8615b85a 100644 --- a/deployments/examples/ocis_full/config/ocis/csp.yaml +++ b/deployments/examples/ocis_full/config/ocis/csp.yaml @@ -5,6 +5,7 @@ directives: - '''self''' - 'https://${COMPANION_DOMAIN|companion.owncloud.test}/' - 'wss://${COMPANION_DOMAIN|companion.owncloud.test}/' + - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/' default-src: - '''none''' font-src: @@ -22,6 +23,7 @@ directives: - '''self''' - 'data:' - 'blob:' + - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/' # In contrary to bash and docker the default is given after the | character - 'https://${ONLYOFFICE_DOMAIN|onlyoffice.owncloud.test}/' - 'https://${COLLABORA_DOMAIN|collabora.owncloud.test}/' diff --git a/deployments/examples/ocis_keycloak/config/ocis/csp.yaml b/deployments/examples/ocis_keycloak/config/ocis/csp.yaml index ac417f923..2ba7ee244 100644 --- a/deployments/examples/ocis_keycloak/config/ocis/csp.yaml +++ b/deployments/examples/ocis_keycloak/config/ocis/csp.yaml @@ -3,6 +3,7 @@ directives: - '''self''' connect-src: - '''self''' + - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/' # In contrary to bash and docker the default is given after the | character - 'https://${KEYCLOAK_DOMAIN|keycloak.owncloud.test}/' default-src: @@ -19,6 +20,7 @@ directives: - '''self''' - 'data:' - 'blob:' + - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/' manifest-src: - '''self''' media-src: diff --git a/services/proxy/pkg/config/csp.yaml b/services/proxy/pkg/config/csp.yaml index 6eab1f860..58cd0645f 100644 --- a/services/proxy/pkg/config/csp.yaml +++ b/services/proxy/pkg/config/csp.yaml @@ -3,6 +3,7 @@ directives: - '''self''' connect-src: - '''self''' + - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/' default-src: - '''none''' font-src: @@ -17,6 +18,7 @@ directives: - '''self''' - 'data:' - 'blob:' + - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/' manifest-src: - '''self''' media-src: diff --git a/services/web/pkg/config/defaults/defaultconfig.go b/services/web/pkg/config/defaults/defaultconfig.go index f442df70a..b2eb2b28a 100644 --- a/services/web/pkg/config/defaults/defaultconfig.go +++ b/services/web/pkg/config/defaults/defaultconfig.go @@ -98,7 +98,7 @@ func DefaultConfig() *config.Config { ResponseType: "code", Scope: "openid profile email", }, - Apps: []string{"files", "search", "text-editor", "pdf-viewer", "external", "admin-settings", "epub-reader", "preview"}, + Apps: []string{"files", "search", "text-editor", "pdf-viewer", "external", "admin-settings", "epub-reader", "preview", "app-store"}, Options: config.Options{ ContextHelpersReadMore: true, AccountEditLink: &config.AccountEditLink{}, diff --git a/tests/config/drone/ocis-config.json b/tests/config/drone/ocis-config.json index 7749116ff..cc6ac0483 100644 --- a/tests/config/drone/ocis-config.json +++ b/tests/config/drone/ocis-config.json @@ -24,6 +24,7 @@ "preview", "pdf-viewer", "search", - "admin-settings" + "admin-settings", + "app-store" ] } From b254acfe982f4be628a604d75ae66ef06e784416 Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Fri, 16 Aug 2024 15:56:45 +0200 Subject: [PATCH 2/3] chore: bump web to v10.1.0 --- .drone.env | 2 +- changelog/unreleased/update-web-10.1.0.md | 22 ++++++++++++++++++++++ services/web/Makefile | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/update-web-10.1.0.md diff --git a/.drone.env b/.drone.env index a640532b8..361b772ff 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The test runner source for UI tests -WEB_COMMITID=9a262d0ef4bd5625e5eb702f094317000ab11a43 +WEB_COMMITID=80eab22a309c50c11e82e7e4e297face6f5d65ec WEB_BRANCH=master diff --git a/changelog/unreleased/update-web-10.1.0.md b/changelog/unreleased/update-web-10.1.0.md new file mode 100644 index 000000000..24ad61d14 --- /dev/null +++ b/changelog/unreleased/update-web-10.1.0.md @@ -0,0 +1,22 @@ +Enhancement: Update web to v10.1.0 + +Tags: web + +We updated ownCloud Web to v10.1.0. Please refer to the changelog (linked) for details on the web release. + +- Bugfix [owncloud/web#11263](https://github.com/owncloud/web/pull/11263) Show more toggle in space members view not reactive +- Bugfix [owncloud/web#11299](https://github.com/owncloud/web/pull/11299) Uploading nested folders +- Bugfix [owncloud/web#11312](https://github.com/owncloud/web/pull/11312) Toggling checkboxes via keyboard +- Bugfix [owncloud/web#11313](https://github.com/owncloud/web/pull/11313) Prevent horizontal table scroll +- Bugfix [owncloud/web#11342](https://github.com/owncloud/web/pull/11342) Keyboard actions for disabled resources +- Bugfix [owncloud/web#11348](https://github.com/owncloud/web/pull/11348) OCM page reload +- Bugfix [owncloud/web#11353](https://github.com/owncloud/web/pull/11353) Closing an app opened via in-app open feature stays open +- Enhancement [owncloud/web#11287](https://github.com/owncloud/web/pull/11287) Add quota information to account page +- Enhancement [owncloud/web#11302](https://github.com/owncloud/web/pull/11302) App Store app +- Enhancement [owncloud/web#11310](https://github.com/owncloud/web/pull/11310) Redesign share link modal +- Enhancement [owncloud/web#11315](https://github.com/owncloud/web/pull/11315) Accessibility +- Enhancement [owncloud/web#11329](https://github.com/owncloud/web/pull/11329) Files as links +- Enhancement [owncloud/web#11344](https://github.com/owncloud/web/pull/11344) Unstick top bar + +https://github.com/owncloud/ocis/pull/9832 +https://github.com/owncloud/web/releases/tag/v10.1.0 diff --git a/services/web/Makefile b/services/web/Makefile index 36346cb23..f61c3cb85 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v10.0.0 +WEB_ASSETS_VERSION = v10.1.0 include ../../.make/recursion.mk From 3a9cf9857ba2dc1e342979712d7a45bf24f4fafa Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Mon, 19 Aug 2024 09:41:15 +0200 Subject: [PATCH 3/3] fix tests --- .drone.star | 2 +- .../downloadFile.feature | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.drone.star b/.drone.star index 7bdd5b353..e278eae0d 100644 --- a/.drone.star +++ b/.drone.star @@ -170,7 +170,7 @@ config = { "part": { "skip": False, "totalParts": 4, # divide and run all suites in parts (divide pipelines) - "xsuites": ["search", "app-provider"], # suites to skip + "xsuites": ["search", "app-provider", "oidc"], # suites to skip }, "search": { "skip": False, diff --git a/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature b/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature index 36674fa0a..11b5e1bdd 100644 --- a/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature +++ b/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature @@ -217,14 +217,14 @@ Feature: download file When user "Alice" downloads file "/" using the WebDAV API Then the HTTP status code should be "200" And the following headers should be set - | header | value | - | Content-Disposition | attachment; filename*=UTF-8''; filename="" | - | Content-Security-Policy | child-src 'self'; connect-src 'self'; default-src 'none'; font-src 'self'; frame-ancestors 'self'; frame-src 'self' blob: https://embed.diagrams.net/; img-src 'self' data: blob:; manifest-src 'self'; media-src 'self'; object-src 'self' blob:; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline' | - | X-Content-Type-Options | nosniff | - | X-Frame-Options | SAMEORIGIN | - | X-Permitted-Cross-Domain-Policies | none | - | X-Robots-Tag | none | - | X-XSS-Protection | 1; mode=block | + | header | value | + | Content-Disposition | attachment; filename*=UTF-8''; filename="" | + | Content-Security-Policy | child-src 'self'; connect-src 'self' https://raw.githubusercontent.com/owncloud/awesome-ocis/; default-src 'none'; font-src 'self'; frame-ancestors 'self'; frame-src 'self' blob: https://embed.diagrams.net/; img-src 'self' data: blob: https://raw.githubusercontent.com/owncloud/awesome-ocis/; manifest-src 'self'; media-src 'self'; object-src 'self' blob:; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline' | + | X-Content-Type-Options | nosniff | + | X-Frame-Options | SAMEORIGIN | + | X-Permitted-Cross-Domain-Policies | none | + | X-Robots-Tag | none | + | X-XSS-Protection | 1; mode=block | And the downloaded content should be "test file" Examples: | dav-path-version | file-name | encoded-file-name | @@ -245,14 +245,14 @@ Feature: download file When user "Alice" downloads file '/"quote"double".txt' using the WebDAV API Then the HTTP status code should be "200" And the following headers should be set - | header | value | - | Content-Disposition | attachment; filename*=UTF-8''%22quote%22double%22.txt; filename=""quote"double".txt" | - | Content-Security-Policy | child-src 'self'; connect-src 'self'; default-src 'none'; font-src 'self'; frame-ancestors 'self'; frame-src 'self' blob: https://embed.diagrams.net/; img-src 'self' data: blob:; manifest-src 'self'; media-src 'self'; object-src 'self' blob:; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline' | - | X-Content-Type-Options | nosniff | - | X-Frame-Options | SAMEORIGIN | - | X-Permitted-Cross-Domain-Policies | none | - | X-Robots-Tag | none | - | X-XSS-Protection | 1; mode=block | + | header | value | + | Content-Disposition | attachment; filename*=UTF-8''%22quote%22double%22.txt; filename=""quote"double".txt" | + | Content-Security-Policy | child-src 'self'; connect-src 'self' https://raw.githubusercontent.com/owncloud/awesome-ocis/; default-src 'none'; font-src 'self'; frame-ancestors 'self'; frame-src 'self' blob: https://embed.diagrams.net/; img-src 'self' data: blob: https://raw.githubusercontent.com/owncloud/awesome-ocis/; manifest-src 'self'; media-src 'self'; object-src 'self' blob:; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline' | + | X-Content-Type-Options | nosniff | + | X-Frame-Options | SAMEORIGIN | + | X-Permitted-Cross-Domain-Policies | none | + | X-Robots-Tag | none | + | X-XSS-Protection | 1; mode=block | And the downloaded content should be "test file" Examples: | dav-path-version |