Merge branch 'native-http'
This commit is contained in:
Olof hagsand
commit
e21e1afdc4
42 changed files with 1944 additions and 660 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -35,6 +35,7 @@ apps/cli/test.c
|
||||||
apps/dbctrl/clixon_dbctrl
|
apps/dbctrl/clixon_dbctrl
|
||||||
apps/netconf/clixon_netconf
|
apps/netconf/clixon_netconf
|
||||||
apps/restconf/clixon_restconf
|
apps/restconf/clixon_restconf
|
||||||
|
apps/restconf/clixon_restconf_libhttp
|
||||||
apps/xmldb/clixon_xmldb
|
apps/xmldb/clixon_xmldb
|
||||||
|
|
||||||
etc/clixonrc
|
etc/clixonrc
|
||||||
|
|
|
||||||
11
CHANGELOG.md
11
CHANGELOG.md
|
|
@ -25,6 +25,17 @@
|
||||||
## 4.6.0
|
## 4.6.0
|
||||||
Expected: July 2020
|
Expected: July 2020
|
||||||
|
|
||||||
|
### C-API changes on existing features (For developers)
|
||||||
|
|
||||||
|
* Due to name collision with libevent, all clixon event functions prepended with `clixon_`. You need to rename your event functions as follows:
|
||||||
|
* event_reg_fd() -> clixon_event_reg_fd()
|
||||||
|
* event_unreg_fd() -> clixon_event_unreg_fd()
|
||||||
|
* event_reg_timeout() -> clixon_event_reg_timeout()
|
||||||
|
* event_unreg_timeout() -> clixon_event_unreg_timeout()
|
||||||
|
* event_poll() -> clixon_event_poll()
|
||||||
|
* event_loop() -> clixon_event_loop()
|
||||||
|
* event_exit() -> clixon_event_exit()
|
||||||
|
|
||||||
### Minor changes
|
### Minor changes
|
||||||
|
|
||||||
* Added new function `clicon_xml2str()` to complement xml_print and others that returns a malloced string.
|
* Added new function `clicon_xml2str()` to complement xml_print and others that returns a malloced string.
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ SUBDIRS += cli
|
||||||
SUBDIRS += netconf
|
SUBDIRS += netconf
|
||||||
|
|
||||||
# See configure.ac
|
# See configure.ac
|
||||||
ifeq ($(with_restconf),yes)
|
ifdef with_restconf
|
||||||
SUBDIRS += restconf
|
SUBDIRS += restconf
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,7 @@ backend_client_rm(clicon_handle h,
|
||||||
for (c = *ce_prev; c; c = c->ce_next){
|
for (c = *ce_prev; c; c = c->ce_next){
|
||||||
if (c == ce){
|
if (c == ce){
|
||||||
if (ce->ce_s){
|
if (ce->ce_s){
|
||||||
event_unreg_fd(ce->ce_s, from_client);
|
clixon_event_unreg_fd(ce->ce_s, from_client);
|
||||||
close(ce->ce_s);
|
close(ce->ce_s);
|
||||||
ce->ce_s = 0;
|
ce->ce_s = 0;
|
||||||
}
|
}
|
||||||
|
|
@ -1510,8 +1510,10 @@ verify_nacm_user(enum nacm_credentials_t mode,
|
||||||
if (mode == NC_EXCEPT){
|
if (mode == NC_EXCEPT){
|
||||||
if (strcmp(peername, "root") == 0)
|
if (strcmp(peername, "root") == 0)
|
||||||
goto ok;
|
goto ok;
|
||||||
|
#ifdef WITH_RESTCONF
|
||||||
if (strcmp(peername, WWWUSER) == 0)
|
if (strcmp(peername, WWWUSER) == 0)
|
||||||
goto ok;
|
goto ok;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
if (strcmp(peername, nacmname) != 0){
|
if (strcmp(peername, nacmname) != 0){
|
||||||
if ((cbmsg = cbuf_new()) == NULL){
|
if ((cbmsg = cbuf_new()) == NULL){
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,7 @@ backend_terminate(clicon_handle h)
|
||||||
if (sockfamily==AF_UNIX && lstat(sockpath, &st) == 0)
|
if (sockfamily==AF_UNIX && lstat(sockpath, &st) == 0)
|
||||||
unlink(sockpath);
|
unlink(sockpath);
|
||||||
backend_handle_exit(h); /* Also deletes streams. Cannot use h after this. */
|
backend_handle_exit(h); /* Also deletes streams. Cannot use h after this. */
|
||||||
event_exit();
|
clixon_event_exit();
|
||||||
clicon_debug(1, "%s done", __FUNCTION__);
|
clicon_debug(1, "%s done", __FUNCTION__);
|
||||||
clicon_log_exit();
|
clicon_log_exit();
|
||||||
return 0;
|
return 0;
|
||||||
|
|
@ -150,7 +150,7 @@ backend_sig_term(int arg)
|
||||||
if (i++ == 0)
|
if (i++ == 0)
|
||||||
clicon_log(LOG_NOTICE, "%s: %s: pid: %u Signal %d",
|
clicon_log(LOG_NOTICE, "%s: %s: pid: %u Signal %d",
|
||||||
__PROGRAM__, __FUNCTION__, getpid(), arg);
|
__PROGRAM__, __FUNCTION__, getpid(), arg);
|
||||||
clicon_exit_set(); /* checked in event_loop() */
|
clicon_exit_set(); /* checked in clixon_event_loop() */
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Create backend server socket and register callback
|
/*! Create backend server socket and register callback
|
||||||
|
|
@ -168,7 +168,7 @@ backend_server_socket(clicon_handle h)
|
||||||
return -1;
|
return -1;
|
||||||
/* ss is a server socket that the clients connect to. The callback
|
/* ss is a server socket that the clients connect to. The callback
|
||||||
therefore accepts clients on ss */
|
therefore accepts clients on ss */
|
||||||
if (event_reg_fd(ss, backend_accept_client, h, "server socket") < 0) {
|
if (clixon_event_reg_fd(ss, backend_accept_client, h, "server socket") < 0) {
|
||||||
close(ss);
|
close(ss);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
@ -923,7 +923,7 @@ main(int argc,
|
||||||
|
|
||||||
if (stream_timer_setup(0, h) < 0)
|
if (stream_timer_setup(0, h) < 0)
|
||||||
goto done;
|
goto done;
|
||||||
if (event_loop() < 0)
|
if (clixon_event_loop() < 0)
|
||||||
goto done;
|
goto done;
|
||||||
ok:
|
ok:
|
||||||
retval = 0;
|
retval = 0;
|
||||||
|
|
|
||||||
|
|
@ -289,7 +289,7 @@ backend_accept_client(int fd,
|
||||||
/*
|
/*
|
||||||
* Here we register callbacks for actual data socket
|
* Here we register callbacks for actual data socket
|
||||||
*/
|
*/
|
||||||
if (event_reg_fd(s, from_client, (void*)ce, "local netconf client socket") < 0)
|
if (clixon_event_reg_fd(s, from_client, (void*)ce, "local netconf client socket") < 0)
|
||||||
goto done;
|
goto done;
|
||||||
retval = 0;
|
retval = 0;
|
||||||
done:
|
done:
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ CLIXON_LIB = libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR)
|
||||||
# even though it may exist in $(libdir). But the new version may not have been installed yet.
|
# even though it may exist in $(libdir). But the new version may not have been installed yet.
|
||||||
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
||||||
|
|
||||||
LIBS = -L$(top_srcdir)/lib/src @LIBS@ $(top_srcdir)/lib/src/$(CLIXON_LIB) -lpthread
|
LIBS = -L$(top_srcdir)/lib/src @LIBS@ $(top_srcdir)/lib/src/$(CLIXON_LIB) #-lpthread
|
||||||
|
|
||||||
CPPFLAGS = @CPPFLAGS@ -fPIC
|
CPPFLAGS = @CPPFLAGS@ -fPIC
|
||||||
INCLUDES = -I. -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
|
INCLUDES = -I. -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
|
||||||
|
|
|
||||||
|
|
@ -987,7 +987,7 @@ cli_notification_cb(int s,
|
||||||
clicon_err(OE_PROTO, ESHUTDOWN, "Socket unexpected close");
|
clicon_err(OE_PROTO, ESHUTDOWN, "Socket unexpected close");
|
||||||
close(s);
|
close(s);
|
||||||
errno = ESHUTDOWN;
|
errno = ESHUTDOWN;
|
||||||
event_unreg_fd(s, cli_notification_cb);
|
clixon_event_unreg_fd(s, cli_notification_cb);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
/* XXX pass yang_spec and use xerr*/
|
/* XXX pass yang_spec and use xerr*/
|
||||||
|
|
|
||||||
|
|
@ -272,7 +272,8 @@ usage(clicon_handle h,
|
||||||
/*
|
/*
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
main(int argc, char **argv)
|
main(int argc,
|
||||||
|
char **argv)
|
||||||
{
|
{
|
||||||
int retval = -1;
|
int retval = -1;
|
||||||
int c;
|
int c;
|
||||||
|
|
|
||||||
|
|
@ -274,7 +274,7 @@ netconf_input_cb(int s,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* poll==1 if more, poll==0 if none */
|
/* poll==1 if more, poll==0 if none */
|
||||||
if ((poll = event_poll(s)) < 0)
|
if ((poll = clixon_event_poll(s)) < 0)
|
||||||
goto done;
|
goto done;
|
||||||
if (poll == 0)
|
if (poll == 0)
|
||||||
break; /* No data to read */
|
break; /* No data to read */
|
||||||
|
|
@ -338,7 +338,7 @@ netconf_terminate(clicon_handle h)
|
||||||
if ((x = clicon_conf_xml(h)) != NULL)
|
if ((x = clicon_conf_xml(h)) != NULL)
|
||||||
xml_free(x);
|
xml_free(x);
|
||||||
xpath_optimize_exit();
|
xpath_optimize_exit();
|
||||||
event_exit();
|
clixon_event_exit();
|
||||||
clicon_handle_exit(h);
|
clicon_handle_exit(h);
|
||||||
clicon_log_exit();
|
clicon_log_exit();
|
||||||
return 0;
|
return 0;
|
||||||
|
|
@ -590,7 +590,7 @@ main(int argc,
|
||||||
/* Send hello to northbound client */
|
/* Send hello to northbound client */
|
||||||
if (!quiet)
|
if (!quiet)
|
||||||
send_hello(h, 1, id);
|
send_hello(h, 1, id);
|
||||||
if (event_reg_fd(0, netconf_input_cb, h, "netconf socket") < 0)
|
if (clixon_event_reg_fd(0, netconf_input_cb, h, "netconf socket") < 0)
|
||||||
goto done;
|
goto done;
|
||||||
if (debug)
|
if (debug)
|
||||||
clicon_option_dump(h, debug);
|
clicon_option_dump(h, debug);
|
||||||
|
|
@ -598,10 +598,10 @@ main(int argc,
|
||||||
struct timeval t;
|
struct timeval t;
|
||||||
gettimeofday(&t, NULL);
|
gettimeofday(&t, NULL);
|
||||||
timeradd(&t, &tv, &t);
|
timeradd(&t, &tv, &t);
|
||||||
if (event_reg_timeout(t, timeout_fn, NULL, "timeout") < 0)
|
if (clixon_event_reg_timeout(t, timeout_fn, NULL, "timeout") < 0)
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
if (event_loop() < 0)
|
if (clixon_event_loop() < 0)
|
||||||
goto done;
|
goto done;
|
||||||
retval = 0;
|
retval = 0;
|
||||||
done:
|
done:
|
||||||
|
|
|
||||||
|
|
@ -437,7 +437,7 @@ netconf_notification_cb(int s,
|
||||||
clicon_err(OE_PROTO, ESHUTDOWN, "Socket unexpected close");
|
clicon_err(OE_PROTO, ESHUTDOWN, "Socket unexpected close");
|
||||||
close(s);
|
close(s);
|
||||||
errno = ESHUTDOWN;
|
errno = ESHUTDOWN;
|
||||||
event_unreg_fd(s, netconf_notification_cb);
|
clixon_event_unreg_fd(s, netconf_notification_cb);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
yspec = clicon_dbspec_yang(h);
|
yspec = clicon_dbspec_yang(h);
|
||||||
|
|
@ -520,7 +520,7 @@ netconf_create_subscription(clicon_handle h,
|
||||||
goto done;
|
goto done;
|
||||||
if (xpath_first(*xret, NULL, "rpc-reply/rpc-error") != NULL)
|
if (xpath_first(*xret, NULL, "rpc-reply/rpc-error") != NULL)
|
||||||
goto ok;
|
goto ok;
|
||||||
if (event_reg_fd(s,
|
if (clixon_event_reg_fd(s,
|
||||||
netconf_notification_cb,
|
netconf_notification_cb,
|
||||||
h,
|
h,
|
||||||
"notification socket") < 0)
|
"notification socket") < 0)
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,9 @@
|
||||||
#
|
#
|
||||||
# ***** END LICENSE BLOCK *****
|
# ***** END LICENSE BLOCK *****
|
||||||
#
|
#
|
||||||
|
# This makefile supports several restconf web packages in compile-time depending
|
||||||
|
# on the value of the with_restconf configure option
|
||||||
|
#
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
|
|
@ -55,6 +58,8 @@ HOST_VENDOR = @host_vendor@
|
||||||
# XXX why is not wwwdir under prefix?
|
# XXX why is not wwwdir under prefix?
|
||||||
wwwdir = @wwwdir@
|
wwwdir = @wwwdir@
|
||||||
wwwuser = @wwwuser@
|
wwwuser = @wwwuser@
|
||||||
|
# one of fcgi or evhtp:
|
||||||
|
with_restconf = @with_restconf@
|
||||||
|
|
||||||
SH_SUFFIX = @SH_SUFFIX@
|
SH_SUFFIX = @SH_SUFFIX@
|
||||||
CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@
|
CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@
|
||||||
|
|
@ -67,27 +72,45 @@ CLIXON_LIB = libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR)
|
||||||
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
LIBDEPS = $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
||||||
|
|
||||||
LIBS = -L$(top_srcdir)/lib/src @LIBS@ $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
LIBS = -L$(top_srcdir)/lib/src @LIBS@ $(top_srcdir)/lib/src/$(CLIXON_LIB)
|
||||||
|
#LIBS += -lpthread -levent -levent_openssl -lssl -lcrypto
|
||||||
|
|
||||||
CPPFLAGS = @CPPFLAGS@ -fPIC
|
CPPFLAGS = @CPPFLAGS@ -fPIC
|
||||||
|
|
||||||
INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
|
INCLUDES = -I. -I$(top_srcdir)/lib/src -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) @INCLUDES@
|
||||||
|
|
||||||
# Name of application
|
# Applications
|
||||||
APPL = clixon_restconf
|
ifeq ($(with_restconf),fcgi)
|
||||||
|
APPL = clixon_restconf # fcgi / nginx
|
||||||
|
else
|
||||||
|
APPL = clixon_restconf_$(with_restconf)
|
||||||
|
endif
|
||||||
|
|
||||||
# Not accessible from plugin
|
# Common source - not accessible from plugin - independent of restconf package (fcgi|evhtp)
|
||||||
APPSRC = restconf_main.c
|
#APPSRC = restconf_lib.c
|
||||||
APPSRC += restconf_methods.c
|
|
||||||
|
# Fcgi-specific source including main
|
||||||
|
ifeq ($(with_restconf),fcgi)
|
||||||
|
APPSRC = restconf_fcgi_lib.c
|
||||||
|
APPSRC += restconf_fcgi_main.c
|
||||||
|
APPSRC += restconf_methods.c # These should be moved ^
|
||||||
APPSRC += restconf_methods_post.c
|
APPSRC += restconf_methods_post.c
|
||||||
APPSRC += restconf_methods_get.c
|
APPSRC += restconf_methods_get.c
|
||||||
APPSRC += restconf_stream.c
|
APPSRC += restconf_stream.c
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Evhtp-specific source including main
|
||||||
|
ifeq ($(with_restconf),evhtp)
|
||||||
|
APPSRC = restconf_evhtp_main.c
|
||||||
|
endif
|
||||||
|
|
||||||
APPOBJ = $(APPSRC:.c=.o)
|
APPOBJ = $(APPSRC:.c=.o)
|
||||||
|
|
||||||
# Accessible from plugin
|
# Accessible from plugin
|
||||||
LIBSRC = restconf_lib.c
|
LIBSRC = restconf_lib.c
|
||||||
LIBOBJ = $(LIBSRC:.c=.o)
|
LIBOBJ = $(LIBSRC:.c=.o)
|
||||||
|
|
||||||
# Name of lib
|
# This lib is very small but used for clixon restconf applications to access clixon restconf lib
|
||||||
|
# functions. Mostly for future use
|
||||||
MYNAME = clixon_restconf
|
MYNAME = clixon_restconf
|
||||||
MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX)
|
MYLIBLINK = lib$(MYNAME)$(SH_SUFFIX)
|
||||||
MYLIB = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
|
MYLIB = $(MYLIBLINK).$(CLIXON_MAJOR).$(CLIXON_MINOR)
|
||||||
|
|
@ -100,7 +123,7 @@ $(top_srcdir)/lib/src/$(CLIXON_LIB):
|
||||||
(cd $(top_srcdir)/lib/src && $(MAKE) $(MFLAGS) $(CLIXON_LIB))
|
(cd $(top_srcdir)/lib/src && $(MAKE) $(MFLAGS) $(CLIXON_LIB))
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(LIBOBJ) *.core $(APPL) $(APPOBJ) $(MYLIB) $(MYLIBSO) $(MYLIBLINK)
|
rm -f $(LIBOBJ) *.core $(APPL) $(APPOBJ) *.o $(MYLIB) $(MYLIBSO) $(MYLIBLINK) # extra .o to clean residue if with_restconf changes
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
rm -f Makefile *~ .depend
|
rm -f Makefile *~ .depend
|
||||||
|
|
@ -136,7 +159,7 @@ uninstall:
|
||||||
.SUFFIXES: .c .o
|
.SUFFIXES: .c .o
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
$(CC) $(INCLUDES) -D__PROGRAM__=\"$(APPL)\" $(CPPFLAGS) $(CFLAGS) -c $<
|
$(CC) $(INCLUDES) -D__PROGRAM__=\"clixon_restconf\" $(CPPFLAGS) $(CFLAGS) -c $<
|
||||||
|
|
||||||
$(APPL) : $(APPOBJ) $(MYLIBLINK) $(LIBDEPS)
|
$(APPL) : $(APPOBJ) $(MYLIBLINK) $(LIBDEPS)
|
||||||
$(CC) $(LDFLAGS) $(APPOBJ) -L. $(MYLIB) $(LIBS) -o $@
|
$(CC) $(LDFLAGS) $(APPOBJ) -L. $(MYLIB) $(LIBS) -o $@
|
||||||
|
|
@ -155,7 +178,7 @@ TAGS:
|
||||||
find . -name '*.[chyl]' -print | etags -
|
find . -name '*.[chyl]' -print | etags -
|
||||||
|
|
||||||
depend:
|
depend:
|
||||||
$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(LIBSRC) $(APPSRC) > .depend
|
$(CC) $(DEPENDFLAGS) @DEFS@ $(INCLUDES) $(CFLAGS) -MM $(APPFCGI) $(APPSRC) > .depend
|
||||||
|
|
||||||
#include .depend
|
#include .depend
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,19 +54,13 @@ typedef enum restconf_media restconf_media;
|
||||||
*/
|
*/
|
||||||
int restconf_err2code(char *tag);
|
int restconf_err2code(char *tag);
|
||||||
const char *restconf_code2reason(int code);
|
const char *restconf_code2reason(int code);
|
||||||
|
const restconf_media restconf_media_str2int(char *media);
|
||||||
int badrequest(FCGX_Request *r);
|
const char *restconf_media_int2str(restconf_media media);
|
||||||
int unauthorized(FCGX_Request *r);
|
int get_user_cookie(char *cookiestr, char *attribute, char **val);
|
||||||
int forbidden(FCGX_Request *r);
|
int restconf_terminate(clicon_handle h);
|
||||||
int notfound(FCGX_Request *r);
|
int restconf_insert_attributes(cxobj *xdata, cvec *qvec);
|
||||||
int conflict(FCGX_Request *r);
|
int restconf_main_extension_cb(clicon_handle h, yang_stmt *yext, yang_stmt *ys);
|
||||||
int internal_server_error(FCGX_Request *r);
|
char *clixon_restconf_param_get(clicon_handle h, char *param);
|
||||||
int notimplemented(FCGX_Request *r);
|
int clixon_restconf_param_set(clicon_handle h, char *param, char *val);
|
||||||
int restconf_test(FCGX_Request *r, int dbg);
|
|
||||||
cbuf *readdata(FCGX_Request *r);
|
|
||||||
int get_user_cookie(char *cookiestr, char *attribute, char **val);
|
|
||||||
int api_return_err(clicon_handle h, FCGX_Request *r, cxobj *xerr,
|
|
||||||
int pretty, restconf_media media, int code);
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* _CLIXON_RESTCONF_H_ */
|
#endif /* _CLIXON_RESTCONF_H_ */
|
||||||
|
|
|
||||||
555
apps/restconf/restconf_evhtp_main.c
Normal file
555
apps/restconf/restconf_evhtp_main.c
Normal file
|
|
@ -0,0 +1,555 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
|
Copyright (C) 2009-2019 Olof Hagsand
|
||||||
|
Copyright (C) 2020 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 *****
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* XXX temp constant should go away, */
|
||||||
|
#undef _EVHTP_NYI
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include "clixon_config.h" /* generated by config & autoconf */
|
||||||
|
#endif
|
||||||
|
/* compilation withotu threading support
|
||||||
|
* XXX: could be disabled already in configure?
|
||||||
|
*/
|
||||||
|
#define EVHTP_DISABLE_EVTHR
|
||||||
|
#define EVHTP_DISABLE_REGEX
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <syslog.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <assert.h>
|
||||||
|
#include <sys/stat.h> /* chmod */
|
||||||
|
|
||||||
|
/* evhtp */
|
||||||
|
#include <evhtp/evhtp.h>
|
||||||
|
#include <evhtp/sslutils.h>
|
||||||
|
|
||||||
|
/* cligen */
|
||||||
|
#include <cligen/cligen.h>
|
||||||
|
|
||||||
|
/* clicon */
|
||||||
|
#include <clixon/clixon.h>
|
||||||
|
|
||||||
|
/* restconf */
|
||||||
|
|
||||||
|
#include "restconf_lib.h"
|
||||||
|
#if 0 /* These are all dependent on FCGX */
|
||||||
|
#include "restconf_methods.h"
|
||||||
|
#include "restconf_methods_get.h"
|
||||||
|
#include "restconf_methods_post.h"
|
||||||
|
#include "restconf_stream.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Command line options to be passed to getopt(3) */
|
||||||
|
#define RESTCONF_OPTS "hD:f:l:p:d:y:a:u:o:P:c:k:"
|
||||||
|
|
||||||
|
/* Need global variable to for signal handler XXX */
|
||||||
|
static clicon_handle _CLICON_HANDLE = NULL;
|
||||||
|
|
||||||
|
/*! Signall terminates process
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
restconf_sig_term(int arg)
|
||||||
|
{
|
||||||
|
static int i=0;
|
||||||
|
|
||||||
|
if (i++ == 0)
|
||||||
|
clicon_log(LOG_NOTICE, "%s: %s: pid: %u Signal %d",
|
||||||
|
__PROGRAM__, __FUNCTION__, getpid(), arg);
|
||||||
|
else
|
||||||
|
exit(-1);
|
||||||
|
if (_CLICON_HANDLE){
|
||||||
|
#ifdef _EVHTP_NYI
|
||||||
|
stream_child_freeall(_CLICON_HANDLE);
|
||||||
|
#endif
|
||||||
|
restconf_terminate(_CLICON_HANDLE);
|
||||||
|
}
|
||||||
|
clicon_exit_set(); /* checked in clixon_event_loop() */
|
||||||
|
exit(-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
restconf_sig_child(int arg)
|
||||||
|
{
|
||||||
|
int status;
|
||||||
|
int pid;
|
||||||
|
|
||||||
|
if ((pid = waitpid(-1, &status, 0)) != -1 && WIFEXITED(status)){
|
||||||
|
#ifdef _EVHTP_NYI
|
||||||
|
;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
cx_gencb(evhtp_request_t *req,
|
||||||
|
void *arg)
|
||||||
|
{
|
||||||
|
evhtp_connection_t *conn;
|
||||||
|
// clicon_handle h = arg;
|
||||||
|
|
||||||
|
fprintf(stderr, "%s\n", __FUNCTION__);
|
||||||
|
if (req == NULL){
|
||||||
|
errno = EINVAL;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if ((conn = evhtp_request_get_connection(req)) == NULL)
|
||||||
|
goto done;
|
||||||
|
htp_sslutil_add_xheaders(
|
||||||
|
req->headers_out,
|
||||||
|
conn->ssl,
|
||||||
|
HTP_SSLUTILS_XHDR_ALL);
|
||||||
|
evhtp_send_reply(req, EVHTP_RES_NOTFOUND);
|
||||||
|
done:
|
||||||
|
return; /* void */
|
||||||
|
}
|
||||||
|
|
||||||
|
static evhtp_res
|
||||||
|
cx_pre_accept(evhtp_connection_t *conn,
|
||||||
|
void *arg)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "%s\n", __FUNCTION__);
|
||||||
|
return EVHTP_RES_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
static evhtp_res
|
||||||
|
cx_post_accept(evhtp_connection_t *conn,
|
||||||
|
void *arg)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "%s\n", __FUNCTION__);
|
||||||
|
return EVHTP_RES_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
print_header_(evhtp_header_t * header, void * arg) {
|
||||||
|
fprintf(stderr, "%s: %s\n", header->key, header->val);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Generic callback called if no other callbacks are matched
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
cx_path_restconf(evhtp_request_t *req,
|
||||||
|
void *arg)
|
||||||
|
{
|
||||||
|
evhtp_connection_t *conn;
|
||||||
|
// clicon_handle h = arg;
|
||||||
|
struct evbuffer *b = NULL;
|
||||||
|
htp_method meth;
|
||||||
|
|
||||||
|
fprintf(stderr, "%s\n", __FUNCTION__);
|
||||||
|
if (req == NULL){
|
||||||
|
errno = EINVAL;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
if ((conn = evhtp_request_get_connection(req)) == NULL)
|
||||||
|
goto done;
|
||||||
|
meth = evhtp_request_get_method(req);
|
||||||
|
fprintf(stderr, "%s method:%d\n", __FUNCTION__, meth);
|
||||||
|
evhtp_headers_for_each(req->headers_in, print_header_, NULL);
|
||||||
|
|
||||||
|
if ((b = evbuffer_new()) == NULL){
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
htp_sslutil_add_xheaders(
|
||||||
|
req->headers_out,
|
||||||
|
conn->ssl,
|
||||||
|
HTP_SSLUTILS_XHDR_ALL);
|
||||||
|
evhtp_send_reply_start(req, EVHTP_RES_OK);
|
||||||
|
evbuffer_add(b, "hej\n", strlen("hej\n\n"));
|
||||||
|
evhtp_send_reply_body(req, b);
|
||||||
|
evhtp_send_reply_end(req);
|
||||||
|
|
||||||
|
// evhtp_headers_add_header(request->headers_out, evhtp_header_new("Host", "localhost", 0, 0)); evhtp_headers_add_headers(request->headers_out, headers);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
done:
|
||||||
|
return; /* void */
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Usage help routine
|
||||||
|
* @param[in] argv0 command line
|
||||||
|
* @param[in] h Clicon handle
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
usage(clicon_handle h,
|
||||||
|
char *argv0)
|
||||||
|
|
||||||
|
{
|
||||||
|
fprintf(stderr, "usage:%s [options]\n"
|
||||||
|
"where options are\n"
|
||||||
|
"\t-h \t\t Help\n"
|
||||||
|
"\t-D <level>\t Debug level\n"
|
||||||
|
"\t-f <file>\t Configuration file (mandatory)\n"
|
||||||
|
"\t-l <s|f<file>> \t Log on (s)yslog, (f)ile (syslog is default)\n"
|
||||||
|
"\t-p <dir>\t Yang directory path (see CLICON_YANG_DIR)\n"
|
||||||
|
"\t-d <dir>\t Specify restconf plugin directory dir (default: %s)\n"
|
||||||
|
"\t-y <file>\t Load yang spec file (override yang main module)\n"
|
||||||
|
"\t-a UNIX|IPv4|IPv6 Internal backend socket family\n"
|
||||||
|
"\t-u <path|addr>\t Internal socket domain path or IP addr (see -a)\n"
|
||||||
|
"\t-o \"<option>=<value>\" Give configuration option overriding config file (see clixon-config.yang)\n"
|
||||||
|
"\t-P <port>\t HTTPS port (default 443)\n"
|
||||||
|
"\t-c <cert>\t SSL server certificate - pemfile (mandatory)\n"
|
||||||
|
"\t-k <key>\t SSL private key - privfile (mandatory)\n"
|
||||||
|
,
|
||||||
|
argv0,
|
||||||
|
clicon_restconf_dir(h)
|
||||||
|
);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Main routine for libevhtp restconf
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
main(int argc,
|
||||||
|
char **argv)
|
||||||
|
{
|
||||||
|
int retval = -1;
|
||||||
|
char *argv0 = argv[0];
|
||||||
|
int c;
|
||||||
|
clicon_handle h;
|
||||||
|
char *dir;
|
||||||
|
int logdst = CLICON_LOG_SYSLOG;
|
||||||
|
yang_stmt *yspec = NULL;
|
||||||
|
char *str;
|
||||||
|
clixon_plugin *cp = NULL;
|
||||||
|
cvec *nsctx_global = NULL; /* Global namespace context */
|
||||||
|
size_t cligen_buflen;
|
||||||
|
size_t cligen_bufthreshold;
|
||||||
|
uint16_t port = 443;
|
||||||
|
#ifdef _EVHTP_NYI
|
||||||
|
char *stream_path;
|
||||||
|
#endif
|
||||||
|
evhtp_t *htp = NULL;
|
||||||
|
struct event_base *evbase = NULL;
|
||||||
|
evhtp_ssl_cfg_t *ssl_config = NULL;
|
||||||
|
struct stat f_stat;
|
||||||
|
|
||||||
|
/* In the startup, logs to stderr & debug flag set later */
|
||||||
|
clicon_log_init(__PROGRAM__, LOG_INFO, logdst);
|
||||||
|
|
||||||
|
/* Create handle */
|
||||||
|
if ((h = clicon_handle_init()) == NULL)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
_CLICON_HANDLE = h; /* for termination handling */
|
||||||
|
|
||||||
|
while ((c = getopt(argc, argv, RESTCONF_OPTS)) != -1)
|
||||||
|
switch (c) {
|
||||||
|
case 'h':
|
||||||
|
usage(h, argv0);
|
||||||
|
break;
|
||||||
|
case 'D' : /* debug */
|
||||||
|
if (sscanf(optarg, "%d", &debug) != 1)
|
||||||
|
usage(h, argv0);
|
||||||
|
break;
|
||||||
|
case 'f': /* override config file */
|
||||||
|
if (!strlen(optarg))
|
||||||
|
usage(h, argv0);
|
||||||
|
clicon_option_str_set(h, "CLICON_CONFIGFILE", optarg);
|
||||||
|
break;
|
||||||
|
case 'l': /* Log destination: s|e|o */
|
||||||
|
if ((logdst = clicon_log_opt(optarg[0])) < 0)
|
||||||
|
usage(h, argv0);
|
||||||
|
if (logdst == CLICON_LOG_FILE &&
|
||||||
|
strlen(optarg)>1 &&
|
||||||
|
clicon_log_file(optarg+1) < 0)
|
||||||
|
goto done;
|
||||||
|
break;
|
||||||
|
} /* switch getopt */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Logs, error and debug to stderr or syslog, set debug level
|
||||||
|
*/
|
||||||
|
clicon_log_init(__PROGRAM__, debug?LOG_DEBUG:LOG_INFO, logdst);
|
||||||
|
|
||||||
|
clicon_debug_init(debug, NULL);
|
||||||
|
clicon_log(LOG_NOTICE, "%s: %u Started", __PROGRAM__, getpid());
|
||||||
|
if (set_signal(SIGTERM, restconf_sig_term, NULL) < 0){
|
||||||
|
clicon_err(OE_DAEMON, errno, "Setting signal");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
if (set_signal(SIGINT, restconf_sig_term, NULL) < 0){
|
||||||
|
clicon_err(OE_DAEMON, errno, "Setting signal");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
if (set_signal(SIGCHLD, restconf_sig_child, NULL) < 0){
|
||||||
|
clicon_err(OE_DAEMON, errno, "Setting signal");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Find and read configfile */
|
||||||
|
if (clicon_options_main(h) < 0)
|
||||||
|
goto done;
|
||||||
|
#ifdef _EVHTP_NYI
|
||||||
|
stream_path = clicon_option_str(h, "CLICON_STREAM_PATH");
|
||||||
|
#endif
|
||||||
|
/* Init evhtp ssl config struct */
|
||||||
|
if ((ssl_config = malloc(sizeof(evhtp_ssl_cfg_t))) == NULL){
|
||||||
|
clicon_err(OE_UNIX, errno, "malloc");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
memset(ssl_config, 0, sizeof(evhtp_ssl_cfg_t));
|
||||||
|
ssl_config->ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1;
|
||||||
|
|
||||||
|
/* Now rest of options, some overwrite option file */
|
||||||
|
optind = 1;
|
||||||
|
opterr = 0;
|
||||||
|
while ((c = getopt(argc, argv, RESTCONF_OPTS)) != -1)
|
||||||
|
switch (c) {
|
||||||
|
case 'h' : /* help */
|
||||||
|
case 'D' : /* debug */
|
||||||
|
case 'f': /* config file */
|
||||||
|
case 'l': /* log */
|
||||||
|
break; /* see above */
|
||||||
|
case 'p' : /* yang dir path */
|
||||||
|
if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
|
||||||
|
goto done;
|
||||||
|
break;
|
||||||
|
case 'd': /* Plugin directory */
|
||||||
|
if (!strlen(optarg))
|
||||||
|
usage(h, argv0);
|
||||||
|
clicon_option_str_set(h, "CLICON_RESTCONF_DIR", optarg);
|
||||||
|
break;
|
||||||
|
case 'y' : /* Load yang spec file (override yang main module) */
|
||||||
|
clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
|
||||||
|
break;
|
||||||
|
case 'a': /* internal backend socket address family */
|
||||||
|
clicon_option_str_set(h, "CLICON_SOCK_FAMILY", optarg);
|
||||||
|
break;
|
||||||
|
case 'u': /* internal backend socket unix domain path or ip host */
|
||||||
|
if (!strlen(optarg))
|
||||||
|
usage(h, argv0);
|
||||||
|
clicon_option_str_set(h, "CLICON_SOCK", optarg);
|
||||||
|
break;
|
||||||
|
case 'o':{ /* Configuration option */
|
||||||
|
char *val;
|
||||||
|
if ((val = index(optarg, '=')) == NULL)
|
||||||
|
usage(h, argv0);
|
||||||
|
*val++ = '\0';
|
||||||
|
if (clicon_option_add(h, optarg, val) < 0)
|
||||||
|
goto done;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 'P': /* http port */
|
||||||
|
if (!strlen(optarg))
|
||||||
|
usage(h, argv0);
|
||||||
|
port=atoi(optarg);
|
||||||
|
break;
|
||||||
|
case 'c': /* SSL Server Certificate */
|
||||||
|
ssl_config->pemfile = optarg;
|
||||||
|
break;
|
||||||
|
case 'k': /* SSL private key */
|
||||||
|
ssl_config->privfile = optarg;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
usage(h, argv0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
argc -= optind;
|
||||||
|
argv += optind;
|
||||||
|
|
||||||
|
/* Check ssl mandatory options */
|
||||||
|
if (ssl_config->pemfile == NULL || ssl_config->privfile == NULL)
|
||||||
|
usage(h, argv0);
|
||||||
|
/* Verify SSL files */
|
||||||
|
if (ssl_config->pemfile == NULL)
|
||||||
|
usage(h, argv0);
|
||||||
|
if (stat(ssl_config->pemfile, &f_stat) != 0) {
|
||||||
|
clicon_err(OE_FATAL, errno, "Cannot load SSL cert '%s'", ssl_config->pemfile);
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
if (ssl_config->privfile == NULL)
|
||||||
|
usage(h, argv0);
|
||||||
|
if (stat(ssl_config->privfile, &f_stat) != 0) {
|
||||||
|
clicon_err(OE_FATAL, errno, "Cannot load SSL key '%s'", ssl_config->privfile);
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
// ssl_verify_mode = htp_sslutil_verify2opts(optarg);
|
||||||
|
assert(SSL_VERIFY_NONE == 0);
|
||||||
|
/* Access the remaining argv/argc options (after --) w clicon-argv_get() */
|
||||||
|
clicon_argv_set(h, argv0, argc, argv);
|
||||||
|
|
||||||
|
/* Init cligen buffers */
|
||||||
|
cligen_buflen = clicon_option_int(h, "CLICON_CLI_BUF_START");
|
||||||
|
cligen_bufthreshold = clicon_option_int(h, "CLICON_CLI_BUF_THRESHOLD");
|
||||||
|
cbuf_alloc_set(cligen_buflen, cligen_bufthreshold);
|
||||||
|
|
||||||
|
/* Add (hardcoded) netconf features in case ietf-netconf loaded here
|
||||||
|
* Otherwise it is loaded in netconf_module_load below
|
||||||
|
*/
|
||||||
|
if (netconf_module_features(h) < 0)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
/* Create top-level yang spec and store as option */
|
||||||
|
if ((yspec = yspec_new()) == NULL)
|
||||||
|
goto done;
|
||||||
|
clicon_dbspec_yang_set(h, yspec);
|
||||||
|
/* Treat unknown XML as anydata */
|
||||||
|
if (clicon_option_bool(h, "CLICON_YANG_UNKNOWN_ANYDATA") == 1)
|
||||||
|
xml_bind_yang_unknown_anydata(1);
|
||||||
|
|
||||||
|
/* Load restconf plugins before yangs are loaded (eg extension callbacks) */
|
||||||
|
if ((dir = clicon_restconf_dir(h)) != NULL)
|
||||||
|
if (clixon_plugins_load(h, CLIXON_PLUGIN_INIT, dir, NULL) < 0)
|
||||||
|
return -1;
|
||||||
|
/* Create a pseudo-plugin to create extension callback to set the ietf-routing
|
||||||
|
* yang-data extension for api-root top-level restconf function.
|
||||||
|
*/
|
||||||
|
if (clixon_pseudo_plugin(h, "pseudo restconf", &cp) < 0)
|
||||||
|
goto done;
|
||||||
|
cp->cp_api.ca_extension = restconf_main_extension_cb;
|
||||||
|
|
||||||
|
/* Load Yang modules
|
||||||
|
* 1. Load a yang module as a specific absolute filename */
|
||||||
|
if ((str = clicon_yang_main_file(h)) != NULL){
|
||||||
|
if (yang_spec_parse_file(h, str, yspec) < 0)
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
/* 2. Load a (single) main module */
|
||||||
|
if ((str = clicon_yang_module_main(h)) != NULL){
|
||||||
|
if (yang_spec_parse_module(h, str, clicon_yang_module_revision(h),
|
||||||
|
yspec) < 0)
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
/* 3. Load all modules in a directory */
|
||||||
|
if ((str = clicon_yang_main_dir(h)) != NULL){
|
||||||
|
if (yang_spec_load_dir(h, str, yspec) < 0)
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
/* Load clixon lib yang module */
|
||||||
|
if (yang_spec_parse_module(h, "clixon-lib", NULL, yspec) < 0)
|
||||||
|
goto done;
|
||||||
|
/* Load yang module library, RFC7895 */
|
||||||
|
if (yang_modules_init(h) < 0)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
/* Load yang restconf module */
|
||||||
|
if (yang_spec_parse_module(h, "ietf-restconf", NULL, yspec)< 0)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
/* Add netconf yang spec, used as internal protocol */
|
||||||
|
if (netconf_module_load(h) < 0)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
/* Add system modules */
|
||||||
|
if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC8040") &&
|
||||||
|
yang_spec_parse_module(h, "ietf-restconf-monitoring", NULL, yspec)< 0)
|
||||||
|
goto done;
|
||||||
|
if (clicon_option_bool(h, "CLICON_STREAM_DISCOVERY_RFC5277") &&
|
||||||
|
yang_spec_parse_module(h, "clixon-rfc5277", NULL, yspec)< 0)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
/* Here all modules are loaded
|
||||||
|
* Compute and set canonical namespace context
|
||||||
|
*/
|
||||||
|
if (xml_nsctx_yangspec(yspec, &nsctx_global) < 0)
|
||||||
|
goto done;
|
||||||
|
if (clicon_nsctx_global_set(h, nsctx_global) < 0)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
/* Dump configuration options on debug */
|
||||||
|
if (debug)
|
||||||
|
clicon_option_dump(h, debug);
|
||||||
|
|
||||||
|
/* Call start function in all plugins before we go interactive
|
||||||
|
*/
|
||||||
|
if (clixon_plugin_start_all(h) < 0)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
/* Find and read configfile */
|
||||||
|
if (clicon_options_main(h) < 0)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
/* Init evhtp */
|
||||||
|
if ((evbase = event_base_new()) == NULL){
|
||||||
|
clicon_err(OE_UNIX, errno, "event_base_new");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
/* create a new evhtp_t instance */
|
||||||
|
if ((htp = evhtp_new(evbase, NULL)) == NULL){
|
||||||
|
clicon_err(OE_UNIX, errno, "evhtp_new");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
if (evhtp_ssl_init(htp, ssl_config) < 0){
|
||||||
|
clicon_err(OE_UNIX, errno, "evhtp_new");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
/* Generic callback called if no other callbacks are matched */
|
||||||
|
evhtp_set_gencb(htp, cx_gencb, h);
|
||||||
|
|
||||||
|
/* Callback before the connection is accepted. */
|
||||||
|
evhtp_set_pre_accept_cb(htp, cx_pre_accept, h);
|
||||||
|
|
||||||
|
/* Callback right after a connection is accepted. */
|
||||||
|
evhtp_set_post_accept_cb(htp, cx_post_accept, h);
|
||||||
|
|
||||||
|
/* Callback to be executed on a specific path */
|
||||||
|
if (evhtp_set_cb(htp, "/" RESTCONF_API, cx_path_restconf, h) == NULL){
|
||||||
|
clicon_err(OE_EVENTS, errno, "evhtp_set_cb");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* bind to a socket, optionally with specific protocol support formatting */
|
||||||
|
if (evhtp_bind_socket(htp, "127.0.0.1", port, 128) < 0){
|
||||||
|
clicon_err(OE_UNIX, errno, "evhtp_bind_socket");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
event_base_loop(evbase, 0);
|
||||||
|
|
||||||
|
evhtp_unbind_socket(htp);
|
||||||
|
|
||||||
|
// evhtp_safe_free(htp, evhtp_free);
|
||||||
|
// evhtp_safe_free(evbase, event_base_free);
|
||||||
|
|
||||||
|
retval = 0;
|
||||||
|
done:
|
||||||
|
#ifdef _EVHTP_NYI
|
||||||
|
stream_child_freeall(h);
|
||||||
|
#endif
|
||||||
|
restconf_terminate(h);
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
470
apps/restconf/restconf_fcgi_lib.c
Normal file
470
apps/restconf/restconf_fcgi_lib.c
Normal file
|
|
@ -0,0 +1,470 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
|
Copyright (C) 2009-2020 Olof Hagsand
|
||||||
|
Copyright (C) 2020 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 *****
|
||||||
|
|
||||||
|
* @see https://nginx.org/en/docs/http/ngx_http_core_module.html#var_https
|
||||||
|
* @note The response payload for errors uses text_html. RFC7231 is vague
|
||||||
|
* on the response payload (and its media). Maybe it should be omitted
|
||||||
|
* altogether?
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <syslog.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <dlfcn.h>
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
|
||||||
|
/* cligen */
|
||||||
|
#include <cligen/cligen.h>
|
||||||
|
|
||||||
|
/* clicon */
|
||||||
|
#include <clixon/clixon.h>
|
||||||
|
|
||||||
|
#include <fcgiapp.h> /* Need to be after clixon_xml-h due to attribute format */
|
||||||
|
|
||||||
|
#include "restconf_lib.h"
|
||||||
|
#include "restconf_fcgi_lib.h"
|
||||||
|
|
||||||
|
/*! HTTP error 400
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_badrequest(clicon_handle h,
|
||||||
|
FCGX_Request *r)
|
||||||
|
{
|
||||||
|
char *path;
|
||||||
|
|
||||||
|
path = clixon_restconf_param_get(h, "REQUEST_URI");
|
||||||
|
FCGX_SetExitStatus(400, r->out);
|
||||||
|
FCGX_FPrintF(r->out, "Status: 400 Bad Request\r\n"); /* 400 bad request */
|
||||||
|
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "<h1>Clixon Bad request/h1>\n");
|
||||||
|
FCGX_FPrintF(r->out, "The requested URL %s or data is in some way badly formed.\n",
|
||||||
|
path);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! HTTP error 401
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_unauthorized(clicon_handle h,
|
||||||
|
FCGX_Request *r)
|
||||||
|
{
|
||||||
|
char *path;
|
||||||
|
|
||||||
|
path = clixon_restconf_param_get(h, "REQUEST_URI");
|
||||||
|
FCGX_SetExitStatus(401, r->out);
|
||||||
|
FCGX_FPrintF(r->out, "Status: 401 Unauthorized\r\n"); /* 401 unauthorized */
|
||||||
|
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "<error-tag>access-denied</error-tag>\n");
|
||||||
|
FCGX_FPrintF(r->out, "The requested URL %s was unauthorized.\n", path);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! HTTP error 403
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_forbidden(clicon_handle h,
|
||||||
|
FCGX_Request *r)
|
||||||
|
{
|
||||||
|
char *path;
|
||||||
|
|
||||||
|
path = clixon_restconf_param_get(h, "REQUEST_URI");
|
||||||
|
FCGX_SetExitStatus(403, r->out);
|
||||||
|
FCGX_FPrintF(r->out, "Status: 403 Forbidden\r\n"); /* 403 forbidden */
|
||||||
|
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "<h1>Forbidden</h1>\n");
|
||||||
|
FCGX_FPrintF(r->out, "The requested URL %s was forbidden.\n", path);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! HTTP error 404
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_notfound(clicon_handle h,
|
||||||
|
FCGX_Request *r)
|
||||||
|
{
|
||||||
|
char *path;
|
||||||
|
|
||||||
|
path = clixon_restconf_param_get(h, "REQUEST_URI");
|
||||||
|
FCGX_SetExitStatus(404, r->out);
|
||||||
|
FCGX_FPrintF(r->out, "Status: 404 Not Found\r\n"); /* 404 not found */
|
||||||
|
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "<h1>Not Found</h1>\n");
|
||||||
|
FCGX_FPrintF(r->out, "Not Found\n");
|
||||||
|
FCGX_FPrintF(r->out, "The requested URL %s was not found on this server.\n",
|
||||||
|
path);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! HTTP error 406 Not acceptable
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_notacceptable(clicon_handle h,
|
||||||
|
FCGX_Request *r)
|
||||||
|
{
|
||||||
|
char *path;
|
||||||
|
|
||||||
|
path = clixon_restconf_param_get(h, "REQUEST_URI");
|
||||||
|
FCGX_SetExitStatus(406, r->out);
|
||||||
|
FCGX_FPrintF(r->out, "Status: 406 Not Acceptable\r\n"); /* 406 not acceptible */
|
||||||
|
|
||||||
|
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "<h1>Not Acceptable</h1>\n");
|
||||||
|
FCGX_FPrintF(r->out, "Not Acceptable\n");
|
||||||
|
FCGX_FPrintF(r->out, "The target resource does not have a current representation that would be acceptable to the user agent.\n",
|
||||||
|
path);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! HTTP error 409
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_conflict(FCGX_Request *r)
|
||||||
|
{
|
||||||
|
FCGX_SetExitStatus(409, r->out);
|
||||||
|
FCGX_FPrintF(r->out, "Status: 409 Conflict\r\n"); /* 409 Conflict */
|
||||||
|
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "<h1>Data resource already exists</h1>\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! HTTP error 409
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_unsupported_media(FCGX_Request *r)
|
||||||
|
{
|
||||||
|
FCGX_SetExitStatus(415, r->out);
|
||||||
|
FCGX_FPrintF(r->out, "Status: 415 Unsupported Media Type\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "<h1>Unsupported Media Type</h1>\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! HTTP error 500
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_internal_server_error(clicon_handle h,
|
||||||
|
FCGX_Request *r)
|
||||||
|
{
|
||||||
|
char *path;
|
||||||
|
|
||||||
|
clicon_debug(1, "%s", __FUNCTION__);
|
||||||
|
path = clixon_restconf_param_get(h, "REQUEST_URI");
|
||||||
|
FCGX_FPrintF(r->out, "Status: 500 Internal Server Error\r\n"); /* 500 internal server error */
|
||||||
|
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "<h1>Internal server error when accessing %s</h1>\n", path);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! HTTP error 501
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_notimplemented(FCGX_Request *r)
|
||||||
|
{
|
||||||
|
clicon_debug(1, "%s", __FUNCTION__);
|
||||||
|
FCGX_FPrintF(r->out, "Status: 501 Not Implemented\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
||||||
|
FCGX_FPrintF(r->out, "<h1>Not Implemented/h1>\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Print all FCGI headers
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
* @see https://nginx.org/en/docs/http/ngx_http_core_module.html#var_https
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_test(FCGX_Request *r,
|
||||||
|
int dbg)
|
||||||
|
{
|
||||||
|
char **environ = r->envp;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
clicon_debug(1, "All environment vars:");
|
||||||
|
for (i = 0; environ[i] != NULL; i++){
|
||||||
|
clicon_debug(1, "%s", environ[i]);
|
||||||
|
}
|
||||||
|
clicon_debug(1, "End environment vars");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Convert FCGI parameters to clixon runtime data
|
||||||
|
* @param[in] h Clixon handle
|
||||||
|
* @param[in] envp Fastcgi request handle parameter array on the format "<param>=<value>"
|
||||||
|
* @see https://nginx.org/en/docs/http/ngx_http_core_module.html#var_https
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
clixon_restconf_params_set(clicon_handle h,
|
||||||
|
char **envp)
|
||||||
|
{
|
||||||
|
int retval = -1;
|
||||||
|
int i;
|
||||||
|
char *param;
|
||||||
|
char *val;
|
||||||
|
|
||||||
|
clicon_debug(1, "%s", __FUNCTION__);
|
||||||
|
for (i = 0; envp[i] != NULL; i++){ /* on the form <param>=<value> */
|
||||||
|
if (clixon_strsplit(envp[i], '=', ¶m, &val) < 0)
|
||||||
|
goto done;
|
||||||
|
clicon_debug(1, "%s param:%s val:%s", __FUNCTION__, param, val);
|
||||||
|
if (clixon_restconf_param_set(h, param, val) < 0)
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
retval = 0;
|
||||||
|
done:
|
||||||
|
clicon_debug(1, "%s %d", __FUNCTION__, retval);
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Clear all FCGI parameters in an environment
|
||||||
|
* @param[in] h Clixon handle
|
||||||
|
* @param[in] envp Fastcgi request handle parameter array on the format "<param>=<value>"
|
||||||
|
* @see https://nginx.org/en/docs/http/ngx_http_core_module.html#var_https
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
clixon_restconf_params_clear(clicon_handle h,
|
||||||
|
char **envp)
|
||||||
|
{
|
||||||
|
int retval = -1;
|
||||||
|
int i;
|
||||||
|
char *param;
|
||||||
|
char *val;
|
||||||
|
|
||||||
|
clicon_debug(1, "%s", __FUNCTION__);
|
||||||
|
for (i = 0; envp[i] != NULL; i++){ /* on the form <param>=<value> */
|
||||||
|
if (clixon_strsplit(envp[i], '=', ¶m, &val) < 0)
|
||||||
|
goto done;
|
||||||
|
clicon_debug(1, "%s param:%s val:%s", __FUNCTION__, param, val);
|
||||||
|
if (clixon_restconf_param_del(h, param) < 0)
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
retval = 0;
|
||||||
|
done:
|
||||||
|
clicon_debug(1, "%s %d", __FUNCTION__, retval);
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
*/
|
||||||
|
cbuf *
|
||||||
|
readdata(FCGX_Request *r)
|
||||||
|
{
|
||||||
|
int c;
|
||||||
|
cbuf *cb;
|
||||||
|
|
||||||
|
if ((cb = cbuf_new()) == NULL)
|
||||||
|
return NULL;
|
||||||
|
while ((c = FCGX_GetChar(r->in)) != -1)
|
||||||
|
cprintf(cb, "%c", c);
|
||||||
|
return cb;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Return restconf error on get/head request
|
||||||
|
* @param[in] h Clixon handle
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
* @param[in] xerr XML error message from backend
|
||||||
|
* @param[in] pretty Set to 1 for pretty-printed xml/json output
|
||||||
|
* @param[in] media Output media
|
||||||
|
* @param[in] code If 0 use rfc8040 sec 7 netconf2restconf error-tag mapping
|
||||||
|
* otherwise use this code
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
api_return_err(clicon_handle h,
|
||||||
|
FCGX_Request *r,
|
||||||
|
cxobj *xerr,
|
||||||
|
int pretty,
|
||||||
|
restconf_media media,
|
||||||
|
int code0)
|
||||||
|
{
|
||||||
|
int retval = -1;
|
||||||
|
cbuf *cb = NULL;
|
||||||
|
cbuf *cberr = NULL;
|
||||||
|
cxobj *xtag;
|
||||||
|
char *tagstr;
|
||||||
|
int code;
|
||||||
|
cxobj *xerr2 = NULL;
|
||||||
|
const char *reason_phrase;
|
||||||
|
|
||||||
|
clicon_debug(1, "%s", __FUNCTION__);
|
||||||
|
if ((cb = cbuf_new()) == NULL){
|
||||||
|
clicon_err(OE_UNIX, errno, "cbuf_new");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
/* A well-formed error message when entering here should look like:
|
||||||
|
* <rpc-error>...<error-tag>invalid-value</error-tag>
|
||||||
|
* Check this is so, otherwise generate an internal error.
|
||||||
|
*/
|
||||||
|
if (strcmp(xml_name(xerr), "rpc-error") != 0 ||
|
||||||
|
(xtag = xpath_first(xerr, NULL, "error-tag")) == NULL){
|
||||||
|
if ((cberr = cbuf_new()) == NULL){
|
||||||
|
clicon_err(OE_UNIX, errno, "cbuf_new");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
cprintf(cberr, "Internal error, system returned invalid error message: ");
|
||||||
|
if (netconf_err2cb(xerr, cberr) < 0)
|
||||||
|
goto done;
|
||||||
|
if (netconf_operation_failed_xml(&xerr2, "application",
|
||||||
|
cbuf_get(cberr)) < 0)
|
||||||
|
goto done;
|
||||||
|
if ((xerr = xpath_first(xerr2, NULL, "//rpc-error")) == NULL){
|
||||||
|
clicon_err(OE_XML, 0, "Internal error, shouldnt happen");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (xml_name_set(xerr, "error") < 0)
|
||||||
|
goto done;
|
||||||
|
tagstr = xml_body(xtag);
|
||||||
|
if (code0 != 0)
|
||||||
|
code = code0;
|
||||||
|
else{
|
||||||
|
if ((code = restconf_err2code(tagstr)) < 0)
|
||||||
|
code = 500; /* internal server error */
|
||||||
|
}
|
||||||
|
if ((reason_phrase = restconf_code2reason(code)) == NULL)
|
||||||
|
reason_phrase="";
|
||||||
|
FCGX_SetExitStatus(code, r->out); /* Created */
|
||||||
|
FCGX_FPrintF(r->out, "Status: %d %s\r\n", code, reason_phrase);
|
||||||
|
FCGX_FPrintF(r->out, "Content-Type: %s\r\n\r\n", restconf_media_int2str(media));
|
||||||
|
switch (media){
|
||||||
|
case YANG_DATA_XML:
|
||||||
|
if (clicon_xml2cbuf(cb, xerr, 2, pretty, -1) < 0)
|
||||||
|
goto done;
|
||||||
|
clicon_debug(1, "%s code:%d err:%s", __FUNCTION__, code, cbuf_get(cb));
|
||||||
|
if (pretty){
|
||||||
|
FCGX_FPrintF(r->out, " <errors xmlns=\"urn:ietf:params:xml:ns:yang:ietf-restconf\">\n", cbuf_get(cb));
|
||||||
|
FCGX_FPrintF(r->out, "%s", cbuf_get(cb));
|
||||||
|
FCGX_FPrintF(r->out, " </errors>\r\n");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
FCGX_FPrintF(r->out, "<errors xmlns=\"urn:ietf:params:xml:ns:yang:ietf-restconf\">", cbuf_get(cb));
|
||||||
|
FCGX_FPrintF(r->out, "%s", cbuf_get(cb));
|
||||||
|
FCGX_FPrintF(r->out, "</errors>\r\n");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case YANG_DATA_JSON:
|
||||||
|
if (xml2json_cbuf(cb, xerr, pretty) < 0)
|
||||||
|
goto done;
|
||||||
|
clicon_debug(1, "%s code:%d err:%s", __FUNCTION__, code, cbuf_get(cb));
|
||||||
|
if (pretty){
|
||||||
|
FCGX_FPrintF(r->out, "{\n");
|
||||||
|
FCGX_FPrintF(r->out, " \"ietf-restconf:errors\" : %s\n",
|
||||||
|
cbuf_get(cb));
|
||||||
|
FCGX_FPrintF(r->out, "}\r\n");
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
FCGX_FPrintF(r->out, "{");
|
||||||
|
FCGX_FPrintF(r->out, "\"ietf-restconf:errors\":");
|
||||||
|
FCGX_FPrintF(r->out, "%s", cbuf_get(cb));
|
||||||
|
FCGX_FPrintF(r->out, "}\r\n");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
clicon_err(OE_YANG, EINVAL, "Invalid media type %d", media);
|
||||||
|
goto done;
|
||||||
|
break;
|
||||||
|
} /* switch media */
|
||||||
|
// ok:
|
||||||
|
retval = 0;
|
||||||
|
done:
|
||||||
|
clicon_debug(1, "%s retval:%d", __FUNCTION__, retval);
|
||||||
|
if (cb)
|
||||||
|
cbuf_free(cb);
|
||||||
|
if (cberr)
|
||||||
|
cbuf_free(cberr);
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Print location header from FCGI environment
|
||||||
|
* @param[in] r Fastcgi request handle
|
||||||
|
* @param[in] xobj If set (eg POST) add to api-path
|
||||||
|
* $https “on” if connection operates in SSL mode, or an empty string otherwise
|
||||||
|
* @note ports are ignored
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
http_location(clicon_handle h,
|
||||||
|
FCGX_Request *r,
|
||||||
|
cxobj *xobj)
|
||||||
|
{
|
||||||
|
int retval = -1;
|
||||||
|
char *https;
|
||||||
|
char *host;
|
||||||
|
char *request_uri;
|
||||||
|
cbuf *cb = NULL;
|
||||||
|
|
||||||
|
https = clixon_restconf_param_get(h, "HTTPS");
|
||||||
|
host = clixon_restconf_param_get(h, "HTTP_HOST");
|
||||||
|
request_uri = clixon_restconf_param_get(h, "REQUEST_URI");
|
||||||
|
if (xobj != NULL){
|
||||||
|
if ((cb = cbuf_new()) == NULL){
|
||||||
|
clicon_err(OE_UNIX, 0, "cbuf_new");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
if (xml2api_path_1(xobj, cb) < 0)
|
||||||
|
goto done;
|
||||||
|
FCGX_FPrintF(r->out, "Location: http%s://%s%s%s\r\n",
|
||||||
|
https?"s":"",
|
||||||
|
host,
|
||||||
|
request_uri,
|
||||||
|
cbuf_get(cb));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
FCGX_FPrintF(r->out, "Location: http%s://%s%s\r\n",
|
||||||
|
https?"s":"",
|
||||||
|
host,
|
||||||
|
request_uri);
|
||||||
|
retval = 0;
|
||||||
|
done:
|
||||||
|
if (cb)
|
||||||
|
cbuf_free(cb);
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
60
apps/restconf/restconf_fcgi_lib.h
Normal file
60
apps/restconf/restconf_fcgi_lib.h
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
|
Copyright (C) 2009-2019 Olof Hagsand
|
||||||
|
Copyright (C) 2020 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 *****
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _RESTCONF_FCGI_LIB_H_
|
||||||
|
#define _RESTCONF_FCGI_LIB_H_
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Prototypes
|
||||||
|
*/
|
||||||
|
int restconf_badrequest(clicon_handle h, FCGX_Request *r);
|
||||||
|
int restconf_unauthorized(clicon_handle h, FCGX_Request *r);
|
||||||
|
int restconf_forbidden(clicon_handle h, FCGX_Request *r);
|
||||||
|
int restconf_notfound(clicon_handle h, FCGX_Request *r);
|
||||||
|
int restconf_notacceptable(clicon_handle h, FCGX_Request *r);
|
||||||
|
int restconf_conflict(FCGX_Request *r);
|
||||||
|
int restconf_unsupported_media(FCGX_Request *r);
|
||||||
|
int restconf_internal_server_error(clicon_handle h, FCGX_Request *r);
|
||||||
|
int restconf_notimplemented(FCGX_Request *r);
|
||||||
|
int restconf_test(FCGX_Request *r, int dbg);
|
||||||
|
int clixon_restconf_params_set(clicon_handle h, char **envp);
|
||||||
|
int clixon_restconf_params_clear(clicon_handle h, char **envp);
|
||||||
|
cbuf *readdata(FCGX_Request *r);
|
||||||
|
int api_return_err(clicon_handle h, FCGX_Request *r, cxobj *xerr,
|
||||||
|
int pretty, enum restconf_media media, int code);
|
||||||
|
int http_location(clicon_handle h, FCGX_Request *r, cxobj *xobj);
|
||||||
|
|
||||||
|
#endif /* _RESTCONF_FCGI_LIB_H_ */
|
||||||
|
|
@ -78,6 +78,7 @@
|
||||||
|
|
||||||
/* restconf */
|
/* restconf */
|
||||||
#include "restconf_lib.h"
|
#include "restconf_lib.h"
|
||||||
|
#include "restconf_fcgi_lib.h"
|
||||||
#include "restconf_methods.h"
|
#include "restconf_methods.h"
|
||||||
#include "restconf_methods_get.h"
|
#include "restconf_methods_get.h"
|
||||||
#include "restconf_methods_post.h"
|
#include "restconf_methods_post.h"
|
||||||
|
|
@ -86,12 +87,6 @@
|
||||||
/* Command line options to be passed to getopt(3) */
|
/* Command line options to be passed to getopt(3) */
|
||||||
#define RESTCONF_OPTS "hD:f:l:p:d:y:a:u:o:"
|
#define RESTCONF_OPTS "hD:f:l:p:d:y:a:u:o:"
|
||||||
|
|
||||||
/* RESTCONF enables deployments to specify where the RESTCONF API is
|
|
||||||
located. The client discovers this by getting the "/.well-known/host-meta"
|
|
||||||
resource
|
|
||||||
*/
|
|
||||||
#define RESTCONF_WELL_KNOWN "/.well-known/host-meta"
|
|
||||||
|
|
||||||
/*! Generic REST method, GET, PUT, DELETE, etc
|
/*! Generic REST method, GET, PUT, DELETE, etc
|
||||||
* @param[in] h CLIXON handle
|
* @param[in] h CLIXON handle
|
||||||
* @param[in] r Fastcgi request handle
|
* @param[in] r Fastcgi request handle
|
||||||
|
|
@ -119,7 +114,7 @@ api_data(clicon_handle h,
|
||||||
char *request_method;
|
char *request_method;
|
||||||
|
|
||||||
clicon_debug(1, "%s", __FUNCTION__);
|
clicon_debug(1, "%s", __FUNCTION__);
|
||||||
request_method = FCGX_GetParam("REQUEST_METHOD", r->envp);
|
request_method = clixon_restconf_param_get(h, "REQUEST_METHOD");
|
||||||
clicon_debug(1, "%s method:%s", __FUNCTION__, request_method);
|
clicon_debug(1, "%s method:%s", __FUNCTION__, request_method);
|
||||||
if (strcmp(request_method, "OPTIONS")==0)
|
if (strcmp(request_method, "OPTIONS")==0)
|
||||||
retval = api_data_options(h, r);
|
retval = api_data_options(h, r);
|
||||||
|
|
@ -136,7 +131,7 @@ api_data(clicon_handle h,
|
||||||
else if (strcmp(request_method, "DELETE")==0)
|
else if (strcmp(request_method, "DELETE")==0)
|
||||||
retval = api_data_delete(h, r, api_path, pi, pretty, media_out);
|
retval = api_data_delete(h, r, api_path, pi, pretty, media_out);
|
||||||
else
|
else
|
||||||
retval = restconf_notfound(r);
|
retval = restconf_notfound(h, r);
|
||||||
clicon_debug(1, "%s retval:%d", __FUNCTION__, retval);
|
clicon_debug(1, "%s retval:%d", __FUNCTION__, retval);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
@ -166,7 +161,7 @@ api_operations(clicon_handle h,
|
||||||
char *request_method;
|
char *request_method;
|
||||||
|
|
||||||
clicon_debug(1, "%s", __FUNCTION__);
|
clicon_debug(1, "%s", __FUNCTION__);
|
||||||
request_method = FCGX_GetParam("REQUEST_METHOD", r->envp);
|
request_method = clixon_restconf_param_get(h, "REQUEST_METHOD");
|
||||||
clicon_debug(1, "%s method:%s", __FUNCTION__, request_method);
|
clicon_debug(1, "%s method:%s", __FUNCTION__, request_method);
|
||||||
if (strcmp(request_method, "GET")==0)
|
if (strcmp(request_method, "GET")==0)
|
||||||
retval = api_operations_get(h, r, path, pi, qvec, data, pretty, media_out);
|
retval = api_operations_get(h, r, path, pi, qvec, data, pretty, media_out);
|
||||||
|
|
@ -174,7 +169,7 @@ api_operations(clicon_handle h,
|
||||||
retval = api_operations_post(h, r, path, pi, qvec, data,
|
retval = api_operations_post(h, r, path, pi, qvec, data,
|
||||||
pretty, media_out);
|
pretty, media_out);
|
||||||
else
|
else
|
||||||
retval = restconf_notfound(r);
|
retval = restconf_notfound(h, r);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -345,8 +340,8 @@ api_restconf(clicon_handle h,
|
||||||
cxobj *xerr;
|
cxobj *xerr;
|
||||||
|
|
||||||
clicon_debug(1, "%s", __FUNCTION__);
|
clicon_debug(1, "%s", __FUNCTION__);
|
||||||
path = restconf_uripath(r);
|
path = restconf_uripath(h);
|
||||||
query = FCGX_GetParam("QUERY_STRING", r->envp);
|
query = clixon_restconf_param_get(h, "QUERY_STRING");
|
||||||
pretty = clicon_option_bool(h, "CLICON_RESTCONF_PRETTY");
|
pretty = clicon_option_bool(h, "CLICON_RESTCONF_PRETTY");
|
||||||
|
|
||||||
/* Get media for output (proactive negotiation) RFC7231 by using
|
/* Get media for output (proactive negotiation) RFC7231 by using
|
||||||
|
|
@ -354,7 +349,7 @@ api_restconf(clicon_handle h,
|
||||||
* operation POST, etc
|
* operation POST, etc
|
||||||
* If accept is * default is yang-json
|
* If accept is * default is yang-json
|
||||||
*/
|
*/
|
||||||
if ((media_str = FCGX_GetParam("HTTP_ACCEPT", r->envp)) == NULL){
|
if ((media_str = clixon_restconf_param_get(h, "HTTP_ACCEPT")) == NULL){
|
||||||
// retval = restconf_unsupported_media(r);
|
// retval = restconf_unsupported_media(r);
|
||||||
// goto done;
|
// goto done;
|
||||||
}
|
}
|
||||||
|
|
@ -372,15 +367,15 @@ api_restconf(clicon_handle h,
|
||||||
goto done;
|
goto done;
|
||||||
/* Sanity check of path. Should be /restconf/ */
|
/* Sanity check of path. Should be /restconf/ */
|
||||||
if (pn < 2){
|
if (pn < 2){
|
||||||
restconf_notfound(r);
|
restconf_notfound(h, r);
|
||||||
goto ok;
|
goto ok;
|
||||||
}
|
}
|
||||||
if (strlen(pvec[0]) != 0){
|
if (strlen(pvec[0]) != 0){
|
||||||
retval = restconf_notfound(r);
|
retval = restconf_notfound(h, r);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
if (strcmp(pvec[1], RESTCONF_API)){
|
if (strcmp(pvec[1], RESTCONF_API)){
|
||||||
retval = restconf_notfound(r);
|
retval = restconf_notfound(h, r);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
restconf_test(r, 1);
|
restconf_test(r, 1);
|
||||||
|
|
@ -390,7 +385,7 @@ api_restconf(clicon_handle h,
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
if ((method = pvec[2]) == NULL){
|
if ((method = pvec[2]) == NULL){
|
||||||
retval = restconf_notfound(r);
|
retval = restconf_notfound(h, r);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
clicon_debug(1, "%s: method=%s", __FUNCTION__, method);
|
clicon_debug(1, "%s: method=%s", __FUNCTION__, method);
|
||||||
|
|
@ -446,7 +441,7 @@ api_restconf(clicon_handle h,
|
||||||
else if (strcmp(method, "test") == 0)
|
else if (strcmp(method, "test") == 0)
|
||||||
restconf_test(r, 0);
|
restconf_test(r, 0);
|
||||||
else
|
else
|
||||||
restconf_notfound(r);
|
restconf_notfound(h, r);
|
||||||
ok:
|
ok:
|
||||||
retval = 0;
|
retval = 0;
|
||||||
done:
|
done:
|
||||||
|
|
@ -488,48 +483,10 @@ restconf_sig_term(int arg)
|
||||||
stream_child_freeall(_CLICON_HANDLE);
|
stream_child_freeall(_CLICON_HANDLE);
|
||||||
restconf_terminate(_CLICON_HANDLE);
|
restconf_terminate(_CLICON_HANDLE);
|
||||||
}
|
}
|
||||||
clicon_exit_set(); /* checked in event_loop() */
|
clicon_exit_set(); /* checked in clixon_event_loop() */
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Callback for yang extensions ietf-restconf:yang-data
|
|
||||||
* @see ietf-restconf.yang
|
|
||||||
* @param[in] h Clixon handle
|
|
||||||
* @param[in] yext Yang node of extension
|
|
||||||
* @param[in] ys Yang node of (unknown) statement belonging to extension
|
|
||||||
* @retval 0 OK, all callbacks executed OK
|
|
||||||
* @retval -1 Error in one callback
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
restconf_main_extension_cb(clicon_handle h,
|
|
||||||
yang_stmt *yext,
|
|
||||||
yang_stmt *ys)
|
|
||||||
{
|
|
||||||
int retval = -1;
|
|
||||||
char *extname;
|
|
||||||
char *modname;
|
|
||||||
yang_stmt *ymod;
|
|
||||||
yang_stmt *yc;
|
|
||||||
yang_stmt *yn = NULL;
|
|
||||||
|
|
||||||
ymod = ys_module(yext);
|
|
||||||
modname = yang_argument_get(ymod);
|
|
||||||
extname = yang_argument_get(yext);
|
|
||||||
if (strcmp(modname, "ietf-restconf") != 0 || strcmp(extname, "yang-data") != 0)
|
|
||||||
goto ok;
|
|
||||||
clicon_debug(1, "%s Enabled extension:%s:%s", __FUNCTION__, modname, extname);
|
|
||||||
if ((yc = yang_find(ys, 0, NULL)) == NULL)
|
|
||||||
goto ok;
|
|
||||||
if ((yn = ys_dup(yc)) == NULL)
|
|
||||||
goto done;
|
|
||||||
if (yn_insert(yang_parent_get(ys), yn) < 0)
|
|
||||||
goto done;
|
|
||||||
ok:
|
|
||||||
retval = 0;
|
|
||||||
done:
|
|
||||||
return retval;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
restconf_sig_child(int arg)
|
restconf_sig_child(int arg)
|
||||||
{
|
{
|
||||||
|
|
@ -567,7 +524,7 @@ usage(clicon_handle h,
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Main routine for fastcgi API
|
/*! Main routine for fastcgi restconf
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
main(int argc,
|
main(int argc,
|
||||||
|
|
@ -603,6 +560,7 @@ main(int argc,
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
_CLICON_HANDLE = h; /* for termination handling */
|
_CLICON_HANDLE = h; /* for termination handling */
|
||||||
|
|
||||||
while ((c = getopt(argc, argv, RESTCONF_OPTS)) != -1)
|
while ((c = getopt(argc, argv, RESTCONF_OPTS)) != -1)
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case 'h':
|
case 'h':
|
||||||
|
|
@ -832,8 +790,12 @@ main(int argc,
|
||||||
clicon_session_id_set(h, id);
|
clicon_session_id_set(h, id);
|
||||||
start++;
|
start++;
|
||||||
}
|
}
|
||||||
|
/* Translate from FCGI parameter form to Clixon runtime data
|
||||||
if ((path = FCGX_GetParam("REQUEST_URI", r->envp)) != NULL){
|
* XXX: potential name collision?
|
||||||
|
*/
|
||||||
|
if (clixon_restconf_params_set(h, r->envp) < 0)
|
||||||
|
goto done;
|
||||||
|
if ((path = clixon_restconf_param_get(h, "REQUEST_URI")) != NULL){
|
||||||
clicon_debug(1, "path: %s", path);
|
clicon_debug(1, "path: %s", path);
|
||||||
if (strncmp(path, "/" RESTCONF_API, strlen("/" RESTCONF_API)) == 0)
|
if (strncmp(path, "/" RESTCONF_API, strlen("/" RESTCONF_API)) == 0)
|
||||||
api_restconf(h, r); /* This is the function */
|
api_restconf(h, r); /* This is the function */
|
||||||
|
|
@ -845,11 +807,13 @@ main(int argc,
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
clicon_debug(1, "top-level %s not found", path);
|
clicon_debug(1, "top-level %s not found", path);
|
||||||
restconf_notfound(r);
|
restconf_notfound(h, r);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
clicon_debug(1, "NULL URI");
|
clicon_debug(1, "NULL URI");
|
||||||
|
if (clixon_restconf_params_clear(h, r->envp) < 0)
|
||||||
|
goto done;
|
||||||
if (finish)
|
if (finish)
|
||||||
FCGX_Finish_r(r);
|
FCGX_Finish_r(r);
|
||||||
else{ /* A handler is forked so we initiate a new request after instead
|
else{ /* A handler is forked so we initiate a new request after instead
|
||||||
|
|
@ -859,7 +823,8 @@ main(int argc,
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
} /* while */
|
||||||
retval = 0;
|
retval = 0;
|
||||||
done:
|
done:
|
||||||
stream_child_freeall(h);
|
stream_child_freeall(h);
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
***** BEGIN LICENSE BLOCK *****
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
Copyright (C) 2009-2020 Olof Hagsand
|
Copyright (C) 2009-2020 Olof Hagsand
|
||||||
|
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
|
||||||
|
|
||||||
This file is part of CLIXON.
|
This file is part of CLIXON.
|
||||||
|
|
||||||
|
|
@ -58,8 +59,6 @@
|
||||||
/* clicon */
|
/* clicon */
|
||||||
#include <clixon/clixon.h>
|
#include <clixon/clixon.h>
|
||||||
|
|
||||||
#include <fcgiapp.h> /* Need to be after clixon_xml-h due to attribute format */
|
|
||||||
|
|
||||||
#include "restconf_lib.h"
|
#include "restconf_lib.h"
|
||||||
|
|
||||||
/* See RFC 8040 Section 7: Mapping from NETCONF<error-tag> to Status Code
|
/* See RFC 8040 Section 7: Mapping from NETCONF<error-tag> to Status Code
|
||||||
|
|
@ -186,242 +185,18 @@ restconf_media_int2str(restconf_media media)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
restconf_media
|
restconf_media
|
||||||
restconf_content_type(FCGX_Request *r)
|
restconf_content_type(clicon_handle h)
|
||||||
{
|
{
|
||||||
char *str;
|
char *str;
|
||||||
restconf_media m;
|
restconf_media m;
|
||||||
|
|
||||||
if ((str = FCGX_GetParam("HTTP_CONTENT_TYPE", r->envp)) == NULL)
|
if ((str = clixon_restconf_param_get(h, "HTTP_CONTENT_TYPE")) == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
if ((int)(m = restconf_media_str2int(str)) == -1)
|
if ((int)(m = restconf_media_str2int(str)) == -1)
|
||||||
return -1;
|
return -1;
|
||||||
return m;
|
return m;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! HTTP error 400
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
restconf_badrequest(FCGX_Request *r)
|
|
||||||
{
|
|
||||||
char *path;
|
|
||||||
|
|
||||||
path = FCGX_GetParam("DOCUMENT_URI", r->envp);
|
|
||||||
FCGX_SetExitStatus(400, r->out);
|
|
||||||
FCGX_FPrintF(r->out, "Status: 400 Bad Request\r\n"); /* 400 bad request */
|
|
||||||
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "<h1>Clixon Bad request/h1>\n");
|
|
||||||
FCGX_FPrintF(r->out, "The requested URL %s or data is in some way badly formed.\n",
|
|
||||||
path);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! HTTP error 401
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
restconf_unauthorized(FCGX_Request *r)
|
|
||||||
{
|
|
||||||
char *path;
|
|
||||||
|
|
||||||
path = FCGX_GetParam("DOCUMENT_URI", r->envp);
|
|
||||||
FCGX_SetExitStatus(401, r->out);
|
|
||||||
FCGX_FPrintF(r->out, "Status: 401 Unauthorized\r\n"); /* 401 unauthorized */
|
|
||||||
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "<error-tag>access-denied</error-tag>\n");
|
|
||||||
FCGX_FPrintF(r->out, "The requested URL %s was unauthorized.\n", path);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! HTTP error 403
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
restconf_forbidden(FCGX_Request *r)
|
|
||||||
{
|
|
||||||
char *path;
|
|
||||||
|
|
||||||
path = FCGX_GetParam("DOCUMENT_URI", r->envp);
|
|
||||||
FCGX_SetExitStatus(403, r->out);
|
|
||||||
FCGX_FPrintF(r->out, "Status: 403 Forbidden\r\n"); /* 403 forbidden */
|
|
||||||
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "<h1>Forbidden</h1>\n");
|
|
||||||
FCGX_FPrintF(r->out, "The requested URL %s was forbidden.\n", path);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! HTTP error 404
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
restconf_notfound(FCGX_Request *r)
|
|
||||||
{
|
|
||||||
char *path;
|
|
||||||
|
|
||||||
path = FCGX_GetParam("DOCUMENT_URI", r->envp);
|
|
||||||
FCGX_SetExitStatus(404, r->out);
|
|
||||||
FCGX_FPrintF(r->out, "Status: 404 Not Found\r\n"); /* 404 not found */
|
|
||||||
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "<h1>Not Found</h1>\n");
|
|
||||||
FCGX_FPrintF(r->out, "Not Found\n");
|
|
||||||
FCGX_FPrintF(r->out, "The requested URL %s was not found on this server.\n",
|
|
||||||
path);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! HTTP error 406 Not acceptable
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
restconf_notacceptable(FCGX_Request *r)
|
|
||||||
{
|
|
||||||
char *path;
|
|
||||||
|
|
||||||
path = FCGX_GetParam("DOCUMENT_URI", r->envp);
|
|
||||||
FCGX_SetExitStatus(406, r->out);
|
|
||||||
FCGX_FPrintF(r->out, "Status: 406 Not Acceptable\r\n"); /* 406 not acceptible */
|
|
||||||
|
|
||||||
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "<h1>Not Acceptable</h1>\n");
|
|
||||||
FCGX_FPrintF(r->out, "Not Acceptable\n");
|
|
||||||
FCGX_FPrintF(r->out, "The target resource does not have a current representation that would be acceptable to the user agent.\n",
|
|
||||||
path);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! HTTP error 409
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
restconf_conflict(FCGX_Request *r)
|
|
||||||
{
|
|
||||||
FCGX_SetExitStatus(409, r->out);
|
|
||||||
FCGX_FPrintF(r->out, "Status: 409 Conflict\r\n"); /* 409 Conflict */
|
|
||||||
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "<h1>Data resource already exists</h1>\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! HTTP error 409
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
restconf_unsupported_media(FCGX_Request *r)
|
|
||||||
{
|
|
||||||
FCGX_SetExitStatus(415, r->out);
|
|
||||||
FCGX_FPrintF(r->out, "Status: 415 Unsupported Media Type\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "<h1>Unsupported Media Type</h1>\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! HTTP error 500
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
restconf_internal_server_error(FCGX_Request *r)
|
|
||||||
{
|
|
||||||
char *path;
|
|
||||||
|
|
||||||
clicon_debug(1, "%s", __FUNCTION__);
|
|
||||||
path = FCGX_GetParam("DOCUMENT_URI", r->envp);
|
|
||||||
FCGX_FPrintF(r->out, "Status: 500 Internal Server Error\r\n"); /* 500 internal server error */
|
|
||||||
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "<h1>Internal server error when accessing %s</h1>\n", path);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! HTTP error 501
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
restconf_notimplemented(FCGX_Request *r)
|
|
||||||
{
|
|
||||||
clicon_debug(1, "%s", __FUNCTION__);
|
|
||||||
FCGX_FPrintF(r->out, "Status: 501 Not Implemented\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "Content-Type: text/html\r\n\r\n");
|
|
||||||
FCGX_FPrintF(r->out, "<h1>Not Implemented/h1>\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
printparam(FCGX_Request *r,
|
|
||||||
char *e,
|
|
||||||
int dbgp)
|
|
||||||
{
|
|
||||||
char *p = FCGX_GetParam(e, r->envp);
|
|
||||||
|
|
||||||
if (dbgp)
|
|
||||||
clicon_debug(1, "%s = '%s'", e, p?p:"");
|
|
||||||
else
|
|
||||||
FCGX_FPrintF(r->out, "%s = '%s'\n", e, p?p:"");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! Print all FCGI headers
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
* @see https://nginx.org/en/docs/http/ngx_http_core_module.html#var_https
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
restconf_test(FCGX_Request *r,
|
|
||||||
int dbg)
|
|
||||||
{
|
|
||||||
printparam(r, "QUERY_STRING", dbg);
|
|
||||||
printparam(r, "REQUEST_METHOD", dbg);
|
|
||||||
printparam(r, "CONTENT_TYPE", dbg);
|
|
||||||
printparam(r, "CONTENT_LENGTH", dbg);
|
|
||||||
printparam(r, "SCRIPT_FILENAME", dbg);
|
|
||||||
printparam(r, "SCRIPT_NAME", dbg);
|
|
||||||
printparam(r, "REQUEST_URI", dbg);
|
|
||||||
printparam(r, "DOCUMENT_URI", dbg);
|
|
||||||
printparam(r, "DOCUMENT_ROOT", dbg);
|
|
||||||
printparam(r, "SERVER_PROTOCOL", dbg);
|
|
||||||
printparam(r, "GATEWAY_INTERFACE", dbg);
|
|
||||||
printparam(r, "SERVER_SOFTWARE", dbg);
|
|
||||||
printparam(r, "REMOTE_ADDR", dbg);
|
|
||||||
printparam(r, "REMOTE_PORT", dbg);
|
|
||||||
printparam(r, "SERVER_ADDR", dbg);
|
|
||||||
printparam(r, "SERVER_PORT", dbg);
|
|
||||||
printparam(r, "SERVER_NAME", dbg);
|
|
||||||
printparam(r, "HTTP_COOKIE", dbg);
|
|
||||||
printparam(r, "HTTPS", dbg);
|
|
||||||
printparam(r, "HTTP_HOST", dbg);
|
|
||||||
printparam(r, "HTTP_ACCEPT", dbg);
|
|
||||||
printparam(r, "HTTP_CONTENT_TYPE", dbg);
|
|
||||||
printparam(r, "HTTP_AUTHORIZATION", dbg);
|
|
||||||
#if 0 /* For debug */
|
|
||||||
clicon_debug(1, "All environment vars:");
|
|
||||||
{
|
|
||||||
extern char **environ;
|
|
||||||
int i;
|
|
||||||
for (i = 0; environ[i] != NULL; i++){
|
|
||||||
clicon_debug(1, "%s", environ[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
clicon_debug(1, "End environment vars:");
|
|
||||||
#endif
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
*/
|
|
||||||
cbuf *
|
|
||||||
readdata(FCGX_Request *r)
|
|
||||||
{
|
|
||||||
int c;
|
|
||||||
cbuf *cb;
|
|
||||||
|
|
||||||
if ((cb = cbuf_new()) == NULL)
|
|
||||||
return NULL;
|
|
||||||
while ((c = FCGX_GetChar(r->in)) != -1)
|
|
||||||
cprintf(cb, "%c", c);
|
|
||||||
return cb;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! Parse a cookie string and return value of cookie attribute
|
/*! Parse a cookie string and return value of cookie attribute
|
||||||
* @param[in] cookiestr cookie string according to rfc6265 (modified)
|
* @param[in] cookiestr cookie string according to rfc6265 (modified)
|
||||||
* @param[in] attribute cookie attribute
|
* @param[in] attribute cookie attribute
|
||||||
|
|
@ -449,165 +224,6 @@ get_user_cookie(char *cookiestr,
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Return restconf error on get/head request
|
|
||||||
* @param[in] h Clixon handle
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
* @param[in] xerr XML error message from backend
|
|
||||||
* @param[in] pretty Set to 1 for pretty-printed xml/json output
|
|
||||||
* @param[in] media Output media
|
|
||||||
* @param[in] code If 0 use rfc8040 sec 7 netconf2restconf error-tag mapping
|
|
||||||
* otherwise use this code
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
api_return_err(clicon_handle h,
|
|
||||||
FCGX_Request *r,
|
|
||||||
cxobj *xerr,
|
|
||||||
int pretty,
|
|
||||||
restconf_media media,
|
|
||||||
int code0)
|
|
||||||
{
|
|
||||||
int retval = -1;
|
|
||||||
cbuf *cb = NULL;
|
|
||||||
cbuf *cberr = NULL;
|
|
||||||
cxobj *xtag;
|
|
||||||
char *tagstr;
|
|
||||||
int code;
|
|
||||||
cxobj *xerr2 = NULL;
|
|
||||||
const char *reason_phrase;
|
|
||||||
|
|
||||||
clicon_debug(1, "%s", __FUNCTION__);
|
|
||||||
if ((cb = cbuf_new()) == NULL){
|
|
||||||
clicon_err(OE_UNIX, errno, "cbuf_new");
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
/* A well-formed error message when entering here should look like:
|
|
||||||
* <rpc-error>...<error-tag>invalid-value</error-tag>
|
|
||||||
* Check this is so, otherwise generate an internal error.
|
|
||||||
*/
|
|
||||||
if (strcmp(xml_name(xerr), "rpc-error") != 0 ||
|
|
||||||
(xtag = xpath_first(xerr, NULL, "error-tag")) == NULL){
|
|
||||||
if ((cberr = cbuf_new()) == NULL){
|
|
||||||
clicon_err(OE_UNIX, errno, "cbuf_new");
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
cprintf(cberr, "Internal error, system returned invalid error message: ");
|
|
||||||
if (netconf_err2cb(xerr, cberr) < 0)
|
|
||||||
goto done;
|
|
||||||
if (netconf_operation_failed_xml(&xerr2, "application",
|
|
||||||
cbuf_get(cberr)) < 0)
|
|
||||||
goto done;
|
|
||||||
if ((xerr = xpath_first(xerr2, NULL, "//rpc-error")) == NULL){
|
|
||||||
clicon_err(OE_XML, 0, "Internal error, shouldnt happen");
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (xml_name_set(xerr, "error") < 0)
|
|
||||||
goto done;
|
|
||||||
tagstr = xml_body(xtag);
|
|
||||||
if (code0 != 0)
|
|
||||||
code = code0;
|
|
||||||
else{
|
|
||||||
if ((code = restconf_err2code(tagstr)) < 0)
|
|
||||||
code = 500; /* internal server error */
|
|
||||||
}
|
|
||||||
if ((reason_phrase = restconf_code2reason(code)) == NULL)
|
|
||||||
reason_phrase="";
|
|
||||||
FCGX_SetExitStatus(code, r->out); /* Created */
|
|
||||||
FCGX_FPrintF(r->out, "Status: %d %s\r\n", code, reason_phrase);
|
|
||||||
FCGX_FPrintF(r->out, "Content-Type: %s\r\n\r\n", restconf_media_int2str(media));
|
|
||||||
switch (media){
|
|
||||||
case YANG_DATA_XML:
|
|
||||||
if (clicon_xml2cbuf(cb, xerr, 2, pretty, -1) < 0)
|
|
||||||
goto done;
|
|
||||||
clicon_debug(1, "%s code:%d err:%s", __FUNCTION__, code, cbuf_get(cb));
|
|
||||||
if (pretty){
|
|
||||||
FCGX_FPrintF(r->out, " <errors xmlns=\"urn:ietf:params:xml:ns:yang:ietf-restconf\">\n", cbuf_get(cb));
|
|
||||||
FCGX_FPrintF(r->out, "%s", cbuf_get(cb));
|
|
||||||
FCGX_FPrintF(r->out, " </errors>\r\n");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
FCGX_FPrintF(r->out, "<errors xmlns=\"urn:ietf:params:xml:ns:yang:ietf-restconf\">", cbuf_get(cb));
|
|
||||||
FCGX_FPrintF(r->out, "%s", cbuf_get(cb));
|
|
||||||
FCGX_FPrintF(r->out, "</errors>\r\n");
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case YANG_DATA_JSON:
|
|
||||||
if (xml2json_cbuf(cb, xerr, pretty) < 0)
|
|
||||||
goto done;
|
|
||||||
clicon_debug(1, "%s code:%d err:%s", __FUNCTION__, code, cbuf_get(cb));
|
|
||||||
if (pretty){
|
|
||||||
FCGX_FPrintF(r->out, "{\n");
|
|
||||||
FCGX_FPrintF(r->out, " \"ietf-restconf:errors\" : %s\n",
|
|
||||||
cbuf_get(cb));
|
|
||||||
FCGX_FPrintF(r->out, "}\r\n");
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
FCGX_FPrintF(r->out, "{");
|
|
||||||
FCGX_FPrintF(r->out, "\"ietf-restconf:errors\":");
|
|
||||||
FCGX_FPrintF(r->out, "%s", cbuf_get(cb));
|
|
||||||
FCGX_FPrintF(r->out, "}\r\n");
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
clicon_err(OE_YANG, EINVAL, "Invalid media type %d", media);
|
|
||||||
goto done;
|
|
||||||
break;
|
|
||||||
} /* switch media */
|
|
||||||
// ok:
|
|
||||||
retval = 0;
|
|
||||||
done:
|
|
||||||
clicon_debug(1, "%s retval:%d", __FUNCTION__, retval);
|
|
||||||
if (cb)
|
|
||||||
cbuf_free(cb);
|
|
||||||
if (cberr)
|
|
||||||
cbuf_free(cberr);
|
|
||||||
return retval;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! Print location header from FCGI environment
|
|
||||||
* @param[in] r Fastcgi request handle
|
|
||||||
* @param[in] xobj If set (eg POST) add to api-path
|
|
||||||
* $https “on” if connection operates in SSL mode, or an empty string otherwise
|
|
||||||
* @note ports are ignored
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
http_location(FCGX_Request *r,
|
|
||||||
cxobj *xobj)
|
|
||||||
{
|
|
||||||
int retval = -1;
|
|
||||||
char *https;
|
|
||||||
char *host;
|
|
||||||
char *request_uri;
|
|
||||||
cbuf *cb = NULL;
|
|
||||||
|
|
||||||
https = FCGX_GetParam("HTTPS", r->envp);
|
|
||||||
host = FCGX_GetParam("HTTP_HOST", r->envp);
|
|
||||||
request_uri = FCGX_GetParam("REQUEST_URI", r->envp);
|
|
||||||
if (xobj != NULL){
|
|
||||||
if ((cb = cbuf_new()) == NULL){
|
|
||||||
clicon_err(OE_UNIX, 0, "cbuf_new");
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
if (xml2api_path_1(xobj, cb) < 0)
|
|
||||||
goto done;
|
|
||||||
FCGX_FPrintF(r->out, "Location: http%s://%s%s%s\r\n",
|
|
||||||
https?"s":"",
|
|
||||||
host,
|
|
||||||
request_uri,
|
|
||||||
cbuf_get(cb));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
FCGX_FPrintF(r->out, "Location: http%s://%s%s\r\n",
|
|
||||||
https?"s":"",
|
|
||||||
host,
|
|
||||||
request_uri);
|
|
||||||
retval = 0;
|
|
||||||
done:
|
|
||||||
if (cb)
|
|
||||||
cbuf_free(cb);
|
|
||||||
return retval;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! Clean and close all state of restconf process (but dont exit).
|
/*! Clean and close all state of restconf process (but dont exit).
|
||||||
* Cannot use h after this
|
* Cannot use h after this
|
||||||
* @param[in] h Clixon handle
|
* @param[in] h Clixon handle
|
||||||
|
|
@ -757,6 +373,83 @@ restconf_insert_attributes(cxobj *xdata,
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*! Callback for yang extensions ietf-restconf:yang-data
|
||||||
|
* @see ietf-restconf.yang
|
||||||
|
* @param[in] h Clixon handle
|
||||||
|
* @param[in] yext Yang node of extension
|
||||||
|
* @param[in] ys Yang node of (unknown) statement belonging to extension
|
||||||
|
* @retval 0 OK, all callbacks executed OK
|
||||||
|
* @retval -1 Error in one callback
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
restconf_main_extension_cb(clicon_handle h,
|
||||||
|
yang_stmt *yext,
|
||||||
|
yang_stmt *ys)
|
||||||
|
{
|
||||||
|
int retval = -1;
|
||||||
|
char *extname;
|
||||||
|
char *modname;
|
||||||
|
yang_stmt *ymod;
|
||||||
|
yang_stmt *yc;
|
||||||
|
yang_stmt *yn = NULL;
|
||||||
|
|
||||||
|
ymod = ys_module(yext);
|
||||||
|
modname = yang_argument_get(ymod);
|
||||||
|
extname = yang_argument_get(yext);
|
||||||
|
if (strcmp(modname, "ietf-restconf") != 0 || strcmp(extname, "yang-data") != 0)
|
||||||
|
goto ok;
|
||||||
|
clicon_debug(1, "%s Enabled extension:%s:%s", __FUNCTION__, modname, extname);
|
||||||
|
if ((yc = yang_find(ys, 0, NULL)) == NULL)
|
||||||
|
goto ok;
|
||||||
|
if ((yn = ys_dup(yc)) == NULL)
|
||||||
|
goto done;
|
||||||
|
if (yn_insert(yang_parent_get(ys), yn) < 0)
|
||||||
|
goto done;
|
||||||
|
ok:
|
||||||
|
retval = 0;
|
||||||
|
done:
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Get restconf http parameter
|
||||||
|
* @param[in] h Clicon handle
|
||||||
|
* @param[in] name Data name
|
||||||
|
* @retval val Data value as string
|
||||||
|
* Currently using clixon runtime data but there is risk for colliding names
|
||||||
|
*/
|
||||||
|
char *
|
||||||
|
clixon_restconf_param_get(clicon_handle h,
|
||||||
|
char *param)
|
||||||
|
{
|
||||||
|
char *val;
|
||||||
|
if (clicon_data_get(h, param, &val) < 0)
|
||||||
|
return NULL;
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Set restconf http parameter
|
||||||
|
* @param[in] h Clicon handle
|
||||||
|
* @param[in] name Data name
|
||||||
|
* @param[in] val Data value as null-terminated string
|
||||||
|
* @retval 0 OK
|
||||||
|
* @retval -1 Error
|
||||||
|
* Currently using clixon runtime data but there is risk for colliding names
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
clixon_restconf_param_set(clicon_handle h,
|
||||||
|
char *param,
|
||||||
|
char *val)
|
||||||
|
{
|
||||||
|
return clicon_data_set(h, param, val);
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
clixon_restconf_param_del(clicon_handle h,
|
||||||
|
char *param)
|
||||||
|
{
|
||||||
|
return clicon_data_del(h, param);
|
||||||
|
}
|
||||||
|
|
||||||
/*! Extract uri-encoded uri-path from fastcgi parameters
|
/*! Extract uri-encoded uri-path from fastcgi parameters
|
||||||
* Use REQUEST_URI parameter and strip ?args
|
* Use REQUEST_URI parameter and strip ?args
|
||||||
* REQUEST_URI have args and is encoded
|
* REQUEST_URI have args and is encoded
|
||||||
|
|
@ -766,14 +459,13 @@ restconf_insert_attributes(cxobj *xdata,
|
||||||
* causes problems with eg /interface=eth%2f0%2f0
|
* causes problems with eg /interface=eth%2f0%2f0
|
||||||
*/
|
*/
|
||||||
char *
|
char *
|
||||||
restconf_uripath(FCGX_Request *r)
|
restconf_uripath(clicon_handle h)
|
||||||
{
|
{
|
||||||
char *path;
|
char *path;
|
||||||
char *q;
|
char *q;
|
||||||
|
|
||||||
path = FCGX_GetParam("REQUEST_URI", r->envp);
|
path = clixon_restconf_param_get(h, "REQUEST_URI");
|
||||||
if ((q = index(path, '?')) != NULL)
|
if ((q = index(path, '?')) != NULL)
|
||||||
*q = '\0';
|
*q = '\0';
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
***** BEGIN LICENSE BLOCK *****
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
Copyright (C) 2009-2019 Olof Hagsand
|
Copyright (C) 2009-2019 Olof Hagsand
|
||||||
|
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
|
||||||
|
|
||||||
This file is part of CLIXON.
|
This file is part of CLIXON.
|
||||||
|
|
||||||
|
|
@ -41,8 +42,15 @@
|
||||||
*/
|
*/
|
||||||
#define RESTCONF_API "restconf"
|
#define RESTCONF_API "restconf"
|
||||||
|
|
||||||
|
/* RESTCONF enables deployments to specify where the RESTCONF API is
|
||||||
|
located. The client discovers this by getting the "/.well-known/host-meta"
|
||||||
|
resource
|
||||||
|
*/
|
||||||
|
#define RESTCONF_WELL_KNOWN "/.well-known/host-meta"
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Types
|
* Variables
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*! RESTCONF media types
|
/*! RESTCONF media types
|
||||||
|
|
@ -58,32 +66,20 @@ enum restconf_media{
|
||||||
typedef enum restconf_media restconf_media;
|
typedef enum restconf_media restconf_media;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Prototypes (also in clixon_restconf.h)
|
* Prototypes
|
||||||
*/
|
*/
|
||||||
int restconf_err2code(char *tag);
|
int restconf_err2code(char *tag);
|
||||||
const char *restconf_code2reason(int code);
|
const char *restconf_code2reason(int code);
|
||||||
|
|
||||||
const restconf_media restconf_media_str2int(char *media);
|
const restconf_media restconf_media_str2int(char *media);
|
||||||
const char *restconf_media_int2str(restconf_media media);
|
const char *restconf_media_int2str(restconf_media media);
|
||||||
restconf_media restconf_content_type(FCGX_Request *r);
|
restconf_media restconf_content_type(clicon_handle h);
|
||||||
int restconf_badrequest(FCGX_Request *r);
|
int get_user_cookie(char *cookiestr, char *attribute, char **val);
|
||||||
int restconf_unauthorized(FCGX_Request *r);
|
int restconf_terminate(clicon_handle h);
|
||||||
int restconf_forbidden(FCGX_Request *r);
|
int restconf_insert_attributes(cxobj *xdata, cvec *qvec);
|
||||||
int restconf_notfound(FCGX_Request *r);
|
int restconf_main_extension_cb(clicon_handle h, yang_stmt *yext, yang_stmt *ys);
|
||||||
int restconf_notacceptable(FCGX_Request *r);
|
char *clixon_restconf_param_get(clicon_handle h, char *param);
|
||||||
int restconf_conflict(FCGX_Request *r);
|
int clixon_restconf_param_set(clicon_handle h, char *param, char *val);
|
||||||
int restconf_unsupported_media(FCGX_Request *r);
|
int clixon_restconf_param_del(clicon_handle h, char *param);
|
||||||
int restconf_internal_server_error(FCGX_Request *r);
|
char *restconf_uripath(clicon_handle h);
|
||||||
int restconf_notimplemented(FCGX_Request *r);
|
|
||||||
|
|
||||||
int restconf_test(FCGX_Request *r, int dbg);
|
|
||||||
cbuf *readdata(FCGX_Request *r);
|
|
||||||
int get_user_cookie(char *cookiestr, char *attribute, char **val);
|
|
||||||
int api_return_err(clicon_handle h, FCGX_Request *r, cxobj *xerr,
|
|
||||||
int pretty, enum restconf_media media, int code);
|
|
||||||
int http_location(FCGX_Request *r, cxobj *xobj);
|
|
||||||
int restconf_terminate(clicon_handle h);
|
|
||||||
int restconf_insert_attributes(cxobj *xdata, cvec *qvec);
|
|
||||||
char *restconf_uripath(FCGX_Request *r);
|
|
||||||
|
|
||||||
#endif /* _RESTCONF_LIB_H_ */
|
#endif /* _RESTCONF_LIB_H_ */
|
||||||
|
|
|
||||||
|
|
@ -122,6 +122,7 @@ Mapping netconf error-tag -> status code
|
||||||
#include <fcgiapp.h> /* Need to be after clixon_xml-h due to attribute format */
|
#include <fcgiapp.h> /* Need to be after clixon_xml-h due to attribute format */
|
||||||
|
|
||||||
#include "restconf_lib.h"
|
#include "restconf_lib.h"
|
||||||
|
#include "restconf_fcgi_lib.h"
|
||||||
#include "restconf_methods.h"
|
#include "restconf_methods.h"
|
||||||
|
|
||||||
/*! REST OPTIONS method
|
/*! REST OPTIONS method
|
||||||
|
|
@ -310,7 +311,7 @@ api_data_write(clicon_handle h,
|
||||||
#endif
|
#endif
|
||||||
if (xml_child_nr(xret) == 0){ /* Object does not exist */
|
if (xml_child_nr(xret) == 0){ /* Object does not exist */
|
||||||
if (plain_patch){ /* If the target resource instance does not exist, the server MUST NOT create it. */
|
if (plain_patch){ /* If the target resource instance does not exist, the server MUST NOT create it. */
|
||||||
restconf_badrequest(r);
|
restconf_badrequest(h, r);
|
||||||
goto ok;
|
goto ok;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -739,7 +740,7 @@ api_data_put(clicon_handle h,
|
||||||
{
|
{
|
||||||
restconf_media media_in;
|
restconf_media media_in;
|
||||||
|
|
||||||
media_in = restconf_content_type(r);
|
media_in = restconf_content_type(h);
|
||||||
return api_data_write(h, r, api_path0, pcvec, pi, qvec, data, pretty,
|
return api_data_write(h, r, api_path0, pcvec, pi, qvec, data, pretty,
|
||||||
media_in, media_out, 0);
|
media_in, media_out, 0);
|
||||||
}
|
}
|
||||||
|
|
@ -775,7 +776,7 @@ api_data_patch(clicon_handle h,
|
||||||
restconf_media media_in;
|
restconf_media media_in;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
media_in = restconf_content_type(r);
|
media_in = restconf_content_type(h);
|
||||||
switch (media_in){
|
switch (media_in){
|
||||||
case YANG_DATA_XML:
|
case YANG_DATA_XML:
|
||||||
case YANG_DATA_JSON: /* plain patch */
|
case YANG_DATA_JSON: /* plain patch */
|
||||||
|
|
|
||||||
|
|
@ -60,6 +60,7 @@
|
||||||
#include <fcgiapp.h> /* Need to be after clixon_xml-h due to attribute format */
|
#include <fcgiapp.h> /* Need to be after clixon_xml-h due to attribute format */
|
||||||
|
|
||||||
#include "restconf_lib.h"
|
#include "restconf_lib.h"
|
||||||
|
#include "restconf_fcgi_lib.h"
|
||||||
#include "restconf_methods_get.h"
|
#include "restconf_methods_get.h"
|
||||||
|
|
||||||
/*! Generic GET (both HEAD and GET)
|
/*! Generic GET (both HEAD and GET)
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,7 @@
|
||||||
#include <fcgiapp.h> /* Need to be after clixon_xml.h due to attribute format */
|
#include <fcgiapp.h> /* Need to be after clixon_xml.h due to attribute format */
|
||||||
|
|
||||||
#include "restconf_lib.h"
|
#include "restconf_lib.h"
|
||||||
|
#include "restconf_fcgi_lib.h"
|
||||||
#include "restconf_methods_post.h"
|
#include "restconf_methods_post.h"
|
||||||
|
|
||||||
/*! Generic REST POST method
|
/*! Generic REST POST method
|
||||||
|
|
@ -187,7 +188,7 @@ api_data_post(clicon_handle h,
|
||||||
* If xbot is top-level (api_path=null) it does not have a spec therefore look for
|
* If xbot is top-level (api_path=null) it does not have a spec therefore look for
|
||||||
* top-level (yspec) otherwise assume parent (xbot) is populated.
|
* top-level (yspec) otherwise assume parent (xbot) is populated.
|
||||||
*/
|
*/
|
||||||
media_in = restconf_content_type(r);
|
media_in = restconf_content_type(h);
|
||||||
switch (media_in){
|
switch (media_in){
|
||||||
case YANG_DATA_XML:
|
case YANG_DATA_XML:
|
||||||
if ((ret = clixon_xml_parse_string(data, yb, yspec, &xbot, &xerr)) < 0){
|
if ((ret = clixon_xml_parse_string(data, yb, yspec, &xbot, &xerr)) < 0){
|
||||||
|
|
@ -381,8 +382,7 @@ api_data_post(clicon_handle h,
|
||||||
}
|
}
|
||||||
FCGX_SetExitStatus(201, r->out);
|
FCGX_SetExitStatus(201, r->out);
|
||||||
FCGX_FPrintF(r->out, "Status: 201 Created\r\n");
|
FCGX_FPrintF(r->out, "Status: 201 Created\r\n");
|
||||||
http_location(r, xdata);
|
http_location(h, r, xdata);
|
||||||
FCGX_GetParam("HTTP_ACCEPT", r->envp);
|
|
||||||
FCGX_FPrintF(r->out, "\r\n");
|
FCGX_FPrintF(r->out, "\r\n");
|
||||||
ok:
|
ok:
|
||||||
retval = 0;
|
retval = 0;
|
||||||
|
|
@ -450,7 +450,7 @@ api_operations_post_input(clicon_handle h,
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
/* Parse input data as json or xml into xml */
|
/* Parse input data as json or xml into xml */
|
||||||
media_in = restconf_content_type(r);
|
media_in = restconf_content_type(h);
|
||||||
switch (media_in){
|
switch (media_in){
|
||||||
case YANG_DATA_XML:
|
case YANG_DATA_XML:
|
||||||
/* XXX: Here data is on the form: <input xmlns="urn:example:clixon"/> and has no proper yang binding
|
/* XXX: Here data is on the form: <input xmlns="urn:example:clixon"/> and has no proper yang binding
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
***** BEGIN LICENSE BLOCK *****
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
Copyright (C) 2009-2019 Olof Hagsand
|
Copyright (C) 2009-2019 Olof Hagsand
|
||||||
|
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
|
||||||
|
|
||||||
This file is part of CLIXON.
|
This file is part of CLIXON.
|
||||||
|
|
||||||
|
|
@ -85,6 +86,7 @@
|
||||||
#include <fcgiapp.h> /* Need to be after clixon_xml.h due to attribute format */
|
#include <fcgiapp.h> /* Need to be after clixon_xml.h due to attribute format */
|
||||||
|
|
||||||
#include "restconf_lib.h"
|
#include "restconf_lib.h"
|
||||||
|
#include "restconf_fcgi_lib.h"
|
||||||
#include "restconf_stream.h"
|
#include "restconf_stream.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -334,7 +336,7 @@ stream_timeout(int s,
|
||||||
gettimeofday(&t, NULL);
|
gettimeofday(&t, NULL);
|
||||||
t1.tv_sec = 1; t1.tv_usec = 0;
|
t1.tv_sec = 1; t1.tv_usec = 0;
|
||||||
timeradd(&t, &t1, &t);
|
timeradd(&t, &t1, &t);
|
||||||
event_reg_timeout(t, stream_timeout, arg, "Stream timeout");
|
clixon_event_reg_timeout(t, stream_timeout, arg, "Stream timeout");
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -372,28 +374,28 @@ api_stream(clicon_handle h,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
clicon_debug(1, "%s", __FUNCTION__);
|
clicon_debug(1, "%s", __FUNCTION__);
|
||||||
path = restconf_uripath(r);
|
path = restconf_uripath(h);
|
||||||
query = FCGX_GetParam("QUERY_STRING", r->envp);
|
query = clixon_restconf_param_get(h, "QUERY_STRING");
|
||||||
pretty = clicon_option_bool(h, "CLICON_RESTCONF_PRETTY");
|
pretty = clicon_option_bool(h, "CLICON_RESTCONF_PRETTY");
|
||||||
restconf_test(r, 1);
|
restconf_test(r, 1);
|
||||||
if ((pvec = clicon_strsep(path, "/", &pn)) == NULL)
|
if ((pvec = clicon_strsep(path, "/", &pn)) == NULL)
|
||||||
goto done;
|
goto done;
|
||||||
/* Sanity check of path. Should be /stream/<name> */
|
/* Sanity check of path. Should be /stream/<name> */
|
||||||
if (pn != 3){
|
if (pn != 3){
|
||||||
restconf_notfound(r);
|
restconf_notfound(h, r);
|
||||||
goto ok;
|
goto ok;
|
||||||
}
|
}
|
||||||
if (strlen(pvec[0]) != 0){
|
if (strlen(pvec[0]) != 0){
|
||||||
retval = restconf_notfound(r);
|
retval = restconf_notfound(h, r);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
if (strcmp(pvec[1], streampath)){
|
if (strcmp(pvec[1], streampath)){
|
||||||
retval = restconf_notfound(r);
|
retval = restconf_notfound(h, r);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((method = pvec[2]) == NULL){
|
if ((method = pvec[2]) == NULL){
|
||||||
retval = restconf_notfound(r);
|
retval = restconf_notfound(h, r);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
clicon_debug(1, "%s: method=%s", __FUNCTION__, method);
|
clicon_debug(1, "%s: method=%s", __FUNCTION__, method);
|
||||||
|
|
@ -452,12 +454,12 @@ api_stream(clicon_handle h,
|
||||||
xml_free(xret);
|
xml_free(xret);
|
||||||
#endif /* STREAM_FORK */
|
#endif /* STREAM_FORK */
|
||||||
/* Listen to backend socket */
|
/* Listen to backend socket */
|
||||||
if (event_reg_fd(s,
|
if (clixon_event_reg_fd(s,
|
||||||
restconf_stream_cb,
|
restconf_stream_cb,
|
||||||
(void*)r,
|
(void*)r,
|
||||||
"stream socket") < 0)
|
"stream socket") < 0)
|
||||||
goto done;
|
goto done;
|
||||||
if (event_reg_fd(r->listen_sock,
|
if (clixon_event_reg_fd(r->listen_sock,
|
||||||
stream_checkuplink,
|
stream_checkuplink,
|
||||||
(void*)r,
|
(void*)r,
|
||||||
"stream socket") < 0)
|
"stream socket") < 0)
|
||||||
|
|
@ -465,11 +467,11 @@ api_stream(clicon_handle h,
|
||||||
/* Poll upstream errors */
|
/* Poll upstream errors */
|
||||||
stream_timeout(0, (void*)r);
|
stream_timeout(0, (void*)r);
|
||||||
/* Start loop */
|
/* Start loop */
|
||||||
event_loop();
|
clixon_event_loop();
|
||||||
close(s);
|
close(s);
|
||||||
event_unreg_fd(s, restconf_stream_cb);
|
clixon_event_unreg_fd(s, restconf_stream_cb);
|
||||||
event_unreg_fd(r->listen_sock, restconf_stream_cb);
|
clixon_event_unreg_fd(r->listen_sock, restconf_stream_cb);
|
||||||
event_unreg_timeout(stream_timeout, (void*)r);
|
clixon_event_unreg_timeout(stream_timeout, (void*)r);
|
||||||
clicon_exit_reset();
|
clicon_exit_reset();
|
||||||
#ifdef STREAM_FORK
|
#ifdef STREAM_FORK
|
||||||
FCGX_Finish_r(r);
|
FCGX_Finish_r(r);
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
***** BEGIN LICENSE BLOCK *****
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
Copyright (C) 2009-2019 Olof Hagsand
|
Copyright (C) 2009-2019 Olof Hagsand
|
||||||
|
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
|
||||||
|
|
||||||
This file is part of CLIXON.
|
This file is part of CLIXON.
|
||||||
|
|
||||||
|
|
|
||||||
377
configure
vendored
377
configure
vendored
|
|
@ -1363,13 +1363,20 @@ Optional Features:
|
||||||
Optional Packages:
|
Optional Packages:
|
||||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||||
--with-cligen=dir Use CLIGEN here
|
--with-cligen=dir Use CLIGEN installation in this dir
|
||||||
--without-restconf disable support for restconf
|
--with-restconf=fcgi FCGI interface for stand-alone web rev-proxy eg
|
||||||
|
nginx (default)
|
||||||
|
--with-restconf=evhtp Integrate restconf with libevhtp server
|
||||||
|
--without-restconf Disable restconf altogether
|
||||||
--with-wwwuser=<user> Set www user different from www-data
|
--with-wwwuser=<user> Set www user different from www-data
|
||||||
--with-configfile=FILE set default path to config file
|
--with-configfile=FILE Set default path to config file
|
||||||
--with-libxml2 use gnome/libxml2 regex engine
|
--with-libxml2 Use gnome/libxml2 regex engine
|
||||||
--with-yang-installdir=DIR Install Clixon yang files here (default: ${prefix}/share/clixon)
|
--with-yang-installdir=DIR
|
||||||
--with-opt-yang-installdir=DIR Install optional yang files here (default: ${prefix}/share/clixon)
|
Install Clixon yang files here (default:
|
||||||
|
${prefix}/share/clixon)
|
||||||
|
--with-opt-yang-installdir=DIR
|
||||||
|
Install optional yang files here (default:
|
||||||
|
${prefix}/share/clixon)
|
||||||
|
|
||||||
Some influential environment variables:
|
Some influential environment variables:
|
||||||
CC C compiler command
|
CC C compiler command
|
||||||
|
|
@ -4660,16 +4667,22 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# This is for restconf (and fastcgi)
|
# This is for restconf. There are three options:
|
||||||
|
# --without-restconf No restconf support
|
||||||
|
# --with-restconf=fcgi FCGI interface for separate web reverse proxy like nginx
|
||||||
|
# --with-restconf=evhtp Integration with embedded web server libevhtp
|
||||||
|
# Real one
|
||||||
|
|
||||||
# Check whether --with-restconf was given.
|
# Check whether --with-restconf was given.
|
||||||
if test "${with_restconf+set}" = set; then :
|
if test "${with_restconf+set}" = set; then :
|
||||||
withval=$with_restconf;
|
withval=$with_restconf;
|
||||||
else
|
else
|
||||||
with_restconf=yes
|
with_restconf=fcgi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x${with_restconf}" == xyes; then
|
|
||||||
|
# Actions for each specific package
|
||||||
|
if test "x${with_restconf}" == xfcgi; then
|
||||||
# Lives in libfcgi-dev
|
# Lives in libfcgi-dev
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FCGX_Init in -lfcgi" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FCGX_Init in -lfcgi" >&5
|
||||||
$as_echo_n "checking for FCGX_Init in -lfcgi... " >&6; }
|
$as_echo_n "checking for FCGX_Init in -lfcgi... " >&6; }
|
||||||
|
|
@ -4718,26 +4731,360 @@ else
|
||||||
as_fn_error $? "libfcgi-dev missing" "$LINENO" 5
|
as_fn_error $? "libfcgi-dev missing" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
elif test "x${with_restconf}" == xevhtp; then
|
||||||
|
for ac_header in evhtp/evhtp.h
|
||||||
|
do :
|
||||||
|
ac_fn_c_check_header_mongrel "$LINENO" "evhtp/evhtp.h" "ac_cv_header_evhtp_evhtp_h" "$ac_includes_default"
|
||||||
|
if test "x$ac_cv_header_evhtp_evhtp_h" = xyes; then :
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define HAVE_EVHTP_EVHTP_H 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
else
|
||||||
|
as_fn_error $? "evhtp header missing. See https://github.com/criticalstack/libevhtp" "$LINENO" 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# This is for changing web user default www-data
|
done
|
||||||
|
|
||||||
|
#LIBS += -lpthread -levent -levent_openssl -lssl -lcrypto
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
|
||||||
|
$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
|
||||||
|
if ${ac_cv_lib_pthread_pthread_create+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
LIBS="-lpthread $LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any GCC internal prototype to avoid an error.
|
||||||
|
Use char because int might match the return type of a GCC
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
#endif
|
||||||
|
char pthread_create ();
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
return pthread_create ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"; then :
|
||||||
|
ac_cv_lib_pthread_pthread_create=yes
|
||||||
|
else
|
||||||
|
ac_cv_lib_pthread_pthread_create=no
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
LIBS=$ac_check_lib_save_LIBS
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
|
||||||
|
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
|
||||||
|
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define HAVE_LIBPTHREAD 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
LIBS="-lpthread $LIBS"
|
||||||
|
|
||||||
|
else
|
||||||
|
as_fn_error $? "libpthread missing" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for event_init in -levent" >&5
|
||||||
|
$as_echo_n "checking for event_init in -levent... " >&6; }
|
||||||
|
if ${ac_cv_lib_event_event_init+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
LIBS="-levent $LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any GCC internal prototype to avoid an error.
|
||||||
|
Use char because int might match the return type of a GCC
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
#endif
|
||||||
|
char event_init ();
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
return event_init ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"; then :
|
||||||
|
ac_cv_lib_event_event_init=yes
|
||||||
|
else
|
||||||
|
ac_cv_lib_event_event_init=no
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
LIBS=$ac_check_lib_save_LIBS
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_event_event_init" >&5
|
||||||
|
$as_echo "$ac_cv_lib_event_event_init" >&6; }
|
||||||
|
if test "x$ac_cv_lib_event_event_init" = xyes; then :
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define HAVE_LIBEVENT 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
LIBS="-levent $LIBS"
|
||||||
|
|
||||||
|
else
|
||||||
|
as_fn_error $? "libevent missing" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bufferevent_openssl_socket_new in -levent_openssl" >&5
|
||||||
|
$as_echo_n "checking for bufferevent_openssl_socket_new in -levent_openssl... " >&6; }
|
||||||
|
if ${ac_cv_lib_event_openssl_bufferevent_openssl_socket_new+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
LIBS="-levent_openssl $LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any GCC internal prototype to avoid an error.
|
||||||
|
Use char because int might match the return type of a GCC
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
#endif
|
||||||
|
char bufferevent_openssl_socket_new ();
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
return bufferevent_openssl_socket_new ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"; then :
|
||||||
|
ac_cv_lib_event_openssl_bufferevent_openssl_socket_new=yes
|
||||||
|
else
|
||||||
|
ac_cv_lib_event_openssl_bufferevent_openssl_socket_new=no
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
LIBS=$ac_check_lib_save_LIBS
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_event_openssl_bufferevent_openssl_socket_new" >&5
|
||||||
|
$as_echo "$ac_cv_lib_event_openssl_bufferevent_openssl_socket_new" >&6; }
|
||||||
|
if test "x$ac_cv_lib_event_openssl_bufferevent_openssl_socket_new" = xyes; then :
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define HAVE_LIBEVENT_OPENSSL 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
LIBS="-levent_openssl $LIBS"
|
||||||
|
|
||||||
|
else
|
||||||
|
as_fn_error $? "libevent_openssl missing" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL_init_ssl in -lssl" >&5
|
||||||
|
$as_echo_n "checking for OPENSSL_init_ssl in -lssl... " >&6; }
|
||||||
|
if ${ac_cv_lib_ssl_OPENSSL_init_ssl_+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
LIBS="-lssl $LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any GCC internal prototype to avoid an error.
|
||||||
|
Use char because int might match the return type of a GCC
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
#endif
|
||||||
|
char OPENSSL_init_ssl ();
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
return OPENSSL_init_ssl ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"; then :
|
||||||
|
ac_cv_lib_ssl_OPENSSL_init_ssl_=yes
|
||||||
|
else
|
||||||
|
ac_cv_lib_ssl_OPENSSL_init_ssl_=no
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
LIBS=$ac_check_lib_save_LIBS
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_OPENSSL_init_ssl_" >&5
|
||||||
|
$as_echo "$ac_cv_lib_ssl_OPENSSL_init_ssl_" >&6; }
|
||||||
|
if test "x$ac_cv_lib_ssl_OPENSSL_init_ssl_" = xyes; then :
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define HAVE_LIBSSL 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
LIBS="-lssl $LIBS"
|
||||||
|
|
||||||
|
else
|
||||||
|
as_fn_error $? "libssl missing" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AES_encrypt in -lcrypto" >&5
|
||||||
|
$as_echo_n "checking for AES_encrypt in -lcrypto... " >&6; }
|
||||||
|
if ${ac_cv_lib_crypto_AES_encrypt+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
LIBS="-lcrypto $LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any GCC internal prototype to avoid an error.
|
||||||
|
Use char because int might match the return type of a GCC
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
#endif
|
||||||
|
char AES_encrypt ();
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
return AES_encrypt ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"; then :
|
||||||
|
ac_cv_lib_crypto_AES_encrypt=yes
|
||||||
|
else
|
||||||
|
ac_cv_lib_crypto_AES_encrypt=no
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
LIBS=$ac_check_lib_save_LIBS
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_AES_encrypt" >&5
|
||||||
|
$as_echo "$ac_cv_lib_crypto_AES_encrypt" >&6; }
|
||||||
|
if test "x$ac_cv_lib_crypto_AES_encrypt" = xyes; then :
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define HAVE_LIBCRYPTO 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
LIBS="-lcrypto $LIBS"
|
||||||
|
|
||||||
|
else
|
||||||
|
as_fn_error $? "libcrypto missing" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for evhtp_new in -levhtp" >&5
|
||||||
|
$as_echo_n "checking for evhtp_new in -levhtp... " >&6; }
|
||||||
|
if ${ac_cv_lib_evhtp_evhtp_new+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_check_lib_save_LIBS=$LIBS
|
||||||
|
LIBS="-levhtp -lpthread -levent -levent_openssl -lssl -lcrypto $LIBS"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any GCC internal prototype to avoid an error.
|
||||||
|
Use char because int might match the return type of a GCC
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
#endif
|
||||||
|
char evhtp_new ();
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
return evhtp_new ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"; then :
|
||||||
|
ac_cv_lib_evhtp_evhtp_new=yes
|
||||||
|
else
|
||||||
|
ac_cv_lib_evhtp_evhtp_new=no
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
LIBS=$ac_check_lib_save_LIBS
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_evhtp_evhtp_new" >&5
|
||||||
|
$as_echo "$ac_cv_lib_evhtp_evhtp_new" >&6; }
|
||||||
|
if test "x$ac_cv_lib_evhtp_evhtp_new" = xyes; then :
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define HAVE_LIBEVHTP 1
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
LIBS="-levhtp $LIBS"
|
||||||
|
|
||||||
|
else
|
||||||
|
as_fn_error $? "libevhtp missing" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
elif test "x${with_restconf}" == xno; then
|
||||||
|
# Cant get around "no" as an answer for --without-restconf that is reset here to undefined
|
||||||
|
with_restconf=
|
||||||
|
else
|
||||||
|
as_fn_error $? "No such restconf package: ${with_restconf}" "$LINENO" 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${with_restconf}" != "x"; then
|
||||||
|
# This is so it appears in config.h
|
||||||
|
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define WITH_RESTCONF ${with_restconf}
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
fi
|
||||||
|
# These are dummies just to get the help strings right
|
||||||
|
|
||||||
|
# Check whether --with-restconf was given.
|
||||||
|
if test "${with_restconf+set}" = set; then :
|
||||||
|
withval=$with_restconf;
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Check whether --with-restconf was given.
|
||||||
|
if test "${with_restconf+set}" = set; then :
|
||||||
|
withval=$with_restconf;
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Check whether --with-restconf was given.
|
||||||
|
if test "${with_restconf+set}" = set; then :
|
||||||
|
withval=$with_restconf;
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Common actions for all restconf packages
|
||||||
|
if test "x${with_restconf}" != "x"; then
|
||||||
|
# This is for changing web user default www-data
|
||||||
|
|
||||||
# Check whether --with-wwwuser was given.
|
# Check whether --with-wwwuser was given.
|
||||||
if test "${with_wwwuser+set}" = set; then :
|
if test "${with_wwwuser+set}" = set; then :
|
||||||
withval=$with_wwwuser;
|
withval=$with_wwwuser;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "${with_wwwuser}"; then
|
if test "${with_wwwuser}"; then
|
||||||
wwwuser=${with_wwwuser}
|
wwwuser=${with_wwwuser}
|
||||||
|
fi
|
||||||
fi
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: www user is $wwwuser" >&5
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: www user is $wwwuser" >&5
|
|
||||||
$as_echo "www user is $wwwuser" >&6; }
|
$as_echo "www user is $wwwuser" >&6; }
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
#define WWWUSER "$wwwuser"
|
#define WWWUSER "$wwwuser"
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
# Set default config file location
|
# Set default config file location
|
||||||
CLIXON_DEFAULT_CONFIG=/usr/local/etc/clixon.xml
|
CLIXON_DEFAULT_CONFIG=/usr/local/etc/clixon.xml
|
||||||
|
|
|
||||||
71
configure.ac
71
configure.ac
|
|
@ -145,7 +145,8 @@ fi
|
||||||
SH_SUFFIX=".so"
|
SH_SUFFIX=".so"
|
||||||
|
|
||||||
# This is for cligen
|
# This is for cligen
|
||||||
AC_ARG_WITH(cligen, [ --with-cligen=dir Use CLIGEN here ] )
|
AC_ARG_WITH([cligen],
|
||||||
|
AS_HELP_STRING([--with-cligen=dir],[Use CLIGEN installation in this dir]))
|
||||||
if test "${with_cligen}"; then
|
if test "${with_cligen}"; then
|
||||||
echo "Using CLIGEN here: ${with_cligen}"
|
echo "Using CLIGEN here: ${with_cligen}"
|
||||||
CPPFLAGS="-I${with_cligen}/include ${CPPFLAGS}"
|
CPPFLAGS="-I${with_cligen}/include ${CPPFLAGS}"
|
||||||
|
|
@ -188,30 +189,65 @@ AC_CHECK_HEADERS(cligen/cligen.h,, AC_MSG_ERROR([CLIgen missing. Try: git clone
|
||||||
|
|
||||||
AC_CHECK_LIB(cligen, cligen_init,, AC_MSG_ERROR([CLIgen missing. Try: git clone https://github.com/olofhagsand/cligen.git]))
|
AC_CHECK_LIB(cligen, cligen_init,, AC_MSG_ERROR([CLIgen missing. Try: git clone https://github.com/olofhagsand/cligen.git]))
|
||||||
|
|
||||||
# This is for restconf (and fastcgi)
|
# This is for restconf. There are three options:
|
||||||
|
# --without-restconf No restconf support
|
||||||
|
# --with-restconf=fcgi FCGI interface for separate web reverse proxy like nginx
|
||||||
|
# --with-restconf=evhtp Integration with embedded web server libevhtp
|
||||||
|
# Real one
|
||||||
AC_ARG_WITH([restconf],
|
AC_ARG_WITH([restconf],
|
||||||
[AS_HELP_STRING([--without-restconf],[disable support for restconf])],
|
AS_HELP_STRING([--with-restconf=fcgi],[FCGI interface for stand-alone web rev-proxy eg nginx (default)]),
|
||||||
[],
|
,
|
||||||
[with_restconf=yes])
|
[with_restconf=fcgi])
|
||||||
if test "x${with_restconf}" == xyes; then
|
|
||||||
|
# Actions for each specific package
|
||||||
|
if test "x${with_restconf}" == xfcgi; then
|
||||||
# Lives in libfcgi-dev
|
# Lives in libfcgi-dev
|
||||||
AC_CHECK_LIB(fcgi, FCGX_Init,, AC_MSG_ERROR([libfcgi-dev missing]))
|
AC_CHECK_LIB(fcgi, FCGX_Init,, AC_MSG_ERROR([libfcgi-dev missing]))
|
||||||
|
elif test "x${with_restconf}" == xevhtp; then
|
||||||
|
AC_CHECK_HEADERS(evhtp/evhtp.h,, AC_MSG_ERROR([evhtp header missing. See https://github.com/criticalstack/libevhtp]))
|
||||||
|
#LIBS += -lpthread -levent -levent_openssl -lssl -lcrypto
|
||||||
|
AC_CHECK_LIB(pthread, pthread_create,, AC_MSG_ERROR([libpthread missing]))
|
||||||
|
AC_CHECK_LIB(event, event_init,, AC_MSG_ERROR([libevent missing]))
|
||||||
|
AC_CHECK_LIB(event_openssl, bufferevent_openssl_socket_new,, AC_MSG_ERROR([libevent_openssl missing]))
|
||||||
|
AC_CHECK_LIB(ssl, OPENSSL_init_ssl ,, AC_MSG_ERROR([libssl missing]))
|
||||||
|
AC_CHECK_LIB(crypto, AES_encrypt,, AC_MSG_ERROR([libcrypto missing]))
|
||||||
|
AC_CHECK_LIB(evhtp, evhtp_new,, AC_MSG_ERROR([libevhtp missing]),[-lpthread -levent -levent_openssl -lssl -lcrypto])
|
||||||
|
|
||||||
|
elif test "x${with_restconf}" == xno; then
|
||||||
|
# Cant get around "no" as an answer for --without-restconf that is reset here to undefined
|
||||||
|
with_restconf=
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR([No such restconf package: ${with_restconf}])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# This is for changing web user default www-data
|
if test "x${with_restconf}" != "x"; then
|
||||||
AC_ARG_WITH([wwwuser],
|
# This is so it appears in config.h
|
||||||
|
AC_DEFINE_UNQUOTED(WITH_RESTCONF, ${with_restconf}, [Restconf package])
|
||||||
|
fi
|
||||||
|
# These are dummies just to get the help strings right
|
||||||
|
AC_ARG_WITH([restconf],
|
||||||
|
AS_HELP_STRING([--with-restconf=fcgi],[FCGI interface for stand-alone web rev-proxy eg nginx (default)]))
|
||||||
|
AC_ARG_WITH([restconf],
|
||||||
|
AS_HELP_STRING([--with-restconf=evhtp],[Integrate restconf with libevhtp server]))
|
||||||
|
AC_ARG_WITH([restconf],
|
||||||
|
AS_HELP_STRING([--without-restconf],[Disable restconf altogether]))
|
||||||
|
|
||||||
|
# Common actions for all restconf packages
|
||||||
|
if test "x${with_restconf}" != "x"; then
|
||||||
|
# This is for changing web user default www-data
|
||||||
|
AC_ARG_WITH([wwwuser],
|
||||||
[AS_HELP_STRING([--with-wwwuser=<user>],[Set www user different from www-data])])
|
[AS_HELP_STRING([--with-wwwuser=<user>],[Set www user different from www-data])])
|
||||||
if test "${with_wwwuser}"; then
|
if test "${with_wwwuser}"; then
|
||||||
wwwuser=${with_wwwuser}
|
wwwuser=${with_wwwuser}
|
||||||
|
fi
|
||||||
|
AC_MSG_RESULT(www user is $wwwuser)
|
||||||
|
AC_DEFINE_UNQUOTED(WWWUSER, "$wwwuser", [WWW user for restconf daemon])
|
||||||
fi
|
fi
|
||||||
AC_MSG_RESULT(www user is $wwwuser)
|
|
||||||
AC_DEFINE_UNQUOTED(WWWUSER, "$wwwuser", [WWW user for restconf daemon])
|
|
||||||
|
|
||||||
# Set default config file location
|
# Set default config file location
|
||||||
CLIXON_DEFAULT_CONFIG=/usr/local/etc/clixon.xml
|
CLIXON_DEFAULT_CONFIG=/usr/local/etc/clixon.xml
|
||||||
AC_ARG_WITH([configfile],
|
AC_ARG_WITH([configfile],
|
||||||
[AS_HELP_STRING([--with-configfile=FILE],[set default path to config file])],
|
[AS_HELP_STRING([--with-configfile=FILE],[Set default path to config file])],
|
||||||
[CLIXON_DEFAULT_CONFIG="$withval"],)
|
[CLIXON_DEFAULT_CONFIG="$withval"],)
|
||||||
|
|
||||||
AC_CHECK_LIB(socket, socket)
|
AC_CHECK_LIB(socket, socket)
|
||||||
|
|
@ -220,7 +256,8 @@ AC_CHECK_LIB(dl, dlopen)
|
||||||
# This is for libxml2 XSD regex engine
|
# This is for libxml2 XSD regex engine
|
||||||
# Note this only enables the compiling of the code. In order to actually
|
# Note this only enables the compiling of the code. In order to actually
|
||||||
# use it you need to set Clixon config option CLICON_YANG_REGEXP to libxml2
|
# use it you need to set Clixon config option CLICON_YANG_REGEXP to libxml2
|
||||||
AC_ARG_WITH(libxml2, [ --with-libxml2 use gnome/libxml2 regex engine ] )
|
AC_ARG_WITH([libxml2],
|
||||||
|
[AS_HELP_STRING([--with-libxml2],[Use gnome/libxml2 regex engine])])
|
||||||
if test "${with_libxml2}"; then
|
if test "${with_libxml2}"; then
|
||||||
# Find libxml2 lib
|
# Find libxml2 lib
|
||||||
AC_CHECK_LIB(xml2, xmlRegexpCompile,[], AC_MSG_ERROR([libxml2 not found]))
|
AC_CHECK_LIB(xml2, xmlRegexpCompile,[], AC_MSG_ERROR([libxml2 not found]))
|
||||||
|
|
@ -239,7 +276,7 @@ AC_MSG_RESULT(Have getsockopt SO_PEERCRED)])
|
||||||
# Each application designer may need to place YANG_INSTALLDIR in their config:
|
# Each application designer may need to place YANG_INSTALLDIR in their config:
|
||||||
# <CLICON_YANG_DIR>$YANG_INSTALLDIR</CLICON_YANG_DIR>
|
# <CLICON_YANG_DIR>$YANG_INSTALLDIR</CLICON_YANG_DIR>
|
||||||
AC_ARG_WITH(yang-installdir,
|
AC_ARG_WITH(yang-installdir,
|
||||||
[ --with-yang-installdir=DIR Install Clixon yang files here (default: ${prefix}/share/clixon) ],
|
[AS_HELP_STRING([--with-yang-installdir=DIR],[Install Clixon yang files here (default: ${prefix}/share/clixon)])],
|
||||||
[YANG_INSTALLDIR="$withval"],
|
[YANG_INSTALLDIR="$withval"],
|
||||||
[YANG_INSTALLDIR="${prefix}/share/clixon"]
|
[YANG_INSTALLDIR="${prefix}/share/clixon"]
|
||||||
)
|
)
|
||||||
|
|
@ -251,7 +288,7 @@ AC_MSG_RESULT(Clixon yang files are installed in ${YANG_INSTALLDIR})
|
||||||
# that Clixon needs to run (or examples rely on). These may be retreived from
|
# that Clixon needs to run (or examples rely on). These may be retreived from
|
||||||
# elsewhere (eg yangmodels repo)
|
# elsewhere (eg yangmodels repo)
|
||||||
AC_ARG_WITH(opt-yang-installdir,
|
AC_ARG_WITH(opt-yang-installdir,
|
||||||
[ --with-opt-yang-installdir=DIR Install optional yang files here (default: ${prefix}/share/clixon) ],
|
[AS_HELP_STRING([--with-opt-yang-installdir=DIR],[Install optional yang files here (default: ${prefix}/share/clixon)])],
|
||||||
[OPT_YANG_INSTALLDIR="$withval"],
|
[OPT_YANG_INSTALLDIR="$withval"],
|
||||||
[OPT_YANG_INSTALLDIR="${prefix}/share/clixon"]
|
[OPT_YANG_INSTALLDIR="${prefix}/share/clixon"]
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
#
|
#
|
||||||
# ***** BEGIN LICENSE BLOCK *****
|
# ***** BEGIN LICENSE BLOCK *****
|
||||||
#
|
#
|
||||||
# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
|
# Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
|
||||||
|
# Copyright (C) 2017-2019 Olof Hagsand
|
||||||
|
# Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgat)e
|
||||||
#
|
#
|
||||||
# This file is part of CLIXON
|
# This file is part of CLIXON
|
||||||
#
|
#
|
||||||
|
|
@ -63,7 +65,7 @@ NETCONF_PLUGIN = $(APPNAME)_netconf.so
|
||||||
RESTCONF_PLUGIN = $(APPNAME)_restconf.so
|
RESTCONF_PLUGIN = $(APPNAME)_restconf.so
|
||||||
|
|
||||||
PLUGINS = $(BE_PLUGIN) $(BE2_PLUGIN) $(CLI_PLUGIN) $(NETCONF_PLUGIN)
|
PLUGINS = $(BE_PLUGIN) $(BE2_PLUGIN) $(CLI_PLUGIN) $(NETCONF_PLUGIN)
|
||||||
ifeq ($(with_restconf),yes)
|
ifdef with_restconf
|
||||||
PLUGINS += $(RESTCONF_PLUGIN)
|
PLUGINS += $(RESTCONF_PLUGIN)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
@ -138,7 +140,7 @@ install: $(YANGSPECS) $(CLISPECS) $(PLUGINS) $(APPNAME).xml
|
||||||
install -m 0644 $(INSTALLFLAGS) $(BE_PLUGIN) $(BE2_PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/backend
|
install -m 0644 $(INSTALLFLAGS) $(BE_PLUGIN) $(BE2_PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/backend
|
||||||
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/netconf
|
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/netconf
|
||||||
install -m 0644 $(INSTALLFLAGS) $(NETCONF_PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/netconf
|
install -m 0644 $(INSTALLFLAGS) $(NETCONF_PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/netconf
|
||||||
ifeq ($(with_restconf),yes)
|
ifdef with_restconf
|
||||||
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/restconf
|
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/restconf
|
||||||
install -m 0644 $(INSTALLFLAGS) $(RESTCONF_PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/restconf
|
install -m 0644 $(INSTALLFLAGS) $(RESTCONF_PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/restconf
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -235,7 +235,7 @@ example_stream_timer_setup(clicon_handle h)
|
||||||
gettimeofday(&t, NULL);
|
gettimeofday(&t, NULL);
|
||||||
t1.tv_sec = 5; t1.tv_usec = 0;
|
t1.tv_sec = 5; t1.tv_usec = 0;
|
||||||
timeradd(&t, &t1, &t);
|
timeradd(&t, &t1, &t);
|
||||||
return event_reg_timeout(t, example_stream_timer, h, "example stream timer");
|
return clixon_event_reg_timeout(t, example_stream_timer, h, "example stream timer");
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Smallest possible RPC declaration for test
|
/*! Smallest possible RPC declaration for test
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,9 @@
|
||||||
*
|
*
|
||||||
***** BEGIN LICENSE BLOCK *****
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
|
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
|
||||||
|
Copyright (C) 2017-2019 Olof Hagsand
|
||||||
|
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgat)e
|
||||||
|
|
||||||
This file is part of CLIXON.
|
This file is part of CLIXON.
|
||||||
|
|
||||||
|
|
@ -31,6 +33,8 @@
|
||||||
|
|
||||||
***** END LICENSE BLOCK *****
|
***** END LICENSE BLOCK *****
|
||||||
*
|
*
|
||||||
|
* This code uses WITH_RESTCONF_FCGI to identify its run with fcgi intreface for ca_auth
|
||||||
|
* This should be changed.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
@ -39,14 +43,13 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <fcgiapp.h>
|
|
||||||
|
|
||||||
/* cligen */
|
/* cligen */
|
||||||
#include <cligen/cligen.h>
|
#include <cligen/cligen.h>
|
||||||
|
|
||||||
/* clicon */
|
/* clicon */
|
||||||
#include <clixon/clixon.h>
|
#include <clixon/clixon.h>
|
||||||
#include <clixon/clixon_restconf.h>
|
#include <clixon/clixon_restconf.h> /* minor use */
|
||||||
|
|
||||||
static const char Base64[] =
|
static const char Base64[] =
|
||||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||||
|
|
@ -198,23 +201,22 @@ example_restconf_credentials(clicon_handle h,
|
||||||
void *arg)
|
void *arg)
|
||||||
{
|
{
|
||||||
int retval = -1;
|
int retval = -1;
|
||||||
FCGX_Request *r = (FCGX_Request *)arg;
|
|
||||||
cxobj *xt = NULL;
|
cxobj *xt = NULL;
|
||||||
char *auth;
|
|
||||||
char *user = NULL;
|
char *user = NULL;
|
||||||
|
cbuf *cb = NULL;
|
||||||
|
char *auth;
|
||||||
char *passwd;
|
char *passwd;
|
||||||
char *passwd2 = "";
|
char *passwd2 = "";
|
||||||
size_t authlen;
|
size_t authlen;
|
||||||
cbuf *cb = NULL;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* HTTP basic authentication not enabled, pass with user "none" */
|
/* HTTP basic authentication not enabled, pass with user "none" */
|
||||||
if (basic_auth==0)
|
if (basic_auth==0)
|
||||||
goto ok;
|
goto ok;
|
||||||
/* At this point in the code we must use HTTP basic authentication */
|
/* At this point in the code we must use HTTP basic authentication */
|
||||||
if ((auth = FCGX_GetParam("HTTP_AUTHORIZATION", r->envp)) == NULL)
|
if ((auth = clixon_restconf_param_get(h, "HTTP_AUTHORIZATION")) == NULL)
|
||||||
goto fail;
|
goto fail;
|
||||||
if (strlen(auth) < strlen("Basic "))
|
if (strlen(auth) < strlen("Basic "))
|
||||||
goto fail;
|
goto fail;
|
||||||
if (strncmp("Basic ", auth, strlen("Basic ")))
|
if (strncmp("Basic ", auth, strlen("Basic ")))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,9 @@
|
||||||
/* Define to 1 if you have the <cligen/cligen.h> header file. */
|
/* Define to 1 if you have the <cligen/cligen.h> header file. */
|
||||||
#undef HAVE_CLIGEN_CLIGEN_H
|
#undef HAVE_CLIGEN_CLIGEN_H
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <evhtp/evhtp.h> header file. */
|
||||||
|
#undef HAVE_EVHTP_EVHTP_H
|
||||||
|
|
||||||
/* Define to 1 if you have the `getpeereid' function. */
|
/* Define to 1 if you have the `getpeereid' function. */
|
||||||
#undef HAVE_GETPEEREID
|
#undef HAVE_GETPEEREID
|
||||||
|
|
||||||
|
|
@ -42,6 +45,9 @@
|
||||||
/* Define to 1 if you have the `dl' library (-ldl). */
|
/* Define to 1 if you have the `dl' library (-ldl). */
|
||||||
#undef HAVE_LIBDL
|
#undef HAVE_LIBDL
|
||||||
|
|
||||||
|
/* Define to 1 if you have the `evhtp' library (-levhtp). */
|
||||||
|
#undef HAVE_LIBEVHTP
|
||||||
|
|
||||||
/* Define to 1 if you have the `fcgi' library (-lfcgi). */
|
/* Define to 1 if you have the `fcgi' library (-lfcgi). */
|
||||||
#undef HAVE_LIBFCGI
|
#undef HAVE_LIBFCGI
|
||||||
|
|
||||||
|
|
@ -120,6 +126,9 @@
|
||||||
/* Define to 1 if you have the ANSI C header files. */
|
/* Define to 1 if you have the ANSI C header files. */
|
||||||
#undef STDC_HEADERS
|
#undef STDC_HEADERS
|
||||||
|
|
||||||
|
/* Restconf package */
|
||||||
|
#undef WITH_RESTCONF
|
||||||
|
|
||||||
/* WWW user for restconf daemon */
|
/* WWW user for restconf daemon */
|
||||||
#undef WWWUSER
|
#undef WWWUSER
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,9 @@
|
||||||
*
|
*
|
||||||
***** BEGIN LICENSE BLOCK *****
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
|
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
|
||||||
|
Copyright (C) 2017-2019 Olof Hagsand
|
||||||
|
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
|
||||||
|
|
||||||
This file is part of CLIXON.
|
This file is part of CLIXON.
|
||||||
|
|
||||||
|
|
@ -35,6 +37,7 @@
|
||||||
* Access functions for clixon data.
|
* Access functions for clixon data.
|
||||||
* Free-typed values for runtime getting and setting.
|
* Free-typed values for runtime getting and setting.
|
||||||
* Accessed with clicon_data(h).
|
* Accessed with clicon_data(h).
|
||||||
|
* @see clixon_option.[ch] for clixon options
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _CLIXON_DATA_H_
|
#ifndef _CLIXON_DATA_H_
|
||||||
|
|
@ -52,6 +55,10 @@ typedef struct {
|
||||||
/*
|
/*
|
||||||
* Prototypes
|
* Prototypes
|
||||||
*/
|
*/
|
||||||
|
int clicon_data_get(clicon_handle h, char *id, char **val);
|
||||||
|
int clicon_data_set(clicon_handle h, char *id, char *val);
|
||||||
|
int clicon_data_del(clicon_handle h, char *name);
|
||||||
|
|
||||||
yang_stmt * clicon_dbspec_yang(clicon_handle h);
|
yang_stmt * clicon_dbspec_yang(clicon_handle h);
|
||||||
int clicon_dbspec_yang_set(clicon_handle h, yang_stmt *ys);
|
int clicon_dbspec_yang_set(clicon_handle h, yang_stmt *ys);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,9 @@
|
||||||
*
|
*
|
||||||
***** BEGIN LICENSE BLOCK *****
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
|
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
|
||||||
|
Copyright (C) 2017-2019 Olof Hagsand
|
||||||
|
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
|
||||||
|
|
||||||
This file is part of CLIXON.
|
This file is part of CLIXON.
|
||||||
|
|
||||||
|
|
@ -47,19 +49,19 @@ int clicon_exit_reset(void);
|
||||||
|
|
||||||
int clicon_exit_get(void);
|
int clicon_exit_get(void);
|
||||||
|
|
||||||
int event_reg_fd(int fd, int (*fn)(int, void*), void *arg, char *str);
|
int clixon_event_reg_fd(int fd, int (*fn)(int, void*), void *arg, char *str);
|
||||||
|
|
||||||
int event_unreg_fd(int s, int (*fn)(int, void*));
|
int clixon_event_unreg_fd(int s, int (*fn)(int, void*));
|
||||||
|
|
||||||
int event_reg_timeout(struct timeval t, int (*fn)(int, void*),
|
int clixon_event_reg_timeout(struct timeval t, int (*fn)(int, void*),
|
||||||
void *arg, char *str);
|
void *arg, char *str);
|
||||||
|
|
||||||
int event_unreg_timeout(int (*fn)(int, void*), void *arg);
|
int clixon_event_unreg_timeout(int (*fn)(int, void*), void *arg);
|
||||||
|
|
||||||
int event_poll(int fd);
|
int clixon_event_poll(int fd);
|
||||||
|
|
||||||
int event_loop(void);
|
int clixon_event_loop(void);
|
||||||
|
|
||||||
int event_exit(void);
|
int clixon_event_exit(void);
|
||||||
|
|
||||||
#endif /* _CLIXON_EVENT_H_ */
|
#endif /* _CLIXON_EVENT_H_ */
|
||||||
|
|
|
||||||
|
|
@ -33,8 +33,10 @@
|
||||||
|
|
||||||
***** END LICENSE BLOCK *****
|
***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
*
|
* This file contains access functions for two types of clixon vars:
|
||||||
* Configuration file and Options.
|
* - options, ie string based variables from Clixon configuration files.
|
||||||
|
* Accessed with clicon_options(h).
|
||||||
|
* @see clixon_data.[ch] for free-type runtime get/set *
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _CLIXON_OPTIONS_H_
|
#ifndef _CLIXON_OPTIONS_H_
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,7 @@ static inline char * strdup4(char *str)
|
||||||
*/
|
*/
|
||||||
char **clicon_strsep(char *string, char *delim, int *nvec0);
|
char **clicon_strsep(char *string, char *delim, int *nvec0);
|
||||||
char *clicon_strjoin (int argc, char **argv, char *delim);
|
char *clicon_strjoin (int argc, char **argv, char *delim);
|
||||||
|
int clixon_strsplit(char *nodeid, const int delim, char **prefix, char **id);
|
||||||
int str2cvec(char *string, char delim1, char delim2, cvec **cvp);
|
int str2cvec(char *string, char delim1, char delim2, cvec **cvp);
|
||||||
#if defined(__GNUC__) && __GNUC__ >= 3
|
#if defined(__GNUC__) && __GNUC__ >= 3
|
||||||
int uri_percent_encode(char **encp, char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
|
int uri_percent_encode(char **encp, char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,9 @@
|
||||||
*
|
*
|
||||||
***** BEGIN LICENSE BLOCK *****
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
|
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
|
||||||
|
Copyright (C) 2017-2019 Olof Hagsand
|
||||||
|
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgate)
|
||||||
|
|
||||||
This file is part of CLIXON.
|
This file is part of CLIXON.
|
||||||
|
|
||||||
|
|
@ -35,6 +37,7 @@
|
||||||
* Access functions for clixon data.
|
* Access functions for clixon data.
|
||||||
* Free-typed values for runtime getting and setting.
|
* Free-typed values for runtime getting and setting.
|
||||||
* Accessed with clicon_data(h).
|
* Accessed with clicon_data(h).
|
||||||
|
* @see clixon_option.[ch] for clixon options
|
||||||
*/
|
*/
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "clixon_config.h" /* generated by config & autoconf */
|
#include "clixon_config.h" /* generated by config & autoconf */
|
||||||
|
|
@ -75,8 +78,66 @@
|
||||||
#include "clixon_xpath.h"
|
#include "clixon_xpath.h"
|
||||||
#include "clixon_data.h"
|
#include "clixon_data.h"
|
||||||
|
|
||||||
/*! Get YANG specification for application specs
|
/*! Get generic clixon data on the form <name>=<val> where <val> is string
|
||||||
* Must use hash functions directly since they are not strings.
|
* @param[in] h Clicon handle
|
||||||
|
* @param[in] name Data name
|
||||||
|
* @param[out] val Data value as string
|
||||||
|
* @retval 0 OK
|
||||||
|
* @retval -1 Not found
|
||||||
|
* @see clicon_option_str
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
clicon_data_get(clicon_handle h,
|
||||||
|
char *name,
|
||||||
|
char **val)
|
||||||
|
{
|
||||||
|
clicon_hash_t *cdat = clicon_data(h);
|
||||||
|
|
||||||
|
if (val == NULL){
|
||||||
|
clicon_err(OE_CFG, EINVAL, "%s val is NULL", __FUNCTION__);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (clicon_hash_lookup(cdat, (char*)name) == NULL)
|
||||||
|
return -1;
|
||||||
|
*val = clicon_hash_value(cdat, (char*)name, NULL);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Set generic clixon data on the form <name>=<val> where <val> is string
|
||||||
|
* @param[in] h Clicon handle
|
||||||
|
* @param[in] name Data name
|
||||||
|
* @param[in] val Data value as null-terminated string
|
||||||
|
* @retval 0 OK
|
||||||
|
* @retval -1 Error
|
||||||
|
* @see clicon_option_str_set
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
clicon_data_set(clicon_handle h,
|
||||||
|
char *name,
|
||||||
|
char *val)
|
||||||
|
{
|
||||||
|
clicon_hash_t *cdat = clicon_data(h);
|
||||||
|
|
||||||
|
return clicon_hash_add(cdat, (char*)name, val, strlen(val)+1)==NULL?-1:0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*! Delete generic clixon data
|
||||||
|
* @param[in] h Clicon handle
|
||||||
|
* @param[in] name Data name
|
||||||
|
* @retval 0 OK
|
||||||
|
* @retval -1 Error
|
||||||
|
* @see clicon_option_del
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
clicon_data_del(clicon_handle h,
|
||||||
|
char *name)
|
||||||
|
{
|
||||||
|
clicon_hash_t *cdat = clicon_data(h);
|
||||||
|
|
||||||
|
return clicon_hash_del(cdat, (char*)name);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
* @param[in] h Clicon handle
|
* @param[in] h Clicon handle
|
||||||
* @retval yspec Yang spec
|
* @retval yspec Yang spec
|
||||||
* @see clicon_config_yang for the configuration yang
|
* @see clicon_config_yang for the configuration yang
|
||||||
|
|
@ -655,3 +716,4 @@ clicon_session_id_set(clicon_handle h,
|
||||||
clicon_hash_add(cdat, "session-id", &id, sizeof(uint32_t));
|
clicon_hash_add(cdat, "session-id", &id, sizeof(uint32_t));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,9 @@
|
||||||
*
|
*
|
||||||
***** BEGIN LICENSE BLOCK *****
|
***** BEGIN LICENSE BLOCK *****
|
||||||
|
|
||||||
Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
|
Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren
|
||||||
|
Copyright (C) 2017-2019 Olof Hagsand
|
||||||
|
Copyright (C) 2020 Olof Hagsand and Rubicon Communications, LLC(Netgat)e
|
||||||
|
|
||||||
This file is part of CLIXON.
|
This file is part of CLIXON.
|
||||||
|
|
||||||
|
|
@ -80,7 +82,7 @@ struct event_data{
|
||||||
static struct event_data *ee = NULL;
|
static struct event_data *ee = NULL;
|
||||||
static struct event_data *ee_timers = NULL;
|
static struct event_data *ee_timers = NULL;
|
||||||
|
|
||||||
/* Set if element in ee is deleted (event_unreg_fd). Check in ee loops */
|
/* Set if element in ee is deleted (clixon_event_unreg_fd). Check in ee loops */
|
||||||
static int _ee_unreg = 0;
|
static int _ee_unreg = 0;
|
||||||
|
|
||||||
static int _clicon_exit = 0;
|
static int _clicon_exit = 0;
|
||||||
|
|
@ -123,14 +125,14 @@ clicon_exit_get(void)
|
||||||
* @code
|
* @code
|
||||||
* int fn(int fd, void *arg){
|
* int fn(int fd, void *arg){
|
||||||
* }
|
* }
|
||||||
* event_reg_fd(fd, fn, (void*)42, "call fn on input on fd");
|
* clixon_event_reg_fd(fd, fn, (void*)42, "call fn on input on fd");
|
||||||
* @endcode
|
* @endcode
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
event_reg_fd(int fd,
|
clixon_event_reg_fd(int fd,
|
||||||
int (*fn)(int, void*),
|
int (*fn)(int, void*),
|
||||||
void *arg,
|
void *arg,
|
||||||
char *str)
|
char *str)
|
||||||
{
|
{
|
||||||
struct event_data *e;
|
struct event_data *e;
|
||||||
|
|
||||||
|
|
@ -154,12 +156,12 @@ event_reg_fd(int fd,
|
||||||
* @param[in] s File descriptor
|
* @param[in] s File descriptor
|
||||||
* @param[in] fn Function to call when input available on fd
|
* @param[in] fn Function to call when input available on fd
|
||||||
* Note: deregister when exactly function and socket match, not argument
|
* Note: deregister when exactly function and socket match, not argument
|
||||||
* @see event_reg_fd
|
* @see clixon_event_reg_fd
|
||||||
* @see event_unreg_timeout
|
* @see clixon_event_unreg_timeout
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
event_unreg_fd(int s,
|
clixon_event_unreg_fd(int s,
|
||||||
int (*fn)(int, void*))
|
int (*fn)(int, void*))
|
||||||
{
|
{
|
||||||
struct event_data *e, **e_prev;
|
struct event_data *e, **e_prev;
|
||||||
int found = 0;
|
int found = 0;
|
||||||
|
|
@ -189,7 +191,7 @@ event_unreg_fd(int s,
|
||||||
* gettimeofday(&t, NULL);
|
* gettimeofday(&t, NULL);
|
||||||
* t1.tv_sec = 1; t1.tv_usec = 0;
|
* t1.tv_sec = 1; t1.tv_usec = 0;
|
||||||
* timeradd(&t, &t1, &t);
|
* timeradd(&t, &t1, &t);
|
||||||
* event_reg_timeout(t, fn, NULL, "call every second");
|
* clixon_event_reg_timeout(t, fn, NULL, "call every second");
|
||||||
* }
|
* }
|
||||||
* @endcode
|
* @endcode
|
||||||
*
|
*
|
||||||
|
|
@ -198,14 +200,14 @@ event_unreg_fd(int s,
|
||||||
* registration for each period, see example above.
|
* registration for each period, see example above.
|
||||||
* Note also that the first argument to fn is a dummy, just to get the same
|
* Note also that the first argument to fn is a dummy, just to get the same
|
||||||
* signatute as for file-descriptor callbacks.
|
* signatute as for file-descriptor callbacks.
|
||||||
* @see event_reg_fd
|
* @see clixon_event_reg_fd
|
||||||
* @see event_unreg_timeout
|
* @see clixon_event_unreg_timeout
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
event_reg_timeout(struct timeval t,
|
clixon_event_reg_timeout(struct timeval t,
|
||||||
int (*fn)(int, void*),
|
int (*fn)(int, void*),
|
||||||
void *arg,
|
void *arg,
|
||||||
char *str)
|
char *str)
|
||||||
{
|
{
|
||||||
struct event_data *e, *e1, **e_prev;
|
struct event_data *e, *e1, **e_prev;
|
||||||
|
|
||||||
|
|
@ -228,22 +230,22 @@ event_reg_timeout(struct timeval t,
|
||||||
}
|
}
|
||||||
e->e_next = e1;
|
e->e_next = e1;
|
||||||
*e_prev = e;
|
*e_prev = e;
|
||||||
clicon_debug(2, "event_reg_timeout: %s", str);
|
clicon_debug(2, "%s: %s", __FUNCTION__, str);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Deregister a timeout callback as previosly registered by event_reg_timeout()
|
/*! Deregister a timeout callback as previosly registered by clixon_event_reg_timeout()
|
||||||
* Note: deregister when exactly function and function arguments match, not time. So you
|
* Note: deregister when exactly function and function arguments match, not time. So you
|
||||||
* cannot have same function and argument callback on different timeouts. This is a little
|
* cannot have same function and argument callback on different timeouts. This is a little
|
||||||
* different from event_unreg_fd.
|
* different from clixon_event_unreg_fd.
|
||||||
* @param[in] fn Function to call at time t
|
* @param[in] fn Function to call at time t
|
||||||
* @param[in] arg Argument to function fn
|
* @param[in] arg Argument to function fn
|
||||||
* @see event_reg_timeout
|
* @see clixon_event_reg_timeout
|
||||||
* @see event_unreg_fd
|
* @see clixon_event_unreg_fd
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
event_unreg_timeout(int (*fn)(int, void*),
|
clixon_event_unreg_timeout(int (*fn)(int, void*),
|
||||||
void *arg)
|
void *arg)
|
||||||
{
|
{
|
||||||
struct event_data *e, **e_prev;
|
struct event_data *e, **e_prev;
|
||||||
int found = 0;
|
int found = 0;
|
||||||
|
|
@ -268,7 +270,7 @@ event_unreg_timeout(int (*fn)(int, void*),
|
||||||
* @retval 1 Something to read on fd
|
* @retval 1 Something to read on fd
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
event_poll(int fd)
|
clixon_event_poll(int fd)
|
||||||
{
|
{
|
||||||
int retval = -1;
|
int retval = -1;
|
||||||
fd_set fdset;
|
fd_set fdset;
|
||||||
|
|
@ -288,7 +290,7 @@ event_poll(int fd)
|
||||||
* @retval -1 Error: eg select, callback, timer,
|
* @retval -1 Error: eg select, callback, timer,
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
event_loop(void)
|
clixon_event_loop(void)
|
||||||
{
|
{
|
||||||
struct event_data *e;
|
struct event_data *e;
|
||||||
struct event_data *e_next;
|
struct event_data *e_next;
|
||||||
|
|
@ -363,7 +365,7 @@ event_loop(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
event_exit(void)
|
clixon_event_exit(void)
|
||||||
{
|
{
|
||||||
struct event_data *e, *e_next;
|
struct event_data *e, *e_next;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -37,9 +37,7 @@
|
||||||
* This file contains access functions for two types of clixon vars:
|
* This file contains access functions for two types of clixon vars:
|
||||||
* - options, ie string based variables from Clixon configuration files.
|
* - options, ie string based variables from Clixon configuration files.
|
||||||
* Accessed with clicon_options(h).
|
* Accessed with clicon_options(h).
|
||||||
* - data. Free-typed values for runtime getting and setting.
|
* @see clixon_data.[ch] for free-type runtime get/set
|
||||||
* Accessed with clicon_data(h).
|
|
||||||
* Consider splitting?
|
|
||||||
*/
|
*/
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "clixon_config.h" /* generated by config & autoconf */
|
#include "clixon_config.h" /* generated by config & autoconf */
|
||||||
|
|
|
||||||
|
|
@ -230,7 +230,7 @@ stream_get_xml(clicon_handle h,
|
||||||
/*! Check all stream subscription stop timers, set up new timer
|
/*! Check all stream subscription stop timers, set up new timer
|
||||||
* @param[in] fd No-op
|
* @param[in] fd No-op
|
||||||
* @param[in] arg Clicon handle
|
* @param[in] arg Clicon handle
|
||||||
* @note format is given by event_reg_timeout callback function (fd not needed)
|
* @note format is given by clixon_event_reg_timeout callback function (fd not needed)
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
stream_timer_setup(int fd,
|
stream_timer_setup(int fd,
|
||||||
|
|
@ -295,7 +295,7 @@ stream_timer_setup(int fd,
|
||||||
}
|
}
|
||||||
/* Initiate new timer */
|
/* Initiate new timer */
|
||||||
timeradd(&now, &t1, &t);
|
timeradd(&now, &t1, &t);
|
||||||
if (event_reg_timeout(t,
|
if (clixon_event_reg_timeout(t,
|
||||||
stream_timer_setup, /* this function */
|
stream_timer_setup, /* this function */
|
||||||
h, /* clicon handle */
|
h, /* clicon handle */
|
||||||
"stream timer setup") < 0)
|
"stream timer setup") < 0)
|
||||||
|
|
@ -841,7 +841,7 @@ stream_replay_trigger(clicon_handle h,
|
||||||
ra->ra_fn = fn;
|
ra->ra_fn = fn;
|
||||||
ra->ra_arg = arg;
|
ra->ra_arg = arg;
|
||||||
gettimeofday(&now, NULL);
|
gettimeofday(&now, NULL);
|
||||||
if (event_reg_timeout(now, stream_replay_cb, ra,
|
if (clixon_event_reg_timeout(now, stream_replay_cb, ra,
|
||||||
"create-subscribtion stream replay") < 0)
|
"create-subscribtion stream replay") < 0)
|
||||||
goto done;
|
goto done;
|
||||||
retval = 0;
|
retval = 0;
|
||||||
|
|
|
||||||
|
|
@ -148,6 +148,59 @@ clicon_strjoin(int argc,
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*! Split a string once into two parts: prefix and suffix
|
||||||
|
* @param[in] string
|
||||||
|
* @param[in] delim
|
||||||
|
* @param[out] prefix If non-NULL, return malloced string, or NULL.
|
||||||
|
* @param[out] suffix If non-NULL, return malloced identifier.
|
||||||
|
* @retval 0 OK
|
||||||
|
* @retval -1 Error
|
||||||
|
* @code
|
||||||
|
* char *a = NULL;
|
||||||
|
* char *b = NULL;
|
||||||
|
* if (clixon_strsplit(nodeid, ':', &a, &b) < 0)
|
||||||
|
* goto done;
|
||||||
|
* if (a)
|
||||||
|
* free(a);
|
||||||
|
* if (b)
|
||||||
|
* free(b);
|
||||||
|
* @note caller need to free prefix and suffix after use
|
||||||
|
* @see clicon_strsep not just single split
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
clixon_strsplit(char *string,
|
||||||
|
const int delim,
|
||||||
|
char **prefix,
|
||||||
|
char **suffix)
|
||||||
|
{
|
||||||
|
int retval = -1;
|
||||||
|
char *str;
|
||||||
|
|
||||||
|
if ((str = strchr(string, delim)) == NULL){
|
||||||
|
if (suffix && (*suffix = strdup(string)) == NULL){
|
||||||
|
clicon_err(OE_YANG, errno, "strdup");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (prefix){
|
||||||
|
if ((*prefix = strdup(string)) == NULL){
|
||||||
|
clicon_err(OE_YANG, errno, "strdup");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
(*prefix)[str-string] = '\0';
|
||||||
|
}
|
||||||
|
str++;
|
||||||
|
if (suffix && (*suffix = strdup(str)) == NULL){
|
||||||
|
clicon_err(OE_YANG, errno, "strdup");
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
retval = 0;
|
||||||
|
done:
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
uri_unreserved(unsigned char in)
|
uri_unreserved(unsigned char in)
|
||||||
{
|
{
|
||||||
|
|
@ -676,6 +729,7 @@ clicon_str2int_search(const map_str2int *mstab,
|
||||||
return -1; /* not found */
|
return -1; /* not found */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*! Split colon-separated node identifier into prefix and name
|
/*! Split colon-separated node identifier into prefix and name
|
||||||
* @param[in] node-id
|
* @param[in] node-id
|
||||||
* @param[out] prefix If non-NULL, return malloced string, or NULL.
|
* @param[out] prefix If non-NULL, return malloced string, or NULL.
|
||||||
|
|
@ -698,32 +752,7 @@ nodeid_split(char *nodeid,
|
||||||
char **prefix,
|
char **prefix,
|
||||||
char **id)
|
char **id)
|
||||||
{
|
{
|
||||||
int retval = -1;
|
return clixon_strsplit(nodeid, ':', prefix, id);
|
||||||
char *str;
|
|
||||||
|
|
||||||
if ((str = strchr(nodeid, ':')) == NULL){
|
|
||||||
if (id && (*id = strdup(nodeid)) == NULL){
|
|
||||||
clicon_err(OE_YANG, errno, "strdup");
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if (prefix){
|
|
||||||
if ((*prefix = strdup(nodeid)) == NULL){
|
|
||||||
clicon_err(OE_YANG, errno, "strdup");
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
(*prefix)[str-nodeid] = '\0';
|
|
||||||
}
|
|
||||||
str++;
|
|
||||||
if (id && (*id = strdup(str)) == NULL){
|
|
||||||
clicon_err(OE_YANG, errno, "strdup");
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
retval = 0;
|
|
||||||
done:
|
|
||||||
return retval;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! Trim blanks from front and end of a string, return new string
|
/*! Trim blanks from front and end of a string, return new string
|
||||||
|
|
|
||||||
13
test/lib.sh
13
test/lib.sh
|
|
@ -87,6 +87,15 @@ else
|
||||||
: ${RCWAIT:=2}
|
: ${RCWAIT:=2}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# RESTCONF protocol, eg http or https
|
||||||
|
: ${RCPROTO:=http}
|
||||||
|
|
||||||
|
# RESTCONF port
|
||||||
|
: ${RCPORT:=80}
|
||||||
|
|
||||||
|
# RESTCONF error message (if not up)
|
||||||
|
: ${RCERROR:="HTTP/1.1 502 Bad Gateway"}
|
||||||
|
|
||||||
# www user (on linux typically www-data, freebsd www)
|
# www user (on linux typically www-data, freebsd www)
|
||||||
# could be taken from configure
|
# could be taken from configure
|
||||||
: ${wwwuser:=www-data}
|
: ${wwwuser:=www-data}
|
||||||
|
|
@ -238,9 +247,9 @@ stop_restconf(){
|
||||||
|
|
||||||
# Wait for restconf to stop sending 502 Bad Gateway
|
# Wait for restconf to stop sending 502 Bad Gateway
|
||||||
wait_restconf(){
|
wait_restconf(){
|
||||||
hdr=$(curl --head -sS http://localhost/restconf)
|
hdr=$(curl --head -sS $RCPROTO://localhost:$RCPORT/restconf)
|
||||||
let i=0;
|
let i=0;
|
||||||
while [[ $hdr == "HTTP/1.1 502 Bad Gateway"* ]]; do
|
while [[ $hdr == "$RCERROR"* ]]; do
|
||||||
sleep 1
|
sleep 1
|
||||||
hdr=$(curl --head -sS http://localhost/restconf)
|
hdr=$(curl --head -sS http://localhost/restconf)
|
||||||
let i++;
|
let i++;
|
||||||
|
|
|
||||||
|
|
@ -539,9 +539,9 @@ main(int argc,
|
||||||
clicon_err(OE_XML, errno, "nghttp2_session_send");
|
clicon_err(OE_XML, errno, "nghttp2_session_send");
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
if (event_reg_fd(ss, ssl_input_cb, sd, "ssl socket") < 0)
|
if (clixon_event_reg_fd(ss, ssl_input_cb, sd, "ssl socket") < 0)
|
||||||
goto done;
|
goto done;
|
||||||
if (event_loop() < 0)
|
if (clixon_event_loop() < 0)
|
||||||
goto done;
|
goto done;
|
||||||
retval = 0;
|
retval = 0;
|
||||||
done:
|
done:
|
||||||
|
|
|
||||||
|
|
@ -531,9 +531,9 @@ main(int argc,
|
||||||
clicon_err(OE_XML, errno, "nghttp2_session_send");
|
clicon_err(OE_XML, errno, "nghttp2_session_send");
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
if (event_reg_fd(ss, ssl_input_cb, sd, "ssl socket") < 0)
|
if (clixon_event_reg_fd(ss, ssl_input_cb, sd, "ssl socket") < 0)
|
||||||
goto done;
|
goto done;
|
||||||
if (event_loop() < 0)
|
if (clixon_event_loop() < 0)
|
||||||
goto done;
|
goto done;
|
||||||
retval = 0;
|
retval = 0;
|
||||||
done:
|
done:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue