Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for http-01 stray tokens, dns-01 CNAMEs, contact e-mail format and updates; account security operations; misc #841

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
def924c
Add code for deleteing ftps tokens
tlhackque Mar 16, 2024
31168a0
Fixes for stray http01 tokens with *ftp*
tlhackque Mar 16, 2024
90ddc4c
Add dns_scripts/dns_nodelete
tlhackque Mar 16, 2024
49bb400
Rework dns-01 CNAME handling
tlhackque Mar 17, 2024
1c6ad12
Automatically update ACCOUNT_EMAIL (contact) in registration
tlhackque Mar 17, 2024
0d68989
Implement --new-account-key and --DEACTIVATE-account
tlhackque Mar 18, 2024
fe50d15
Implement token substitution in ACLs
tlhackque Mar 19, 2024
6aef05b
Support specifying local ip address (and optional port) in nsupdate
tlhackque Mar 19, 2024
426f557
Typo in template. Update revision history.
tlhackque Mar 19, 2024
80bc3d4
Relax restriction on dns-01 CNAMEs
tlhackque Mar 21, 2024
e897d17
Ensure that --all doesn't run --new-account-key or --DEACTIVATE-accou…
tlhackque Mar 22, 2024
78d8d51
Avoid domain processing for account-management commands.
tlhackque Mar 22, 2024
94f43ac
Handle multiple contact e-mail addresses
tlhackque Mar 24, 2024
a0f1b76
Export LC_ALL to solve date (and future) issues
tlhackque Mar 24, 2024
26f20c5
Use /etc/services (or local equivalent" to translate port names.
tlhackque Mar 25, 2024
ff43afc
Document that service names can be uset for SERVER_TYPE.
tlhackque Mar 24, 2024
c89e578
Use DOMAIN accounts for account operations. Add some guardrails.
tlhackque Mar 25, 2024
d57ca78
Make file deletion with ftp use the correct port.
tlhackque Mar 24, 2024
5750aaa
Fix curl not using path when deleting challenge tokens
tlhackque Mar 25, 2024
4f1e240
Fix test failures from curl warnings that --ftp-ssl is insecure
tlhackque Mar 25, 2024
0cf8fe3
FTP test failures on centos6
tlhackque Mar 25, 2024
f29c91a
Add all starttls protocols supported by openssl.
tlhackque Apr 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,10 @@ domain(s) -X –experimental tag Allow upgrade to a specified version of
getssl -U, –nocheck Do not check if a more recent version is available
-v –version Display current version of getssl -w working_dir “Working
directory” –preferred-chain “chain” Use an alternate chain for the
certificate ```
certificate --account-id Display account id and exit --new-account-key
Replace the account key with a new one --DEACTIVATE-account
Permanently deactivate account
```


Quick Start Guide
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ Options:
-v --version Display current version of getssl
-w working_dir "Working directory"
--preferred-chain "chain" Use an alternate chain for the certificate
--account-id Display account id and exit
--new-account-key Replace the account key with a new one
--DEACTIVATE-account Permanently deactivate account
```

## Quick Start Guide
Expand Down
3 changes: 2 additions & 1 deletion dns_scripts/dns_add_nsupdate
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ token="$2"
# DNS_NSUPDATE_GETKEY - command to execute if access to the key file requires
# some special action: mounting a disk, decrypting a file..
# Called with the operation 'add' and action 'open" / 'close'

# DNS_NSUPDATE_LOCALIP - IP source address for update (TSIG is preferred) Can be address<space>port.

if [ -n "${DNS_NSUPDATE_KEYFILE}" ]; then
if [ -n "${DNS_NSUPDATE_KEY_HOOK}" ] && ! ${DNS_NSUPDATE_KEY_HOOK} 'add' 'open' "${fulldomain}" ; then
Expand All @@ -26,6 +26,7 @@ if [ -n "${DNS_SERVER}" ]; then
cmd+="server ${DNS_SERVER}\n"
fi

[ -n "$DNS_NSUPDATE_LOCALIP" ] && cmd+="local ${DNS_NSUPDATE_LOCALIP}\n"
cmd+="update add ${DNS_ZONE:-"_acme-challenge.${fulldomain}."} 300 in TXT \"${token}\"\n"
cmd+="\n" # blank line is a "send" command to nsupdate

Expand Down
2 changes: 2 additions & 0 deletions dns_scripts/dns_del_nsupdate
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ token="$2"
# some special action: dismounting a disk, encrypting a
# file... Called with the operation 'del' and action
# 'open" / 'close'
# DNS_NSUPDATE_LOCALIP - IP source address for update (TSIG is preferred) Can be address<space>port.

if [ -n "${DNS_NSUPDATE_KEYFILE}" ]; then
if [ -n "${DNS_NSUPDATE_KEY_HOOK}" ] && ! "${DNS_NSUPDATE_KEY_HOOK}" 'del' 'open' "${fulldomain}" ; then
Expand All @@ -26,6 +27,7 @@ if [ -n "${DNS_SERVER}" ]; then
cmd+="server ${DNS_SERVER}\n"
fi

[ -n "$DNS_NSUPDATE_LOCALIP" ] && cmd+="local ${DNS_NSUPDATE_LOCALIP}\n"
cmd+="update delete ${DNS_ZONE:-"_acme-challenge.${fulldomain}."} 300 in TXT \"${token}\"\n"
cmd+="\n" # blank line is a "send" command to nsupdate

Expand Down
20 changes: 20 additions & 0 deletions dns_scripts/dns_nodelete
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash

# For debugging, use this as the DNS update "delete" driver
#
# It will log whatever seems interesting in /tmp/dns_nodelete.log, but
# it will NOT delete the tokens. Currently used with nsupdate, but
# variables for other drivers are welcome. This is mainly for debugging
# CNAME aliasing & token cleanup tools.

(
NOLOG="/tmp/dns_nodelete.log"
NOSTAMP="$(date +'%a, %d-%b-%Y %T.%N'): "
NODOMAIN="$1"
NOTOKEN="$2"
NOVARS="DNS_.*|*NODOMAIN|NOTOKEN*"

set | grep -E "^($NOVARS)=" | while read -r ; do echo "${NOSTAMP}$REPLY" >>$NOLOG; done

echo "${NOSTAMP}update delete ${DNS_ZONE:-"_acme-challenge.${NODOMAIN}."} 300 in TXT \"${NOTOKEN}\"\n" >>"$NOLOG"
)
Loading
Loading