Skip to content

chore: sync master with stable-8.0#12353

Merged
DeepDiver1975 merged 80 commits into
owncloud:masterfrom
kobergj:sync/master-with-stable-8.0-20260522
May 22, 2026
Merged

chore: sync master with stable-8.0#12353
DeepDiver1975 merged 80 commits into
owncloud:masterfrom
kobergj:sync/master-with-stable-8.0-20260522

Conversation

@kobergj

@kobergj kobergj commented May 22, 2026

Copy link
Copy Markdown
Contributor

Summary

Syncs master with stable-8.0 to bring across the 8.0.1/8.0.2/8.0.4 changelog entries and forward-port one fix that had not yet landed on master.

Two commits:

  1. Merge upstream/stable-8.0 — net diff vs master is docs + environment only:

    • 16 changelog files under changelog/8.0.{1,2,4}_…/
    • deployments/examples/ocis_multi/config/ldap/schemas/10_owncloud_schema.ldif adds the owncloudExternalID attribute to the example schema
  2. Cherry-pick dc754e673fix: dont write externalID when empty — this stable-8.0 bugfix had not been forward-ported to master. Test resolution adapted for master's 5-arg NewLDAPBackend(...) signature; the duplicate changelog/unreleased/ entry was dropped since the same changelog is already present under changelog/8.0.1_2026-03-09/.

