mirror of
				https://github.com/hiskang/acme.sh
				synced 2025-11-04 12:28:12 +00:00 
			
		
		
		
	fix dp
This commit is contained in:
		
							parent
							
								
									28145a9deb
								
							
						
					
					
						commit
						a6b6e31cda
					
				@ -15,6 +15,8 @@ dns_dp_add() {
 | 
				
			|||||||
  fulldomain=$1
 | 
					  fulldomain=$1
 | 
				
			||||||
  txtvalue=$2
 | 
					  txtvalue=$2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  DP_Id="${DP_Id:-$(_readaccountconf_mutable DP_Id)}"
 | 
				
			||||||
 | 
					  DP_Key="${DP_Key:-$(_readaccountconf_mutable DP_Key)}"
 | 
				
			||||||
  if [ -z "$DP_Id" ] || [ -z "$DP_Key" ]; then
 | 
					  if [ -z "$DP_Id" ] || [ -z "$DP_Key" ]; then
 | 
				
			||||||
    DP_Id=""
 | 
					    DP_Id=""
 | 
				
			||||||
    DP_Key=""
 | 
					    DP_Key=""
 | 
				
			||||||
@ -24,8 +26,8 @@ dns_dp_add() {
 | 
				
			|||||||
  fi
 | 
					  fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  #save the api key and email to the account conf file.
 | 
					  #save the api key and email to the account conf file.
 | 
				
			||||||
  _saveaccountconf DP_Id "$DP_Id"
 | 
					  _saveaccountconf_mutable DP_Id "$DP_Id"
 | 
				
			||||||
  _saveaccountconf DP_Key "$DP_Key"
 | 
					  _saveaccountconf_mutable DP_Key "$DP_Key"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  _debug "First detect the root zone"
 | 
					  _debug "First detect the root zone"
 | 
				
			||||||
  if ! _get_root "$fulldomain"; then
 | 
					  if ! _get_root "$fulldomain"; then
 | 
				
			||||||
@ -33,24 +35,18 @@ dns_dp_add() {
 | 
				
			|||||||
    return 1
 | 
					    return 1
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  existing_records "$_domain" "$_sub_domain"
 | 
					  add_record "$_domain" "$_sub_domain" "$txtvalue"
 | 
				
			||||||
  _debug count "$count"
 | 
					 | 
				
			||||||
  if [ "$?" != "0" ]; then
 | 
					 | 
				
			||||||
    _err "Error get existing records."
 | 
					 | 
				
			||||||
    return 1
 | 
					 | 
				
			||||||
  fi
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if [ "$count" = "0" ]; then
 | 
					 | 
				
			||||||
    add_record "$_domain" "$_sub_domain" "$txtvalue"
 | 
					 | 
				
			||||||
  else
 | 
					 | 
				
			||||||
    update_record "$_domain" "$_sub_domain" "$txtvalue"
 | 
					 | 
				
			||||||
  fi
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#fulldomain txtvalue
 | 
					#fulldomain txtvalue
 | 
				
			||||||
dns_dp_rm() {
 | 
					dns_dp_rm() {
 | 
				
			||||||
  fulldomain=$1
 | 
					  fulldomain=$1
 | 
				
			||||||
  txtvalue=$2
 | 
					  txtvalue=$2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  DP_Id="${DP_Id:-$(_readaccountconf_mutable DP_Id)}"
 | 
				
			||||||
 | 
					  DP_Key="${DP_Key:-$(_readaccountconf_mutable DP_Key)}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  _debug "First detect the root zone"
 | 
					  _debug "First detect the root zone"
 | 
				
			||||||
  if ! _get_root "$fulldomain"; then
 | 
					  if ! _get_root "$fulldomain"; then
 | 
				
			||||||
    _err "invalid domain"
 | 
					    _err "invalid domain"
 | 
				
			||||||
@ -83,37 +79,6 @@ dns_dp_rm() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#usage:  root  sub
 | 
					 | 
				
			||||||
#return if the sub record already exists.
 | 
					 | 
				
			||||||
#echos the existing records count.
 | 
					 | 
				
			||||||
# '0' means doesn't exist
 | 
					 | 
				
			||||||
existing_records() {
 | 
					 | 
				
			||||||
  _debug "Getting txt records"
 | 
					 | 
				
			||||||
  root=$1
 | 
					 | 
				
			||||||
  sub=$2
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if ! _rest POST "Record.List" "login_token=$DP_Id,$DP_Key&domain_id=$_domain_id&sub_domain=$_sub_domain"; then
 | 
					 | 
				
			||||||
    return 1
 | 
					 | 
				
			||||||
  fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if _contains "$response" 'No records'; then
 | 
					 | 
				
			||||||
    count=0
 | 
					 | 
				
			||||||
    return 0
 | 
					 | 
				
			||||||
  fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if _contains "$response" "Action completed successful"; then
 | 
					 | 
				
			||||||
    count=$(printf "%s" "$response" | grep -c '<type>TXT</type>' | tr -d ' ')
 | 
					 | 
				
			||||||
    record_id=$(printf "%s" "$response" | grep '^<id>' | tail -1 | cut -d '>' -f 2 | cut -d '<' -f 1)
 | 
					 | 
				
			||||||
    _debug record_id "$record_id"
 | 
					 | 
				
			||||||
    return 0
 | 
					 | 
				
			||||||
  else
 | 
					 | 
				
			||||||
    _err "get existing records error."
 | 
					 | 
				
			||||||
    return 1
 | 
					 | 
				
			||||||
  fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  count=0
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#add the txt record.
 | 
					#add the txt record.
 | 
				
			||||||
#usage: root  sub  txtvalue
 | 
					#usage: root  sub  txtvalue
 | 
				
			||||||
add_record() {
 | 
					add_record() {
 | 
				
			||||||
@ -136,28 +101,6 @@ add_record() {
 | 
				
			|||||||
  return 1 #error
 | 
					  return 1 #error
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#update the txt record
 | 
					 | 
				
			||||||
#Usage: root sub txtvalue
 | 
					 | 
				
			||||||
update_record() {
 | 
					 | 
				
			||||||
  root=$1
 | 
					 | 
				
			||||||
  sub=$2
 | 
					 | 
				
			||||||
  txtvalue=$3
 | 
					 | 
				
			||||||
  fulldomain="$sub.$root"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  _info "Updating record"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if ! _rest POST "Record.Modify" "login_token=$DP_Id,$DP_Key&format=json&domain_id=$_domain_id&sub_domain=$_sub_domain&record_type=TXT&value=$txtvalue&record_line=默认&record_id=$record_id"; then
 | 
					 | 
				
			||||||
    return 1
 | 
					 | 
				
			||||||
  fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if _contains "$response" "Action completed successful"; then
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    return 0
 | 
					 | 
				
			||||||
  fi
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  return 1 #error
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
####################  Private functions below ##################################
 | 
					####################  Private functions below ##################################
 | 
				
			||||||
#_acme-challenge.www.domain.com
 | 
					#_acme-challenge.www.domain.com
 | 
				
			||||||
#returns
 | 
					#returns
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user