handle SecurityOptions: null in docker response

asottile · asottile · commit 2930ea0fcd48 · 2025-09-06T14:40:20.000-04:00
diff --git a/pre_commit/languages/docker.py b/pre_commit/languages/docker.py
@@ -115,7 +115,7 @@ def _is_rootless() -> bool:  # pragma: win32 no cover
         return (
             # docker:
             # https://docs.docker.com/reference/api/engine/version/v1.48/#tag/System/operation/SystemInfo
-            'name=rootless' in info.get('SecurityOptions', ()) or
+            'name=rootless' in (info.get('SecurityOptions') or ()) or
             # podman:
             # https://docs.podman.io/en/latest/_static/api.html?version=v5.4#tag/system/operation/SystemInfoLibpod
             info['host']['security']['rootless']
diff --git a/tests/languages/docker_test.py b/tests/languages/docker_test.py
@@ -89,7 +89,8 @@ def test_docker_user_rootless(info_ret):
     (
         (0, b'{"SecurityOptions": ["name=cgroupns"]}', b''),
         (0, b'{"host": {"security": {"rootless": false}}}', b''),
-        (0, b'{"respone_from_some_other_container_engine": true}', b''),
+        (0, b'{"response_from_some_other_container_engine": true}', b''),
+        (0, b'{"SecurityOptions": null}', b''),
         (1, b'', b''),
     ),
 )

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ def test_docker_user_rootless(info_ret):`
`89`	`89`	`(`
`90`	`90`	`(0, b'{"SecurityOptions": ["name=cgroupns"]}', b''),`
`91`	`91`	`(0, b'{"host": {"security": {"rootless": false}}}', b''),`
`92`		`- (0, b'{"respone_from_some_other_container_engine": true}', b''),`
	`92`	`+ (0, b'{"response_from_some_other_container_engine": true}', b''),`
	`93`	`+ (0, b'{"SecurityOptions": null}', b''),`
`93`	`94`	`(1, b'', b''),`
`94`	`95`	`),`
`95`	`96`	`)`