Merge pull request #2146 from rgerhards/i-1977

rainerscript: new function "http_request"

configure.ac

@@ -438,6 +438,8 @@ if test "$rsyslog_have_pthread_setschedparam" = "yes" -a "$rsyslog_have_sched_h"
 fi
 
 
+PKG_CHECK_MODULES([CURL], [libcurl])
+
 # klog
 AC_ARG_ENABLE(klog,
         [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])],

grammar/Makefile.am

@@ -12,6 +12,8 @@ libgrammar_la_SOURCES = \
 	parserif.h \
 	grammar.h
 libgrammar_la_CPPFLAGS =  $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
+#libgrammar_la_LIBADD = $(CURL_LIBS) $(RSRT_LIBS) $(SOL_LIBS)
+libgrammar_la_LIBADD = $(CURL_LIBS)
 
 #testdriver_SOURCES = testdriver.c libgrammar.la
 #testdriver_CPPFLAGS =  $(RSRT_CFLAGS)

grammar/rainerscript.c

@@ -2,7 +2,7 @@
  *
  * Module begun 2011-07-01 by Rainer Gerhards
  *
- * Copyright 2011-2016 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2011-2017 Rainer Gerhards and Others.
  *
  * This file is part of the rsyslog runtime library.
  *
@@ -36,6 +36,7 @@
 #include <sys/types.h>
 #include <libestr.h>
 #include <time.h>
+#include <curl/curl.h>
 #include "rsyslog.h"
 #include "rainerscript.h"
 #include "conf.h"
@@ -68,6 +69,11 @@ static void cnfstmtOptimizePRIFilt(struct cnfstmt *stmt);
 static void cnfarrayPrint(struct cnfarray *ar, int indent);
 struct cnffunc * cnffuncNew_prifilt(int fac);
 