Conflict resolution policy

  • vendor/, go.mod, go.sum, .bingo/ → master (deps stay on master)
  • .github/workflows/, Dockerfile, README.md, sonar-project.properties, ocis-pkg/version/version.go → master
  • .drone.*, tests/config/drone/ → removed (master dropped Drone)
  • services/idp/{package.json,pnpm-lock.yaml,webpack.config.js} → master
  • services/graph/pkg/config/config.go, services/proxy/pkg/middleware/account_resolver.go → master
  • tests/acceptance/bootstrap/WebDav.php, tests/acceptance/fixtures/*.png, tests/acceptance/run-*.py → master (master has the OCISDEV-816 variance-based thumbnail check + regenerated fixtures + tests/config/ci/ rename)
  • All *.po translation files → master (newer POT-Creation-Date)
  • deployments/examples/ocis_full/web_extensions/*.yml, deployments/examples/ocis_multi/{README.md,docker-compose.yml} → master (newer image tags / clearer master-id docs)
  • services/graph/pkg/identity/ldap.go + ldap_test.go → master in the merge commit, then forward-port via the cherry-pick

Test plan

  • CI green
  • Verify all 8.0.{0,1,2,4} changelog entries are visible in the rendered changelog
  • Smoke test that services/graph builds and TestCreateUser passes (table-driven with/without externalID)

kobergj and others added 30 commits January 23, 2026 19:00
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
[docs-only] Fix of storage-publiclink readme
The expected translatable message was empty, which caused the
translation system to use the empty key, which contains "weird"
unrelated data.
With the fix, if there is no translatable message, the related output
will remain empty.
…ction_empty_stable8.0

[Backport] fix: some notifications were translated wrong due to an empty l10n key
[docs-only][stable-8] Update deployment images
feat: bump mockery to v2.53.5

feat: bump govulncheck

feat: bump bingo to v0.10.0

force go-1.25.7

update thumbnail images for test
…table-8.0

[full-ci][k6-test] feat: bump go1.25
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
….3.1

[full-ci] Chore/bump web to v12.3.1
…xample

[OCISDEV-599] Fix Group Creation in Deployment example
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
 [tests-only][full-ci] test:  fix public link related test for k8s deployment
Instead of trying to download kpop every time, bring in the specific
code that we are using. There is very little code that we are actually
using from kpop so pulling it as a dependency is not really necessary
and it should fix the current CI issues.
…hout-dependency

[backport] chore(idp): use kpop without dependency
[full-ci] chore(web): bump ownCloud Web to v12.3.2
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
kobergj and others added 24 commits April 24, 2026 15:36
…-only modes

OnlyOffice sends a WOPI Lock request on document open regardless of whether
the user has write access. The Lock handler was calling SetLock with a
read-only CS3 token, which returned a permission error propagated as HTTP 500
to OnlyOffice, causing an error dialog on load.

Return 200 OK immediately for READ_ONLY and VIEW_ONLY view modes without
acquiring a CS3 lock.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
…opi-lock-read-only

fix(collaboration): [OCISDEV-781] return 200 OK for WOPI Lock in read-only modes
fix: [OCISDEV-788] fixed the internal links access control
fix the OCM share permission change notification handling
… [k6-test]

* [OCISDEV-827] Add workflow file to run k6-tests in GitHub Actions

* [OCISDEV-827] Fix broken pipeline job

* [OCISDEV-827] Fix broken pipeline job - switched to double quotes.

* [OCISDEV-827] Trying to fix a broken pipeline job

* [OCISDEV-827] Fix secrets and variables used to run k6-test

* [OCISDEV-827] Add health check and SSH keepalive in run_k6_tests.sh

* [OCISDEV-827] Rename variable DRONE_COMMIT to OCIS_COMMIT_SHA
…sion-12.3.3

[full-ci] chore: bump web version to 12.3.3
…uests

The space management middleware removed users from all project spaces
when processing signed URL requests because no OIDC claims are present
in that auth context. Return early when claims are nil to prevent the
oscillating add/remove cycle.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
…pace-manager-signed-url

fix(proxy): [OCISDEV-845] skip space reconciliation on signed URL requests
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
…cloud#12309) (owncloud#12319)

* fix: release fix passing version string value to image

* fix: bump release tag

* chore: bump go-git

* fix: missing fcntl64 int the build image due to GHA image update
… (owncloud#12320)

* fix: ci, release pipeline steps ordering

* chore: security bump

* fix: ignore for trivy scan, steps order
# Conflicts:
#	services/idp/package.json
#	services/idp/pnpm-lock.yaml
…er files read-only in Web frontend (owncloud#12351)

fix: [OCISDEV-873] *WithoutTrashbin space editor roles render files read-only in Web frontend (owncloud#12346)

* fix: [OCISDEV-873] *WithoutTrashbin space editor roles render files as read-only in Web frontend

* fix: ci after godata bump

ocis CI bumped github.com/CiscoM31/godata from v1.0.10 → v1.0.11 as a transitive dependency of the reva bump. The new godata version parses "mail add 10 (invalid operator) as a parse error → 400 instead of unsupported operation → 501.

* fix ci: more precise role

* fix: bump reva to pull fix merged into reva
chore: Release 8.0.4

Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
…ith-stable-8.0-20260522

# Conflicts:
#	.bingo/mockery.mod
#	.drone.env
#	.drone.star
#	.github/workflows/acceptance-tests.yml
#	.github/workflows/k6-load-test.yml
#	.github/workflows/release.yml
#	Dockerfile
#	README.md
#	changelog/8.0.0_2026-02-13/bump-go-1.25.md
#	deployments/examples/ocis_full/web_extensions/drawio.yml
#	deployments/examples/ocis_full/web_extensions/externalsites.yml
#	deployments/examples/ocis_full/web_extensions/importer.yml
#	deployments/examples/ocis_full/web_extensions/jsonviewer.yml
#	deployments/examples/ocis_full/web_extensions/progressbars.yml
#	deployments/examples/ocis_full/web_extensions/unzip.yml
#	deployments/examples/ocis_multi/README.md
#	deployments/examples/ocis_multi/docker-compose.yml
#	go.mod
#	go.sum
#	ocis-pkg/version/version.go
#	services/activitylog/pkg/service/l10n/locale/ca/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/de/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/en_GB/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/en_US/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/es/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/it/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/ja/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/lo/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/pt/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/pt_BR/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/ru/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/sq/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/ug/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/uk/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/zh-Hant/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/zh/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/zh_CN/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/zh_HK/LC_MESSAGES/activitylog.po
#	services/activitylog/pkg/service/l10n/locale/zh_TW/LC_MESSAGES/activitylog.po
#	services/graph/pkg/config/config.go
#	services/graph/pkg/identity/ldap_test.go
#	services/graph/pkg/l10n/locale/ca/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/de/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/es/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/it/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/lo/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/ru/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/sq/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/uk/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/zh-Hant/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/zh/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/zh_CN/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/zh_HK/LC_MESSAGES/graph.po
#	services/graph/pkg/l10n/locale/zh_TW/LC_MESSAGES/graph.po
#	services/idp/package.json
#	services/idp/pnpm-lock.yaml
#	services/idp/ui_config/webpack.config.js
#	services/notifications/pkg/email/l10n/locale/ca/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/de/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/en_GB/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/en_US/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/es/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/it/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/lo/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/pt/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/pt_BR/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/ru/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/sq/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/ug/LC_MESSAGES/notifications.po
#	services/notifications/pkg/email/l10n/locale/uk/LC_MESSAGES/notifications.po
#	services/proxy/pkg/middleware/account_resolver.go
#	services/settings/pkg/service/v0/l10n/locale/ca/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/de/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/en_GB/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/en_US/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/es/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/it/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/lo/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/pt/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/pt_BR/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/ru/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/sq/LC_MESSAGES/settings.po
#	services/settings/pkg/service/v0/l10n/locale/uk/LC_MESSAGES/settings.po
#	services/userlog/pkg/service/l10n/locale/bg/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/ca/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/de/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/en_GB/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/en_US/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/es/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/it/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/ko/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/lo/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/pt/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/pt_BR/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/ru/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/sq/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/tr/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/ug/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/uk/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/zh/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/zh_CN/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/zh_HK/LC_MESSAGES/userlog.po
#	services/userlog/pkg/service/l10n/locale/zh_TW/LC_MESSAGES/userlog.po
#	sonar-project.properties
#	tests/acceptance/bootstrap/WebDav.php
#	tests/acceptance/fixtures/fill.png
#	tests/acceptance/fixtures/fit.png
#	tests/acceptance/fixtures/resize.png
#	tests/acceptance/fixtures/thumbnail.png
#	tests/acceptance/fixtures/unicode-fixture.png
#	tests/acceptance/run-cs3api.py
#	tests/acceptance/run-e2e.py
#	tests/acceptance/run-github.py
#	tests/acceptance/run-litmus.py
#	tests/acceptance/run-wopi.py
#	tests/config/drone/run_k6_tests.sh
#	vendor/github.com/go-git/go-git/v5/plumbing/format/idxfile/decoder.go
#	vendor/github.com/go-git/go-git/v5/plumbing/format/idxfile/idxfile.go
#	vendor/github.com/go-git/go-git/v5/plumbing/format/packfile/scanner.go
#	vendor/github.com/miekg/dns/version.go
#	vendor/github.com/minio/minio-go/v7/CLAUDE.md
#	vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv/client.go
#	vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv/server.go
#	vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv/util.go
#	vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/transport.go
#	vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/version.go
#	vendor/go.opentelemetry.io/otel/semconv/v1.37.0/httpconv/metric.go
#	vendor/go.opentelemetry.io/otel/semconv/v1.39.0/httpconv/metric.go
#	vendor/go.opentelemetry.io/otel/semconv/v1.40.0/httpconv/metric.go
#	vendor/modules.txt
Signed-off-by: Julian Koberg <julian.koberg@kiteworks.com>
@update-docs

update-docs Bot commented May 22, 2026

Copy link
Copy Markdown

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@mzner mzner self-requested a review May 22, 2026 10:39
@DeepDiver1975 DeepDiver1975 merged commit 1b53bc4 into owncloud:master May 22, 2026
55 checks passed
@kobergj kobergj deleted the sync/master-with-stable-8.0-20260522 branch May 22, 2026 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants