Issue #12714 verify workername for Mongo usage #12715
Open
+183
−3
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
gregw
previously approved these changes
Jan 15, 2025
| @@ -159,6 +157,8 @@ public class MongoSessionDataStore extends NoSqlSessionDataStore | |||
| */ | |||
| private DBObject _version1; | |||
|
|
|||
| private final Pattern _workerNamePattern = Pattern.compile("[0-9a-zA-Z]*"); | |||
There was a problem hiding this comment.
Not that it will make any difference, but:
Suggested change
| private final Pattern _workerNamePattern = Pattern.compile("[0-9a-zA-Z]*"); | |
| private final static Pattern __workerNamePattern = Pattern.compile("[0-9a-zA-Z]*"); |
benweidig
reviewed
Jan 15, 2025
| @@ -159,6 +157,8 @@ public class MongoSessionDataStore extends NoSqlSessionDataStore | |||
| */ | |||
| private DBObject _version1; | |||
|
|
|||
| private final Pattern _workerNamePattern = Pattern.compile("[0-9a-zA-Z]*"); | |||
There was a problem hiding this comment.
Underscore is a valid character, too.
Adding it would allow the name to support snake case.
benweidig
reviewed
Jan 15, 2025
| return; | ||
|
|
||
| if (!_workerNamePattern.matcher(_context.getWorkerName()).matches()) | ||
| throw new IllegalStateException("Invalid worker name: " + _context.getWorkerName()); |
There was a problem hiding this comment.
Works like a charm!
Only improvement might be stating what's valid, so if the issue is encountered it'd be fixable without diving into the code and looking up the Pattern
olamy
approved these changes
Jan 20, 2025
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.
Fixes #12714
The
workerNameconfigured on theDefaultSessionIdManagercan be unacceptable toMongoDB. TheDefaultSessionIdManagerprepends theworkerNameonto the generated random id to form a session id. If thisworkerNamecontains punctuation or other delimiter type characters, this messes with theMongoDBindex over the session ids.This PR allows
MongoSessionDataStoreto check theworkerNameat startup and fail the startup if it isn't admissible.