This repository has been archived by the owner on May 21, 2024. It is now read-only.
Fix/ota 4941/installed version matching #1666
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
zabbal
reviewed
May 5, 2020
| @@ -115,7 +115,7 @@ void ImageRepository::fetchTargets(INvStorage& storage, const IMetadataFetcher& | |||
| verifyTargets(image_targets, false); | |||
|
|
|||
| if (local_version > remote_version) { | |||
| throw Uptane::SecurityException(RepositoryType::IMAGE, "Mismatched target versions"); | |||
| throw Uptane::SecurityException(RepositoryType::IMAGE, "Rollback attempt"); | |||
There was a problem hiding this comment.
That looks like smth which deserves big bold red error in the log output. Is this done where this exception is caught?
There was a problem hiding this comment.
Yes, I believe so, although the real tragedy is we don't think we make this particularly obvious in the web UI.
There was a problem hiding this comment.
Hmm... I though there's a ticket for that but can't find it now.
zabbal
reviewed
May 5, 2020
| @@ -110,6 +110,7 @@ bool PackageManagerFake::fetchTarget(const Uptane::Target& target, Uptane::Fetch | |||
| return false; | |||
| } | |||
|
|
|||
| // TODO(OTA-4939): Unify this and make it more generic. | |||
There was a problem hiding this comment.
Perhaps explicitly saying unification with what exactly is desired would be helpful in future? Like function name or file for example.
There was a problem hiding this comment.
Fair point, done.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
Functionally should be no change. I'm just trying to make the online and offline metadata checks as similar as possible, as well as the handling of the Director and Image repo. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
Specifically, if metadata content changes but the version is not updated. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
This is the same function used for matching Targets from the Director and Image repo. Notably, it also matches hashes and length. Functionally, this shouldn't change much in practice, but if a Target is received in the Director Targets metadata that matches the filename of the currently installed version but *not* the length and/or hashes, we throw an error, since that is unexpected. This is covered by a test. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
pattivacek
force-pushed
the
fix/OTA-4941/installed-version-matching
branch
from
5173bcc to
1230c4f
Compare
zabbal
approved these changes
May 5, 2020
Codecov Report
@@ Coverage Diff @@
## master #1666 +/- ##
=======================================
Coverage 82.68% 82.69%
=======================================
Files 191 191
Lines 12088 12088
=======================================
+ Hits 9995 9996 +1
+ Misses 2093 2092 -1
Continue to review full report at Codecov.
|
lbonn
approved these changes
May 5, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.