Mirror/muninlite
1
0
Fork 0
mirror of https://github.com/munin-monitoring/muninlite.git synced 2025-01-03 11:42:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve parsing of commands and plugin names

Browse source 
Previously special characters for regular expressions (e.g. ".") could
work around the name check (without being able to cause harm).
This commit is contained in:
Lars Kruse 2020-02-07 14:51:47 +01:00
parent 281578664c
commit c2108276eb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
muninlite.in
View file

@ -41,7 +41,7 @@ do_nodes() {
} }
do_config() { do_config() {
if echo "$PLUGINS" | grep "\b$1\b" >/dev/null 2>&1; then if echo "$PLUGINS" | grep -qwF "$1"; then
config_$1 config_$1
else else
echo "# Unknown service" echo "# Unknown service"
@ -50,7 +50,7 @@ do_config() {
} }
do_fetch() { do_fetch() {
if echo "$PLUGINS" | grep "\b$1\b" >/dev/null 2>&1; then if echo "$PLUGINS" | grep -qwF "$1"; then
fetch_$1 fetch_$1
else else
echo "# Unknown service" echo "# Unknown service"
@ -96,7 +96,7 @@ do
if [ -f $MYPLUGIN -a -x $MYPLUGIN ]; then if [ -f $MYPLUGIN -a -x $MYPLUGIN ]; then
MYPLUGINNAME=$(basename $MYPLUGIN) MYPLUGINNAME=$(basename $MYPLUGIN)
#ensure we don't have name collision #ensure we don't have name collision
if echo "$RES" | grep "\b$MYPLUGINNAME\b" >/dev/null 2>&1 ; then if echo "$RES" | grep -qwF "$MYPLUGINNAME"; then
MYPLUGINNAME="plugindir_$MYPLUGINNAME" MYPLUGINNAME="plugindir_$MYPLUGINNAME"
fi fi
RES="$RES $MYPLUGINNAME" RES="$RES $MYPLUGINNAME"
@ -119,7 +119,7 @@ while read arg0 arg1
do do
arg0=$(echo "$arg0" | xargs) arg0=$(echo "$arg0" | xargs)
arg1=$(echo "$arg1" | xargs) arg1=$(echo "$arg1" | xargs)
if ! echo "$FUNCTIONS" | grep "\b$arg0\b" >/dev/null 2>&1 ; then if ! echo "$FUNCTIONS" | grep -qwF "$arg0"; then
echo "# Unknown command. Try" $(echo "$FUNCTIONS" | sed -e 's/\( [[:alpha:]]\{1,\}\)/,\1/g' -e 's/,\( [[:alpha:]]\{1,\}\)$/ or\1/') echo "# Unknown command. Try" $(echo "$FUNCTIONS" | sed -e 's/\( [[:alpha:]]\{1,\}\)/,\1/g' -e 's/,\( [[:alpha:]]\{1,\}\)$/ or\1/')
continue continue
fi fi