Browse Source

Exit if certificate check fails

Bob Mottram 7 years ago
parent
commit
978f848350
4 changed files with 8 additions and 1 deletions
  1. 1
    0
      src/freedombone-app-irc
  2. 1
    0
      src/freedombone-app-xmpp
  3. 1
    0
      src/freedombone-base-email
  4. 5
    1
      src/freedombone-utils-web

+ 1
- 0
src/freedombone-app-irc View File

523
     if [[ "$(cert_exists "${DEFAULT_DOMAIN_NAME}")" == "0" ]]; then
523
     if [[ "$(cert_exists "${DEFAULT_DOMAIN_NAME}")" == "0" ]]; then
524
         "${PROJECT_NAME}-addcert" -h ngircd --dhkey "${DH_KEYLENGTH}"
524
         "${PROJECT_NAME}-addcert" -h ngircd --dhkey "${DH_KEYLENGTH}"
525
         function_check check_certificates
525
         function_check check_certificates
526
+        CHECK_HOSTNAME=ngircd
526
         check_certificates ngircd
527
         check_certificates ngircd
527
     fi
528
     fi
528
 
529
 

+ 1
- 0
src/freedombone-app-xmpp View File

973
     if [ ! -f "/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem" ]; then
973
     if [ ! -f "/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem" ]; then
974
         if [ ! -f /etc/ssl/certs/xmpp.crt ]; then
974
         if [ ! -f /etc/ssl/certs/xmpp.crt ]; then
975
             "${PROJECT_NAME}-addcert" -h xmpp --dhkey "${DH_KEYLENGTH}"
975
             "${PROJECT_NAME}-addcert" -h xmpp --dhkey "${DH_KEYLENGTH}"
976
+            CHECK_HOSTNAME=xmpp
976
             check_certificates xmpp
977
             check_certificates xmpp
977
             if [ ! -f /etc/ssl/certs/xmpp.crt ]; then
978
             if [ ! -f /etc/ssl/certs/xmpp.crt ]; then
978
                 echo $'Failed to create xmpp certificate'
979
                 echo $'Failed to create xmpp certificate'

+ 1
- 0
src/freedombone-base-email View File

1068
 
1068
 
1069
     if [[ "$(cert_exists dovecot)" == "0" ]]; then
1069
     if [[ "$(cert_exists dovecot)" == "0" ]]; then
1070
         "${PROJECT_NAME}-addcert" -h dovecot --dhkey "$DH_KEYLENGTH"
1070
         "${PROJECT_NAME}-addcert" -h dovecot --dhkey "$DH_KEYLENGTH"
1071
+        CHECK_HOSTNAME=dovecot
1071
         check_certificates dovecot
1072
         check_certificates dovecot
1072
     fi
1073
     fi
1073
 
1074
 

+ 5
- 1
src/freedombone-utils-web View File

184
 # Checks whether certificates were generated for the given hostname
184
 # Checks whether certificates were generated for the given hostname
185
 function check_certificates {
185
 function check_certificates {
186
     if [ ! "$1" ]; then
186
     if [ ! "$1" ]; then
187
-        return
187
+        echo $'No certificate name provided'
188
+        exit 3568736585683
188
     fi
189
     fi
189
     USE_LETSENCRYPT='no'
190
     USE_LETSENCRYPT='no'
190
     if [ "$2" ]; then
191
     if [ "$2" ]; then
259
             echo $"Lets Encrypt failed for ${SITE_DOMAIN_NAME}, so try making a self-signed cert"
260
             echo $"Lets Encrypt failed for ${SITE_DOMAIN_NAME}, so try making a self-signed cert"
260
             "${PROJECT_NAME}-addcert" -h "${SITE_DOMAIN_NAME}" --dhkey "${DH_KEYLENGTH}"
261
             "${PROJECT_NAME}-addcert" -h "${SITE_DOMAIN_NAME}" --dhkey "${DH_KEYLENGTH}"
261
             function_check check_certificates
262
             function_check check_certificates
263
+            CHECK_HOSTNAME="${SITE_DOMAIN_NAME}"
262
             check_certificates "${SITE_DOMAIN_NAME}"
264
             check_certificates "${SITE_DOMAIN_NAME}"
263
         else
265
         else
264
             echo $"Lets Encrypt failed for $SITE_DOMAIN_NAME"
266
             echo $"Lets Encrypt failed for $SITE_DOMAIN_NAME"
272
     fi
274
     fi
273
 
275
 
274
     function_check check_certificates
276
     function_check check_certificates
277
+    CHECK_HOSTNAME="${SITE_DOMAIN_NAME}"
275
     check_certificates "${SITE_DOMAIN_NAME}" 'yes'
278
     check_certificates "${SITE_DOMAIN_NAME}" 'yes'
276
 }
279
 }
277
 
280
 
1013
     fi
1016
     fi
1014
     if [ ! -f /etc/ssl/certs/exim.dhparam ]; then
1017
     if [ ! -f /etc/ssl/certs/exim.dhparam ]; then
1015
         "${PROJECT_NAME}-addcert" -h exim --dhkey "$DH_KEYLENGTH"
1018
         "${PROJECT_NAME}-addcert" -h exim --dhkey "$DH_KEYLENGTH"
1019
+        CHECK_HOSTNAME=exim
1016
         check_certificates exim
1020
         check_certificates exim
1017
         cp /etc/ssl/certs/exim.dhparam /etc/exim4
1021
         cp /etc/ssl/certs/exim.dhparam /etc/exim4
1018
         chown root:Debian-exim /etc/exim4/exim.dhparam
1022
         chown root:Debian-exim /etc/exim4/exim.dhparam