fix: fix role checking when using websocket push (#20679) (CP: 24.6) #20709
+98
−21
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mcollovati
force-pushed
the
cherry/cherrypick-20679-to-24.6
branch
from
5591805 to
56f918e
Compare
caalador
reviewed
Dec 16, 2024
Comment on lines
390
to
409
| // Workaround for https://github.com/vaadin/flow-components/issues/3646 | ||
| // The issue causes the upload test to be flaky | ||
| private void waitForUploads(UploadElement element, int maxSeconds) { | ||
| WebDriver.Timeouts timeouts = getDriver().manage().timeouts(); | ||
| timeouts.scriptTimeout(Duration.ofSeconds(maxSeconds)); | ||
|
|
||
| String script = """ | ||
| var callback = arguments[arguments.length - 1]; | ||
| var upload = arguments[0]; | ||
| let intervalId; | ||
| intervalId = window.setInterval(function() { | ||
| var inProgress = upload.files.filter(function(file) { return file.uploading;}).length >0; | ||
| if (!inProgress) { | ||
| window.clearInterval(intervalId); | ||
| callback(); | ||
| } | ||
| }, 500); | ||
| """; | ||
| getCommandExecutor().getDriver().executeAsyncScript(script, element); | ||
| } |
There was a problem hiding this comment.
Is this test change needed for the cherry pick or should it be its own pick for the upload test fix from #20642?
There was a problem hiding this comment.
Good catch! You're right. I forgot to pick 20642. I'll add the labels, then I'll rebase this one (and the other related picks)
When using PUSH with websocket transport, the atmosphere wrapped request can be a no-op implementation whose isUserInRole method alwasy returns false, causing, for example, wrong access checking during navigation. This change falls back to Spring Securty for role checking when PUSH transport is websocket. It also fixes some tests in order to propagate the Spring Security context when starting Thread that perform UI operations. References psi#123 Part of #11026
mcollovati
force-pushed
the
cherry/cherrypick-20679-to-24.6
branch
from
56f918e to
a3b4050
Compare
caalador
approved these changes
Dec 16, 2024
|
|
This ticket/PR has been released with Vaadin 24.6.0. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using PUSH with websocket transport, the atmosphere wrapped request can be a no-op implementation whose isUserInRole method alwasy returns false, causing, for example, wrong access checking during navigation. This change falls back to Spring Securty for role checking when PUSH transport is websocket.
It also fixes some tests in order to propagate the Spring Security context when starting Thread that perform UI operations.
References psi#123
Part of #11026