Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version Management #854

Merged
merged 10 commits into from
Jun 19, 2019
Merged

Version Management #854

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ec39d4
added minor version check
mnm678 Apr 11, 2019
1326a01
support shorter spec_version
mnm678 Apr 11, 2019
9d05dde
bug fix
mnm678 Apr 12, 2019
812170c
use distutils.version
mnm678 Apr 24, 2019
9e2b5c7
use parse_version
mnm678 Apr 24, 2019
45aa0b5
Updated the spec-version check to only parse the version once
mnm678 Jun 6, 2019
819a5dd
removed unused import
mnm678 Jun 6, 2019
9d5eef1
removed trailing whitespace
mnm678 Jun 6, 2019
e7a49a8
minor spec-version comparison now checks for any difference in minor …
mnm678 Jun 6, 2019
149d5bd
removed trailing whitespace
mnm678 Jun 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions tuf/client/updater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,8 +1493,13 @@ def _get_metadata_file(self, metadata_role, remote_filename,
# number, the new metadata is safe to parse.
try:
metadata_spec_version = metadata_signable['signed']['spec_version']
metadata_spec_major_version = int(metadata_spec_version.split('.')[0])
code_spec_major_version = int(tuf.SPECIFICATION_VERSION.split('.')[0])
metadata_spec_version_split = metadata_spec_version.split('.')
metadata_spec_major_version = int(metadata_spec_version_split[0])
metadata_spec_minor_version = int(metadata_spec_version_split[1])

code_spec_version_split = tuf.SPECIFICATION_VERSION.split('.')
code_spec_major_version = int(code_spec_version_split[0])
code_spec_minor_version = int(code_spec_version_split[1])

if metadata_spec_major_version != code_spec_major_version:
raise tuf.exceptions.UnsupportedSpecificationError(
Expand All @@ -1503,6 +1508,15 @@ def _get_metadata_file(self, metadata_role, remote_filename,
repr(code_spec_major_version) + '; however, the obtained '
'metadata lists version number: ' + str(metadata_spec_version))

#report to user if minor versions do not match, continue with update
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment suggests != but the code and the log message >. Which one is it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the operator and message to report any mismatch in the minor version.

if metadata_spec_minor_version != code_spec_minor_version:
logger.info("Downloaded metadata that specifies a different minor " +
"spec_version. This code has version " +
str(tuf.SPECIFICATION_VERSION) +
" and the metadata lists version number " +
str(metadata_spec_version) +
". The update will continue as the major versions match.")

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please try to wrap lines at character 79.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OT: This is actually something we should have the linter check as well.

except (ValueError, TypeError):
raise securesystemslib.exceptions.FormatError('Improperly'
' formatted spec_version, which must be in major.minor.fix format')
Expand Down