Merge pull request #16 from essentialkaos/develop

Version 1.5.1

.travis.yml

@@ -17,7 +17,7 @@ before_install:
   - tar xf shellcheck-latest.linux.x86_64.tar.xz
   - ./shellcheck-latest/shellcheck --version
   - docker pull "$IMAGE"
-  - wget https://raw.githubusercontent.com/essentialkaos/perfecto/master/perfecto-docker
+  - wget https://kaos.sh/perfecto/perfecto-docker
   - chmod +x perfecto-docker
 
 script:

SOURCES/webkaos-utils

@@ -7,7 +7,7 @@
 APP="WEBKAOS Utils"
 
 # Utility version
-VER="1.5.0"
+VER="1.5.1"
 
 ########################################################################################
 
@@ -173,13 +173,15 @@ csrInfo() {
   cname=$(echo "$subject" | cut -f6 -d"," | cut -f2 -d"=" | cut -f1 -d"/")
   email=$(echo "$subject" | cut -f6 -d"," | cut -f3 -d"=")
 
+  show ""
   show "${CL_BOLD}Country Name:${CL_NORM}           ${country:---empty--}"
   show "${CL_BOLD}State or Province Name:${CL_NORM} ${state:---empty--}"
   show "${CL_BOLD}Locality Name:${CL_NORM}          ${locality:---empty--}"
   show "${CL_BOLD}Organization:${CL_NORM}           ${org:---empty--}"
   show "${CL_BOLD}Organizational Unit:${CL_NORM}    ${unit:---empty--}"
   show "${CL_BOLD}Common Name:${CL_NORM}            ${cname:---empty--}"
   show "${CL_BOLD}Email address:${CL_NORM}          ${email:---empty--}"
+  show ""
 }
 
 # Check OCSP stapling
@@ -223,6 +225,10 @@ genCSR() {
   local host="${1//./_}"
 
   openssl req -new -newkey rsa:4096 -nodes -sha256 -keyout "${host}.key" -out "${host}.csr"
+
+  chmod 600 "${host}.key" "${host}.csr"
+
+  show "Certificate Signing Request successfully generated as ${host}.csr (key: ${host}.key)" $GREEN
 }
 
 # Generate HPKP for some request
@@ -293,6 +299,8 @@ generateOCSPFile() {
     return 1
   fi
 
+  chmod 600 "$output"
+
   show "OCSP stapling file saved as $output" $GREEN
 
   return 0

webkaos-utils.spec

@@ -2,7 +2,7 @@
 
 Summary:         Helpers for working with webkaos server
 Name:            webkaos-utils
-Version:         1.5.0
+Version:         1.5.1
 Release:         0%{?dist}
 Group:           Applications/System
 License:         EKOL
@@ -47,6 +47,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Tue Aug 07 2018 Anton Novojilov <[email protected]> - 1.5.1-0
+- Generating files with more strict permissions
+
 * Mon Aug 06 2018 Anton Novojilov <[email protected]> - 1.5.0-0
 - Added output name normalization for csr-gen command