From: Amitay Isaacs <amitay@gmail.com>
Date: Wed, 18 Apr 2018 01:53:57 +0000 (+1000)
Subject: ctdb-common: Add a function to validate logging specification
X-Git-Tag: ldb-1.4.0~265
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ef8dbc7fc6f45d09f3813e5c61a4751c1f82a9d;p=thirdparty%2Fsamba.git

ctdb-common: Add a function to validate logging specification

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/common/logging.c b/ctdb/common/logging.c
index 0a46b00eb11..3cc19331bab 100644
--- a/ctdb/common/logging.c
+++ b/ctdb/common/logging.c
@@ -25,6 +25,7 @@
 #include "system/time.h"
 #include "system/filesys.h"
 #include "system/syslog.h"
+#include "system/dir.h"
 
 #include "lib/util/time_basic.h"
 #include "lib/util/sys_rw.h"
@@ -154,6 +155,37 @@ static int file_log_state_destructor(struct file_log_state *state)
 	return 0;
 }
 
+static bool file_log_validate(const char *option)
+{
+	char *t, *dir;
+	struct stat st;
+	int ret;
+
+	if (option == NULL || strcmp(option, "-") == 0) {
+		return true;
+	}
+
+	t = strdup(option);
+	if (t == NULL) {
+		return false;
+	}
+
+	dir = dirname(t);
+
+	ret = stat(dir, &st);
+	if (ret != 0) {
+		free(t);
+		return false;
+	}
+
+	if (! S_ISDIR(st.st_mode)) {
+		free(t);
+		return false;
+	}
+
+	return true;
+}
+
 static int file_log_setup(TALLOC_CTX *mem_ctx, const char *option,
 			  const char *app_name)
 {
@@ -510,6 +542,23 @@ static int syslog_log_setup_udp(TALLOC_CTX *mem_ctx, const char *app_name,
 	return 0;
 }
 
+static bool syslog_log_validate(const char *option)
+{
+	if (option == NULL) {
+		return true;
+#ifdef _PATH_LOG
+	} else if (strcmp(option, "nonblocking") == 0) {
+		return true;
+#endif
+	} else if (strcmp(option, "udp") == 0) {
+		return true;
+	} else if (strcmp(option, "udp-rfc5424") == 0) {
+		return true;
+	}
+
+	return false;
+}
+
 static int syslog_log_setup(TALLOC_CTX *mem_ctx, const char *option,
 			    const char *app_name)
 {
@@ -530,6 +579,7 @@ static int syslog_log_setup(TALLOC_CTX *mem_ctx, const char *option,
 
 struct log_backend {
 	const char *name;
+	bool (*validate)(const char *option);
 	int (*setup)(TALLOC_CTX *mem_ctx,
 		     const char *option,
 		     const char *app_name);
@@ -538,10 +588,12 @@ struct log_backend {
 static struct log_backend log_backend[] = {
 	{
 		.name = "file",
+		.validate = file_log_validate,
 		.setup = file_log_setup,
 	},
 	{
 		.name = "syslog",
+		.validate = syslog_log_validate,
 		.setup = syslog_log_setup,
 	},
 };
@@ -593,6 +645,30 @@ static int log_backend_parse(TALLOC_CTX *mem_ctx,
 	return 0;
 }
 
+bool logging_validate(const char *logging)
+{
+	TALLOC_CTX *tmp_ctx;
+	struct log_backend *backend;
+	char *option;
+	int ret;
+	bool status;
+
+	tmp_ctx = talloc_new(NULL);
+	if (tmp_ctx == NULL) {
+		return false;
+	}
+
+	ret = log_backend_parse(tmp_ctx, logging, &backend, &option);
+	if (ret != 0) {
+		talloc_free(tmp_ctx);
+		return false;
+	}
+
+	status = backend->validate(option);
+	talloc_free(tmp_ctx);
+	return status;
+}
+
 /* Initialise logging */
 int logging_init(TALLOC_CTX *mem_ctx, const char *logging,
 		 const char *debug_level, const char *app_name)
diff --git a/ctdb/common/logging.h b/ctdb/common/logging.h
index 70d3207cacc..368171fe406 100644
--- a/ctdb/common/logging.h
+++ b/ctdb/common/logging.h
@@ -37,6 +37,7 @@ bool debug_level_parse(const char *log_string, int *log_level);
 const char *debug_level_to_string(int log_level);
 int debug_level_from_string(const char *log_string);
 
+bool logging_validate(const char *logging);
 int logging_init(TALLOC_CTX *mem_ctx, const char *logging,
 		 const char *debuglevel, const char *app_name);