dns_yc: fix wildcard handling and TXT record cleanup logic

- Properly append TXT values instead of overwriting recordset - Remove only matching TXT value during cleanup - Support arbitrary FQDN (acmetest compatibility) - Fix multi-value TXT handling required for wildcard validation - Use _mktemp and avoid persistent key deletion - Ensure add/rm run correctly in isolated subshells
5 days ago · 9d6fcca23f
1 changed files with 83 additions and 300 deletions
--- a/dnsapi/dns_yc.sh
+++ b/dnsapi/dns_yc.sh
@ -10,357 +10,140 @@ Options:
 YC_SA_ID Service Account ID
 YC_SA_Key_ID Service Account IAM Key ID
 YC_SA_Key_File_Path Private key file path. Optional.
 YC_SA_Key_File_PEM_b64 Base64 content of private key file. Use instead of Path to private key file. Optional.
 YC_SA_Key_File_PEM_b64 Base64 content of private key file. Optional.
 Issues: github.com/acmesh-official/acme.sh/issues/4210
 '
 YC_Api="https://dns.api.cloud.yandex.net/dns/v1"
 ########  Public functions #####################
 ########################
 # add
 ########################
 #Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 dns_yc_add() {
  fulldomain="$(echo "$1". | _lower_case)" # Add dot at end of domain name
  txtvalue=$2
  fulldomain="$(echo "$1" | _lower_case)"
  txtvalue="$2"
  _yc_prepare_key_file
  trap _yc_cleanup_key_file 0
  _yc_init || return 1
  YC_Zone_ID="${YC_Zone_ID:-$(_readaccountconf_mutable YC_Zone_ID)}"
  YC_Folder_ID="${YC_Folder_ID:-$(_readaccountconf_mutable YC_Folder_ID)}"
  YC_SA_ID="${YC_SA_ID:-$(_readaccountconf_mutable YC_SA_ID)}"
  YC_SA_Key_ID="${YC_SA_Key_ID:-$(_readaccountconf_mutable YC_SA_Key_ID)}"
  _debug "Detect root zone"
  _get_root "$fulldomain" || return 1
  if ! _yc_validate_creds; then
    return 1
  fi
  _debug "Fetching existing TXT"
  _yc_rest GET "zones/${_domain_id}:getRecordSet?type=TXT&name=$_sub_domain" || return 1
  # Save per-domain or per-account settings
  if [ "$YC_Zone_ID" ]; then
    _savedomainconf YC_Zone_ID "$YC_Zone_ID"
  elif [ "$YC_Folder_ID" ]; then
    _savedomainconf YC_Folder_ID "$YC_Folder_ID"
  fi
  _saveaccountconf_mutable YC_SA_ID "$YC_SA_ID"
  _saveaccountconf_mutable YC_SA_Key_ID "$YC_SA_Key_ID"
  if [ "${YC_SA_Key_File_PEM_b64:-}" ]; then
    _saveaccountconf_mutable YC_SA_Key_File_PEM_b64 "$YC_SA_Key_File_PEM_b64"
    _clearaccountconf_mutable YC_SA_Key_File_Path
  else
    _saveaccountconf_mutable YC_SA_Key_File_Path "$YC_SA_Key_File_Path"
    _clearaccountconf_mutable YC_SA_Key_File_PEM_b64
  fi
  existing="$(_yc_extract_data_array)"
  _debug "First detect the root zone"
  if ! _get_root "$fulldomain"; then
    _err "invalid domain"
    return 1
  fi
  _debug _domain_id "$_domain_id"
  _debug _sub_domain "$_sub_domain"
  _debug _domain "$_domain"
  _debug "Getting txt records"
  if ! _yc_rest GET "zones/${_domain_id}:getRecordSet?type=TXT&name=$_sub_domain"; then
    _err "Error: $response"
    return 1
  fi
  newdata="$(_yc_array_add "$existing" "$txtvalue")"
  _info "Adding record"
  if _yc_rest POST "zones/$_domain_id:upsertRecordSets" "{\"merges\": [ { \"name\":\"$_sub_domain\",\"type\":\"TXT\",\"ttl\":\"120\",\"data\":[\"$txtvalue\"]}]}"; then
    if _contains "$response" "\"done\": true"; then
      _info "Added, OK"
      return 0
    fi
  fi
  _info "Adding TXT record"
  _yc_rest POST "zones/${_domain_id}:upsertRecordSets" \
    "{\"merges\":[{\"name\":\"$_sub_domain\",\"type\":\"TXT\",\"ttl\":\"60\",\"data\":$newdata}]}" \
    || return 1
  _err "Add txt record error."
  return 1
  _contains "$response" "\"done\": true" || return 1
  return 0
 }
 #fulldomain txtvalue
 dns_yc_rm() {
  fulldomain="$(echo "$1". | _lower_case)" # Add dot at end of domain name
  txtvalue=$2
 ########################
 # rm
 ########################
  _yc_prepare_key_file
  trap _yc_cleanup_key_file 0
 dns_yc_rm() {
  fulldomain="$(echo "$1" | _lower_case)"
  txtvalue="$2"
  YC_Zone_ID="${YC_Zone_ID:-$(_readaccountconf_mutable YC_Zone_ID)}"
  YC_Folder_ID="${YC_Folder_ID:-$(_readaccountconf_mutable YC_Folder_ID)}"
  YC_SA_ID="${YC_SA_ID:-$(_readaccountconf_mutable YC_SA_ID)}"
  YC_SA_Key_ID="${YC_SA_Key_ID:-$(_readaccountconf_mutable YC_SA_Key_ID)}"
  _yc_init || return 1
  if ! _yc_validate_creds; then
    return 1
  fi
  _get_root "$fulldomain" || return 1
  _debug "First detect the root zone"
  if ! _get_root "$fulldomain"; then
    _err "invalid domain"
    return 1
  fi
  _debug _domain_id "$_domain_id"
  _debug _sub_domain "$_sub_domain"
  _debug _domain "$_domain"
  _debug "Getting txt records"
  if ! _yc_rest GET "zones/${_domain_id}:getRecordSet?type=TXT&name=$_sub_domain"; then
    _err "Error: $response"
    return 1
  fi
  _yc_rest GET "zones/${_domain_id}:getRecordSet?type=TXT&name=$_sub_domain" || return 1
  _existing="$(_yc_extract_txt_data_array)"
  _debug existing_data "$_existing"
  existing="$(_yc_extract_data_array)"
  # Nothing to delete
  if [ -z "$_existing" ]; then
    _info "No TXT recordset found, skip."
    return 0
  fi
  [ -z "$existing" ] && return 0
  _newdata="$(_yc_data_array_rm_one "$_existing" "$txtvalue")"
  _debug new_data "$_newdata"
  newdata="$(_yc_array_remove "$existing" "$txtvalue")"
  # If value wasn't present, nothing to do
  if [ "$_newdata" = "$_existing" ]; then
    _info "TXT value not found, skip."
  if [ "$newdata" = "$existing" ]; then
    return 0
  fi
  if [ "$_newdata" = "[]" ]; then
    # delete whole recordset (with previous data array)
    if _yc_rest POST "zones/$_domain_id:updateRecordSets" \
      "{\"deletions\": [ { \"name\":\"$_sub_domain\",\"type\":\"TXT\",\"ttl\":\"120\",\"data\":$_existing }]}"; then
      if _contains "$response" "\"done\": true"; then
        _info "Delete, OK"
        return 0
      fi
    fi
  if [ "$newdata" = "[]" ]; then
    _yc_rest POST "zones/${_domain_id}:updateRecordSets" \
      "{\"deletions\":[{\"name\":\"$_sub_domain\",\"type\":\"TXT\",\"ttl\":\"60\",\"data\":$existing}]}" \
      || return 1
  else
    # keep remaining values
    if _yc_rest POST "zones/$_domain_id:upsertRecordSets" \
      "{\"merges\": [ { \"name\":\"$_sub_domain\",\"type\":\"TXT\",\"ttl\":\"120\",\"data\":$_newdata }]}"; then
      if _contains "$response" "\"done\": true"; then
        _info "Delete, OK"
        return 0
      fi
    fi
    _yc_rest POST "zones/${_domain_id}:upsertRecordSets" \
      "{\"merges\":[{\"name\":\"$_sub_domain\",\"type\":\"TXT\",\"ttl\":\"60\",\"data\":$newdata}]}" \
      || return 1
  fi
  _err "Delete record error."
  return 1
 }
 ####################  Private functions below ##################################
 #returns
 # _sub_domain=_acme-challenge.www
 # _domain=domain.com
 # _domain_id=<id>
 _get_root() {
  domain=$1
  i=1
  p=1
  # Use Zone ID directly if provided
  if [ "$YC_Zone_ID" ]; then
    if ! _yc_rest GET "zones/$YC_Zone_ID"; then
      return 1
    fi
    if echo "$response" | tr -d " " | _egrep_o "\"id\":\"$YC_Zone_ID\"" >/dev/null; then
      _domain=$(echo "$response" | _egrep_o "\"zone\": *\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | _head_n 1 | tr -d " ")
      if [ "$_domain" ]; then
        _cutlength=$((${#domain} - ${#_domain}))
        _sub_domain=$(printf "%s" "$domain" | cut -c "1-$_cutlength")
        _domain_id=$YC_Zone_ID
        return 0
      fi
    fi
    return 1
  fi
  while true; do
    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
    _debug h "$h"
    if [ -z "$h" ]; then
      return 1
    fi
    if [ "$YC_Folder_ID" ]; then
      if ! _yc_rest GET "zones?folderId=$YC_Folder_ID"; then
        return 1
      fi
    else
      _err "You didn't specify a Yandex Cloud Folder ID."
      return 1
    fi
    if _contains "$response" "\"zone\": \"$h\""; then
      _domain_id=$(echo "$response" | _normalizeJson | _egrep_o "[^{]*\"zone\":\"$h\"[^}]*" | _egrep_o "\"id\"[^,]*" | _egrep_o "[^:]*$" | tr -d '"')
      _debug _domain_id "$_domain_id"
      if [ "$_domain_id" ]; then
        _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-"$p")
        _domain=$h
        return 0
      fi
      return 1
    fi
    p=$i
    i=$(_math "$i" + 1)
  done
 }
 # Extract TXT recordset "data" array from YC response
 # Returns JSON array like ["v1","v2"] or empty string if not found
 _yc_extract_txt_data_array() {
  echo "$response" | _normalizeJson | _egrep_o "\"data\":\\[[^\\]]*\\]" | _egrep_o "\\[[^\\]]*\\]"
 }
  _contains "$response" "\"done\": true" || return 1
 # Remove one txt value from JSON array
 # Args: json_array txtvalue
 # Prints: new json array (possibly "[]")
 _yc_data_array_rm_one() {
  _arr="$1"
  _val="$2"
  [ -z "$_arr" ] && { printf "[]"; return 0; }
  # remove exact JSON string element occurrences
  _new=$(printf "%s" "$_arr" | sed \
    -e "s/\"$_val\",//g" \
    -e "s/,\"$_val\"//g" \
    -e "s/\"$_val\"//g" \
    -e 's/\[,/[/' \
    -e 's/,\]/]/' \
    -e 's/,,/,/g')
  # normalize empty leftovers
  _new=$(printf "%s" "$_new" | sed -e 's/\[ *\]/[]/g')
  # if nothing left between brackets -> []
  if _contains "$_new" '[""]'; then
    printf "%s" "$_new"
    return 0
  fi
  # clean cases like "[" or "]" or "[,]"
  if [ "$_new" = "[]" ] || [ "$_new" = "[" ] || [ "$_new" = "]" ] || [ "$_new" = "[,]" ]; then
    printf "[]"
    return 0
  fi
  printf "%s" "$_new"
  return 0
 }
 ########################
 # internal helpers
 ########################
 _yc_validate_creds() {
  if [ ! "$YC_SA_ID" ] || [ ! "$YC_SA_Key_ID" ] || [ ! "$YC_SA_Key_File" ]; then
    _err "You didn't specify a YC_SA_ID or YC_SA_Key_ID or YC_SA_Key_File."
    return 1
  fi
  if [ ! -f "$YC_SA_Key_File" ]; then
    _err "YC_SA_Key_File not found in path $YC_SA_Key_File."
    return 1
  fi
 _yc_init() {
  if ! _isRSA "$YC_SA_Key_File" >/dev/null 2>&1; then
    _err "YC_SA_Key_File not a RSA file(_isRSA function return false)."
    return 1
  fi
  if [ ! "$YC_Zone_ID" ] && [ ! "$YC_Folder_ID" ]; then
    _err "You didn't specify a Yandex Cloud Zone ID or Folder ID yet."
    return 1
  fi
  return 0
 }
 # Prepare YC_SA_Key_File from either PEM_b64 (tmp) or File_Path (persistent)
 # Sets:
 #   YC_SA_Key_File
 #   YC_SA_Key_File_PEM_b64 / YC_SA_Key_File_Path (from env/accountconf)
 #   _yc_tmp_key_file (if created)
 _yc_prepare_key_file() {
  YC_SA_Key_File_PEM_b64="${YC_SA_Key_File_PEM_b64:-$(_readaccountconf_mutable YC_SA_Key_File_PEM_b64)}"
  YC_SA_ID="${YC_SA_ID:-$(_readaccountconf_mutable YC_SA_ID)}"
  YC_SA_Key_ID="${YC_SA_Key_ID:-$(_readaccountconf_mutable YC_SA_Key_ID)}"
  YC_Zone_ID="${YC_Zone_ID:-$(_readaccountconf_mutable YC_Zone_ID)}"
  YC_Folder_ID="${YC_Folder_ID:-$(_readaccountconf_mutable YC_Folder_ID)}"
  YC_SA_Key_File_Path="${YC_SA_Key_File_Path:-$(_readaccountconf_mutable YC_SA_Key_File_Path)}"
  YC_SA_Key_File_PEM_b64="${YC_SA_Key_File_PEM_b64:-$(_readaccountconf_mutable YC_SA_Key_File_PEM_b64)}"
  _yc_tmp_key_file=""
  [ -z "$YC_SA_ID" ] && return 1
  [ -z "$YC_SA_Key_ID" ] && return 1
  if [ "$YC_SA_Key_File_PEM_b64" ]; then
    _yc_tmp_key_file="$(mktemp "${TMPDIR:-/tmp}/acme-yc-key.XXXXXX")"
    chmod 600 "$_yc_tmp_key_file"
    echo "$YC_SA_Key_File_PEM_b64" | _dbase64 >"$_yc_tmp_key_file"
    YC_SA_Key_File="$_yc_tmp_key_file"
    tmpkey="$(_mktemp)"
    echo "$YC_SA_Key_File_PEM_b64" | _dbase64 > "$tmpkey"
    chmod 600 "$tmpkey"
    YC_SA_Key_File="$tmpkey"
  else
    YC_SA_Key_File="$YC_SA_Key_File_Path"
  fi
 }
 # Cleanup only temp key (never touch persistent YC_SA_Key_File_Path)
 _yc_cleanup_key_file() {
  if [ "${_yc_tmp_key_file:-}" ] && [ -f "${_yc_tmp_key_file}" ]; then
    rm -f "${_yc_tmp_key_file}"
  fi
 }
 _yc_rest() {
  m=$1
  ep="$2"
  data="${3-}"
  _debug "$ep"
  if [ ! "${YC_Token:-}" ]; then
    _debug "Login"
    _yc_login
  else
    _debug "Token already exists. Skip Login."
  fi
  token_trimmed=$(echo "$YC_Token" | tr -d '"')
  export _H1="Content-Type: application/json"
  export _H2="Authorization: Bearer $token_trimmed"
  if [ "$m" != "GET" ]; then
    _debug data "$data"
    response="$(_post "$data" "$YC_Api/$ep" "" "$m")"
  else
    response="$(_get "$YC_Api/$ep")"
  fi
  [ ! -f "$YC_SA_Key_File" ] && return 1
  if [ "$?" != "0" ]; then
    _err "error $ep"
    return 1
  fi
  _debug2 response "$response"
  return 0
 }
 _yc_login() {
  header=$(echo "{\"typ\":\"JWT\",\"alg\":\"PS256\",\"kid\":\"$YC_SA_Key_ID\"}" | _normalizeJson | _base64 | _url_replace)
  _debug header "$header"
 _yc_extract_data_array() {
  echo "$response" | _normalizeJson | _egrep_o "\"data\":\\[[^\\]]*\\]" | _egrep_o "\\[[^\\]]*\\]"
 }
  _current_timestamp=$(_time)
  _expire_timestamp=$(_math "$_current_timestamp" + 1200) # 20 minutes
  payload=$(echo "{\"iss\":\"$YC_SA_ID\",\"aud\":\"https://iam.api.cloud.yandex.net/iam/v1/tokens\",\"iat\":$_current_timestamp,\"exp\":$_expire_timestamp}" | _normalizeJson | _base64 | _url_replace)
  _debug payload "$payload"
 _yc_array_add() {
  arr="$1"
  val="$2"
  _signature=$(printf "%s.%s" "$header" "$payload" | _sign "$YC_SA_Key_File" "sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:-1" | _url_replace)
  _debug2 _signature "$_signature"
  [ -z "$arr" ] && { printf "[\"%s\"]" "$val"; return; }
  if printf "%s" "$arr" | _contains "\"$val\""; then
    printf "%s" "$arr"
    return
  fi
  _jwt=$(printf "{\"jwt\": \"%s.%s.%s\"}" "$header" "$payload" "$_signature")
  _debug2 _jwt "$_jwt"
  printf "%s" "$arr" | sed "s/]$/,\"$val\"]/"
  export _H1="Content-Type: application/json"
  _iam_response="$(_post "$_jwt" "https://iam.api.cloud.yandex.net/iam/v1/tokens" "" "POST")"
  _debug3 _iam_response "$(echo "$_iam_response" | _normalizeJson)"
 }
  YC_Token="$(echo "$_iam_response" | _normalizeJson | _egrep_o "\"iamToken\"[^,]*" | _egrep_o "[^:]*$" | tr -d '"')"
  _debug3 YC_Token
 _yc_array_remove() {
  arr="$1"
  val="$2"
  return 0
  printf "%s" "$arr" | sed \
    -e "s/\"$val\",//g" \
    -e "s/,\"$val\"//g" \
    -e "s/\"$val\"//g" \
    -e 's/\[,/[/' \
    -e 's/,\]/]/' \
    -e 's/,,/,/g'
 }