cloud/ocis
1
0
Fork 0
mirror of https://github.com/owncloud/ocis.git synced 2026-10-23 23:29:02 +03:00
Code Activity

feat(app-store): update app store repository to use ownCloud Marketplace (#12793)

Browse Source 
Signed-off-by: Lukas Hirt <info@hirt.cz>
This commit is contained in:
Lukas Hirt
2026-08-13 21:46:59 +02:00
committed by GitHub
parent 74ae9bf88d
commit e21e19470b
15 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
changelog/unreleased/enhancement-update-app-store-repository.md Normal file
View File

@@ -0,0 +1,5 @@
Enhancement: Update app store repository
We've updated the default app store repository to use the new ownCloud Marketplace instead of the awesome-ocis repository. The default Content-Security-Policy configuration was also updated to allow connections to the new marketplace domain.
https://github.com/owncloud/ocis/pull/12793

2
deployments/examples/ocis_full/config/ocis/csp.yaml
View File

@@ -7,6 +7,7 @@ directives:
- 'https://${COMPANION_DOMAIN|companion.owncloud.test}/'
- 'wss://${COMPANION_DOMAIN|companion.owncloud.test}/'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
# In contrary to bash and docker the default is given after the | character
- 'https://${KEYCLOAK_DOMAIN|keycloak.owncloud.test}/'
# Photo-addon: OpenStreetMap tile requests
@@ -32,6 +33,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
# 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}/'

2
deployments/examples/ocis_keycloak/config/ocis/csp.yaml
View File

@@ -5,6 +5,7 @@ directives:
- '''self'''
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
# In contrary to bash and docker the default is given after the | character
- 'https://${KEYCLOAK_DOMAIN|keycloak.owncloud.test}/'
default-src:
@@ -23,6 +24,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
manifest-src:
- '''self'''
media-src:

2
deployments/examples/ocis_multi/config/ocis/csp-ocm.yaml
View File

@@ -5,6 +5,7 @@ directives:
- '''self'''
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
- 'https://${KEYCLOAK_DOMAIN|keycloak.owncloud.test}/'
default-src:
- '''none'''
@@ -24,6 +25,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
manifest-src:
- '''self'''
media-src:

2
deployments/examples/ocis_multi/config/ocis/csp.yaml
View File

@@ -5,6 +5,7 @@ directives:
- '''self'''
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
# In contrary to bash and docker the default is given after the | character
- 'https://${KEYCLOAK_DOMAIN|keycloak.owncloud.test}/'
default-src:
@@ -23,6 +24,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
manifest-src:
- '''self'''
media-src:

2
deployments/examples/ocis_ocm/config/ocis/csp-ocm-next.yaml
View File

@@ -5,6 +5,7 @@ directives:
- '''self'''
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
default-src:
- '''none'''
font-src:
@@ -23,6 +24,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
manifest-src:
- '''self'''
media-src:

2
deployments/examples/ocis_ocm/config/ocis/csp-ocm.yaml
View File

@@ -5,6 +5,7 @@ directives:
- '''self'''
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
default-src:
- '''none'''
font-src:
@@ -25,6 +26,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
# In contrary to bash and docker the default is given after the | character
- 'https://${COLLABORA_DOMAIN|collabora.ocm.next.owncloud.test}/'
manifest-src:

2
deployments/examples/ocis_ocm/config/ocis/csp.yaml
View File

@@ -5,6 +5,7 @@ directives:
- '''self'''
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
default-src:
- '''none'''
font-src:
@@ -25,6 +26,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
# In contrary to bash and docker the default is given after the | character
- 'https://${ONLYOFFICE_DOMAIN|onlyoffice.owncloud.test}/'
manifest-src:

2
services/proxy/pkg/config/csp.yaml
View File

@@ -5,6 +5,7 @@ directives:
- '''self'''
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
default-src:
- '''none'''
font-src:
@@ -21,6 +22,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
manifest-src:
- '''self'''
media-src:

4
tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature
View File

@@ -219,7 +219,7 @@ Feature: download file
And the following headers should be set
| header | value |
| Content-Disposition | attachment; filename*=UTF-8''<encoded-file-name>; filename="<file-name>" |
| Content-Security-Policy | child-src 'self'; connect-src 'self' blob: https://raw.githubusercontent.com/owncloud/awesome-ocis/; default-src 'none'; font-src 'self' data:; 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' |
| Content-Security-Policy | child-src 'self'; connect-src 'self' blob: https://raw.githubusercontent.com/owncloud/awesome-ocis/ https://marketplace.owncloud.com/; default-src 'none'; font-src 'self' data:; frame-ancestors 'self'; frame-src 'self' blob: https://embed.diagrams.net/; img-src 'self' data: blob: https://raw.githubusercontent.com/owncloud/awesome-ocis/ https://marketplace.owncloud.com/; 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 |
@@ -246,7 +246,7 @@ Feature: download file
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' blob: https://raw.githubusercontent.com/owncloud/awesome-ocis/; default-src 'none'; font-src 'self' data:; 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' |
| Content-Security-Policy | child-src 'self'; connect-src 'self' blob: https://raw.githubusercontent.com/owncloud/awesome-ocis/ https://marketplace.owncloud.com/; default-src 'none'; font-src 'self' data:; frame-ancestors 'self'; frame-src 'self' blob: https://embed.diagrams.net/; img-src 'self' data: blob: https://raw.githubusercontent.com/owncloud/awesome-ocis/ https://marketplace.owncloud.com/; 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 |

2
tests/config/ci/csp.yaml
View File

@@ -5,6 +5,7 @@ directives:
- '''self'''
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
# In contrary to bash and docker the default is given after the | character
- 'https://${KEYCLOAK_DOMAIN|keycloak.owncloud.test}/'
- 'https://localhost:8443/'
@@ -27,6 +28,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
# In contrary to bash and docker the default is given after the | character
- 'https://${ONLYOFFICE_DOMAIN|onlyoffice:443}/'
- 'https://${COLLABORA_DOMAIN|collabora:9980}/'

2
tests/config/k8s/values.yaml
View File

@@ -94,6 +94,7 @@ http:
- "'self'"
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
defaultSrc:
- "'none'"
fontSrc:
@@ -110,6 +111,7 @@ http:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
manifestSrc:
- "'self'"
mediaSrc:

2
web/deployments/examples/ocis_web/config/ocis/csp.yaml
View File

@@ -4,6 +4,7 @@ directives:
connect-src:
- '''self'''
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
- 'https://${COMPANION_DOMAIN|companion.owncloud.test}/'
- 'wss://${COMPANION_DOMAIN|companion.owncloud.test}/'
default-src:
@@ -22,6 +23,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
# In contrary to bash and docker the default is given after the | character
- 'https://${COLLABORA_DOMAIN|collabora.owncloud.test}/'
manifest-src:

2
web/dev/docker/ocis/csp.yaml
View File

@@ -5,6 +5,7 @@ directives:
- '''self'''
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
default-src:
- '''none'''
font-src:
@@ -25,6 +26,7 @@ directives:
- 'data:'
- 'blob:'
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
- 'https://marketplace.owncloud.com/'
# In contrast to bash and docker the default is given after the | character
- 'https://${ONLYOFFICE_DOMAIN|host.docker.internal:9981}/'
- 'https://${COLLABORA_DOMAIN|host.docker.internal:9980}/'

2
web/packages/web-app-app-store/src/index.ts
View File

@@ -24,7 +24,7 @@ export default defineWebApplication({
const defaultRepositories: AppStoreRepository[] = [
{
name: 'awesome-ocis',
url: 'https://raw.githubusercontent.com/owncloud/awesome-ocis/main/webApps/apps.json'
url: 'https://marketplace.owncloud.com/api/ocis/v1/apps.json'
}
]
if (applicationConfig?.repositories) {