diff --git a/CHANGELOG.md b/CHANGELOG.md index dd710a45..5ea8ad39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ Expected: June 2021 ### New features +* New utility: clixon_util_validate for stand-alone application that validates or commits datastores * Restconf native HTTP/2 support using nghttp2 * Enable using: `--with-restconf=native --enable-nghttp2` * FCGI/nginx not affected only for `--with-restconf=native` diff --git a/util/Makefile.in b/util/Makefile.in index 6528f195..dd437e58 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -87,6 +87,7 @@ APPSRC += clixon_util_path.c APPSRC += clixon_util_datastore.c APPSRC += clixon_util_regexp.c APPSRC += clixon_util_socket.c +APPSRC += clixon_util_validate.c APPSRC += clixon_netconf_ssh_callhome.c APPSRC += clixon_netconf_ssh_callhome_client.c ifdef with_restconf @@ -138,6 +139,9 @@ clixon_util_regexp: clixon_util_regexp.c $(LIBDEPS) clixon_util_socket: clixon_util_socket.c $(LIBDEPS) $(CC) $(INCLUDES) $(CPPFLAGS) @CFLAGS@ $(LDFLAGS) $^ $(LIBS) -o $@ +clixon_util_validate: clixon_util_validate.c $(LIBDEPS) + $(CC) $(INCLUDES) $(CPPFLAGS) @CFLAGS@ $(LDFLAGS) $^ $(LIBS) -l clixon_backend -o $@ + ifdef with_restconf clixon_util_stream: clixon_util_stream.c $(LIBDEPS) $(CC) $(INCLUDES) $(CPPFLAGS) @CFLAGS@ $(LDFLAGS) $^ $(LIBS) -lcurl -o $@ diff --git a/util/clixon_util_validate.c b/util/clixon_util_validate.c new file mode 100644 index 00000000..a64465fe --- /dev/null +++ b/util/clixon_util_validate.c @@ -0,0 +1,246 @@ +/* + * + ***** BEGIN LICENSE BLOCK ***** + + Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren + Copyright (C) 2017-2019 Olof Hagsand + Copyright (C) 2020-2021 Olof Hagsand and Rubicon Communications, LLC(Netgate) + + This file is part of CLIXON. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Alternatively, the contents of this file may be used under the terms of + the GNU General Public License Version 3 or later (the "GPL"), + in which case the provisions of the GPL are applicable instead + of those above. If you wish to allow use of your version of this file only + under the terms of the GPL, and not to allow others to + use your version of this file under the terms of Apache License version 2, + indicate your decision by deleting the provisions above and replace them with + the notice and other provisions required by the GPL. If you do not delete + the provisions above, a recipient may use your version of this file under + the terms of any one of the Apache License version 2 or the GPL. + + ***** END LICENSE BLOCK ***** + + * Utility to validate and/or commit as a single utility, to be used in eg shell scripts + * Does much of what backend_main.c does, only less so + * Example: + * 1) validate foo_db using a tmp dbdir + * ./clixon_util_validate -f /usr/local/etc/example.xml -d foo -o CLICON_XMLDB_DIR=/tmp + */ + +#ifdef HAVE_CONFIG_H +#include "clixon_config.h" /* generated by config & autoconf */ +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* cligen */ +#include + +/* clixon */ +#include "clixon/clixon.h" + +/* For validate and commit commands. */ +#include "clixon/clixon_backend.h" + +/* Command line options passed to getopt(3) */ +#define UTIL_COMMIT_OPTS "hD:f:cd:o:" + +static int +usage(char *argv0) +{ + fprintf(stderr, "Tool to validate a database\nusage:%s [options]\n" + "where options are\n" + "\t-h \t\tHelp\n" + "\t-D \tDebug\n" + "\t-f \tClixon config file\n" + "\t-d \tDatabase name (if not candidate, must be in XMLDBDIR)\n" + "\t-c \t\tValidate + commit, otherwise only validate\n" + "\t-o \"