Merge branch 'cs3org:edge' into edge

cs3org · Nov 19, 2024 · 0a7a716 · 0a7a716
2 parents d44b415 + 4f31fd9
commit 0a7a716
Show file tree

Hide file tree

Showing 103 changed files with 847 additions and 401 deletions.
diff --git a/.drone.star b/.drone.star
@@ -761,7 +761,7 @@ def posixfsIntegrationTests(parallelRuns, skipExceptParts = []):
                         "environment": {
                             "TEST_SERVER_URL": "http://revad-services:20080",
                             "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/",
-                            "DELETE_USER_DATA_CMD": "bash -cx 'for i in {1..30}; do rm -rf /drone/src/tmp/reva/data/users/* /drone/src/tmp/reva/data/indexes/by-type/* && break || sleep 5; done'",
+                            "DELETE_USER_DATA_CMD": "bash -cx 'for i in {1..30}; do rm -rf /drone/src/tmp/reva/data/users/* /drone/src/tmp/reva/data/indexes/by-type/* && break || sleep 5; done; sleep 1'",
                             "STORAGE_DRIVER": "ocis",
                             "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton",
                             "TEST_WITH_LDAP": "true",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,96 @@
+Changelog for reva 2.26.6 (2024-11-19)
+=======================================
+
+The following sections list the changes in reva 2.26.6 relevant to
+reva users. The changes are ordered by importance.
+
+Summary
+-------
+
+*   Fix #4955: Allow small clock skew in reva token validation
+*   Fix #4929: Fix flaky posixfs integration tests
+*   Fix #4953: Avoid gateway panics
+*   Fix #4959: Fix missing file touched event
+*   Fix #4933: Fix federated sharing when using an external identity provider
+*   Fix #4935: Enable datatx log
+*   Fix #4936: Do not delete mlock files
+*   Fix #4954: Prevent a panic when logging an error
+*   Fix #4956: Improve posixfs error handling and logging
+*   Fix #4951: Pass the initialized logger down the stack
+
+Details
+-------
+
+*   Bugfix #4955: Allow small clock skew in reva token validation
+
+   Allow for a small clock skew (3 seconds by default) when validating reva tokens as the different
+   services might be running on different machines.
+
+   https://github.com/cs3org/reva/issues/4952
+   https://github.com/cs3org/reva/pull/4955
+
+*   Bugfix #4929: Fix flaky posixfs integration tests
+
+   We fixed a problem with the posixfs integration tests where the in-memory id cache sometimes
+   hadn't caught up with the cleanup between test runs leading to flaky failures.
+
+   https://github.com/cs3org/reva/pull/4929
+
+*   Bugfix #4953: Avoid gateway panics
+
+   The gateway would panic if there is a missing user in the context. Now it errors instead.
+
+   https://github.com/cs3org/reva/issues/4953
+
+*   Bugfix #4959: Fix missing file touched event
+
+   We have fixed an issue where the `file touched` event was not being triggered when an office
+   document was created.
+
+   https://github.com/owncloud/ocis/issues/8950
+   https://github.com/cs3org/reva/pull/4959
+
+*   Bugfix #4933: Fix federated sharing when using an external identity provider
+
+   We fixes and issue that caused federated sharing to fail when the identity provider url did not
+   match the federation provider url.
+
+   https://github.com/cs3org/reva/pull/4933
+
+*   Bugfix #4935: Enable datatx log
+
+   We now pass a properly initialized logger to the datatx implementations, allowing the tus
+   handler to log with the same level as the rest of reva.
+
+   https://github.com/cs3org/reva/pull/4935
+
+*   Bugfix #4936: Do not delete mlock files
+
+   To prevent stale NFS file handles we no longer delete empty mlock files after updating the
+   metadata.
+
+   https://github.com/cs3org/reva/pull/4936
+   https://github.com/cs3org/reva/pull/4924
+
+*   Bugfix #4954: Prevent a panic when logging an error
+
+   We fixed a panic when constructing a path failed to get the parent for a node.
+
+   https://github.com/cs3org/reva/pull/4954
+
+*   Bugfix #4956: Improve posixfs error handling and logging
+
+   We improved error handling and logging in the posixfs storage driver.
+
+   https://github.com/cs3org/reva/pull/4956
+
+*   Bugfix #4951: Pass the initialized logger down the stack
+
+   We now make the initialized logger available to grpc services and storage drivers, which
+   allows for easier and more uniform logging.
+
+   https://github.com/cs3org/reva/pull/4951
+
 Changelog for reva 2.26.5 (2024-11-12)
 =======================================
 
@@ -11478,4 +11571,3 @@ Details
    from Drone into Github pages.
 
    https://github.com/cs3org/reva/pull/334
-
diff --git a/RELEASE_DATE b/RELEASE_DATE
@@ -1 +1 @@
-2024-11-12
+2024-11-19
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.26.5
+2.26.6
diff --git a/changelog/2.26.6_2024-11-19/fix-allow-token-clock-skew.md b/changelog/2.26.6_2024-11-19/fix-allow-token-clock-skew.md
@@ -0,0 +1,7 @@
+Bugfix: Allow small clock skew in reva token validation
+
+Allow for a small clock skew (3 seconds by default) when validating reva tokens
+as the different services might be running on different machines.
+
+https://github.com/cs3org/reva/pull/4955
+https://github.com/cs3org/reva/issues/4952
diff --git a/changelog/2.26.6_2024-11-19/fix-flaky-posixfs-tests.md b/changelog/2.26.6_2024-11-19/fix-flaky-posixfs-tests.md
@@ -0,0 +1,6 @@
+Bugfix: Fix flaky posixfs integration tests
+
+We fixed a problem with the posixfs integration tests where the in-memory id cache sometimes hadn't caught up with the cleanup between test runs leading to flaky failures.
+
+https://github.com/cs3org/reva/pull/4929
+
diff --git a/changelog/2.26.6_2024-11-19/fix-gateway-panic.md b/changelog/2.26.6_2024-11-19/fix-gateway-panic.md
@@ -0,0 +1,5 @@
+Bugfix: Avoid gateway panics
+
+The gateway would panic if there is a missing user in the context. Now it errors instead.
+
+https://github.com/cs3org/reva/issues/4953
diff --git a/changelog/2.26.6_2024-11-19/fix-missing-file-touched-event.md b/changelog/2.26.6_2024-11-19/fix-missing-file-touched-event.md
@@ -0,0 +1,7 @@
+Bugfix: Fix missing file touched event
+
+We have fixed an issue where the `file touched` event was not being triggered when an
+office document was created.
+
+https://github.com/cs3org/reva/pull/4959
+https://github.com/owncloud/ocis/issues/8950
diff --git a/changelog/2.26.6_2024-11-19/fix-ocm-external-idp.md b/changelog/2.26.6_2024-11-19/fix-ocm-external-idp.md
@@ -0,0 +1,6 @@
+Bugfix: Fix federated sharing when using an external identity provider
+
+We fixes and issue that caused federated sharing to fail when the identity
+provider url did not match the federation provider url.
+
+https://github.com/cs3org/reva/pull/4933
diff --git a/changelog/2.26.6_2024-11-19/improve-posixfs-logging.md b/changelog/2.26.6_2024-11-19/improve-posixfs-logging.md
@@ -0,0 +1,5 @@
+Bugfix: Improve posixfs error handling and logging
+
+We improved error handling and logging in the posixfs storage driver.
+
+https://github.com/cs3org/reva/pull/4956
diff --git a/changelog/2.26.6_2024-11-19/log-uploads.md b/changelog/2.26.6_2024-11-19/log-uploads.md
@@ -0,0 +1,6 @@
+Bugfix: enable datatx log
+
+We now pass a properly initialized logger to the datatx implementations, allowing the tus handler to log with the same level as the rest of reva.
+
+https://github.com/cs3org/reva/pull/4935
+
diff --git a/changelog/2.26.6_2024-11-19/no-delete-lock.md b/changelog/2.26.6_2024-11-19/no-delete-lock.md
@@ -0,0 +1,6 @@
+Bugfix: Do not delete mlock files
+
+To prevent stale NFS file handles we no longer delete empty mlock files after updating the metadata.
+
+https://github.com/cs3org/reva/pull/4936
+https://github.com/cs3org/reva/pull/4924
diff --git a/changelog/2.26.6_2024-11-19/pass-initialized-loggers.md b/changelog/2.26.6_2024-11-19/pass-initialized-loggers.md
@@ -0,0 +1,5 @@
+Bugfix: Pass the initialized logger down the stack
+
+We now make the initialized logger available to grpc services and storage drivers, which allows for easier and more uniform logging.
+
+https://github.com/cs3org/reva/pull/4951
diff --git a/changelog/2.26.6_2024-11-19/prevent-panic.md b/changelog/2.26.6_2024-11-19/prevent-panic.md
@@ -0,0 +1,5 @@
+Bugfix: prevent a panic when logging an error
+
+We fixed a panic when constructing a path failed to get the parent for a node.
+
+https://github.com/cs3org/reva/pull/4954
diff --git a/changelog/NOTE.md b/changelog/NOTE.md
@@ -1,45 +1,92 @@
-Changelog for reva 2.26.5 (2024-11-12)
+Changelog for reva 2.26.6 (2024-11-19)
 =======================================
 
-The following sections list the changes in reva 2.26.5 relevant to
+The following sections list the changes in reva 2.26.6 relevant to
 reva users. The changes are ordered by importance.
 
 Summary
 -------
 
-*   Fix #4926: Make etag always match content on downloads
-*   Fix #4920: Return correct status codes for simple uploads
-*   Fix #4924: Fix sync propagation
-*   Fix #4916: Improve posixfs stability and performance
+*   Fix #4955: Allow small clock skew in reva token validation
+*   Fix #4929: Fix flaky posixfs integration tests
+*   Fix #4953: Avoid gateway panics
+*   Fix #4959: Fix missing file touched event
+*   Fix #4933: Fix federated sharing when using an external identity provider
+*   Fix #4935: Enable datatx log
+*   Fix #4936: Do not delete mlock files
+*   Fix #4954: Prevent a panic when logging an error
+*   Fix #4956: Improve posixfs error handling and logging
+*   Fix #4951: Pass the initialized logger down the stack
 
 Details
 -------
 
-*   Bugfix #4926: Make etag always match content on downloads
+*   Bugfix #4955: Allow small clock skew in reva token validation
 
-   We added an openReaderfunc to the Download interface to give drivers a way to guarantee that the
-   reader matches the etag returned in a previous GetMD call.
+   Allow for a small clock skew (3 seconds by default) when validating reva tokens as the different
+   services might be running on different machines.
 
-   https://github.com/cs3org/reva/pull/4926
-   https://github.com/cs3org/reva/pull/4923
+   https://github.com/cs3org/reva/issues/4952
+   https://github.com/cs3org/reva/pull/4955
 
-*   Bugfix #4920: Return correct status codes for simple uploads
+*   Bugfix #4929: Fix flaky posixfs integration tests
 
-   Decomposedfs now returns the correct precondition failed status code when the etag does not
-   match. This allows the jsoncs3 share managers optimistic locking to handle concurrent writes
-   correctly
+   We fixed a problem with the posixfs integration tests where the in-memory id cache sometimes
+   hadn't caught up with the cleanup between test runs leading to flaky failures.
 
-   https://github.com/cs3org/reva/pull/4920
+   https://github.com/cs3org/reva/pull/4929
 
-*   Bugfix #4924: Fix sync propagation
+*   Bugfix #4953: Avoid gateway panics
 
-   Fixes the defers in the sync propagation.
+   The gateway would panic if there is a missing user in the context. Now it errors instead.
 
+   https://github.com/cs3org/reva/issues/4953
+
+*   Bugfix #4959: Fix missing file touched event
+
+   We have fixed an issue where the `file touched` event was not being triggered when an office
+   document was created.
+
+   https://github.com/owncloud/ocis/issues/8950
+   https://github.com/cs3org/reva/pull/4959
+
+*   Bugfix #4933: Fix federated sharing when using an external identity provider
+
+   We fixes and issue that caused federated sharing to fail when the identity provider url did not
+   match the federation provider url.
+
+   https://github.com/cs3org/reva/pull/4933
+
+*   Bugfix #4935: Enable datatx log
+
+   We now pass a properly initialized logger to the datatx implementations, allowing the tus
+   handler to log with the same level as the rest of reva.
+
+   https://github.com/cs3org/reva/pull/4935
+
+*   Bugfix #4936: Do not delete mlock files
+
+   To prevent stale NFS file handles we no longer delete empty mlock files after updating the
+   metadata.
+
+   https://github.com/cs3org/reva/pull/4936
    https://github.com/cs3org/reva/pull/4924
 
-*   Bugfix #4916: Improve posixfs stability and performance
+*   Bugfix #4954: Prevent a panic when logging an error
+
+   We fixed a panic when constructing a path failed to get the parent for a node.
+
+   https://github.com/cs3org/reva/pull/4954
+
+*   Bugfix #4956: Improve posixfs error handling and logging
+
+   We improved error handling and logging in the posixfs storage driver.
+
+   https://github.com/cs3org/reva/pull/4956
 
-   The posixfs storage driver saw a number of bugfixes and optimizations.
+*   Bugfix #4951: Pass the initialized logger down the stack
 
-   https://github.com/cs3org/reva/pull/4916
+   We now make the initialized logger available to grpc services and storage drivers, which
+   allows for easier and more uniform logging.
 
+   https://github.com/cs3org/reva/pull/4951