Revert "Merge branch 'develop' of https://github.com/emboman13/python-tuf-lazy-refresh into develop"

This reverts commit 4d2684b, reversing
changes made to 28641dd.

Author: emboman13

.github/workflows/_test.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
 
       - name: Set up Python 3.x
-        uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b
+        uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
         with:
           python-version: 3.x
           cache: 'pip'
@@ -59,7 +59,7 @@ jobs:
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b
+        uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
@@ -101,7 +101,7 @@ jobs:
         run: touch requirements.txt
 
       - name: Set up Python
-        uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b
+        uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
         with:
           python-version: '3.x'
           cache: 'pip'

.github/workflows/cd.yml

@@ -23,7 +23,7 @@ jobs:
           ref: ${{ github.event.workflow_run.head_branch }}
 
       - name: Set up Python
-        uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b
+        uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
         with:
           python-version: '3.x'
 

.github/workflows/codeql-analysis.yml

@@ -25,9 +25,9 @@ jobs:
       uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@f3feb00acb00f31a6f60280e6ace9ca31d91c76a
+      uses: github/codeql-action/init@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db
       with:
         languages: 'python'
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@f3feb00acb00f31a6f60280e6ace9ca31d91c76a
+      uses: github/codeql-action/analyze@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db

.github/workflows/scorecards.yml

@@ -34,6 +34,6 @@ jobs:
           publish_results: true
 
       - name: "Upload to code-scanning dashboard"
-        uses: github/codeql-action/upload-sarif@f3feb00acb00f31a6f60280e6ace9ca31d91c76a
+        uses: github/codeql-action/upload-sarif@7df0ce34898d659f95c0c4a09eaa8d4e32ee64db
         with:
           sarif_file: results.sarif

.github/workflows/specification-version-check.yml

@@ -15,7 +15,7 @@ jobs:
       version: ${{ steps.get-version.outputs.version }}
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
-      - uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b
+      - uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
         with:
           python-version: "3.x"
       - id: get-version

requirements/lint.txt

@@ -8,7 +8,7 @@
 # are pinned to prevent unexpected linting failures when tools update)
 black==23.3.0
 isort==5.12.0
-pylint==2.17.3
+pylint==2.17.2
 mypy==1.2.0
 bandit==1.7.5
 pydocstyle==6.3.0

requirements/pinned.txt

@@ -5,6 +5,6 @@ cryptography==40.0.2      # via securesystemslib
 idna==3.4                 # via requests
 pycparser==2.21           # via cffi
 pynacl==1.5.0             # via securesystemslib
-requests==2.29.0
-securesystemslib[crypto,pynacl]==0.28.0
+requests==2.28.2
+securesystemslib[crypto,pynacl]==0.27.0
 urllib3==1.26.15           # via requests

requirements/test.txt

@@ -4,4 +4,4 @@
 -r pinned.txt
 
 # coverage measurement
-coverage==7.2.5
+coverage==7.2.3

tests/test_updater_top_level_update.py

@@ -748,6 +748,7 @@ def test_refresh_with_offline(self, mock_time: Mock) -> None:
         self.sim.targets.expires = self.sim.safe_expiry - datetime.timedelta(
             days=5
         )
+
         # offline is not set and there is no metadata
         self.sim.fetch_tracker.metadata.clear()
         with patch("datetime.datetime", mock_time):
@@ -756,15 +757,17 @@ def test_refresh_with_offline(self, mock_time: Mock) -> None:
             try:
                 updater.refresh()
             except ExpiredMetadataError:
-                self.assertTrue(True)
+                self.assertTrue()
 
         # Make sure local metadata is available
         updater = self._init_updater()
         updater.refresh()
+
         updater.config.offline = False
 
         # Clean up fetch tracker data
         self.sim.fetch_tracker.metadata.clear()
+
         # Create timestamp v2 in repository
         self.sim.timestamp.version += 1
         self.sim.timestamp.expires = self.sim.safe_expiry
@@ -774,15 +777,17 @@ def test_refresh_with_offline(self, mock_time: Mock) -> None:
         updater.config.offline = True
         updater.refresh()
         self.assertListEqual(self.sim.fetch_tracker.metadata, [])
+
         # Clean up fetch tracker data
         self.sim.fetch_tracker.metadata.clear()
+        
         # create targets v2 in repository
         self.sim.targets.version += 1
         self.sim.targets.expires = self.sim.safe_expiry
         self.sim.update_snapshot()
 
         # Offline flag is set and local metadata is expired. New timestamp
-        # is available but should raise MetaDataError.
+        # is available but should raise MetaDataError. 
         mock_time.utcnow.return_value = (
             self.sim.safe_expiry - datetime.timedelta(days=6)
         )
