daniel vor 4 Jahren
Commit
6cd4f77a49
3 geänderte Dateien mit 155 neuen und 0 gelöschten Zeilen
  1. 12 0
      AllCertsToAstaro.sh
  2. 27 0
      posthook.sh
  3. 116 0
      update-cert

+ 12 - 0
AllCertsToAstaro.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#/scripts/letsencrypt/posthook.sh bouderath.de REF_NQyLEpbKyTZm REF_fbFYUjSZOSUs
+#/scripts/letsencrypt/posthook.sh klenzel.de REF_QqgkgbHTAwvu REF_drsbgEgHJpbf
+#/scripts/letsencrypt/posthook.sh klenzel.net REF_cLkhQdDAZKQQ REF_zVgqWDSggXAz
+#/scripts/letsencrypt/posthook.sh klenzel-baut.de REF_mHjIoYNyVxBq REF_wQdHYAQBiMQJ
+
+
+for i in $(find /root/.acme.sh/ -maxdepth 1 -type d -name "*.*" | grep -v "/root/.acme.sh/$" | sed "s@/root/.acme.sh/@@g"); do
+	befehl=$(cat /root/.acme.sh/${i}/${i}.conf | grep "^Le_PostHook=" | cut -d "_" -f8 | base64 -d)
+	$befehl
+done

+ 27 - 0
posthook.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+DOMAIN=$1
+REF_FWGW=$2
+REF_GFOK=$3
+
+HostFWGW="172.16.23.6"
+HostGFOK="172.16.23.10"
+
+#openssl x509 -inform PEM -in /root/.acme.sh/klenzel.de/klenzel.de.cer > /root/.acme.sh/klenzel.de/cert.pem
+#openssl rsa -in /root/.acme.sh/klenzel.de/klenzel.de.key -text > /root/.acme.sh/klenzel.de/privkey.pem
+
+
+#Verzeichnis erstellen, sofern noch nicht vorhanden
+ssh -p 4711 loginuser@${HostFWGW} "mkdir /home/login/getssl/${DOMAIN}"
+ssh -p 4711 loginuser@${HostGFOK} "mkdir /home/login/getssl/${DOMAIN}"
+
+#Zertifikat und Schlüssel übertragen
+scp -P 4711 /root/.acme.sh/${DOMAIN}/fullchain.cer loginuser@${HostFWGW}:/home/login/getssl/${DOMAIN}/${DOMAIN}.crt
+scp -P 4711 /root/.acme.sh/${DOMAIN}/${DOMAIN}.key loginuser@${HostFWGW}:/home/login/getssl/${DOMAIN}/${DOMAIN}.key
+
+scp -P 4711 /root/.acme.sh/${DOMAIN}/fullchain.cer loginuser@${HostGFOK}:/home/login/getssl/${DOMAIN}/${DOMAIN}.crt
+scp -P 4711 /root/.acme.sh/${DOMAIN}/${DOMAIN}.key loginuser@${HostGFOK}:/home/login/getssl/${DOMAIN}/${DOMAIN}.key
+
+#Auf UTM Zertifikat aktualisieren
+ssh -p 4711 loginuser@${HostFWGW} "sudo /home/login/getssl/update-cert ${DOMAIN} ${REF_FWGW}"
+ssh -p 4711 loginuser@${HostGFOK} "sudo /home/login/getssl/update-cert ${DOMAIN} ${REF_GFOK}"

+ 116 - 0
update-cert

@@ -0,0 +1,116 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright 2016-2017 René Klomp
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+import subprocess,sys,time
+
+cc = '/usr/local/bin/confd-client.plx'
+
+
+def openssl_get(domain, param):
+    cmd_param=param
+    if param == "altnames":
+        cmd_param="text"
+    cmd = "openssl x509 -noout -in /home/login/getssl/%s/%s.crt -%s" % (domain,domain,cmd_param)
+    value = subprocess.check_output(cmd, shell=True).strip()
+    if param in ['startdate','enddate','fingerprint','serial']:
+        return value.split('=')[1]
+    if param in ['issuer','subject']:
+        return value.split('/')[-1]
+    if param == "altnames":
+        i = iter(value.splitlines())
+        for line in i:
+            if 'X509v3 Subject Alternative Name' in line:
+                return "['%s']"% i.next().strip().replace(", ","','")
+    return value
+
+
+def update_cert(domain, cert_ref):
+    print "Writing certificate for %s to object %s" % (domain, cert_ref)
+
+    cert=subprocess.check_output("/usr/bin/openssl x509 -in /home/login/getssl/%s/%s.crt -text" % (domain,domain), shell=True).replace('\n','\\n')
+    key=open("/home/login/getssl/%s/%s.key" % (domain,domain)).read().replace('\n','\\n')
+
+    # There might be a better solution for this, but I cannot find any documentation on cc.
+    cmd = """OBJS
+    ca
+    host_key_cert
+    %s
+    certificate="%s"
+    key="%s"
+    write""" % (cert_ref, cert, key)
+
+    cert_object = subprocess.Popen([cc, '-batch'],  stdin=subprocess.PIPE, stdout=subprocess.PIPE).communicate(input=cmd)[0]
+
+    for line in cert_object.split("\n"):
+        if "'meta' =>" in line:
+             return line.split('>')[1][2:-2]
+
+
+def update_meta(domain, meta_ref):
+    print "Updating certificate meta to object %s" % meta_ref
+
+    cmd = """OBJS
+    ca
+    meta_x509
+    %s
+    vpn_id="%s"
+    startdate="%s"
+    enddate="%s"
+    fingerprint="%s"
+    serial="%s"
+    issuer="%s"
+    issuer_hash="%s"
+    name="%s"
+    subject="%s"
+    subject_hash="%s"
+    subject_alt_names=%s
+    write""" % (
+        meta_ref,domain,
+        openssl_get(domain,'startdate'),
+        openssl_get(domain,'enddate'),
+        openssl_get(domain,'fingerprint'),
+        openssl_get(domain,'serial'),
+        openssl_get(domain,'issuer'),
+        openssl_get(domain,'issuer_hash'),
+        openssl_get(domain,'subject'),
+        openssl_get(domain,'subject'),
+        openssl_get(domain,'subject_hash'),
+        openssl_get(domain,'altnames')
+    )
+
+    subprocess.Popen([cc, '-batch'],  stdin=subprocess.PIPE, stdout=subprocess.PIPE).communicate(input=cmd)[0]
+
+
+def main():
+    if not len(sys.argv) == 3:
+        print "Usage %s <domain> <cert_ref>" % sys.argv[0]
+        sys.exit(1)
+
+    domain = sys.argv[1]
+    cert_ref = sys.argv[2]
+
+    meta_ref = update_cert(domain,cert_ref)
+    update_meta(domain,meta_ref)
+
+    print "Done!"
+    # Wait for a few seconds for the config to be applied so ssl check after this script will succeed
+    time.sleep(5)
+
+if __name__ == "__main__":
+    main()