Mercurial Hosting > luan

changeset 2034:d718511fc69f acme-tiny tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Begin work on moving to tiny-acme.
author Violet7
date Tue, 04 Nov 2025 20:28:50 -0800
parents 905a6ade55f2
children
files backup/start.sh.orig backup/stop.sh.orig host/acme_tiny.py host/startup/nginx/nginx.acme_setup.conf.luan src/luan/host/https.luan
diffstat 5 files changed, 348 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
diff -r 905a6ade55f2 -r d718511fc69f backup/start.sh.orig
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/backup/start.sh.orig	Tue Nov 04 20:28:50 2025 -0800
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+ROOTPWD=$(pwd);
+logsdir=${ROOTPWD}"/logs";
+servelog=${logsdir}"/server.log";
+
+mkdir -p "$logsdir"
+
+if [ "$1" == "launchd" ]; then
+    ${ROOTPWD}/luan.sh server.luan $* &2>${servelog}
+else
+    ${ROOTPWD}/luan.sh server.luan $* &2>${servelog}&
+fi;
diff -r 905a6ade55f2 -r d718511fc69f backup/stop.sh.orig
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/backup/stop.sh.orig	Tue Nov 04 20:28:50 2025 -0800
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+LUAN_PIDS=$(ps ax | awk '/[s]erver.luan/ {print $1}')
+
+if [ -n "$LUAN_PIDS" ]; then
+    echo "Killing luan processes: $LUAN_PIDS"
+    kill -TERM $LUAN_PIDS
+else
+    echo "Info: No luan processes found, continuing."
+fi
+
+exit 0
diff -r 905a6ade55f2 -r d718511fc69f host/acme_tiny.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/host/acme_tiny.py	Tue Nov 04 20:28:50 2025 -0800
@@ -0,0 +1,199 @@
+#!/usr/bin/env python3
+# Copyright Daniel Roesler, under MIT license, see LICENSE at github.com/diafygi/acme-tiny
+import argparse, subprocess, json, os, sys, base64, binascii, time, hashlib, re, copy, textwrap, logging
+try:
+    from urllib.request import urlopen, Request # Python 3
+except ImportError: # pragma: no cover
+    from urllib2 import urlopen, Request # Python 2
+
+DEFAULT_CA = "https://acme-v02.api.letsencrypt.org" # DEPRECATED! USE DEFAULT_DIRECTORY_URL INSTEAD
+DEFAULT_DIRECTORY_URL = "https://acme-v02.api.letsencrypt.org/directory"
+
+LOGGER = logging.getLogger(__name__)
+LOGGER.addHandler(logging.StreamHandler())
+LOGGER.setLevel(logging.INFO)
+
+def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA, disable_check=False, directory_url=DEFAULT_DIRECTORY_URL, contact=None, check_port=None):
+    directory, acct_headers, alg, jwk = None, None, None, None # global variables
+
+    # helper functions - base64 encode for jose spec
+    def _b64(b):
+        return base64.urlsafe_b64encode(b).decode('utf8').replace("=", "")
+
+    # helper function - run external commands
+    def _cmd(cmd_list, stdin=None, cmd_input=None, err_msg="Command Line Error"):
+        proc = subprocess.Popen(cmd_list, stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out, err = proc.communicate(cmd_input)
+        if proc.returncode != 0:
+            raise IOError("{0}\n{1}".format(err_msg, err))
+        return out
+
+    # helper function - make request and automatically parse json response
+    def _do_request(url, data=None, err_msg="Error", depth=0):
+        try:
+            resp = urlopen(Request(url, data=data, headers={"Content-Type": "application/jose+json", "User-Agent": "acme-tiny"}))
+            resp_data, code, headers = resp.read().decode("utf8"), resp.getcode(), resp.headers
+        except IOError as e:
+            resp_data = e.read().decode("utf8") if hasattr(e, "read") else str(e)
+            code, headers = getattr(e, "code", None), {}
+        try:
+            resp_data = json.loads(resp_data) # try to parse json results
+        except ValueError:
+            pass # ignore json parsing errors
+        if depth < 100 and code == 400 and resp_data['type'] == "urn:ietf:params:acme:error:badNonce":
+            raise IndexError(resp_data) # allow 100 retrys for bad nonces
+        if code not in [200, 201, 204]:
+            raise ValueError("{0}:\nUrl: {1}\nData: {2}\nResponse Code: {3}\nResponse: {4}".format(err_msg, url, data, code, resp_data))
+        return resp_data, code, headers
+
+    # helper function - make signed requests
+    def _send_signed_request(url, payload, err_msg, depth=0):
+        payload64 = "" if payload is None else _b64(json.dumps(payload).encode('utf8'))
+        new_nonce = _do_request(directory['newNonce'])[2]['Replay-Nonce']
+        protected = {"url": url, "alg": alg, "nonce": new_nonce}
+        protected.update({"jwk": jwk} if acct_headers is None else {"kid": acct_headers['Location']})
+        protected64 = _b64(json.dumps(protected).encode('utf8'))
+        protected_input = "{0}.{1}".format(protected64, payload64).encode('utf8')
+        out = _cmd(["openssl", "dgst", "-sha256", "-sign", account_key], stdin=subprocess.PIPE, cmd_input=protected_input, err_msg="OpenSSL Error")
+        data = json.dumps({"protected": protected64, "payload": payload64, "signature": _b64(out)})
+        try:
+            return _do_request(url, data=data.encode('utf8'), err_msg=err_msg, depth=depth)
+        except IndexError: # retry bad nonces (they raise IndexError)
+            return _send_signed_request(url, payload, err_msg, depth=(depth + 1))
+
+    # helper function - poll until complete
+    def _poll_until_not(url, pending_statuses, err_msg):
+        result, t0 = None, time.time()
+        while result is None or result['status'] in pending_statuses:
+            assert (time.time() - t0 < 3600), "Polling timeout" # 1 hour timeout
+            time.sleep(0 if result is None else 2)
+            result, _, _ = _send_signed_request(url, None, err_msg)
+        return result
+
+    # parse account key to get public key
+    log.info("Parsing account key...")
+    out = _cmd(["openssl", "rsa", "-in", account_key, "-noout", "-text"], err_msg="OpenSSL Error")
+    pub_pattern = r"modulus:[\s]+?00:([a-f0-9\:\s]+?)\npublicExponent: ([0-9]+)"
+    pub_hex, pub_exp = re.search(pub_pattern, out.decode('utf8'), re.MULTILINE|re.DOTALL).groups()
+    pub_exp = "{0:x}".format(int(pub_exp))
+    pub_exp = "0{0}".format(pub_exp) if len(pub_exp) % 2 else pub_exp
+    alg, jwk = "RS256", {
+        "e": _b64(binascii.unhexlify(pub_exp.encode("utf-8"))),
+        "kty": "RSA",
+        "n": _b64(binascii.unhexlify(re.sub(r"(\s|:)", "", pub_hex).encode("utf-8"))),
+    }
+    accountkey_json = json.dumps(jwk, sort_keys=True, separators=(',', ':'))
+    thumbprint = _b64(hashlib.sha256(accountkey_json.encode('utf8')).digest())
+
+    # find domains
+    log.info("Parsing CSR...")
+    out = _cmd(["openssl", "req", "-in", csr, "-noout", "-text"], err_msg="Error loading {0}".format(csr))
+    domains = set([])
+    common_name = re.search(r"Subject:.*? CN\s?=\s?([^\s,;/]+)", out.decode('utf8'))
+    if common_name is not None:
+        domains.add(common_name.group(1))
+    subject_alt_names = re.search(r"X509v3 Subject Alternative Name: (?:critical)?\n +([^\n]+)\n", out.decode('utf8'), re.MULTILINE|re.DOTALL)
+    if subject_alt_names is not None:
+        for san in subject_alt_names.group(1).split(", "):
+            if san.startswith("DNS:"):
+                domains.add(san[4:])
+    log.info(u"Found domains: {0}".format(", ".join(domains)))
+
+    # get the ACME directory of urls
+    log.info("Getting directory...")
+    directory_url = CA + "/directory" if CA != DEFAULT_CA else directory_url # backwards compatibility with deprecated CA kwarg
+    directory, _, _ = _do_request(directory_url, err_msg="Error getting directory")
+    log.info("Directory found!")
+
+    # create account, update contact details (if any), and set the global key identifier
+    log.info("Registering account...")
+    reg_payload = {"termsOfServiceAgreed": True} if contact is None else {"termsOfServiceAgreed": True, "contact": contact}
+    account, code, acct_headers = _send_signed_request(directory['newAccount'], reg_payload, "Error registering")
+    log.info("{0} Account ID: {1}".format("Registered!" if code == 201 else "Already registered!", acct_headers['Location']))
+    if contact is not None:
+        account, _, _ = _send_signed_request(acct_headers['Location'], {"contact": contact}, "Error updating contact details")
+        log.info("Updated contact details:\n{0}".format("\n".join(account.get('contact') or [])))
+
+    # create a new order
+    log.info("Creating new order...")
+    order_payload = {"identifiers": [{"type": "dns", "value": d} for d in domains]}
+    order, _, order_headers = _send_signed_request(directory['newOrder'], order_payload, "Error creating new order")
+    log.info("Order created!")
+
+    # get the authorizations that need to be completed
+    for auth_url in order['authorizations']:
+        authorization, _, _ = _send_signed_request(auth_url, None, "Error getting challenges")
+        domain = authorization['identifier']['value']
+
+        # skip if already valid
+        if authorization['status'] == "valid":
+            log.info("Already verified: {0}, skipping...".format(domain))
+            continue
+        log.info("Verifying {0}...".format(domain))
+
+        # find the http-01 challenge and write the challenge file
+        challenge = [c for c in authorization['challenges'] if c['type'] == "http-01"][0]
+        token = re.sub(r"[^A-Za-z0-9_\-]", "_", challenge['token'])
+        keyauthorization = "{0}.{1}".format(token, thumbprint)
+        wellknown_path = os.path.join(acme_dir, token)
+        with open(wellknown_path, "w") as wellknown_file:
+            wellknown_file.write(keyauthorization)
+
+        # check that the file is in place
+        try:
+            wellknown_url = "http://{0}{1}/.well-known/acme-challenge/{2}".format(domain, "" if check_port is None else ":{0}".format(check_port), token)
+            assert (disable_check or _do_request(wellknown_url)[0] == keyauthorization)
+        except (AssertionError, ValueError) as e:
+            raise ValueError("Wrote file to {0}, but couldn't download {1}: {2}".format(wellknown_path, wellknown_url, e))
+
+        # say the challenge is done
+        _send_signed_request(challenge['url'], {}, "Error submitting challenges: {0}".format(domain))
+        authorization = _poll_until_not(auth_url, ["pending"], "Error checking challenge status for {0}".format(domain))
+        if authorization['status'] != "valid":
+            raise ValueError("Challenge did not pass for {0}: {1}".format(domain, authorization))
+        os.remove(wellknown_path)
+        log.info("{0} verified!".format(domain))
+
+    # finalize the order with the csr
+    log.info("Signing certificate...")
+    csr_der = _cmd(["openssl", "req", "-in", csr, "-outform", "DER"], err_msg="DER Export Error")
+    _send_signed_request(order['finalize'], {"csr": _b64(csr_der)}, "Error finalizing order")
+
+    # poll the order to monitor when it's done
+    order = _poll_until_not(order_headers['Location'], ["pending", "processing"], "Error checking order status")
+    if order['status'] != "valid":
+        raise ValueError("Order failed: {0}".format(order))
+
+    # download the certificate
+    certificate_pem, _, _ = _send_signed_request(order['certificate'], None, "Certificate download failed")
+    log.info("Certificate signed!")
+    return certificate_pem
+
+def main(argv=None):
+    parser = argparse.ArgumentParser(
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        description=textwrap.dedent("""\
+            This script automates the process of getting a signed TLS certificate from Let's Encrypt using the ACME protocol.
+            It will need to be run on your server and have access to your private account key, so PLEASE READ THROUGH IT!
+            It's only ~200 lines, so it won't take long.
+
+            Example Usage: python acme_tiny.py --account-key ./account.key --csr ./domain.csr --acme-dir /usr/share/nginx/html/.well-known/acme-challenge/ > signed_chain.crt
+            """)
+    )
+    parser.add_argument("--account-key", required=True, help="path to your Let's Encrypt account private key")
+    parser.add_argument("--csr", required=True, help="path to your certificate signing request")
+    parser.add_argument("--acme-dir", required=True, help="path to the .well-known/acme-challenge/ directory")
+    parser.add_argument("--quiet", action="store_const", const=logging.ERROR, help="suppress output except for errors")
+    parser.add_argument("--disable-check", default=False, action="store_true", help="disable checking if the challenge file is hosted correctly before telling the CA")
+    parser.add_argument("--directory-url", default=DEFAULT_DIRECTORY_URL, help="certificate authority directory url, default is Let's Encrypt")
+    parser.add_argument("--ca", default=DEFAULT_CA, help="DEPRECATED! USE --directory-url INSTEAD!")
+    parser.add_argument("--contact", metavar="CONTACT", default=None, nargs="*", help="Contact details (e.g. mailto:aaa@bbb.com) for your account-key")
+    parser.add_argument("--check-port", metavar="PORT", default=None, help="what port to use when self-checking the challenge file, default is port 80")
+
+    args = parser.parse_args(argv)
+    LOGGER.setLevel(args.quiet or LOGGER.level)
+    signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, log=LOGGER, CA=args.ca, disable_check=args.disable_check, directory_url=args.directory_url, contact=args.contact, check_port=args.check_port)
+    sys.stdout.write(signed_crt)
+
+if __name__ == "__main__": # pragma: no cover
+    main(sys.argv[1:])
diff -r 905a6ade55f2 -r d718511fc69f host/startup/nginx/nginx.acme_setup.conf.luan
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/host/startup/nginx/nginx.acme_setup.conf.luan	Tue Nov 04 20:28:50 2025 -0800
@@ -0,0 +1,24 @@
+local rootDir, domain = ...
+
+%>
+  # This config exists to serve up acme challenges on
+  # .well-known for initial domain verification by letsencrypt.
+  # see set_https in luan/src/luan/host/https.luan for more.
+  server {
+    server_name <%=domain%>;
+    listen 80;
+    listen [::]:80;
+
+    error_log <%=rootDir%>/error.log;
+    access_log <%=rootDir%>/access.log;
+
+    root <%=rootDir%>;
+    index index.html;
+
+    location / {
+        try_files $uri $uri/ =404;
+    }
+  }
+
+<%
+
diff -r 905a6ade55f2 -r d718511fc69f src/luan/host/https.luan
--- a/src/luan/host/https.luan	Tue Nov 04 13:30:21 2025 -0700
+++ b/src/luan/host/https.luan	Tue Nov 04 20:28:50 2025 -0800
@@ -25,21 +25,117 @@
 	local dir = uri("site:").parent()
 	local nginx_file = dir.child("nginx.ssl.conf")
 	local key_file = dir.child(domain..".key")
