sysdb: Don't pretty-print JSON in non-interactive mode.

[sysdb.git] / src / tools / sysdb / main.c

diff --git a/src/tools/sysdb/main.c b/src/tools/sysdb/main.c
index 228cd530b6098906ae5f709f84aabf91a0c49ee9..b45ef878873b1b0dc943dbe38efa0555d6d042d2 100644 (file)
--- a/src/tools/sysdb/main.c
+++ b/src/tools/sysdb/main.c
@@ -38,8 +38,10 @@
 #include "utils/llist.h"
 #include "utils/strbuf.h"
 #include "utils/os.h"
+#include "utils/ssl.h"
 
 #include <errno.h>
+#include <time.h>
 
 #if HAVE_LIBGEN_H
 #      include <libgen.h>
@@ -77,9 +79,6 @@
 #      endif
 #endif /* READLINEs */
 
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
 #ifndef DEFAULT_SOCKET
 #      define DEFAULT_SOCKET "unix:"LOCALSTATEDIR"/run/sysdbd.sock"
 #endif
@@ -132,6 +131,8 @@ exit_usage(char *name, int status)
 "               default: %s\n"
 "  -C CERTFILE  client certificate file name\n"
 "               default: %s\n"
+"  -A CAFILE    CA certificates file name\n"
+"               default: %s\n"
 "\n"
 "General options:\n"
 "\n"
@@ -140,7 +141,7 @@ exit_usage(char *name, int status)
 
 "\nSysDB client "SDB_CLIENT_VERSION_STRING SDB_CLIENT_VERSION_EXTRA", "
 PACKAGE_URL"\n", basename(name), user,
-                       ssl_options.key_file, ssl_options.cert_file);
+                       ssl_options.key_file, ssl_options.cert_file, ssl_options.ca_file);
 
        free(user);
        exit(status);
@@ -163,7 +164,7 @@ exit_version(void)
 } /* exit_version */
 
 static int
-execute_commands(sdb_client_t *client, sdb_llist_t *commands)
+execute_commands(sdb_input_t *input, sdb_llist_t *commands)
 {
        sdb_llist_iter_t *iter;
        int status = 0;
@@ -177,7 +178,7 @@ execute_commands(sdb_client_t *client, sdb_llist_t *commands)
        while (sdb_llist_iter_has_next(iter)) {
                sdb_object_t *obj = sdb_llist_iter_get_next(iter);
 
-               if (sdb_client_send(client, SDB_CONNECTION_QUERY,
+               if (sdb_client_send(input->client, SDB_CONNECTION_QUERY,
                                        (uint32_t)strlen(obj->name), obj->name) <= 0) {
                        sdb_log(SDB_LOG_ERR, "Failed to send command '%s' to server",
                                        obj->name);
@@ -189,7 +190,7 @@ execute_commands(sdb_client_t *client, sdb_llist_t *commands)
                 * but eventually see the reply to the query, which is either DATA or
                 * ERROR. */
                while (42) {
-                       status = sdb_command_print_reply(client);
+                       status = sdb_command_print_reply(input);
                        if (status < 0) {
                                sdb_log(SDB_LOG_ERR, "Failed to read reply from server");
                                break;
@@ -227,7 +228,7 @@ main(int argc, char **argv)
        sdb_llist_t *commands = NULL;
 
        while (42) {
-               int opt = getopt(argc, argv, "H:U:c:C:K:hV");
+               int opt = getopt(argc, argv, "H:U:c:C:K:A:hV");
 
                if (-1 == opt)
                        break;
@@ -270,6 +271,9 @@ main(int argc, char **argv)
                        case 'K':
                                ssl_options.key_file = optarg;
                                break;
+                       case 'A':
+                               ssl_options.ca_file = optarg;
+                               break;
 
                        case 'h':
                                exit_usage(argv[0], 0);
@@ -294,8 +298,8 @@ main(int argc, char **argv)
        if (! input.user)
                exit(1);
 
-       SSL_load_error_strings();
-       OpenSSL_add_ssl_algorithms();
+       if (sdb_ssl_init())
+               exit(1);
 
        input.client = sdb_client_create(host);
        if (! input.client) {
@@ -303,6 +307,9 @@ main(int argc, char **argv)
                sdb_input_reset(&input);
                exit(1);
        }
+       input.input = sdb_strbuf_create(2048);
+       sdb_input_init(&input);
+
        canonicalize_ssl_options();
        if (sdb_client_set_ssl_options(input.client, &ssl_options)) {
                sdb_log(SDB_LOG_ERR, "Failed to apply SSL options");
@@ -318,7 +325,9 @@ main(int argc, char **argv)
        }
 
        if (commands) {
-               int status = execute_commands(input.client, commands);
+               int status;
+               input.interactive = 0;
+               status = execute_commands(&input, commands);
                sdb_llist_destroy(commands);
                sdb_input_reset(&input);
                if ((status != SDB_CONNECTION_OK) && (status != SDB_CONNECTION_DATA))
@@ -327,8 +336,10 @@ main(int argc, char **argv)
        }
 
        sdb_log(SDB_LOG_INFO, "SysDB client "SDB_CLIENT_VERSION_STRING
-                       SDB_CLIENT_VERSION_EXTRA" (libsysdbclient %s%s)\n",
+                       SDB_CLIENT_VERSION_EXTRA" (libsysdbclient %s%s)",
                        sdb_client_version_string(), sdb_client_version_extra());
+       sdb_command_print_server_version(&input);
+       printf("\n");
 
        using_history();
 
@@ -347,14 +358,12 @@ main(int argc, char **argv)
                }
        }
 
-       input.input = sdb_strbuf_create(2048);
-       sdb_input_init(&input);
        sdb_input_mainloop();
 
        sdb_client_shutdown(input.client, SHUT_WR);
        while (! sdb_client_eof(input.client)) {
                /* wait for remaining data to arrive */
-               sdb_command_print_reply(input.client);
+               sdb_command_print_reply(&input);
        }
 
        if (hist_file[0] != '\0') {
@@ -367,8 +376,7 @@ main(int argc, char **argv)
        }
 
        sdb_input_reset(&input);
-
-       ERR_free_strings();
+       sdb_ssl_shutdown();
        return 0;
 } /* main */