Merging upstream version 1.29.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 44 insertions, 126 deletions

diff --git a/tests/acls/acl.sh b/tests/acls/acl.sh
deleted file mode 100644
index 9ac404c0..00000000
--- a/tests/acls/acl.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash -x
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-BASICURL="http://127.0.0.1"
-BASICURLS="https://127.0.0.1"
-
-NETDATA_VARLIB_DIR="/var/lib/netdata"
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[0;43m'
-NOCOLOR='\033[0m'
-
-#change the previous acl file and with a new 
-#and store it on a new file
-change_file(){
-    sed "s/$1/$2/g" netdata.cfg > "$4"
-}
-
-NETDATAPID=""
-
-change_ssl_file(){
-    KEYROW="ssl key = $3/key.pem"
-    CERTROW="ssl certificate = $3/cert.pem"
-    sed "s@ssl key =@$KEYROW@g" netdata.ssl.cfg > tmp
-    sed "s@ssl certificate =@$CERTROW@g" tmp > tmp2
-    sed "s/$1/$2/g" tmp2 > "$4"
-}
-
-run_acl_tests() {
-    #Give a time for netdata start properly
-    sleep 2
-
-    curl -v -k --tls-max 1.2 --create-dirs -o index.html "$2" 2> log_index.txt
-    curl -v -k --tls-max 1.2 --create-dirs -o netdata.txt "$2/netdata.conf" 2> log_nc.txt
-    curl -v -k --tls-max 1.2 --create-dirs -o badge.csv "$2/api/v1/badge.svg?chart=cpu.cpu0_interrupts" 2> log_badge.txt
-    curl -v -k --tls-max 1.2 --create-dirs -o info.txt "$2/api/v1/info" 2> log_info.txt
-    curl -H "X-Auth-Token: $1" -v -k --tls-max 1.2 --create-dirs -o health.csv "$2/api/v1/manage/health?cmd=LIST" 2> log_health.txt
-
-    TOT=$(grep -c "HTTP/1.1 301" log_*.txt | cut -d: -f2| grep -c 1)
-    if [ "$TOT" -ne "$4" ]; then
-        echo -e "${RED}I got a wrong number of redirects($TOT) when SSL is activated, It was expected $4 ${NOCOLOR}"
-        rm log_* netdata.conf.test* netdata.txt health.csv index.html badge.csv tmp* key.pem cert.pem info.txt
-        kill $NETDATAPID
-        exit 1
-    elif [ "$TOT" -eq "$4" ] && [ "$4" -ne "0" ]; then
-        echo -e "${YELLOW}I got the correct number of redirects($4) when SSL is activated and I try to access with HTTP. ${NOCOLOR}"
-        return
-    fi
-
-    TOT=$(grep -c "HTTP/1.1 200 OK" log_* | cut -d: -f2| grep -c 1)
-    if [ "$TOT" -ne "$3" ]; then
-        echo -e "${RED}I got a wrong number of \"200 OK\" from the queries, it was expected $3. ${NOCOLOR}"
-        kill $NETDATAPID
-        rm log_* netdata.conf.test* netdata.txt health.csv index.html badge.csv tmp* key.pem cert.pem info.txt
-        exit 1
-    fi
-
-    echo -e "${GREEN}ACLs were applied correctly ${NOCOLOR}"
-}
-
-CONF=$(grep "bind" netdata.cfg)
-MUSER=$(grep run netdata.cfg | cut -d= -f2|sed 's/^[ \t]*//')
-
-openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 -sha512 -subj "/C=US/ST=Denied/L=Somewhere/O=Dis/CN=www.example.com" -keyout key.pem  -out cert.pem
-chown "$MUSER" key.pem cert.pem
-CWD=$(pwd)
-
-if [ -f "${NETDATA_VARLIB_DIR}/netdata.api.key" ] ;then
-    read -r TOKEN < "${NETDATA_VARLIB_DIR}/netdata.api.key"
-else
-    TOKEN="NULL"
-fi
-
-change_file "$CONF" "    bind to = *" "$CWD" "netdata.conf.test0"
-netdata -c "netdata.conf.test0" -D &
-NETDATAPID=$!
-run_acl_tests $TOKEN "$BASICURL:19999" 5 0
-kill $NETDATAPID
-
-change_ssl_file "$CONF" "    bind to = *=dashboard|registry|badges|management|netdata.conf *:20000=dashboard|registry|badges|management *:20001=dashboard|registry|netdata.conf^SSL=optional *:20002=dashboard|registry" "$CWD" "netdata.conf.test1"
-netdata -c "netdata.conf.test1" -D &
-NETDATAPID=$!
-run_acl_tests $TOKEN "$BASICURL:19999" 5 5
-run_acl_tests $TOKEN "$BASICURLS:19999" 5 0
-
-run_acl_tests $TOKEN "$BASICURL:20000" 4 5
-run_acl_tests $TOKEN "$BASICURLS:20000" 4 0
-
-run_acl_tests $TOKEN "$BASICURL:20001" 4 0
-run_acl_tests $TOKEN "$BASICURLS:20001" 4 0
-
-run_acl_tests $TOKEN "$BASICURL:20002" 3 5 
-run_acl_tests $TOKEN "$BASICURLS:20002" 3 0 
-kill $NETDATAPID
-
-change_ssl_file "$CONF" "    bind to = *=dashboard|registry|badges|management|netdata.conf *:20000=dashboard|registry|badges|management *:20001=dashboard|registry|netdata.conf^SSL=force *:20002=dashboard|registry" "$CWD" "netdata.conf.test2"
-netdata -c "netdata.conf.test2" -D &
-NETDATAPID=$!
-run_acl_tests $TOKEN "$BASICURL:19999" 5 5
-run_acl_tests $TOKEN "$BASICURLS:19999" 5 0
-
-run_acl_tests $TOKEN "$BASICURL:20000" 4 5
-run_acl_tests $TOKEN "$BASICURLS:20000" 4 0
-
-run_acl_tests $TOKEN "$BASICURL:20001" 4 5
-run_acl_tests $TOKEN "$BASICURLS:20001" 4 0
-
-run_acl_tests $TOKEN "$BASICURL:20002" 3 5 
-run_acl_tests $TOKEN "$BASICURLS:20002" 3 0 
-kill $NETDATAPID
-
-change_ssl_file "$CONF" "    bind to = *=dashboard|registry|badges|management|netdata.conf *:20000=dashboard|registry|badges|management^SSL=optional *:20001=dashboard|registry|netdata.conf^SSL=force" "$CWD" "netdata.conf.test3"
-netdata -c "netdata.conf.test3" -D &
-NETDATAPID=$!
-run_acl_tests $TOKEN "$BASICURL:19999" 5 5
-run_acl_tests $TOKEN "$BASICURLS:19999" 5 0
-
-run_acl_tests $TOKEN "$BASICURL:20000" 4 0
-run_acl_tests $TOKEN "$BASICURLS:20000" 4 0
-
-run_acl_tests $TOKEN "$BASICURL:20001" 4 5
-run_acl_tests $TOKEN "$BASICURLS:20001" 4 0
-kill $NETDATAPID
-
-rm log_* netdata.conf.test* netdata.txt health.csv index.html badge.csv tmp* key.pem cert.pem info.txt
-echo "All the tests were successful ${NOCOLOR}"
diff --git a/tests/acls/netdata.cfg b/tests/acls/netdata.cfg
new file mode 100644
index 00000000..1dcb4a5c
--- /dev/null
+++ b/tests/acls/netdata.cfg
@@ -0,0 +1,20 @@
+# netdata configuration
+#
+# You can download the latest version of this file, using:
+#
+#  wget -O /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
+# or
+#  curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
+#
+# You can uncomment and change any of the options below.
+# The value shown in the commented settings, is the default value.
+#
+
+[global]
+    run as user = netdata
+
+    # the default database size - 1 hour
+    history = 3600
+
+    # by default do not expose the netdata port
+    bind to = localhost
diff --git a/tests/acls/netdata.ssl.cfg b/tests/acls/netdata.ssl.cfg
new file mode 100644
index 00000000..28e0030d
--- /dev/null
+++ b/tests/acls/netdata.ssl.cfg
@@ -0,0 +1,24 @@
+# netdata configuration
+#
+# You can download the latest version of this file, using:
+#
+#  wget -O /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
+# or
+#  curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
+#
+# You can uncomment and change any of the options below.
+# The value shown in the commented settings, is the default value.
+#
+
+[global]
+    run as user = netdata
+
+    # the default database size - 1 hour
+    history = 3600
+
+    # by default do not expose the netdata port
+    bind to = localhost
+
+[web]
+    ssl key = 
+    ssl certificate =