nihilist/acme.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix regexp for findind acme challenge record from API response

Browse Source
This commit is contained in:
zak905 2024-04-30 12:38:02 +02:00
parent ffde1f8343
commit 30d0945855
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dnsapi/dns_ionos.sh
View File

@ -70,13 +70,12 @@ dns_ionos_rm() {
return 0 return 0
fi fi
else else
_record_name=$(printf "%s" "$fulldomain" | cut -d . -f 1) if ! _ionos_cloud_get_record "$_zone_id" "$txtvalue" "$fulldomain"; then
if ! _ionos_cloud_get_record "$_record_name" "$_zone_id" "$txtvalue"; then
_err "Could not find _acme-challenge TXT record." _err "Could not find _acme-challenge TXT record."
return 1 return 1
fi fi
if _ionos_cloud_rest DELETE "$IONOS_CLOUD_ROUTE_ZONES/$_zone_id/records/$_record_id" && [ "$_code" = "200" ]; then if _ionos_cloud_rest DELETE "$IONOS_CLOUD_ROUTE_ZONES/$_zone_id/records/$_record_id" && [ "$_code" = "202" ]; then
_info "TXT record has been deleted successfully." _info "TXT record has been deleted successfully."
return 0 return 0
fi fi
@ -204,14 +203,17 @@ _ionos_get_record() {
} }
_ionos_cloud_get_record() { _ionos_cloud_get_record() {
_record_name=$1 zone_id=$1
zone_id=$2 txtrecord=$2
txtrecord=$3 fulldomain=$3
_record_name=$(printf "%s" "$fulldomain" | cut -d . -f 1)
if _ionos_cloud_rest GET "$IONOS_ROUTE_ZONES/$zone_id/records"; then if _ionos_cloud_rest GET "$IONOS_CLOUD_ROUTE_ZONES/$zone_id/records"; then
_response="$(echo "$_response" | tr -d "\n")" _response="$(echo "$_response" | tr -d "\n")"
_record="$(echo "$_response" | _egrep_o "\"name\":\"$_record_name\"[^\}]*\"type\":\"TXT\"[^\}]*\"content\":\"\\\\\"$txtrecord\\\\\"\".*\}")" pattern="{\"id\":\"[a-fA-F0-9\-]*\",\"type\":\"record\",\"href\":\"/zones/$zone_id/records/[a-fA-F0-9\-]*\",\"metadata\":{\"createdDate\":\"[A-Z0-9\:\.\-]*\",\"lastModifiedDate\":\"[A-Z0-9\:\.\-]*\",\"fqdn\":\"$fulldomain\",\"state\":\"AVAILABLE\",\"zoneId\":\"$zone_id\"},\"properties\":{\"content\":\"$txtrecord\",\"enabled\":true,\"name\":\"$_record_name\",\"priority\":[0-9]*,\"ttl\":[0-9]*,\"type\":\"TXT\"}}"
_record="$(echo "$_response" | _egrep_o $pattern)"
if [ "$_record" ]; then if [ "$_record" ]; then
_record_id=$(printf "%s\n" "$_record" | _egrep_o "\"id\":\"[a-fA-F0-9\-]*\"" | _head_n 1 | cut -d : -f 2 | tr -d '\"') _record_id=$(printf "%s\n" "$_record" | _egrep_o "\"id\":\"[a-fA-F0-9\-]*\"" | _head_n 1 | cut -d : -f 2 | tr -d '\"')