fix username/password authentication #158
Merged
Conversation
This file contains hidden or 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
timgraham
reviewed
Oct 14, 2024
django_mongodb/base.py
Outdated
| @@ -157,20 +159,35 @@ def __getattr__(self, attr): | |||
| raise AttributeError(attr) | |||
|
|
|||
| def _connect(self): | |||
| settings_dict = self.settings_dict | |||
| settings_dict = deepcopy(self.settings_dict) | |||
There was a problem hiding this comment.
As far as I can tell, there's no need for a copy.
django_mongodb/base.py
Outdated
| user = settings_dict.get("USER") | ||
| password = settings_dict.get("PASSWORD") | ||
| options = settings_dict.get("OPTIONS", {}) | ||
| options_user = options.pop("username", None) |
There was a problem hiding this comment.
I think we should ignore the possibility the developer put username and password in OPTIONS as that's just creating extra complexity, and it breaks the assumption in other places that the USER/PASSWORD will be set (e.g. https://github.com/mongodb-labs/django-mongodb/blob/main/django_mongodb/client.py).
There was a problem hiding this comment.
Okay, fine!
I reworked it and made it as simple as possible
django_mongodb/base.py
Outdated
| password = settings_dict["PASSWORD"] | ||
| if user and password and not self.database.authenticate(user, password): | ||
| raise ImproperlyConfigured("Invalid username or password.") | ||
| # We can check if the credentials are correct by calling server_info(). |
There was a problem hiding this comment.
Thanks for the explanation, but I think we can omit the comment since this is no different from the behavior of other backends.
database.authenticate() was removed in PyMongo 4.
timgraham
changed the title
timgraham
approved these changes
Oct 15, 2024
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.
This PR updates the MongoDB connection logic in the Django MongoDB integration to be compatible with PyMongo 4.x. The old method of authenticating db via
self.database.authenticate(user, password)has been removed, since it was deprecated and fully removed in PyMongo 4.x.Changes Made:
_connect()method to utilize the predefined options to handle user credentials.authenticate(user, password)method.USER/PASSWORD(from settings) andOPTIONS['username']/OPTIONS['password'].