Fix shellcheck errors, clean up configmaps, ingress. Fix spelling in …

…notes
drGrove · May 6, 2019 · c637d89 · c637d89
1 parent cabeb9b
commit c637d89
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 43 deletions.
diff --git a/charts/mtls/Chart.yaml b/charts/mtls/Chart.yaml
@@ -1,6 +1,6 @@
 description: A Helm chart for MTLS, a service for generating SSL Client Certificates based on Google Beyond Corp Zero Trust Framework
 name: mtls
-version: 0.3.1
+version: 0.3.2
 appVersion: 0.13.0
 home: https://www.github.com/drGrove/mtls-server/
 sources:

diff --git a/charts/mtls/scripts/create-ca.sh b/charts/mtls/scripts/create-ca.sh
@@ -16,27 +16,27 @@ mkdir -p output/ca/certs \
 chmod 700 output/ca/private
 touch output/ca/index.txt
 echo 1000 > output/ca/serial
-cp ${DIR}/ca.cnf output/ca/openssl.cnf
+cp "${DIR}/ca.cnf" output/ca/openssl.cnf
 sed -i "s|^dir = /root/ca|dir = ${PWD}/output/ca|g" output/ca/openssl.cnf
 
 if [[ -z "$SUBJ" ]]; then
   if [[ -z "$C" ]]; then
-    read -p 'COUNTRY: ' C
+    read -rp 'COUNTRY: ' C
   fi
   if [[ -z "$ST" ]]; then
-    read -p 'State/Province: ' ST
+    read -rp 'State/Province: ' ST
   fi
   if [[ -z "$L" ]]; then
-    read -p 'Locality: ' L
+    read -rp 'Locality: ' L
   fi
   if [[ -z "$O" ]]; then
-    read -p 'Organization Name: ' O
+    read -rp 'Organization Name: ' O
   fi
   if [[ -z "$OU" ]]; then
-    read -p 'Organizational Unit: ' OU
+    read -rp 'Organizational Unit: ' OU
   fi
   if [[ -z "$CN" ]]; then
-    read -p 'Common Name: ' CN
+    read -rp 'Common Name: ' CN
   fi
   SUBJ="/CN=$CN/O=$O/OU=$OU/C=$C/ST=$ST/L=$L"
 fi
@@ -63,7 +63,8 @@ SUBJ=""
 CN=""
 unset $SUBJ
 unset $CN
-read -p 'Create an intermediate certificate? (y/N) ' CREATE
+read -rp 'Create an intermediate certificate? (y/N) ' CREATE
 if [[ "${CREATE}" == "y" ]]; then
-  source ./scripts/create-intermediate.sh
+  # shellcheck disable=SC1091
+  source "./scripts/create-intermediate.sh"
 fi
