[xwiki-notifications] [xwiki/xwiki-platform] 83c189: XWIKI-22222: Add the concept of "request effective...

Branch: refs/heads/stable-16.5.x Home: https://github.com/xwiki/xwiki-platform Commit: 83c189ea22a8ac01f5d70365a9bc5665891ab94c https://github.com/xwiki/xwiki-platform/commit/83c189ea22a8ac01f5d70365a9bc… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-oldcore/src/checkstyle/checkstyle-suppressions.xml A xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/web/EffectiveAuthorSetterListener.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/render/ScriptXWikiServletRequest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/PreviewAction.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/SaveAction.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/WrappingXWikiRequest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/XWikiRequest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/XWikiServletRequest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/XWikiServletRequestStub.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/META-INF/components.txt M xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/doc/XWikiDocumentTest.java M xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/web/SaveActionTest.java M xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-api/src/main/java/org/xwiki/wysiwyg/script/WysiwygEditorScriptService.java Log Message: ----------- XWIKI-22222: Add the concept of "request effective author" (cherry picked from commit a69bc0ca5573631bc2190446f24440f547e23660) Commit: 63dbdd2cf559220ec2f773f1a4a53225ee4901fe https://github.com/xwiki/xwiki-platform/commit/63dbdd2cf559220ec2f773f1a4a5… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/EntityChannel.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/EntityChannelStore.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/DefaultEntityChannelStore.java A xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EffectiveAuthorSetterListener.java A xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChange.java A xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorBot.java A xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorTracker.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/resources/META-INF/components.txt M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/internal/DefaultEntityChannelStoreTest.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js Log Message: ----------- XWIKI-21949: Restrict the execution of script macros during a realtime WYSIWYG editing session (cherry picked from commit 26921c18ce7dde6032011f218a9cbea55ebb6625) Commit: 8762508ac94e7f8d81fd39b8701d3880f9f2df64 https://github.com/xwiki/xwiki-platform/commit/8762508ac94e7f8d81fd39b8701d… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/PreviewAction.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/SaveAction.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/WrappingXWikiRequest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/XWikiRequest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/XWikiServletRequest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/XWikiServletRequestStub.java M xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/web/SaveActionTest.java M xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-api/src/main/java/org/xwiki/wysiwyg/script/WysiwygEditorScriptService.java Log Message: ----------- XWIKI-22222: Add the concept of "request effective author" * Make the request effective author optional (while keeping the event listener that sets it to the currently authenticated user by default) (cherry picked from commit 6510f9da9d13321b1a20c561f7cf7b38b0f3be2f) Commit: 7dc18722c6ce12a4915fa39353a9e18f92a9b293 https://github.com/xwiki/xwiki-platform/commit/7dc18722c6ce12a4915fa39353a9… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/EntityChannel.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChange.java Log Message: ----------- XWIKI-21949: Restrict the execution of script macros during a realtime WYSIWYG editing session * Use XWikiToStringBuilder (cherry picked from commit 2f8d7927eced7d60a8449e554aaab5e1cefcc4b9) Commit: e67ba873f45447ce86ab8a50e1600c08ec882f9f https://github.com/xwiki/xwiki-platform/commit/e67ba873f45447ce86ab8a50e160… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: R xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/web/EffectiveAuthorSetterListener.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/PreviewAction.java A xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/web/EffectiveAuthorSetterListener.java Log Message: ----------- XWIKI-22222: Add the concept of "request effective author" * Use proper package name * Improve code and comment. (cherry picked from commit ba5339454bd2c2c12d26f0c48b412a013a7a4f7a) Commit: 22626ee25005711017f023e92bbc7adf9c6e4b7d https://github.com/xwiki/xwiki-platform/commit/22626ee25005711017f023e92bbc… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorTracker.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/EntityChannelTest.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/internal/DefaultEntityChannelStoreTest.java A xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/internal/EffectiveAuthorSetterListenerTest.java A xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/internal/EntityChangeTest.java A xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorBotTest.java A xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorTrackerTest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/META-INF/components.txt Log Message: ----------- XWIKI-21949: Restrict the execution of script macros during a realtime WYSIWYG editing session * Add more unit tests. (cherry picked from commit d3c526eab9375e164837e97ae6f45e26587d812f) Commit: 1db4aa1653cf80781f2f356ebce5c1ea4837f5b4 https://github.com/xwiki/xwiki-platform/commit/1db4aa1653cf80781f2f356ebce5… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/EntityChannelStore.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EffectiveAuthorSetterListener.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChange.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorBot.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorTracker.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/XWikiRequest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/web/EffectiveAuthorSetterListener.java Log Message: ----------- XWIKI-21949: Restrict the execution of script macros during a realtime WYSIWYG editing session XWIKI-22222: Add the concept of "request effective author" * Update since version. (cherry picked from commit 8fe327b588ee2c12a756bdd667ee4452adef25aa) Commit: 5848596d1d2b5d77afa2b93ccad46b38190d9dcd https://github.com/xwiki/xwiki-platform/commit/5848596d1d2b5d77afa2b93ccad4… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: A xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/MultiUserTestUtilsParameterResolver.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/UITestTestConfigurationResolver.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/browser/BrowserContainerExecutor.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/servletengine/ServletContainerExecutor.java A xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/junit5/MultiUserTestUtils.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/junit5/TestConfiguration.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/junit5/UITest.java M xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/TestUtils.java Log Message: ----------- XWIKI-22272: Add support for testing with multiple users/browsers * Add new UITest configuration, named 'servletEngineNetworkAliases', to specify additional aliases that can be used to access the servlet engine running XWiki * Add a helper MultiUserTestUtils that can be injected in test methods allowing to: ** create new browser tabs and associate them with a given XWiki alias (you can log in different users in each of these tabs) ** switch between the created tabs, taking care of restoring the proper form token and base URL ** close the created tabs (except the first one) ** access the handle of the first (main) tab (cherry picked from commit 22b740a56970dbf2d667d8ccc26edde9a1e84d55) Commit: 29a30d656a74f4cf0f831d05a96d42932dbde11b https://github.com/xwiki/xwiki-platform/commit/29a30d656a74f4cf0f831d05a96d… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml Log Message: ----------- XWIKI-22308: The inplace editor locks the original translation when creating a new translation * reload the edit mode when switching the edited translation * change the document locale before locking it (taking care to restore the original translation if the edit fails for the new translation) * when reloading the document JSON, fallback on the orignal translation if the requested translation doesn't exist * when rendering the document, fallback on the original translation if the edited translation is new (so that we initialize the content of the new translation with the values from the original translation) (cherry picked from commit d4b3a322da390d0060227058837c6dc94e6de679) Commit: 6984dbc3bd3294bee3a1afc5819f02f89ac23d8c https://github.com/xwiki/xwiki-platform/commit/6984dbc3bd3294bee3a1afc5819f… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-localization/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-office/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-resource/plugin.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-source/plugin.js Log Message: ----------- XWIKI-22308: The inplace editor locks the original translation when creating a new translation * Also make sure the CKEditor requests that affect the edited content use the content locale and not the current UI locale because they can differ (e.g. when there's no document translation matching the current UI locale). (cherry picked from commit 801694d8b4c5f6974d811ffb7efd96526a715fe4) Commit: e2f51defbdbf46649db5ef99f696abbfe662bd7a https://github.com/xwiki/xwiki-platform/commit/e2f51defbdbf46649db5ef99f696… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/web/XWikiRequest.java M xwiki-platform-core/xwiki-platform-oldcore/src/main/java/org/xwiki/internal/web/EffectiveAuthorSetterListener.java Log Message: ----------- XWIKI-22222: Add the concept of "request effective author" * Update since version (cherry picked from commit 01542b3c7b3e8f08d85766f6e43f5c2677dcc495) Commit: de094b22a2e0178247cdb964d1036f9ef74fbc31 https://github.com/xwiki/xwiki-platform/commit/de094b22a2e0178247cdb964d103… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/EntityChannelStore.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EffectiveAuthorSetterListener.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChange.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorBot.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorTracker.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/internal/EffectiveAuthorSetterListenerTest.java M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/test/java/org/xwiki/netflux/internal/EntityChannelScriptAuthorTrackerTest.java Log Message: ----------- XWIKI-21949: Restrict the execution of script macros during a realtime WYSIWYG editing session * Fix a bug in EntityChannelScriptAuthorTracker which didn't lower / update the script level when the target entity reference had initially a low script level (e.g. when two users edit a page whose last author didn't have script right, one of them could use the rights of the other to execute scripts) * Assume that a request can submit data associated with multiple documents (or document translations) so don't try to determine the entity that is targeted by the request; simply compute the effective author by taking the most recent author with the least script rights * Update since versions (cherry picked from commit fa1c0fb1a859c14d8112ad07f1ec9d9fe973283f) Commit: d22fc5407491c84a4a63a70c099eb2ca14b5bc16 https://github.com/xwiki/xwiki-platform/commit/d22fc5407491c84a4a63a70c099e… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js Log Message: ----------- XWIKI-21949: Restrict the execution of script macros during a realtime WYSIWYG editing session * Stop submitting the Netflux channel after we disconnect from the realtime session (do proper cleanup). (cherry picked from commit 7bbd0904a136833144712ead0ddcbfb6af848793) Commit: d063ab15771584fa013a5738cb1ce9ad6c6d8e24 https://github.com/xwiki/xwiki-platform/commit/d063ab15771584fa013a5738cb1c… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/document.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js Log Message: ----------- XWIKI-22309: When creating a new document translation from realtime inplace editor, the content is synchronized with the original translation * Detect when the current document locale changes without a page reload and update the realtime document locale (that is going to be used to fetch the Netflux channels). * When creating a new realtime editor, check if the "all users" channel (that is shared) matches the current realtime document locale, and if it does not then disconnect and connect to the new channel. (cherry picked from commit 8ed990542aaa481d20fda72b7dcbed7f312aa338) Commit: 0ece27b730ecdf8130a8f03b93646a7ebb8f088d https://github.com/xwiki/xwiki-platform/commit/0ece27b730ecdf8130a8f03b9364… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-07-02 (Tue, 02 Jul 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/MacroDialogEditModal.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/AbstractRealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/AllIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGMultiUserIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeCKEditorToolBar.java Log Message: ----------- XWIKI-21949: Restrict the execution of script macros during a realtime WYSIWYG editing session * Add functional tests for limiting script right and for editing translations * Move "multi users" tests to RealtimeWYSIWYGEditorIT and use the new multi user test "framework" * Add page objects to interact with the macro content field on the Macro Edit modal (cherry picked from commit 49030bf17bd6f2a01ff58fa5ea05669bee09bf48) Compare: https://github.com/xwiki/xwiki-platform/compare/b26b1398c3b9...0ece27b730ec To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications