Refine username detection during login #15653
Merged
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
- do not terminate detection on JS-escaped double quotes in username - check for and unescape JS-escaped Unicode characters
moving-bits
force-pushed
the
issue_15610
branch
from
8a03ee6
to
df7f1f6
Compare
bekuno
reviewed
Apr 24, 2024
Comment on lines
-98
to
99
| public static final Pattern PATTERN_LOGIN_NAME_CACHE_COUNT = Pattern.compile("\"publicGuid\":\"[^\"]+\",\"referenceCode\":\"[^\"]+\",\"id\":[0-9]+,\"username\":\"([^\"]+)\",\"dateCreated\":\"[0-9:T-]+\",\"findCount\":([0-9]+),"); | ||
| public static final Pattern PATTERN_LOGIN_NAME1 = Pattern.compile(",\"referenceCode\":\"[^\"]+\",\"id\":[0-9]+,\"username\":\\s*\"(([^\\\\\\\"]*(\\\\[a-z\\\"])*)*)\\\","); | ||
| public static final Pattern PATTERN_FINDCOUNT = Pattern.compile("\"findCount\":\\s*([0-9]+)[,\\s]"); |
There was a problem hiding this comment.
I have an idea to recognise that we are in the right place (block), but without the need for an ordered position (reference to another entry).
The block starts with window['chromeSettings'] = {, so we could use something like
window\['chromeSettings'\].*"username":\s*\"(([^\\\\\"]*(\\[a-z\"])*)*)\"
Maybe additional escapes are necessary.
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.
Description
(switching to reading
serverParametersseems to be non-feasable here, as it is not yet available during login)