gpt-auto-generator: improve log message

We said "exiting", but then the program continues to do other operations and log additional messages.
shared/exec-util: fix logging of the args of an executed program
2024-11-19 17:18:14 +01:00 · 2024-11-19 17:18:14 +01:00 · 2024-11-19 17:18:14 +01:00 · 2024-11-19 17:18:14 +01:00 · 2024-11-19 17:18:14 +01:00 · 2024-11-19 17:18:14 +01:00
1 changed files with 122 additions and 91 deletions
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@ -691,51 +691,34 @@ static void dump_home_record(UserRecord *hr) {
        }
 }

-static int inspect_home(sd_bus *bus, const char *name) {
-        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
-        _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
-        _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
-        _cleanup_(user_record_unrefp) UserRecord *hr = NULL;
-        const char *json;
-        int incomplete;
-        uid_t uid;
-        int r;
+static int mangle_user_list(char **list, char ***ret) {
+        char **l;

-        r = parse_uid(name, &uid);
-        if (r < 0) {
-                if (!valid_user_group_name(name, 0))
-                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid user name '%s'.", name);
+        if (strv_isempty(list)) {
+                _cleanup_free_ char *myself = NULL;

-                r = bus_call_method(bus, bus_mgr, "GetUserRecordByName", &error, &reply, "s", name);
-        } else
-                r = bus_call_method(bus, bus_mgr, "GetUserRecordByUID", &error, &reply, "u", (uint32_t) uid);
-        if (r < 0)
-                return log_error_errno(r, "Failed to inspect home: %s", bus_error_message(&error, r));
-
-        r = sd_bus_message_read(reply, "sbo", &json, &incomplete, NULL);
-        if (r < 0)
-                return bus_log_parse_error(r);
-
-        r = sd_json_parse(json, SD_JSON_PARSE_SENSITIVE, &v, NULL, NULL);
-        if (r < 0)
-                return log_error_errno(r, "Failed to parse JSON identity: %m");
-
-        hr = user_record_new();
-        if (!hr)
+                myself = getusername_malloc();
+                if (!myself)
                        return log_oom();

-        r = user_record_load(hr, v, USER_RECORD_LOAD_REFUSE_SECRET|USER_RECORD_LOG|USER_RECORD_PERMISSIVE);
-        if (r < 0)
-                return r;
+                l = strv_new(myself);
+        } else
+                l = strv_copy(list);
+        if (!l)
+                return log_oom();

-        hr->incomplete = incomplete;
-        dump_home_record(hr);
+        *ret = l;
        return 0;
 }

-static int inspect_homes(int argc, char *argv[], void *userdata) {
+static int inspect_home(int argc, char *argv[], void *userdata) {
        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
-        int r;
+        _cleanup_strv_free_ char **items = NULL;
+        int r, ret = 0;
+
+        r = mangle_user_list(strv_skip(argv, 1), &items);
+        if (r < 0)
+                return r;

        r = acquire_bus(&bus);
        if (r < 0)
@ -743,26 +726,92 @@ static int inspect_homes(int argc, char *argv[], void *userdata) {

        pager_open(arg_pager_flags);

-        char **args = strv_skip(argv, 1);
-        if (args) {
-                _cleanup_free_ char *myself = getusername_malloc();
-                if (!myself)
+        STRV_FOREACH(i, items) {
+                _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
+                _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
+                _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
+                _cleanup_(user_record_unrefp) UserRecord *hr = NULL;
+                const char *json;
+                int incomplete;
+                uid_t uid;
+
+                r = parse_uid(*i, &uid);
+                if (r < 0) {
+                        if (!valid_user_group_name(*i, 0)) {
+                                log_error("Invalid user name '%s'.", *i);
+                                if (ret == 0)
+                                        ret = -EINVAL;
+
+                                continue;
+                        }
+
+                        r = bus_call_method(bus, bus_mgr, "GetUserRecordByName", &error, &reply, "s", *i);
+                } else
+                        r = bus_call_method(bus, bus_mgr, "GetUserRecordByUID", &error, &reply, "u", (uint32_t) uid);
+                if (r < 0) {
+                        log_error_errno(r, "Failed to inspect home: %s", bus_error_message(&error, r));
+                        if (ret == 0)
+                                ret = r;
+
+                        continue;
+                }
+
+                r = sd_bus_message_read(reply, "sbo", &json, &incomplete, NULL);
+                if (r < 0) {
+                        bus_log_parse_error(r);
+                        if (ret == 0)
+                                ret = r;
+
+                        continue;
+                }
+
+                r = sd_json_parse(json, SD_JSON_PARSE_SENSITIVE, &v, NULL, NULL);
+                if (r < 0) {
+                        log_error_errno(r, "Failed to parse JSON identity: %m");
+                        if (ret == 0)
+                                ret = r;
+
+                        continue;
+                }
+
+                hr = user_record_new();
+                if (!hr)
                        return log_oom();

-                return inspect_home(bus, myself);
-        } else {
-                STRV_FOREACH(arg, args)
-                        RET_GATHER(r, inspect_home(bus, *arg));
+                r = user_record_load(hr, v, USER_RECORD_LOAD_REFUSE_SECRET|USER_RECORD_LOG|USER_RECORD_PERMISSIVE);
+                if (r < 0) {
+                        if (ret == 0)
+                                ret = r;

-                return r;
+                        continue;
                }
+
+                hr->incomplete = incomplete;
+                dump_home_record(hr);
+        }
+
+        return ret;
 }

-static int authenticate_home(sd_bus *bus, const char *name) {
-        _cleanup_(user_record_unrefp) UserRecord *secret = NULL;
-        int r;
+static int authenticate_home(int argc, char *argv[], void *userdata) {
+        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
+        _cleanup_strv_free_ char **items = NULL;
+        int r, ret = 0;

-        r = acquire_passed_secrets(name, &secret);
+        r = mangle_user_list(strv_skip(argv, 1), &items);
+        if (r < 0)
+                return r;
+
+        r = acquire_bus(&bus);
+        if (r < 0)
+                return r;
+
+        (void) polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
+
+        STRV_FOREACH(i, items) {
+                _cleanup_(user_record_unrefp) UserRecord *secret = NULL;
+
+                r = acquire_passed_secrets(*i, &secret);
                if (r < 0)
                        return r;

@ -774,7 +823,7 @@ static int authenticate_home(sd_bus *bus, const char *name) {
                        if (r < 0)
                                return bus_log_create_error(r);

-                r = sd_bus_message_append(m, "s", name);
+                        r = sd_bus_message_append(m, "s", *i);
                        if (r < 0)
                                return bus_log_create_error(r);

@ -784,37 +833,19 @@ static int authenticate_home(sd_bus *bus, const char *name) {

                        r = sd_bus_call(bus, m, HOME_SLOW_BUS_CALL_TIMEOUT_USEC, &error, NULL);
                        if (r < 0) {
-                        r = handle_generic_user_record_error(name, secret, &error, r, false);
-                        if (r >= 0)
-                                continue;
+                                r = handle_generic_user_record_error(*i, secret, &error, r, false);
+                                if (r < 0) {
+                                        if (ret == 0)
+                                                ret = r;
+
+                                        break;
                                }
-                return r;
+                        } else
+                                break;
                }
-}
-
-static int authenticate_homes(int argc, char *argv[], void *userdata) {
-        _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
-        int r;
-
-        r = acquire_bus(&bus);
-        if (r < 0)
-                return r;
-
-        (void) polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
-
-        char **args = strv_skip(argv, 1);
-        if (args) {
-                _cleanup_free_ char *myself = getusername_malloc();
-                if (!myself)
-                        return log_oom();
-
-                return authenticate_home(bus, myself);
-        } else {
-                STRV_FOREACH(arg, args)
-                        RET_GATHER(r, authenticate_home(bus, *arg));
-
-                return r;
        }
+
+        return ret;
 }

 static int update_last_change(sd_json_variant **v, bool with_password, bool override) {
@ -4690,8 +4721,8 @@ static int run(int argc, char *argv[]) {
                { "list",           VERB_ANY, 1,        VERB_DEFAULT, list_homes           },
                { "activate",       2,        VERB_ANY, 0,            activate_home        },
                { "deactivate",     2,        VERB_ANY, 0,            deactivate_home      },
-                { "inspect",        VERB_ANY, VERB_ANY, 0,            inspect_homes        },
-                { "authenticate",   VERB_ANY, VERB_ANY, 0,            authenticate_homes   },
+                { "inspect",        VERB_ANY, VERB_ANY, 0,            inspect_home         },
+                { "authenticate",   VERB_ANY, VERB_ANY, 0,            authenticate_home    },
                { "create",         VERB_ANY, 2,        0,            create_home          },
                { "remove",         2,        VERB_ANY, 0,            remove_home          },
                { "update",         VERB_ANY, 2,        0,            update_home          },
Author	SHA1	Message	Date
Zbigniew Jędrzejewski-Szmek	ed0c57c6da	gpt-auto-generator: improve log message We said "exiting", but then the program continues to do other operations and log additional messages.	2024-11-19 17:18:14 +01:00
Zbigniew Jędrzejewski-Szmek	0f99304e11	shared/exec-util: fix logging of the args of an executed program The debug logs has lots of "About to execute /some/path (null)". This occurs when the args array is empty. Instead, only print "(null)" if we failed with oom. Having strv_skip() return NULL makes this pleasant to write without repeating strv_isempty() a few times.	2024-11-19 17:18:14 +01:00
Zbigniew Jędrzejewski-Szmek	ee0d84bff6	test-execve: minor simplification	2024-11-19 17:18:14 +01:00
Zbigniew Jędrzejewski-Szmek	14ded07623	various: handle the positive condition after strv_skip() first	2024-11-19 17:18:14 +01:00
Zbigniew Jędrzejewski-Szmek	7764746336	busctl: use RET_GATHER	2024-11-19 17:18:14 +01:00
Zbigniew Jędrzejewski-Szmek	17d702393b	busctl: use STRV_FOREACH in the usual fashion Also put positive branch first, do not use 'i' as a char** variable name.	2024-11-19 17:18:14 +01:00
Zbigniew Jędrzejewski-Szmek	a573879ac1	analyze: use STRV_FOREACH in consistent fashion Also put positive condition first.	2024-11-19 17:18:14 +01:00
Zbigniew Jędrzejewski-Szmek	e30467cea0	basic/strv: return NULL from strv_skip strv_skip was written to carefully return the original array, but this turns out to be an unnecessary complication. After the previous patch, no caller cares about the distinction between NULL and { NULL }, but various callers need to wrap the process the returned value with strv_isempty(), sometimes more than once. Let's always return NULL for an empty result to allow callers to be simplified.	2024-11-19 17:18:14 +01:00
Zbigniew Jędrzejewski-Szmek	5fb5bbfdea	homectl: do not rely on strv_skip() returning an empty list mangle_user_list() was doing a microoptimization of avoiding of copying of a single string by constructing the strv object manually. This seems like more trouble than it's worth, considering that this is called once in the program's life. Simplify that code and always return an array constructed with strv_copy() or strv_new().	2024-11-19 17:18:14 +01:00