Elgato_dark/python-tuf
1
0
Fork 0
mirror of https://github.com/theupdateframework/python-tuf synced 2026-05-24 10:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tuf.api: make expires a property

Browse source 
Signed-off-by: Joshua Lock <jlock@vmware.com>
This commit is contained in:
Joshua Lock 2020-07-02 22:35:11 +01:00
parent 0ca471ed2a
commit eb93fe133e
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tuf/api/metadata.py
View file

@ -70,6 +70,10 @@ def signable(self) -> JsonDict:
"""
raise NotImplementedError()
@property
def expires(self) -> str:
return self.expiration.replace(tzinfo=None).isoformat()+'Z'
def bump_version(self) -> None:
self.version = self.version + 1
@ -138,11 +142,10 @@ def read_from_json(self, filename: str) -> None:
tuf.formats.TIMESTAMP_SCHEMA.check_match(self.signed)
def signable(self):
expires = self.expiration.replace(tzinfo=None).isoformat()+'Z'
filedict = self.signed['meta']
return tuf.formats.build_dict_conforming_to_schema(
tuf.formats.TIMESTAMP_SCHEMA, version=self.version,
expires=expires, meta=filedict)
expires=self.expires, meta=filedict)
# Update metadata about the snapshot metadata.
def update(self, version: int, length: int, hashes: JsonDict):
@ -168,11 +171,9 @@ def read_from_json(self, filename: str) -> None:
self.targets_fileinfo[target_role] = tuf.formats.make_metadata_fileinfo(version, length, hashes)
def signable(self):
# TODO: probably want to generalise this, a @property.getter in Metadata?
expires = self.expiration.replace(tzinfo=None).isoformat()+'Z'
return tuf.formats.build_dict_conforming_to_schema(
tuf.formats.SNAPSHOT_SCHEMA, version=self.version,
expires=expires, meta=self.targets_fileinfo)
expires=self.expires, meta=self.targets_fileinfo)
# Add or update metadata about the targets metadata.
def update(self, rolename: str, version: int, length: Optional[int] = None, hashes: Optional[JsonDict] = None):
@ -192,12 +193,10 @@ def read_from_json(self, filename: str) -> None:
self.delegations = self.signed.get('delegations', None)
def signable(self):
# TODO: probably want to generalise this, a @property.getter in Metadata?
expires = self.expiration.replace(tzinfo=None).isoformat()+'Z'
return tuf.formats.build_dict_conforming_to_schema(
tuf.formats.TARGETS_SCHEMA,
version=self.version,
expires=expires,
expires=self.expires,
targets=self.targets,
delegations=self.delegations)