From 89a8a6fcf07368c56a98ff8168db77b6814fbe7b Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Mon, 29 Oct 2018 14:39:05 +0100
Subject: [PATCH] Process OpenSSH configuration files by default.

This will allow to use the same configuration in client applications
including the users aliases or system wide cryptographic configuration.

As the configuration parsing is the last thing before doing the
actual connection, it might overwrite previously set options.
If this is not intended, the client application can
ask the configuration files to be parsed before setting some other
options that should not ve overwritten. The code ensures that
the configuration is not parsed again.

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
---
 include/libssh/session.h       |  3 +++
 src/client.c                   | 10 ++++++++++
 src/options.c                  |  2 ++
 tests/client/torture_connect.c |  1 +
 4 files changed, 16 insertions(+)

diff --git a/include/libssh/session.h b/include/libssh/session.h
index 8b963066..88be7ff3 100644
--- a/include/libssh/session.h
+++ b/include/libssh/session.h
@@ -20,6 +20,8 @@
 
 #ifndef SESSION_H_
 #define SESSION_H_
+#include <stdbool.h>
+
 #include "libssh/priv.h"
 #include "libssh/kex.h"
 #include "libssh/packet.h"
@@ -217,6 +219,7 @@ struct ssh_session_struct {
         int gss_delegate_creds;
         int flags;
         int nodelay;
+        bool config_processed;
     } opts;
     /* counters */
     ssh_counter socket_counter;
diff --git a/src/client.c b/src/client.c
index cfaacf8f..964251c0 100644
--- a/src/client.c
+++ b/src/client.c
@@ -526,6 +526,16 @@ int ssh_connect(ssh_session session) {
     return SSH_ERROR;
   }
 
+  /* If the system configuration files were not yet processed, do it now */
+  if (!session->opts.config_processed) {
+    ret = ssh_options_parse_config(session, NULL);
+    if (ret != 0) {
+      ssh_set_error(session, SSH_FATAL,
+                    "Failed to process system configuration files");
+      return SSH_ERROR;
+    }
+  }
+
   ret = ssh_options_apply(session);
   if (ret < 0) {
       ssh_set_error(session, SSH_FATAL, "Couldn't apply options");
diff --git a/src/options.c b/src/options.c
index 576af075..a7bd4538 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1335,6 +1335,8 @@ int ssh_options_parse_config(ssh_session session, const char *filename) {
       r = ssh_config_parse_file(session, "/etc/ssh/ssh_config");
   }
 
+  /* Do not process the default configuration as part of connection again */
+  session->opts.config_processed = true;
 out:
   free(expanded_filename);
   return r;
diff --git a/tests/client/torture_connect.c b/tests/client/torture_connect.c
index 23f14a96..71d0bf07 100644
--- a/tests/client/torture_connect.c
+++ b/tests/client/torture_connect.c
@@ -68,6 +68,7 @@ static int session_setup(void **state)
     assert_non_null(s->ssh.session);
 
     ssh_options_set(s->ssh.session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
+    ssh_options_set(s->ssh.session, SSH_OPTIONS_HOST, BLACKHOLE);
 
     return 0;
 }