diff --git a/charts/mtls/scripts/create-intermediate.sh b/charts/mtls/scripts/create-intermediate.sh
@@ -8,72 +8,75 @@ if [[ "$PWD" == "$DIR" ]]; then
 fi
 
 prompt_continue() {
-  read -p 'Create another intermediate certificate? (y/N) ' CREATE
+  read -rp 'Create another intermediate certificate? (y/N) ' CREATE
   if [[ "${CREATE}" == "y" ]]; then
     query
   fi
 }
 
 query() {
   if [[ -z "${CN}" ]]; then
-    read -p 'What is the common name for this? (ie. My Intermediate CA): ' CN
+    read -rp 'What is the common name for this? (ie. My Intermediate CA): ' CN
   fi
   echo "Creating Intermediate Certificate Output Folders For ${CN}..."
   NORMALIZED_CN=$(echo "${CN}" | tr -d '[:space:][:punct:]')
-  echo $NORMALIZED_CN
-  mkdir -p output/ca/intermediate/${NORMALIZED_CN}/certs \
-    output/ca/intermediate/${NORMALIZED_CN}/crl \
-    output/ca/intermediate/${NORMALIZED_CN}/newcerts \
-    output/ca/intermediate/${NORMALIZED_CN}/private \
-    output/ca/intermediate/${NORMALIZED_CN}/csr
-  touch output/ca/intermediate/${NORMALIZED_CN}/index.txt
-  echo 1000 > output/ca/intermediate/${NORMALIZED_CN}/serial
-  cp ${DIR}/intermediate.cnf output/ca/intermediate/${NORMALIZED_CN}/openssl.cnf
+  echo "${NORMALIZED_CN}"
+  mkdir -p "output/ca/intermediate/${NORMALIZED_CN}/certs" \
+    "output/ca/intermediate/${NORMALIZED_CN}/crl" \
+    "output/ca/intermediate/${NORMALIZED_CN}/newcerts" \
+    "output/ca/intermediate/${NORMALIZED_CN}/private" \
+    "output/ca/intermediate/${NORMALIZED_CN}/csr"
+  touch "output/ca/intermediate/${NORMALIZED_CN}/index.txt"
+  echo 1000 > "output/ca/intermediate/${NORMALIZED_CN}/serial"
+  cp "${DIR}/intermediate.cnf" "output/ca/intermediate/${NORMALIZED_CN}/openssl.cnf"
   sed -i "s|^dir = /root/ca|dir = ${PWD}/output/intermediate/${NORMALIZED_CN}|g" \
-    output/ca/intermediate/${NORMALIZED_CN}/openssl.cnf
-  gen_key $NORMALIZED_CN
+    "output/ca/intermediate/${NORMALIZED_CN}/openssl.cnf"
+  gen_key "${NORMALIZED_CN}"
   if [[ -z "$SUBJ" ]]; then
     if [[ -z "$C" ]]; then
-      read -p 'COUNTRY: ' C
+      read -rp 'COUNTRY: ' C
     fi
     if [[ -z "$ST" ]]; then
-      read -p 'State/Province: ' ST
+      read -rp 'State/Province: ' ST
     fi
     if [[ -z "$L" ]]; then
-      read -p 'Locality: ' L
+      read -rp 'Locality: ' L
     fi
     if [[ -z "$O" ]]; then
-      read -p 'Organization Name: ' O
+      read -rp 'Organization Name: ' O
     fi
     if [[ -z "$OU" ]]; then
-      read -p 'Organizational Unit: ' OU
+      read -rp 'Organizational Unit: ' OU
     fi
     if [[ -z "$CN" ]]; then
-      read -p 'Common Name: ' CN
+      read -rp 'Common Name: ' CN
     fi
     SUBJ="/CN=$CN/O=$O/OU=$OU/C=$C/ST=$ST/L=$L"
   fi
   echo "Generating Intermediate CA Certificate CSR for ${CN}..."
-  openssl req -config output/ca/intermediate/${NORMALIZED_CN}/openssl.cnf \
+  openssl req -config "output/ca/intermediate/${NORMALIZED_CN}/openssl.cnf" \
     -new -sha256 \
     -subj "${SUBJ}" \
-    -key output/ca/intermediate/${NORMALIZED_CN}/private/${NORMALIZED_CN}.key.pem \
-    -out output/ca/intermediate/${NORMALIZED_CN}/csr/${NORMALIZED_CN}.csr.pem
+    -key "output/ca/intermediate/${NORMALIZED_CN}/private/${NORMALIZED_CN}.key.pem" \
+    -out "output/ca/intermediate/${NORMALIZED_CN}/csr/${NORMALIZED_CN}.csr.pem"
 
   echo "Generating Intermediate CA Certificate for ${NORMALIZED_CN}..."
   openssl ca -config output/ca/openssl.cnf -extensions v3_intermediate_ca \
     -days 3650 -notext -md sha256 \
-    -in output/ca/intermediate/${NORMALIZED_CN}/csr/${NORMALIZED_CN}.csr.pem \
-    -out output/ca/intermediate/${NORMALIZED_CN}/certs/${NORMALIZED_CN}.cert.pem
+    -in "output/ca/intermediate/${NORMALIZED_CN}/csr/${NORMALIZED_CN}.csr.pem" \
+    -out "output/ca/intermediate/${NORMALIZED_CN}/certs/${NORMALIZED_CN}.cert.pem"
 
   echo "Creating ca-chain..."
-  cat output/ca/intermediate/${NORMALIZED_CN}/certs/${NORMALIZED_CN}.cert.pem \
+  cat "output/ca/intermediate/${NORMALIZED_CN}/certs/${NORMALIZED_CN}.cert.pem" \
     output/ca/certs/ca.cert.pem > \
-    output/ca/intermediate/${NORMALIZED_CN}/certs/ca-chain.cert.pem
+    "output/ca/intermediate/${NORMALIZED_CN}/certs/ca-chain.cert.pem"
 
-  unset $NORMALIZED_CN
+  # Clear out the values
+  NORMALIZED_CN=""
   SUBJ=""
   CN=""
+  # Unset the values
+  unset $NORMALIZED_CN
   unset $SUBJ
   unset $CN
   prompt_continue
@@ -89,7 +92,8 @@ gen_key() {
   openssl \
     genrsa \
     $EXTRA  \
-    -out output/ca/intermediate/${NORMALIZED_CN}/private/${NORMALIZED_CN}.key.pem 4096
+    -out "output/ca/intermediate/${NORMALIZED_CN}/private/${NORMALIZED_CN}.key.pem" \
+    4096
 }
 
 query
diff --git a/charts/mtls/templates/NOTES.txt b/charts/mtls/templates/NOTES.txt
@@ -27,7 +27,7 @@
 ###      See values.yaml's secrets.ca_key and secrets.ca_crt             ###
 ############################################################################
 
-This configuration will not allow other services to take advanced of Client
+This configuration will not allow other services to take advantage of Client
 Certificate Authentication via MTLS.
 
 This is due to the fact that the nginx-ingress requires the ability to connect

diff --git a/charts/mtls/templates/configmap-admin-seeds.yaml b/charts/mtls/templates/configmap-admin-seeds.yaml
@@ -11,6 +11,6 @@ metadata:
 data:
 {{- range $key, $value := .Values.admin_seeds }}
   {{ $key }}: |-
-{{ $value | indent 6 }}
+{{ $value | indent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/mtls/templates/configmap-user-seeds.yaml b/charts/mtls/templates/configmap-user-seeds.yaml
@@ -11,6 +11,6 @@ metadata:
 data:
 {{- range $key, $value := .Values.user_seeds }}
   {{ $key }}: |-
-{{ $value | indent 6 }}
+{{ $value | indent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/mtls/templates/ingress.yaml b/charts/mtls/templates/ingress.yaml
@@ -30,11 +30,11 @@ spec:
     - host: {{ . | quote }}
       http:
         paths:
-	{{- range $ingressPaths }}
+          {{- range $ingressPaths }}
           - path: {{ . }}
             backend:
               serviceName: {{ $fullName }}
               servicePort: http
-	{{- end }}
+          {{- end }}
   {{- end }}
 {{- end }}