@@ -793,7 +798,7 @@ def test_refresh_with_offline(self, mock_time: Mock) -> None:
             try:
                 updater.refresh()
             except ExpiredMetadataError:
-                self.assertFalse(False)
+                self.assertFalse()
 
         # Clean up fetch tracker data
         self.sim.fetch_tracker.metadata.clear()
@@ -811,6 +816,7 @@ def test_refresh_with_offline(self, mock_time: Mock) -> None:
             ("targets", 2),
         ]
         self.assertListEqual(self.sim.fetch_tracker.metadata, expected_calls)
+    
     @patch.object(datetime, "datetime", wraps=datetime.datetime)
     def test_expired_metadata(self, mock_time: Mock) -> None:
         """Verifies that expired local timestamp/snapshot can be used for

tuf/ngclient/_internal/trusted_metadata_set.py

@@ -78,22 +78,20 @@ class TrustedMetadataSet(abc.Mapping):
     to update the metadata with the caller making decisions on what is updated.
     """
 
-    def __init__(self, root_data: bytes, is_offline: bool = False):
+    def __init__(self, root_data: bytes):
         """Initialize ``TrustedMetadataSet`` by loading trusted root metadata.
 
         Args:
             root_data: Trusted root metadata as bytes. Note that this metadata
                 will only be verified by itself: it is the source of trust for
                 all metadata in the ``TrustedMetadataSet``
-            is_offline: Defines whether the client wants to be offline or not.
 
         Raises:
             RepositoryError: Metadata failed to load or verify. The actual
                 error type and content will contain more details.
         """
         self._trusted_set: Dict[str, Metadata] = {}
         self.reference_time = datetime.datetime.utcnow()
-        self.offline = is_offline
 
         # Load and validate the local root metadata. Valid initial trusted root
         # metadata is required
@@ -205,10 +203,7 @@ def update_timestamp(self, data: bytes, offline=False) -> Metadata[Timestamp]:
             raise RuntimeError("Cannot update timestamp after snapshot")
 
         # client workflow 5.3.10: Make sure final root is not expired.
-        if (
-            self.root.signed.is_expired(self.reference_time)
-            and not self.offline
-        ):
+        if self.root.signed.is_expired(self.reference_time) and not offline:
             raise exceptions.ExpiredMetadataError("Final root.json is expired")
         # No need to check for 5.3.11 (fast forward attack recovery):
         # timestamp/snapshot can not yet be loaded at this point
@@ -251,7 +246,7 @@ def update_timestamp(self, data: bytes, offline=False) -> Metadata[Timestamp]:
         logger.debug("Updated timestamp v%d", new_timestamp.signed.version)
 
         # timestamp is loaded: raise if it is not valid _final_ timestamp
-        self._check_final_timestamp() if not self.offline else None
+        self._check_final_timestamp() if not offline else None
 
         return new_timestamp
 
@@ -262,9 +257,7 @@ def _check_final_timestamp(self) -> None:
             raise exceptions.ExpiredMetadataError("timestamp.json is expired")
 
     def update_snapshot(
-        self,
-        data: bytes,
-        trusted: Optional[bool] = False,
+        self, data: bytes, trusted: Optional[bool] = False, offline=False
     ) -> Metadata[Snapshot]:
         """Verify and load ``data`` as new snapshot metadata.
 
@@ -301,7 +294,7 @@ def update_snapshot(
         logger.debug("Updating snapshot")
 
         # Snapshot cannot be loaded if final timestamp is expired
-        self._check_final_timestamp() if not self.offline else None
+        self._check_final_timestamp() if not offline else None
 
         snapshot_meta = self.timestamp.signed.snapshot_meta
 
@@ -362,10 +355,7 @@ def update_snapshot(
     def _check_final_snapshot(self) -> None:
         """Raise if snapshot is expired or meta version does not match."""
 
-        if (
-            self.snapshot.signed.is_expired(self.reference_time)
-            and not self.offline
-        ):
+        if self.snapshot.signed.is_expired(self.reference_time):
             raise exceptions.ExpiredMetadataError("snapshot.json is expired")
         snapshot_meta = self.timestamp.signed.snapshot_meta
         if self.snapshot.signed.version != snapshot_meta.version:
@@ -452,10 +442,7 @@ def update_delegated_targets(
                 f"Expected {role_name} v{meta.version}, got v{version}."
             )
 
-        if (
-            new_delegate.signed.is_expired(self.reference_time)
-            and not self.offline
-        ):
+        if new_delegate.signed.is_expired(self.reference_time) and not offline:
             raise exceptions.ExpiredMetadataError(f"New {role_name} is expired")
 
         self._trusted_set[role_name] = new_delegate