rpms/grafana
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix quoting in grafana-cli wrapper script

Browse Source
This commit is contained in:
Andreas Gerstmayr 2022-07-14 14:28:36 +02:00
parent 0ca120b8ba
commit 4eb2bc3050
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-update-grafana-cli-script-with-distro-specific-paths.patch
View File

@ -1,4 +1,4 @@
From fa9ef506a8168b9ab64ee6e479d76fe9df2174a1 Mon Sep 17 00:00:00 2001 From 7355a597e6b7290ec643c0a19b664746e0654e11 Mon Sep 17 00:00:00 2001
From: Andreas Gerstmayr <agerstmayr@redhat.com> From: Andreas Gerstmayr <agerstmayr@redhat.com>
Date: Wed, 22 Jun 2022 16:57:52 +0200 Date: Wed, 22 Jun 2022 16:57:52 +0200
Subject: [PATCH] update grafana-cli script with distro-specific paths and Subject: [PATCH] update grafana-cli script with distro-specific paths and
@ -6,7 +6,7 @@ Subject: [PATCH] update grafana-cli script with distro-specific paths and
diff --git a/packaging/wrappers/grafana-cli b/packaging/wrappers/grafana-cli diff --git a/packaging/wrappers/grafana-cli b/packaging/wrappers/grafana-cli
index dafa075a2c..6d32aeff74 100755 index dafa075a2c..eda358c425 100755
--- a/packaging/wrappers/grafana-cli --- a/packaging/wrappers/grafana-cli
+++ b/packaging/wrappers/grafana-cli +++ b/packaging/wrappers/grafana-cli
@@ -5,18 +5,19 @@ @@ -5,18 +5,19 @@
@ -31,17 +31,33 @@ index dafa075a2c..6d32aeff74 100755
if [ ! -x $EXECUTABLE ]; then if [ ! -x $EXECUTABLE ]; then
echo "Program not installed or not executable" echo "Program not installed or not executable"
@@ -36,4 +37,13 @@ OPTS="--homepath=${GRAFANA_HOME} \ @@ -28,12 +29,21 @@ if [ -f "$DEFAULT" ]; then
cfg:default.paths.logs=${LOG_DIR} \ . "$DEFAULT"
cfg:default.paths.plugins=${PLUGINS_DIR}'" fi
-OPTS="--homepath=${GRAFANA_HOME} \
- --config=${CONF_FILE} \
- --pluginsDir=${PLUGINS_DIR} \
- --configOverrides='cfg:default.paths.provisioning=$PROVISIONING_CFG_DIR \
- cfg:default.paths.data=${DATA_DIR} \
- cfg:default.paths.logs=${LOG_DIR} \
- cfg:default.paths.plugins=${PLUGINS_DIR}'"
-
-eval $EXECUTABLE "$OPTS" '$@' -eval $EXECUTABLE "$OPTS" '$@'
+OPTS=("--homepath=${GRAFANA_HOME}"
+ "--config=${CONF_FILE}"
+ "--pluginsDir=${PLUGINS_DIR}"
+ "--configOverrides=cfg:default.paths.provisioning=$PROVISIONING_CFG_DIR \
+ cfg:default.paths.data=${DATA_DIR} \
+ cfg:default.paths.logs=${LOG_DIR} \
+ cfg:default.paths.plugins=${PLUGINS_DIR}")
+
+if [ "$(id -u)" -eq 0 ]; then +if [ "$(id -u)" -eq 0 ]; then
+ cd "${GRAFANA_HOME}" + cd "${GRAFANA_HOME}"
+ exec runuser -u "${GRAFANA_USER}" -- "$EXECUTABLE" "$OPTS" "$@" + exec runuser -u "${GRAFANA_USER}" -- "$EXECUTABLE" "${OPTS[@]}" "$@"
+elif [ "$(id -u -n)" = "${GRAFANA_USER}" ]; then +elif [ "$(id -u -n)" = "${GRAFANA_USER}" ]; then
+ cd "${GRAFANA_HOME}" + cd "${GRAFANA_HOME}"
+ exec "$EXECUTABLE" "$OPTS" "$@" + exec "$EXECUTABLE" "${OPTS[@]}" "$@"
+else +else
+ echo "$0: please run this script as user \"${GRAFANA_USER}\" or root." + echo "$0: please run this script as user \"${GRAFANA_USER}\" or root."
+ exit 5 + exit 5

5
grafana.spec
View File

@ -22,7 +22,7 @@ end}
Name: grafana Name: grafana
Version: 9.0.2 Version: 9.0.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: Metrics dashboard and graph editor Summary: Metrics dashboard and graph editor
License: AGPLv3 License: AGPLv3
URL: https://grafana.org URL: https://grafana.org
@ -892,6 +892,9 @@ OPENSSL_FORCE_FIPS_MODE=1 GOLANG_FIPS=1 go test -v ./pkg/util -run TestEncryptio
%changelog %changelog
* Thu Jul 14 2022 Andreas Gerstmayr <agerstmayr@redhat.com> 9.0.2-3
- fix quoting in grafana-cli wrapper script (rhbz#2107046)
* Wed Jul 13 2022 Andreas Gerstmayr <agerstmayr@redhat.com> 9.0.2-2 * Wed Jul 13 2022 Andreas Gerstmayr <agerstmayr@redhat.com> 9.0.2-2
- use systemd-sysusers to create the Grafana user and group - use systemd-sysusers to create the Grafana user and group