Fix subdomain matching#3854
Merged
droidmonkey merged 1 commit intokeepassxreboot:release/2.5.2from Nov 23, 2019
Merged
Conversation
This was referenced Nov 15, 2019
Contributor
|
Tested and solves #3848 for me. |
2a5feeb to
c50e1bb
Compare
Member
|
The tests are great but very fragile and difficult to follow. This is because they are a simple list without programmatic linkage between "valid" and "invalid" or expected to "match". This means we have to read comments and manually process them. I am merging for now, but these can be improved in the future perhaps with a QHash or structure that defines the test expectations per entry url. |
Member
Author
|
@droidmonkey You are absolutely right. I'll put that to my TODO list. |
droidmonkey
approved these changes
Nov 23, 2019
droidmonkey
added a commit
that referenced
this pull request
Jan 4, 2020
Added - Browser: Show UI warning when entering invalid URLs [#3912] - Browser: Option to use an entry only for HTTP auth [#3927] Changed - Disable the user interface when merging or saving the database [#3991] - Ability to hide protected attribute after reveal [#3877] - Remove mention of "snaps" in Windows and macOS [#3879] - CLI: Merge parameter for source database key file (--key-file-from) [#3961] - Improve GUI tests reliability on Hi-DPI displays [#4075] - Disable deprecation warnings to allow building with Qt 5.14+ [#4075] - OPVault: Use 'otp' attribute for TOTP field imports [#4075] Fixed - Fix crashes when saving a database to cloud storage [#3991] - Fix crash when pressing enter twice while opening database [#3885] - Fix handling of HTML when displayed in the entry preview panel [#3910] - Fix start minimized to tray on Linux [#3899] - Fix Auto Open with key file only databases [#4075] - Fix escape key closing the standalone password generator [#3892] - macOS: Fix monospace font usage in password field and notes [#4075] - macOS: Fix building on macOS 10.9 to 10.11 [#3946] - Fix TOTP setup dialog not closing on database lock [#4075] - Browser: Fix condition where additional URLs are ignored [#4033] - Browser: Fix subdomain matching to return only relevant site entries [#3854] - Secret Service: Fix multiple crashes and incompatibilities [#3871, #4009, #4074] - Secret Service: Fix searching of entries [#4008, #4036] - Secret Service: Fix behavior when exposed group is recycled [#3914] - CLI: Release the database instance before exiting interactive mode [#3889] - Fix (most) memory leaks in tests [#3922]
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Type of change
Description and Context
Fix for subdomain matching with Browser Integration. The previous fix handled the matching mostly based on the domain, and entry URL's with different subdomains were returned.
The behaviour is now following:
https://accounts.example.comentry URL is only matched withhttps://accounts.example.comor any subdomain under it.https://example.comentry URL is matched with any subdomain (or none) underexample.com.Also fixes matching with local files (handy for testing purposes). With those, a direct match between the page URL and entry URL is required.
Fixes #3848.
Testing strategy
Tested manually and with added automatic tests. Tests have some helpful comments added.
Checklist:
-DWITH_ASAN=ON. [REQUIRED]