+  local key_file_str = key_file.canonical().to_string()
+  local csr_file = dir.child(domain..".csr")
+  local csr_file_str = csr_file.canonical().to_string()
 	local local_cer_file = dir.child("fullchain.cer")
+  local local_cer_file_str = local_cer_file.canonical().to_string()
 	local local_ca_file = dir.child("ca.cer")
 	local top_dir = uri("file:.").canonical().to_string()
 	local changed = false
+  -- use for testing, so as to not hit rate limits
+  -- on the real letsencrypt servers
+  local dry_run = true
+
 	if is_https then  -- https
 		if not key_file.exists() then
 			local is_local = ip(domain) == "127.0.0.1"
 			logger.info("is_local "..is_local)
+
+      -- Use openssl directly to make a self-signed cert,
+      -- no external cert authority involved
 			if is_local then
+        -- set up a temporary barebones nginx conf
+        -- to serve acme challenges on the domain
+
+        local temp_dir_string = "/tmp/acme_setup/"..domain
+
+        -- recursion guard, must have this to prevent
+        -- the http request from invoking this code
+        -- and causing an infinite recursion.
+        local guard_file = temp_dir_string.."/recursionguard.lock"
+        local guard_uri = uri("file:"..guard_file)
+        if guard_uri.exists() then
+            logger.info("set_https already running for "..domain..", skipping")
+            return
+        end
+
+        -- Clean out old temp files
+        local cmd = "rm -rf "..temp_dir_string
+				local s = uri("bash:"..cmd).read_text()
+
+        -- create all the dirs needed
+        local webroot = temp_dir_string.."/webroot"
+        local acme_challenges = webroot.."/.well-known/acme-challenge"
+        local cmd = "mkdir -p "..acme_challenges
+				local s = uri("bash:"..cmd).read_text()
+
+        guard_uri.write("this is a recursion guard, see https.luan")
+
+
+        -- Create the nginx config from the template
+        local temp_dir = uri("file:"..temp_dir_string)
+        -- The *output* file, where the generated config is stored
+        local acme_nginx_file = temp_dir.child("nginx.acme_setup.conf")
+        local conf = load_file "file:startup/nginx/nginx.acme_setup.conf.luan"
+				local acme_nginx = ` conf(webroot,domain) `
+				acme_nginx_file.write(acme_nginx)
+
+        -- Create an index.html to search for in the logs
+        -- to verify everything is working
+        local index_file = webroot.."/index.html"
+        local cmd = "echo 'hi, testing' > "..index_file
+        local s = uri("bash:"..cmd).read_text()
+
+        -- The config in ./local/nginx.conf has a directive to
+        -- glob include confs in /tmp/acme_setup/*/nginx.acme_setup.conf
+        -- so we just need to reload it so it can find the one we just made
+        local cmd = [[
+          sudo $(which nginx) -t -c "]]..top_dir..[[/local/nginx.conf" && sudo $(which nginx) -s reload;
+        ]]
+        local s = uri("bash:"..cmd).read_text()
+        logger.info("reload_nginx "..s)
+
+        -- We've set up nginx to serve from our temp root, now we need to
+        -- create a *domain key*, which we then use to sign our cert.
+        local cmd = "openssl genrsa 4096 > "..key_file_str
+        local s = uri("bash:"..cmd).read_text()
+        logger.info("create domain key"..s)
+
+        -- create the cert, signed with the key we just made
+        local cmd = 'openssl req -new -sha256 -key '..key_file_str..' -subj "/CN='..domain..'" > '..csr_file_str
+        local s = uri("bash:"..cmd).read_text()
+        logger.info("create domain key"..s)
+
+        -- Finally, get our cert signed by letsencrypt.
+        local cmd = [[
+        python acme_tiny.py --account-key ./local/tiny_account.key \
+        --csr ]]..csr_file_str..[[ \
+        --acme-dir ]]..acme_challenges..[[ \
+        > ./local/]]..domain..[[_signed_chain.crt
+        ]]
+        local s = uri("bash:"..cmd).read_text()
+        logger.info("create domain key"..s)
+
+
+
+        -- testing if there is an http server on the domain
+        -- that is serving files
+				local cmd = "./testhttp.sh "..domain
+				local s = uri("bash:"..cmd).read_text()
+				logger.info("test if http up")
+        -- The above http request is the only thing that causes a recursion
+        -- so it is safe to delete the guard here.
+        guard_uri.delete()
+
 				local cmd = [[
-./local_https.sh "]]..domain..[["
-]]
+          ./local_https.sh "]]..domain..[["
+        ]]
 				local s = uri("bash:"..cmd).read_text()
 				logger.info("issue local certificate")
 			else
+        -- 1. Generate certificate
+        -- 2. Put it in the 
           local cmd = [[
             ./acme.sh --debug --issue -d "]]..domain..[[" --stateless --server letsencrypt \
               --config-home "]]..top_dir..[[/local/letsencrypt/config" \
@@ -52,6 +148,8 @@
 			end
 			if key_file.exists() and local_cer_file.exists() then
 				changed = true
+        -- the nginx config only requires 2 files:
+        -- fullchain.cer and DOMAIN.key
 				local conf = load_file "file:startup/nginx/nginx.ssl.conf.luan"
 				local nginx = ` conf(top_dir,domain) `
 				nginx_file.write(nginx)
@@ -81,4 +179,3 @@
 	--logger.info "done"
 end
 Hosted.set_https = Boot.no_security(Hosted.set_https)
-