Merge remote-tracking branch 'origin/main' into stlc/promote-next

Author: kernel-internal[bot]

.github/workflows/ci.yml

@@ -37,6 +37,9 @@ jobs:
       - name: Run lints
         run: ./scripts/lint
 
+      - name: Run tests
+        run: ./scripts/test
+
   build:
     if: (github.event_name == 'push' || github.event.pull_request.head.repo.fork) && (github.event_name != 'push' || github.event.head_commit.message != 'codegen metadata')
     timeout-minutes: 10

bin/check-release-environment

@@ -12,7 +12,7 @@ fi
 
 lenErrors=${#errors[@]}
 
-if [[ lenErrors -gt 0 ]]; then
+if [[ "$lenErrors" -gt 0 ]]; then
   echo -e "Found the following errors in the release environment:\n"
 
   for error in "${errors[@]}"; do

src/hypeman/lib/cp.py

@@ -58,8 +58,8 @@ class _UploadEntry:
     guest_path: str
     is_dir: bool
     mode: int
-    uid: int
-    gid: int
+    uid: int | None
+    gid: int | None
     size: int
 
 
@@ -91,8 +91,8 @@ def visit(local_path: Path, remote_path: str, root: bool = False) -> None:
 
         is_dir = stat.S_ISDIR(info.st_mode)
         entry_mode = mode if root and mode is not None else stat.S_IMODE(info.st_mode)
-        uid = int(getattr(info, "st_uid", 0)) if archive else 0
-        gid = int(getattr(info, "st_gid", 0)) if archive else 0
+        uid = int(getattr(info, "st_uid", 0)) if archive else None
+        gid = int(getattr(info, "st_gid", 0)) if archive else None
         entries.append(
             _UploadEntry(
                 source=local_path,
@@ -131,9 +131,9 @@ def _request(entry: _UploadEntry) -> str:
         "is_dir": entry.is_dir,
         "mode": entry.mode,
     }
-    if entry.uid:
+    if entry.uid is not None:
         payload["uid"] = entry.uid
-    if entry.gid:
+    if entry.gid is not None:
         payload["gid"] = entry.gid
     return json.dumps(payload, separators=(",", ":"))
 
@@ -318,6 +318,7 @@ def __init__(self, destination: Path, archive: bool, callbacks: CopyCallbacks |
         self.file: BinaryIO | None = None
         self.temp_path: Path | None = None
         self.bytes_received = 0
+        self.directories: list[_DownloadHeader] = []
         self.complete = False
 
     def abort(self) -> None:
@@ -405,8 +406,7 @@ def _start(self, message: dict[str, object]) -> None:
             if target.is_symlink() or (target.exists() and not target.is_dir()):
                 raise CopyProtocolError(f"cp cannot replace local path with directory: {target}")
             target.mkdir(parents=True, exist_ok=True)
-            target.chmod(header.mode)
-            self._chown(target, header, follow_symlinks=True)
+            self.directories.append(header)
         elif header.is_symlink:
             self._create_symlink(header)
         else:
@@ -474,6 +474,11 @@ def _end(self, message: dict[str, object]) -> None:
         self.header = None
         self.bytes_received = 0
         if final:
+            for directory in reversed(self.directories):
+                if directory.mtime:
+                    os.utime(directory.target, (directory.mtime, directory.mtime))
+                self._chown(directory.target, directory, follow_symlinks=True)
+                directory.target.chmod(directory.mode)
             self.complete = True
 
     def _chown(self, path: Path, header: _DownloadHeader, *, follow_symlinks: bool) -> None:

tests/lib/test_websocket_lib.py

@@ -22,6 +22,7 @@
     cp_to_instance_async,
     cp_from_instance_async,
 )
+from hypeman.lib.cp import _request, _UploadEntry
 
 
 @dataclass
@@ -268,10 +269,8 @@ def test_cp_upload_file_preserves_mode_and_reports_progress(tmp_path: Path) -> N
         "mode": 0o640,
     }
     source_stat = source.stat()
-    if source_stat.st_uid:
-        expected_request["uid"] = source_stat.st_uid
-    if source_stat.st_gid:
-        expected_request["gid"] = source_stat.st_gid
+    expected_request["uid"] = source_stat.st_uid
+    expected_request["gid"] = source_stat.st_gid
     assert request == expected_request
     assert websocket.sent[1:] == [b"payload", '{"type":"end"}']
     assert connector.calls[0][2] == 2**20
@@ -282,6 +281,14 @@ def test_cp_upload_file_preserves_mode_and_reports_progress(tmp_path: Path) -> N
     ]
 
 
+def test_cp_upload_archive_includes_root_ownership(tmp_path: Path) -> None:
+    entry = _UploadEntry(tmp_path, "/guest/file", False, 0o644, 0, 0, 0)
+    request = json.loads(_request(entry))
+
+    assert request["uid"] == 0
+    assert request["gid"] == 0
+
+
 def test_cp_upload_directory_uses_one_connection_per_entry(tmp_path: Path) -> None:
     source = tmp_path / "tree"
     source.mkdir()
@@ -357,6 +364,44 @@ def test_cp_download_file_is_atomic_and_preserves_metadata(tmp_path: Path) -> No
     }
 
 
+def test_cp_download_defers_restrictive_directory_mode(tmp_path: Path) -> None:
+    directory = text_frame(
+        {
+            "type": "header",
+            "path": "tree",
+            "mode": 0o500,
+            "is_dir": True,
+            "is_symlink": False,
+            "link_target": "",
+            "size": 0,
+            "mtime": 0,
+        }
+    )
+    websocket = FakeWebSocket(
+        deque(
+            [
+                directory,
+                text_frame({"type": "end", "final": False}),
+                file_header("tree/child.txt", size=1),
+                b"x",
+                text_frame({"type": "end", "final": True}),
+            ]
+        )
+    )
+    destination = tmp_path / "download"
+
+    cp_from_instance(
+        FakeClient(),
+        "inst",
+        "/guest/tree",
+        destination,
+        connector=FakeConnector(deque([websocket])),
+    )
+
+    assert (destination / "tree" / "child.txt").read_bytes() == b"x"
+    assert stat_mode(destination / "tree") == 0o500
+
+
 def stat_mode(path: Path) -> int:
     return path.stat().st_mode & 0o7777