qnetd-certutil: Add -G option

Signed-off-by: Jan Friesse <jfriesse@redhat.com>

diff --git a/man/corosync-qnetd-certutil.8 b/man/corosync-qnetd-certutil.8
index d55ac28aa9eca761bb5aeb2690b2d9b223d70657..6773666e2b6a12369b7be4f2cb686a29d2bd79c8 100644 (file)
--- a/man/corosync-qnetd-certutil.8
+++ b/man/corosync-qnetd-certutil.8
@@ -58,6 +58,18 @@ file /etc/corosync/qnetd/nssdb/cluster-$ClusterName.crt
 .TP
 .B -c
 Certificate request file to sign.
+.TP
+.B -G
+Do not set group write bit for new files. This option has effect only when used together with
+.B -i
+option. It is useful when extended security is needed and it's viable to prohibit daemon to change its
+configuration. Expected usage is to first set owner of the /etc/corosync/qnetd directory
+to root:$COROQNETD with permissions 0750 and then create database (as a root):
+
+.nf
+# corosync-qnetd-certutil -i -G
+.fi
+
 .TP
 .B -n
 Name of the cluster.

diff --git a/man/corosync-qnetd.8 b/man/corosync-qnetd.8
index be4680e7d0e4a4a563e875b30434adeb2c925d5e..6b446e5eb6ba7c7f75175b9cfede08f3c7c13cc0 100644 (file)
--- a/man/corosync-qnetd.8
+++ b/man/corosync-qnetd.8
@@ -135,10 +135,8 @@ directories.
 .fi
 
 Some systems have the /var/run directory on a tmpfs file system which gets discarded after
-a reboot. The solution is to use an initscript which takes care of the /var/run/corosync-qnetd
-creation and sets the correct owner and permissions. For systems with systemd it's possible
-to use a tmpfile.d configuration file (installed by default if systemd is enabled during
-corosync compilation).
+a reboot. The solution is to use an initscript or systemd unit, because both of them takes
+care of the /var/run/corosync-qnetd creation and sets the correct owner and permissions.
 
 The last step is to make sure
 .B corosync-qnetd

diff --git a/qdevices/corosync-qnetd-certutil.sh b/qdevices/corosync-qnetd-certutil.sh
index 091980c3130cda75f330822fb14c3f0b153441fb..5cb6592945b0b9debc76d249ee9d2507ae45fcfe 100644 (file)
--- a/qdevices/corosync-qnetd-certutil.sh
+++ b/qdevices/corosync-qnetd-certutil.sh
@@ -50,11 +50,12 @@ CERTDB_FILES=("cert9.db key4.db pkcs11.txt"
               "cert8.db key3.db secmod.db")
 
 usage() {
-    echo "$0: [-i|-s] [-c certificate] [-n cluster_name]"
+    echo "$0: [-i|-s] [-c certificate] [-G] [-n cluster_name]"
     echo
     echo " -i                  Initialize QNetd CA and generate server certificate"
     echo " -s                  Sign cluster certificate (needs cluster certificate)"
     echo " -c certificate      CRQ certificate file name"
+    echo " -G                  Do not set group write bit for new files"
     echo " -n cluster_name     Name of cluster (for -s operation)"
 
     exit 0
@@ -66,6 +67,16 @@ chown_ref_cfgdir() {
     fi
 }
 
+# get_perm [directory]
+# Return permission based on -G and directory flag
+get_perm() {
+    if [ "$1" == true ];then
+        [ "$SET_GROUP_WRITE_BIT" == true ] && echo "0770" || echo "0750"
+    else
+        [ "$SET_GROUP_WRITE_BIT" == true ] && echo "0660" || echo "0640"
+    fi
+}
+
 create_new_noise_file() {
     local noise_file="$1"
 
@@ -75,7 +86,7 @@ create_new_noise_file() {
         (ps -elf; date; w) | sha1sum | (read sha_sum rest; echo $sha_sum) > "$noise_file"
 
         chown_ref_cfgdir "$noise_file"
-        chmod 0660 "$noise_file"
+        chmod `get_perm` "$noise_file"
     else
         echo "Using existing noise file $noise_file"
     fi
@@ -87,7 +98,7 @@ get_serial_no() {
     if ! [ -f "$SERIAL_NO_FILE" ];then
         echo "100" > $SERIAL_NO_FILE
         chown_ref_cfgdir "$SERIAL_NO_FILE"
-        chmod 0660 "$SERIAL_NO_FILE"
+        chmod `get_perm` "$SERIAL_NO_FILE"
     fi
     serial_no=`cat $SERIAL_NO_FILE`
     serial_no=$((serial_no+1))
@@ -121,13 +132,13 @@ init_qnetd_ca() {
         echo "Creating $DB_DIR"
         mkdir -p "$DB_DIR"
         chown_ref_cfgdir "$DB_DIR"
-        chmod 0770 "$DB_DIR"
+        chmod `get_perm true` "$DB_DIR"
     fi
 
     echo "Creating new key and cert db"
     echo -n "" > "$PWD_FILE"
     chown_ref_cfgdir "$PWD_FILE"
-    chmod 0660 "$PWD_FILE"
+    chmod `get_perm` "$PWD_FILE"
 
     certutil -N -d "$DB_DIR" -f "$PWD_FILE"
     cert_files=`find_certdb_files`
@@ -139,7 +150,7 @@ init_qnetd_ca() {
 
     for fname in $cert_files;do
         chown_ref_cfgdir "$DB_DIR/$fname"
-        chmod 0660 "$DB_DIR/$fname"
+        chmod `get_perm` "$DB_DIR/$fname"
     done
 
     create_new_noise_file "$NOISE_FILE"
@@ -180,8 +191,9 @@ sign_cluster_cert() {
 OPERATION=""
 CERTIFICATE_FILE=""
 CLUSTER_NAME=""
+SET_GROUP_WRITE_BIT=true
 
-while getopts ":hisc:n:" opt; do
+while getopts ":Ghisc:n:" opt; do
     case $opt in
         i)
             OPERATION=init_qnetd_ca
@@ -195,6 +207,9 @@ while getopts ":hisc:n:" opt; do
         c)
             CERTIFICATE_FILE="$OPTARG"
             ;;
+        G)
+            SET_GROUP_WRITE_BIT=false
+            ;;
         n)
             CLUSTER_NAME="$OPTARG"
             ;;