mirror of
https://github.com/acmesh-official/acme.sh
synced 2025-08-22 01:49:43 +00:00
1f486fc9a5
* Fix for empty error objects in response breaking extraction of domain validation types
Fix for empty error objects in the response which mess up the extraction of domain validation types due to the closing brace in the error object prematurely matching the end of the search pattern.
This seems to be a recent change with ZeroSSL in particular where "error":{} is being included in responses.
There could potentially be a related issue if there is a complex error object ever returned in the validation check response where an embedded sub-object could lead to an incomplete extraction of the error message, roughly around line 5040.
Adapted from fix suggested here: https://github.com/acmesh-official/acme.sh/issues/4933#issuecomment-1870499018
* Add new dnsapi support for OpenProvider.eu using new REST API
* Cleanup duplicate debug log output based on DNS test run
* Resolve spellcheck error
* Configure 10 second timeout to ACME_DIRECTORY API call
* add support for AIX style netstat
* add
* fix for wiki
* minor
* minor
* wiki
* wiki
* dnsapi: dns_mydnsjp.sh fix author
The @epgdatacapbon was renamed to @tkmsst
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
* dnsapi: dns_ddnss.sh remove RaidenII from authors
He made the DuckDNS script that was used for this script but he can't support the script.
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
* dnsapi: fix authors: use @ for GitHub profiles
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
* dnsapi: dns_vultr.sh remove empty author
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
* dnsapi: dns_mijnhost.sh rearrange fields, use user docs instead of API docs
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
* dnsapi: fix Structured DNS Info
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
* Fix logged typo when running pre hook
* Run post hook when _on_before_issue errors
---------
Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
Co-authored-by: Ciaran Walsh <ciaran@ciaran-walsh.com>
Co-authored-by: Lambiek12 <algemeen@lambiek12.nl>
Co-authored-by: Erwin Oegema <blablaechthema@hotmail.com>
Co-authored-by: laDanz <cdanzmann@gmail.com>
Co-authored-by: neil <github@neilpang.com>
Co-authored-by: neil <gitpc@neilpang.com>
Co-authored-by: Sergey Ponomarev <stokito@gmail.com>
Co-authored-by: David Beitey <david@davidjb.com>
Co-authored-by: Jan-willem van Kampen <Lambiek12@users.noreply.github.com>
117 lines
3.0 KiB
Bash
117 lines
3.0 KiB
Bash
#!/usr/bin/env sh
|
|
# shellcheck disable=SC2034
|
|
dns_joker_info='Joker.com
|
|
Site: Joker.com
|
|
Docs: github.com/acmesh-official/acme.sh/wiki/dnsapi2#dns_joker
|
|
Options:
|
|
JOKER_USERNAME Username
|
|
JOKER_PASSWORD Password
|
|
Issues: github.com/acmesh-official/acme.sh/issues/2840
|
|
Author: @aattww
|
|
'
|
|
|
|
JOKER_API="https://svc.joker.com/nic/replace"
|
|
|
|
######## Public functions #####################
|
|
|
|
#Usage: dns_joker_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
|
|
dns_joker_add() {
|
|
fulldomain=$1
|
|
txtvalue=$2
|
|
|
|
JOKER_USERNAME="${JOKER_USERNAME:-$(_readaccountconf_mutable JOKER_USERNAME)}"
|
|
JOKER_PASSWORD="${JOKER_PASSWORD:-$(_readaccountconf_mutable JOKER_PASSWORD)}"
|
|
|
|
if [ -z "$JOKER_USERNAME" ] || [ -z "$JOKER_PASSWORD" ]; then
|
|
_err "No Joker.com username and password specified."
|
|
return 1
|
|
fi
|
|
|
|
_saveaccountconf_mutable JOKER_USERNAME "$JOKER_USERNAME"
|
|
_saveaccountconf_mutable JOKER_PASSWORD "$JOKER_PASSWORD"
|
|
|
|
if ! _get_root "$fulldomain"; then
|
|
_err "Invalid domain"
|
|
return 1
|
|
fi
|
|
|
|
_info "Adding TXT record"
|
|
if _joker_rest "username=$JOKER_USERNAME&password=$JOKER_PASSWORD&zone=$_domain&label=$_sub_domain&type=TXT&value=$txtvalue"; then
|
|
if _startswith "$response" "OK"; then
|
|
_info "Added, OK"
|
|
return 0
|
|
fi
|
|
fi
|
|
_err "Error adding TXT record."
|
|
return 1
|
|
}
|
|
|
|
#fulldomain txtvalue
|
|
dns_joker_rm() {
|
|
fulldomain=$1
|
|
txtvalue=$2
|
|
|
|
JOKER_USERNAME="${JOKER_USERNAME:-$(_readaccountconf_mutable JOKER_USERNAME)}"
|
|
JOKER_PASSWORD="${JOKER_PASSWORD:-$(_readaccountconf_mutable JOKER_PASSWORD)}"
|
|
|
|
if ! _get_root "$fulldomain"; then
|
|
_err "Invalid domain"
|
|
return 1
|
|
fi
|
|
|
|
_info "Removing TXT record"
|
|
# TXT record is removed by setting its value to empty.
|
|
if _joker_rest "username=$JOKER_USERNAME&password=$JOKER_PASSWORD&zone=$_domain&label=$_sub_domain&type=TXT&value="; then
|
|
if _startswith "$response" "OK"; then
|
|
_info "Removed, OK"
|
|
return 0
|
|
fi
|
|
fi
|
|
_err "Error removing TXT record."
|
|
return 1
|
|
}
|
|
|
|
#################### Private functions below ##################################
|
|
#_acme-challenge.www.domain.com
|
|
#returns
|
|
# _sub_domain=_acme-challenge.www
|
|
# _domain=domain.com
|
|
_get_root() {
|
|
fulldomain=$1
|
|
i=1
|
|
while true; do
|
|
h=$(printf "%s" "$fulldomain" | cut -d . -f "$i"-100)
|
|
_debug h "$h"
|
|
if [ -z "$h" ]; then
|
|
return 1
|
|
fi
|
|
|
|
# Try to remove a test record. With correct root domain, username and password this will return "OK: ..." regardless
|
|
# of record in question existing or not.
|
|
if _joker_rest "username=$JOKER_USERNAME&password=$JOKER_PASSWORD&zone=$h&label=jokerTXTUpdateTest&type=TXT&value="; then
|
|
if _startswith "$response" "OK"; then
|
|
_sub_domain="$(echo "$fulldomain" | sed "s/\\.$h\$//")"
|
|
_domain=$h
|
|
return 0
|
|
fi
|
|
fi
|
|
|
|
i=$(_math "$i" + 1)
|
|
done
|
|
|
|
_debug "Root domain not found"
|
|
return 1
|
|
}
|
|
|
|
_joker_rest() {
|
|
data="$1"
|
|
_debug data "$data"
|
|
|
|
if ! response="$(_post "$data" "$JOKER_API" "" "POST")"; then
|
|
_err "Error POSTing"
|
|
return 1
|
|
fi
|
|
_debug response "$response"
|
|
return 0
|
|
}
|