Secret Service: cleanup and fix crash #5660
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
Aetf
force-pushed
the
fix/fdosecrets-5279
branch
from
ff3e518
to
a2557c3
Compare
droidmonkey
requested changes
Nov 4, 2020
droidmonkey
requested changes
Nov 4, 2020
Aetf
force-pushed
the
fix/fdosecrets-5279
branch
3 times, most recently
from
892143b
to
b16a318
Compare
|
The CI failure on Windows seems unrelated |
|
@Aetf Is this ready to go? |
Aetf
force-pushed
the
fix/fdosecrets-5279
branch
from
b16a318
to
d7ac18c
Compare
|
@droidmonkey Yes, it's ready. I just rebased. |
This gets rid of the m_registered state, so whenever there is a valid m_backend, it is guaranteed to be registered already. While at it, this commit also improves DBusObject::registerWithPath a little bit by allowing properly registering multiple paths using the same adaptor, mostly for supporting Collection aliases. Now when DBus registration fails, the code does not go into an inconsistent state or crash.
…xreboot#5279 - Use completeBaseName rather than baseName to ensure nonempty name - Handle two databases have the same name - Cleanup Service::onDatabaseTabOpened logic
Aetf
force-pushed
the
fix/fdosecrets-5279
branch
from
d7ac18c
to
668a918
Compare
Aetf
force-pushed
the
fix/fdosecrets-5279
branch
from
668a918
to
9f41189
Compare
|
@droidmonkey ping. I also fixed a signal connection problem that was introduced during the refactoring. |
droidmonkey
approved these changes
Nov 15, 2020
|
Excellent! Can we merge the prompt for access one soon? |
|
I'm working on that one now. It still needs some work and doesn't apply cleanly with this merged. I'll update very soon 😄 |
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 #5279. Aside from typos and formatting fixing, this does the following
Collection, so it's less likely to be left in an inconsistent stateQFileInfo::baseNamewas used to derive the name, but this can be empty if there are leading dots in the filename, causing Secret service crash when searching with null baseGroup #5279.QFileInfo::completeBaseNameis used instead.Testing strategy
New test cases added covering the corner cases mentioned above.
Type of change