diff --git a/dnsapi/dns_me.sh b/dnsapi/dns_me.sh index 3135718e..abc17475 100755 --- a/dnsapi/dns_me.sh +++ b/dnsapi/dns_me.sh @@ -10,43 +10,43 @@ ME_Api=https://api.dnsmadeeasy.com/V2.0/dns/managed ######## Public functions ##################### #Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" -dns_me_add(){ +dns_me_add() { fulldomain=$1 txtvalue=$2 - - if [ -z "$ME_Key" ] || [ -z "$ME_Secret" ] ; then + + if [ -z "$ME_Key" ] || [ -z "$ME_Secret" ]; then _err "You didn't specify DNSMadeEasy api key and secret yet." _err "Please create you key and try again." return 1 fi - + #save the api key and email to the account conf file. _saveaccountconf ME_Key "$ME_Key" _saveaccountconf ME_Secret "$ME_Secret" - + _debug "First detect the root zone" - if ! _get_root $fulldomain ; then + 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" _me_rest GET "${_domain_id}/records?recordName=$_sub_domain&type=TXT" - - if ! printf "$response" | grep \"totalRecords\": > /dev/null ; then + + if ! printf "$response" | grep \"totalRecords\": >/dev/null; then _err "Error" return 1 fi - + count=$(printf "%s\n" "$response" | _egrep_o \"totalRecords\":[^,]* | cut -d : -f 2) _debug count "$count" - if [ "$count" = "0" ] ; then + if [ "$count" = "0" ]; then _info "Adding record" - if _me_rest POST "$_domain_id/records/" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"value\":\"$txtvalue\",\"gtdLocation\":\"DEFAULT\",\"ttl\":120}"; then - if printf -- "%s" "$response" | grep \"id\": > /dev/null ; then + if _me_rest POST "$_domain_id/records/" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"value\":\"$txtvalue\",\"gtdLocation\":\"DEFAULT\",\"ttl\":120}"; then + if printf -- "%s" "$response" | grep \"id\": >/dev/null; then _info "Added" #todo: check if the record takes effect return 0 @@ -60,19 +60,18 @@ dns_me_add(){ _info "Updating record" record_id=$(printf "%s\n" "$response" | _egrep_o \"id\":[^,]* | cut -d : -f 2 | head -n 1) _debug "record_id" $record_id - - _me_rest PUT "$_domain_id/records/$record_id/" "{\"id\":\"$record_id\",\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"value\":\"$txtvalue\",\"gtdLocation\":\"DEFAULT\",\"ttl\":120}" + + _me_rest PUT "$_domain_id/records/$record_id/" "{\"id\":\"$record_id\",\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"value\":\"$txtvalue\",\"gtdLocation\":\"DEFAULT\",\"ttl\":120}" if [ "$?" = "0" ]; then _info "Updated" #todo: check if the record takes effect - return 0; + return 0 fi _err "Update error" return 1 fi - -} +} #fulldomain dns_me_rm() { @@ -80,7 +79,6 @@ dns_me_rm() { } - #################### Private functions bellow ################################## #_acme-challenge.www.domain.com #returns @@ -91,20 +89,20 @@ _get_root() { domain=$1 i=2 p=1 - while [ '1' ] ; do + while [ '1' ]; do h=$(printf $domain | cut -d . -f $i-100) - if [ -z "$h" ] ; then + if [ -z "$h" ]; then #not valid - return 1; - fi - - if ! _me_rest GET "name?domainname=$h" ; then return 1 fi - - if printf $response | grep \"name\":\"$h\" >/dev/null ; then - _domain_id=$(printf "%s\n" "$response" | _egrep_o \"id\":[^,]* | head -n 1 | cut -d : -f 2 ) - if [ "$_domain_id" ] ; then + + if ! _me_rest GET "name?domainname=$h"; then + return 1 + fi + + if printf $response | grep \"name\":\"$h\" >/dev/null; then + _domain_id=$(printf "%s\n" "$response" | _egrep_o \"id\":[^,]* | head -n 1 | cut -d : -f 2) + if [ "$_domain_id" ]; then _sub_domain=$(printf $domain | cut -d . -f 1-$p) _domain=$h return 0 @@ -124,25 +122,23 @@ _me_rest() { _debug $ep cdate=$(date -u +"%a, %d %b %Y %T %Z") - hmac=$(printf "$cdate" | _hmac sha1 "$ME_Secret" 1) + hmac=$(printf "$cdate" | _hmac sha1 "$ME_Secret" 1) _H1="x-dnsme-apiKey: $ME_Key" _H2="x-dnsme-requestDate: $cdate" _H3="x-dnsme-hmac: $hmac" - - if [ "$data" ] ; then + + if [ "$data" ]; then _debug data "$data" response="$(_post "$data" "$ME_Api/$ep" "" $m)" else response="$(_get "$ME_Api/$ep")" fi - - if [ "$?" != "0" ] ; then + + if [ "$?" != "0" ]; then _err "error $ep" return 1 fi _debug2 response "$response" return 0 } - -