+struct curl_funcData {
+	const char *reply;
+	size_t replyLen;
+};
+
 /* debug support: convert token to a human-readable string. Note that
  * this function only supports a single thread due to a static buffer.
  * This is deemed a solid solution, as it is intended to be used during
@@ -1890,22 +1896,100 @@ num2ipv4(struct svar *__restrict__ const sourceVal) {
 		goto done;
 	}
 	if(num < 0 || num > 4294967295) {
-		DBGPRINTF("rainerscript: (num2ipv4) invalid number(too big/negative); does not represent IPv4 address\n");
+		DBGPRINTF("rainerscript: (num2ipv4) invalid number(too big/negative); does "
+			"not represent IPv4 address\n");
 		len = snprintf(str, 16, "-1");
 		goto done;
 	}
 	for(int i = 0 ; i < 4 ; i++){
 		numip[i] = num % 256;
 		num = num / 256;
 	}
-	DBGPRINTF("rainerscript: (num2ipv4) Numbers: 1:'%d' 2:'%d' 3:'%d' 4:'%d'\n", numip[0], numip[1], numip[2], numip[3]);
+	DBGPRINTF("rainerscript: (num2ipv4) Numbers: 1:'%d' 2:'%d' 3:'%d' 4:'%d'\n",
+		numip[0], numip[1], numip[2], numip[3]);
 	len = snprintf(str, 16, "%d.%d.%d.%d", numip[3], numip[2], numip[1], numip[0]);
 done:
 	DBGPRINTF("rainerscript: (num2ipv4) ipv4-Address: %s, lengh: %zu\n", str, len);
 	estr = es_newStrFromCStr(str, len);
 	return(estr);
 }
 
+/* curl callback for doFunc_http_request */
+static size_t
+curlResult(void *ptr, size_t size, size_t nmemb, void *userdata)
+{
+	char *buf;
+	size_t newlen;
+	struct cnffunc *const func = (struct cnffunc *) userdata;
+	assert(func != NULL);
+	struct curl_funcData *const curlData = (struct curl_funcData*) func->funcdata;
+	assert(curlData != NULL);
+
+	if(ptr == NULL) {
+		LogError(0, RS_RET_ERR, "internal error: libcurl provided ptr=NULL");
+		return 0;
+	}
+
+	newlen = curlData->replyLen + size*nmemb;
+	if((buf = realloc((void*)curlData->reply, newlen + 1)) == NULL) {
+		LogError(errno, RS_RET_ERR, "rainerscript: realloc failed in curlResult");
+		return 0; /* abort due to failure */
+	}
+	memcpy(buf+curlData->replyLen, (char*)ptr, size*nmemb);
+	curlData->replyLen = newlen;
+	curlData->reply = buf;
+	return size*nmemb;
+}
+
+static rsRetVal ATTR_NONNULL(1,2,3)
+doFunc_http_request(struct cnffunc *__restrict__ const func,
+	struct svar *__restrict__ const ret,
+	const char *const url)
+{
+	int resultSet = 0;
+	CURL *handle = NULL;
+	CURLcode res;
+	assert(func != NULL);
+	struct curl_funcData *const curlData = (struct curl_funcData*) func->funcdata;
+	assert(curlData != NULL);
+	DEFiRet;
+
+
+	CHKmalloc(handle = curl_easy_init());
+	curl_easy_setopt(handle, CURLOPT_NOSIGNAL, TRUE);
+	curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, curlResult);
+	curl_easy_setopt(handle, CURLOPT_WRITEDATA, func);
+
+	curl_easy_setopt(handle, CURLOPT_URL, url);
+	res = curl_easy_perform(handle);
+	if(res != CURLE_OK) {
+		LogError(0, RS_RET_IO_ERROR,
+			"rainerscript: http_request to failed, URL: '%s', error %s",
+			url, curl_easy_strerror(res));
+		ABORT_FINALIZE(RS_RET_OK);
+	}
+
+
+	CHKmalloc(ret->d.estr = es_newStrFromCStr(curlData->reply, curlData->replyLen));
+	ret->datatype = 'S';
+	resultSet = 1;
+
+finalize_it:
+	free((void*)curlData->reply);
+	curlData->reply = NULL;
+	curlData->replyLen = 0;
+
+	if(handle != NULL) {
+		curl_easy_cleanup(handle);
+	}
+	if(!resultSet) {
+		/* provide dummy value */
+		ret->d.n = 0;
+		ret->datatype = 'N';
+	}
+	RETiRet;
+}
+
 /*
  * Uses the given (current) year/month to decide which year
  * the incoming month likely belongs in.
@@ -2304,15 +2388,24 @@ doFuncCall(struct cnffunc *__restrict__ const func, struct svar *__restrict__ co
 		if(bMustFree) free(str);
 		if(bMustFree2) free(str2);
 		break;
+	case CNFFUNC_HTTP_REQUEST:
+		cnfexprEval(func->expr[0], &r[0], usrptr, pWti);
+		str = (char*) var2CString(&r[0], &bMustFree);
+		doFunc_http_request(func, ret, str);
+		if(bMustFree) free(str);
+		varFreeMembers(&r[0]);
+		break;
 	default:
 		if(Debug) {
 			char *fname = es_str2cstr(func->fname, NULL);
-			dbgprintf("rainerscript: invalid function id %u (name '%s')\n",
-				  (unsigned) func->fID, fname);
+			LogError(0, RS_RET_INTERNAL_ERROR,
+				"rainerscript: internal error: invalid function id %u (name '%s')\n",
+				(unsigned) func->fID, fname);
 			free(fname);
 		}
 		ret->datatype = 'N';
 		ret->d.n = 0;
+		break;
 	}
 }
 
@@ -2957,6 +3050,11 @@ cnffuncDestruct(struct cnffunc *func)
 			if(func->funcdata != NULL)
 				regexp.regfree(func->funcdata);
 			break;
+		case CNFFUNC_HTTP_REQUEST:
+			if(func->funcdata != NULL) {
+				free((void*) ((struct curl_funcData*)func->funcdata)->reply);
+			}
+			break;
 		default:break;
 	}
 	if(func->destructable_funcdata) {
@@ -4432,6 +4530,8 @@ funcName2ID(es_str_t *fname, unsigned short nParams)
 		GENERATE_FUNC("script_error", 0, CNFFUNC_SCRIPT_ERROR);
 	} else if(FUNC_NAME("previous_action_suspended")) {
 		GENERATE_FUNC("previous_action_suspended", 0, CNFFUNC_PREVIOUS_ACTION_SUSPENDED);
+	} else if(FUNC_NAME("http_request")) {
+		GENERATE_FUNC("http_request", 1, CNFFUNC_HTTP_REQUEST);
 	} else {
 		return CNFFUNC_INVALID;
 	}
@@ -4514,6 +4614,24 @@ initFunc_exec_template(struct cnffunc *func)
 	RETiRet;
 }
 
+static rsRetVal ATTR_NONNULL(1)
+initFunc_http_request(struct cnffunc *const func)
+{
+	DEFiRet;
+
+	func->destructable_funcdata = 1;
+	CHKmalloc(func->funcdata = calloc(1, sizeof(struct curl_funcData)));
+	if(func->nParams != 1) {
+		parser_errmsg("rsyslog logic error in line %d of file %s\n",
+			__LINE__, __FILE__);
+		FINALIZE;
+	}
+
+finalize_it:
+	RETiRet;
+}
+
+
 
 static rsRetVal
 initFunc_prifilt(struct cnffunc *func)
@@ -4658,6 +4776,9 @@ cnffuncNew(es_str_t *fname, struct cnffparamlst* paramlst)
 			case CNFFUNC_DYN_INC:
 				initFunc_dyn_stats(func);
 				break;
+			case CNFFUNC_HTTP_REQUEST:
+				initFunc_http_request(func);
+				break;
 			default:break;
 		}
 	}

grammar/rainerscript.h

@@ -242,7 +242,8 @@ enum cnffuncid {
 	CNFFUNC_PARSE_TIME,
 	CNFFUNC_PARSE_JSON,
 	CNFFUNC_PREVIOUS_ACTION_SUSPENDED,
-	CNFFUNC_SCRIPT_ERROR
+	CNFFUNC_SCRIPT_ERROR,
+	CNFFUNC_HTTP_REQUEST
 };
 
 struct cnffunc {

tests/Makefile.am

@@ -224,6 +224,7 @@ endif
 if ENABLE_TESTBENCH2
 TESTS +=  \
 	rscript_contains.sh \
+	rscript_http_request.sh \
 	rscript_ipv42num.sh \
 	rscript_field.sh \
 	rscript_stop.sh \
@@ -306,6 +307,7 @@ TESTS +=  \
 	mmexternal-SegFault-vg.sh \
 	internal-errmsg-memleak-vg.sh \
 	rscript_set_memleak-vg.sh \
+	rscript_http_request-vg.sh \
 	no-parser-vg.sh \
 	discard-rptdmsg-vg.sh \
 	discard-allmark-vg.sh \
@@ -895,6 +897,8 @@ EXTRA_DIST= \
 	testsuites/diskqueue.conf \
 	arrayqueue.sh \
 	testsuites/arrayqueue.conf \
+	rscript_http_request.sh \
+	rscript_http_request-vg.sh \
 	rscript_contains.sh \
 	testsuites/rscript_contains.conf \
 	rscript_ipv42num.sh \

tests/rscript_http_request-vg.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+# add 2017-12-01 by Rainer Gerhards, released under ASL 2.0
+
+uname
+#if [ `uname` = "FreeBSD" ] ; then
+#   echo "This test currently does not work on FreeBSD."
+#   exit 77
+#fi
+
+. $srcdir/diag.sh init
+. $srcdir/diag.sh generate-conf
+. $srcdir/diag.sh add-conf '
+module(load="../plugins/imtcp/.libs/imtcp")
+input(type="imtcp" port="13514")
+
+# for debugging the test itself:
+#template(name="outfmt" type="string" string="%$!%:  :%$.%:  %rawmsg%\n")
+template(name="outfmt" type="string" string="%$!%\n")
+
+if $msg contains "msgnum:" then {
+	set $.url = "http://www.rsyslog.com/testbench/echo-get.php?content=" & ltrim($msg);
+	set $!reply = http_request($.url);
+	action(type="omfile" file="rsyslog.out.log" template="outfmt")
+}
+
+'
+. $srcdir/diag.sh startup-vg
+. $srcdir/diag.sh tcpflood -m10
+. $srcdir/diag.sh shutdown-when-empty
+. $srcdir/diag.sh wait-shutdown-vg
+. $srcdir/diag.sh check-exit-vg
+echo '{ "reply": "msgnum:00000000:" }
+{ "reply": "msgnum:00000001:" }
+{ "reply": "msgnum:00000002:" }
+{ "reply": "msgnum:00000003:" }
+{ "reply": "msgnum:00000004:" }
+{ "reply": "msgnum:00000005:" }
+{ "reply": "msgnum:00000006:" }
+{ "reply": "msgnum:00000007:" }
+{ "reply": "msgnum:00000008:" }
+{ "reply": "msgnum:00000009:" }' | cmp - rsyslog.out.log
+if [ ! $? -eq 0 ]; then
+  echo "invalid function output detected, rsyslog.out.log is:"
+  cat rsyslog.out.log
+  . $srcdir/diag.sh error-exit 1
+fi;
+. $srcdir/diag.sh exit
+

tests/rscript_http_request.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+# add 2017-12-01 by Rainer Gerhards, released under ASL 2.0
+
+uname
+#if [ `uname` = "FreeBSD" ] ; then
+#   echo "This test currently does not work on FreeBSD."
+#   exit 77
+#fi
+
+. $srcdir/diag.sh init
+. $srcdir/diag.sh generate-conf
+. $srcdir/diag.sh add-conf '
+module(load="../plugins/imtcp/.libs/imtcp")
+input(type="imtcp" port="13514")
+
+# for debugging the test itself:
+#template(name="outfmt" type="string" string="%$!%:  :%$.%:  %rawmsg%\n")
+template(name="outfmt" type="string" string="%$!%\n")
+
+if $msg contains "msgnum:" then {
+	set $.url = "http://www.rsyslog.com/testbench/echo-get.php?content=" & ltrim($msg);
+	set $!reply = http_request($.url);
+	action(type="omfile" file="rsyslog.out.log" template="outfmt")
+}
+
+'
+. $srcdir/diag.sh startup
+. $srcdir/diag.sh tcpflood -m10
+. $srcdir/diag.sh shutdown-when-empty
+. $srcdir/diag.sh wait-shutdown
+echo '{ "reply": "msgnum:00000000:" }
+{ "reply": "msgnum:00000001:" }
+{ "reply": "msgnum:00000002:" }
+{ "reply": "msgnum:00000003:" }
+{ "reply": "msgnum:00000004:" }
+{ "reply": "msgnum:00000005:" }
+{ "reply": "msgnum:00000006:" }
+{ "reply": "msgnum:00000007:" }
+{ "reply": "msgnum:00000008:" }
+{ "reply": "msgnum:00000009:" }' | cmp - rsyslog.out.log
+if [ ! $? -eq 0 ]; then
+  echo "invalid function output detected, rsyslog.out.log is:"
+  cat rsyslog.out.log
+  . $srcdir/diag.sh error-exit 1
+fi;
+. $srcdir/diag.sh exit
+