busctl: add new --augment-creds= switch for controlling whether shown credential...

diff --git a/man/busctl.xml b/man/busctl.xml
index 872f3f496b31396889c0ea0f5de3fe6887e6bfb6..a4c4227d5e2fea99a6e3d85f2ab620641bde3123 100644 (file)
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -232,6 +232,20 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         </listitem>
       </varlistentry>
 
         </listitem>
       </varlistentry>
 

+      <varlistentry>
+        <term><option>--augment-creds=</option><replaceable>BOOL</replaceable></term>
+
+        <listitem>
+          <para>Controls whether credential data reported by
+          <command>list</command> or <command>status</command> shall
+          be augmented with data from
+          <filename>/proc</filename>. When this is turned on the data
+          shown is possibly inconsistent, as the data read from
+          <filename>/proc</filename> might be more recent than rest of
+          the credential information. Defaults to <literal>yes</literal>.</para>
+        </listitem>
+      </varlistentry>
+

       <xi:include href="user-system-options.xml" xpointer="user" />
       <xi:include href="user-system-options.xml" xpointer="system" />
       <xi:include href="user-system-options.xml" xpointer="host" />
       <xi:include href="user-system-options.xml" xpointer="user" />
       <xi:include href="user-system-options.xml" xpointer="system" />
       <xi:include href="user-system-options.xml" xpointer="host" />

diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c
index b2c7be20ae58fd2b3a6c2d05e7ad3e55967afefe..0795472c8be02c6ccd303fb9a3ea3162befaf806 100644 (file)
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/libsystemd/sd-bus/busctl.c
@@ -56,6 +56,7 @@ static bool arg_verbose = false;
 static bool arg_expect_reply = true;
 static bool arg_auto_start = true;
 static bool arg_allow_interactive_authorization = true;
 static bool arg_expect_reply = true;
 static bool arg_auto_start = true;
 static bool arg_allow_interactive_authorization = true;

+static bool arg_augment_creds = true;

 static usec_t arg_timeout = 0;
 
 static void pager_open_if_enabled(void) {
 static usec_t arg_timeout = 0;
 
 static void pager_open_if_enabled(void) {


@@ -161,10 +162,12 @@ static int list_bus_names(sd_bus *bus, char **argv) {
 
                 printf("%-*s", (int) max_i, *i);
 
 
                 printf("%-*s", (int) max_i, *i);
 

-                r = sd_bus_get_name_creds(bus, *i,
-                                     SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM|
-                                     SD_BUS_CREDS_UNIQUE_NAME|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_SESSION|
-                                     SD_BUS_CREDS_DESCRIPTION, &creds);
+                r = sd_bus_get_name_creds(
+                                bus, *i,
+                                (arg_augment_creds ? SD_BUS_CREDS_AUGMENT : 0) |
+                                SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM|
+                                SD_BUS_CREDS_UNIQUE_NAME|SD_BUS_CREDS_UNIT|SD_BUS_CREDS_SESSION|
+                                SD_BUS_CREDS_DESCRIPTION, &creds);

                 if (r >= 0) {
                         const char *unique, *session, *unit, *cn;
                         pid_t pid;
                 if (r >= 0) {
                         const char *unique, *session, *unit, *cn;
                         pid_t pid;


@@ -1179,7 +1182,11 @@ static int status(sd_bus *bus, char *argv[]) {
 
         r = parse_pid(argv[1], &pid);
         if (r < 0)
 
         r = parse_pid(argv[1], &pid);
         if (r < 0)

-                r = sd_bus_get_name_creds(bus, argv[1], _SD_BUS_CREDS_ALL, &creds);
+                r = sd_bus_get_name_creds(
+                                bus,
+                                argv[1],
+                                (arg_augment_creds ? SD_BUS_CREDS_AUGMENT : 0) | _SD_BUS_CREDS_ALL,
+                                &creds);

         else
                 r = sd_bus_creds_new_from_pid(&creds, pid, _SD_BUS_CREDS_ALL);
 
         else
                 r = sd_bus_creds_new_from_pid(&creds, pid, _SD_BUS_CREDS_ALL);
 


@@ -1664,7 +1671,8 @@ static int help(void) {
                "     --auto-start=BOOL    Auto-start destination service\n"
                "     --allow-interactive-authorization=BOOL\n"
                "                          Allow interactive authorization for operation\n"
                "     --auto-start=BOOL    Auto-start destination service\n"
                "     --allow-interactive-authorization=BOOL\n"
                "                          Allow interactive authorization for operation\n"

-               "     --timeout=SECS       Maximum time to wait for method call completion\n\n"
+               "     --timeout=SECS       Maximum time to wait for method call completion\n"
+               "     --augment-creds=BOOL Extend credential data with data read from /proc/$PID\n\n"

                "Commands:\n"
                "  list                    List bus names\n"
                "  status SERVICE          Show service name status\n"
                "Commands:\n"
                "  list                    List bus names\n"
                "  status SERVICE          Show service name status\n"


@@ -1705,6 +1713,7 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_AUTO_START,
                 ARG_ALLOW_INTERACTIVE_AUTHORIZATION,
                 ARG_TIMEOUT,
                 ARG_AUTO_START,
                 ARG_ALLOW_INTERACTIVE_AUTHORIZATION,
                 ARG_TIMEOUT,

+                ARG_AUGMENT_CREDS,

         };
 
         static const struct option options[] = {
         };
 
         static const struct option options[] = {


@@ -1730,6 +1739,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "auto-start",   required_argument, NULL, ARG_AUTO_START   },
                 { "allow-interactive-authorization", required_argument, NULL, ARG_ALLOW_INTERACTIVE_AUTHORIZATION },
                 { "timeout",      required_argument, NULL, ARG_TIMEOUT      },
                 { "auto-start",   required_argument, NULL, ARG_AUTO_START   },
                 { "allow-interactive-authorization", required_argument, NULL, ARG_ALLOW_INTERACTIVE_AUTHORIZATION },
                 { "timeout",      required_argument, NULL, ARG_TIMEOUT      },

+                { "augment-creds",required_argument, NULL, ARG_AUGMENT_CREDS},

                 {},
         };
 
                 {},
         };
 


@@ -1872,6 +1882,16 @@ static int parse_argv(int argc, char *argv[]) {
 
                         break;
 
 
                         break;
 

+                case ARG_AUGMENT_CREDS:
+                        r = parse_boolean(optarg);
+                        if (r < 0) {
+                                log_error("Failed to parse --augment-creds= parameter.");
+                                return r;
+                        }
+
+                        arg_augment_creds = !!r;
+                        break;
+

                 case '?':
                         return -EINVAL;
 
                 case '?':
                         return -EINVAL;