Merge pull request #1701 from giuseppe/set-home-unknown-id

utils: set_home_env returns negative value on errors

Author: giuseppe

src/libcrun/utils.c

@@ -1463,7 +1463,7 @@ set_home_env (uid_t id)
 
 error:
   /* Let callers handle the error if the user was not found. */
-  return ret;
+  return ret ? -errno : 0;
 }
 
 /*if subuid or subgid exist, take the first range for the user */

tests/test_cwd.py

@@ -26,9 +26,63 @@ def test_cwd():
     if "/var" not in out:
         return -1
     return 0
-    
+
+def test_cwd_relative():
+    conf = base_config()
+    conf['process']['args'] = ['./init', 'echo', 'hello']
+    conf['process']['cwd'] = "/sbin"
+    add_all_namespaces(conf)
+    try:
+        out, _ = run_and_get_output(conf)
+        if "hello" not in str(out):
+            return -1
+    except Exception as e:
+        return -1
+    return 0
+
+def test_cwd_relative_subdir():
+    conf = base_config()
+    conf['process']['args'] = ['sbin/init', 'echo', 'hello']
+    conf['process']['cwd'] = "/"
+    add_all_namespaces(conf)
+    try:
+        out, _ = run_and_get_output(conf)
+        if "hello" not in str(out):
+            return -1
+    except:
+        return -1
+    return 0
+
+def test_cwd_not_exist():
+    conf = base_config()
+    conf['process']['args'] = ['/init', 'true']
+    conf['process']['cwd'] = "/doesnotexist"
+    add_all_namespaces(conf)
+    try:
+        run_and_get_output(conf)
+    except:
+        return -1
+    return 0
+
+def test_cwd_absolute():
+    conf = base_config()
+    conf['process']['args'] = ['/init', 'echo', 'hello']
+    conf['process']['cwd'] = "/sbin"
+    add_all_namespaces(conf)
+    try:
+        out, _ = run_and_get_output(conf)
+        if "hello" not in str(out):
+            return -1
+    except:
+        return -1
+    return 0
+
 all_tests = {
     "cwd" : test_cwd,
+    "cwd-relative": test_cwd_relative,
+    "cwd-relative-subdir": test_cwd_relative_subdir,
+    "cwd-absolute": test_cwd_absolute,
+    "cwd-not-exist" : test_cwd_not_exist,
 }
 
 if __name__ == "__main__":

tests/test_start.py

@@ -24,56 +24,6 @@
 import json
 from tests_utils import *
 
-def test_cwd_relative():
-    conf = base_config()
-    conf['process']['args'] = ['./init', 'echo', 'hello']
-    conf['process']['cwd'] = "/sbin"
-    add_all_namespaces(conf)
-    try:
-        out, _ = run_and_get_output(conf)
-        if "hello" not in str(out):
-            return -1
-    except Exception as e:
-        return -1
-    return 0
-
-def test_cwd_relative_subdir():
-    conf = base_config()
-    conf['process']['args'] = ['sbin/init', 'echo', 'hello']
-    conf['process']['cwd'] = "/"
-    add_all_namespaces(conf)
-    try:
-        out, _ = run_and_get_output(conf)
-        if "hello" not in str(out):
-            return -1
-    except:
-        return -1
-    return 0
-
-def test_cwd_not_exist():
-    conf = base_config()
-    conf['process']['args'] = ['/init', 'true']
-    conf['process']['cwd'] = "/doesnotexist"
-    add_all_namespaces(conf)
-    try:
-        run_and_get_output(conf)
-    except:
-        return -1
-    return 0
-
-def test_cwd_absolute():
-    conf = base_config()
-    conf['process']['args'] = ['/init', 'echo', 'hello']
-    conf['process']['cwd'] = "/sbin"
-    add_all_namespaces(conf)
-    try:
-        out, _ = run_and_get_output(conf)
-        if "hello" not in str(out):
-            return -1
-    except:
-        return -1
-    return 0
-
 def test_not_allowed_ipc_sysctl():
     if is_rootless():
         return 77
@@ -556,6 +506,21 @@ def test_invalid_id():
         return -1
     return 0
 
+def test_home_unknown_id():
+    if is_rootless():
+        return 77
+
+    conf = base_config()
+    conf['process']['args'] = ['/init', 'printenv', "HOME"]
+    conf['process']['user']['uid'] = 101010
+    conf['process']['user']['gid'] = 101010
+    add_all_namespaces(conf)
+    out, _ = run_and_get_output(conf)
+    if out != "/":
+        sys.stderr.write("expected: `/`, got output: `%s`\n" % out)
+        return -1
+    return 0
+
 all_tests = {
     "start" : test_start,
     "start-override-config" : test_start_override_config,
@@ -565,10 +530,6 @@ def test_invalid_id():
     "sd-notify-env" : test_sd_notify_env,
     "sd-notify-proxy": test_sd_notify_proxy,
     "listen_pid_env": test_listen_pid_env,
-    "cwd-relative": test_cwd_relative,
-    "cwd-relative-subdir": test_cwd_relative_subdir,
-    "cwd-absolute": test_cwd_absolute,
-    "cwd-not-exist" : test_cwd_not_exist,
     "empty-home": test_empty_home,
     "delete-in-created-state": test_delete_in_created_state,
     "run-rootless-netns-with-userns" : test_run_rootless_netns_with_userns,
@@ -579,6 +540,7 @@ def test_invalid_id():
     "ioprio": test_ioprio,
     "run-keep": test_run_keep,
     "invalid-id": test_invalid_id,
+    "home-unknown-id": test_home_unknown_id,
 }
 
 if __name__ == "__main__":