Browse Source

Fixes to follow coding standards.

pull/909/head
RaidenII 8 years ago
parent
commit
63c6ed3fd0
  1. 16
      dnsapi/dns_duckdns.sh
  2. 32
      dnsapi/dns_namecom.sh

16
dnsapi/dns_duckdns.sh

@ -7,7 +7,7 @@
# Due to the fact that DuckDNS uses StartSSL as cert provider, --insecure must be used with acme.sh # Due to the fact that DuckDNS uses StartSSL as cert provider, --insecure must be used with acme.sh
DuckDNS_API="https://www.duckdns.org/update" DuckDNS_API="https://www.duckdns.org/update"
API_Params="domains=$DuckDNS_domain&token=$DuckDNS_token"
API_Params="domains=$DuckDNS_Domain&token=$DuckDNS_Token"
######## Public functions ##################### ######## Public functions #####################
@ -17,23 +17,23 @@ dns_duckdns_add() {
txtvalue=$2 txtvalue=$2
# We'll extract the domain/username from full domain # We'll extract the domain/username from full domain
DuckDNS_domain=$(printf "%s\n" "$fulldomain" | rev | cut -d . -f 3 | rev)
DuckDNS_Domain=$(echo $fulldomain | _lower_case | _egrep_o '.[^.]*.duckdns.org' | cut -d . -f 2)
if [ -z "$DuckDNS_domain" ]; then
if [ -z "$DuckDNS_Domain" ]; then
_err "Error extracting the domain." _err "Error extracting the domain."
return 1 return 1
fi fi
if [ -z "$DuckDNS_token" ]; then
DuckDNS_token=""
if [ -z "$DuckDNS_Token" ]; then
DuckDNS_Token=""
_err "The token for your DuckDNS account is necessary." _err "The token for your DuckDNS account is necessary."
_err "You can look it up in your DuckDNS account." _err "You can look it up in your DuckDNS account."
return 1 return 1
fi fi
# Now save the credentials. # Now save the credentials.
_saveaccountconf DuckDNS_domain "$DuckDNS_domain"
_saveaccountconf DuckDNS_token "$DuckDNS_token"
_saveaccountconf DuckDNS_Domain "$DuckDNS_Domain"
_saveaccountconf DuckDNS_Token "$DuckDNS_Token"
# Unfortunately, DuckDNS does not seems to support lookup domain through API # Unfortunately, DuckDNS does not seems to support lookup domain through API
# So I assume your credentials (which are your domain and token) are correct # So I assume your credentials (which are your domain and token) are correct
@ -86,6 +86,6 @@ _duckdns_rest() {
return 1 return 1
fi fi
_debug response "$response"
_debug2 response "$response"
return 0 return 0
} }

32
dnsapi/dns_namecom.sh

@ -5,7 +5,7 @@
#Utilize name.com API to finish dns-01 verifications. #Utilize name.com API to finish dns-01 verifications.
######## Public functions ##################### ######## Public functions #####################
namecom_api="https://api.name.com/api"
Namecom_API="https://api.name.com/api"
#Usage: dns_namecom_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" #Usage: dns_namecom_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
dns_namecom_add() { dns_namecom_add() {
@ -13,23 +13,23 @@ dns_namecom_add() {
txtvalue=$2 txtvalue=$2
# First we need name.com credentials. # First we need name.com credentials.
if [ -z "$namecom_username" ]; then
namecom_username=""
if [ -z "$Namecom_Username" ]; then
Namecom_Username=""
_err "Username for name.com is missing." _err "Username for name.com is missing."
_err "Please specify that in your environment variable." _err "Please specify that in your environment variable."
return 1 return 1
fi fi
if [ -z "$namecom_token" ]; then
namecom_token=""
if [ -z "$Namecom_Token" ]; then
Namecom_Token=""
_err "API token for name.com is missing." _err "API token for name.com is missing."
_err "Please specify that in your environment variable." _err "Please specify that in your environment variable."
return 1 return 1
fi fi
# Save them in configuration. # Save them in configuration.
_saveaccountconf namecom_username "$namecom_username"
_saveaccountconf namecom_token "$namecom_token"
_saveaccountconf Namecom_Username "$Namecom_Username"
_saveaccountconf Namecom_Token "$Namecom_Token"
# Login in using API # Login in using API
_namecom_login _namecom_login
@ -45,7 +45,7 @@ dns_namecom_add() {
_namecom_addtxt_json="{\"hostname\":\"$_sub_domain\",\"type\":\"TXT\",\"content\":\"$txtvalue\",\"ttl\":\"300\",\"priority\":\"10\"}" _namecom_addtxt_json="{\"hostname\":\"$_sub_domain\",\"type\":\"TXT\",\"content\":\"$txtvalue\",\"ttl\":\"300\",\"priority\":\"10\"}"
if _namecom_rest POST "dns/create/$_domain" "$_namecom_addtxt_json"; then if _namecom_rest POST "dns/create/$_domain" "$_namecom_addtxt_json"; then
retcode=$(printf "%s\n" "$response" | _egrep_o "\"code\":100") retcode=$(printf "%s\n" "$response" | _egrep_o "\"code\":100")
if [ ! -z "$retcode" ]; then
if [ "$retcode" ]; then
_info "Successfully added TXT record, ready for validation." _info "Successfully added TXT record, ready for validation."
_namecom_logout _namecom_logout
return 0 return 0
@ -75,7 +75,7 @@ dns_namecom_rm() {
# Get the record id. # Get the record id.
if _namecom_rest GET "dns/list/$_domain"; then if _namecom_rest GET "dns/list/$_domain"; then
retcode=$(printf "%s\n" "$response" | _egrep_o "\"code\":100") retcode=$(printf "%s\n" "$response" | _egrep_o "\"code\":100")
if [ ! -z "$retcode" ]; then
if [ "$retcode" ]; then
_record_id=$(printf "%s\n" "$response" | _egrep_o "\"record_id\":\"[0-9]+\",\"name\":\"$fulldomain\",\"type\":\"TXT\"" | cut -d \" -f 4) _record_id=$(printf "%s\n" "$response" | _egrep_o "\"record_id\":\"[0-9]+\",\"name\":\"$fulldomain\",\"type\":\"TXT\"" | cut -d \" -f 4)
_debug record_id "$_record_id" _debug record_id "$_record_id"
_info "Successfully retrieved the record id for ACME challenge." _info "Successfully retrieved the record id for ACME challenge."
@ -90,7 +90,7 @@ dns_namecom_rm() {
_namecom_rmtxt_json="{\"record_id\":\"$_record_id\"}" _namecom_rmtxt_json="{\"record_id\":\"$_record_id\"}"
if _namecom_rest POST "dns/delete/$_domain" "$_namecom_rmtxt_json"; then if _namecom_rest POST "dns/delete/$_domain" "$_namecom_rmtxt_json"; then
retcode=$(printf "%s\n" "$response" | _egrep_o "\"code\":100") retcode=$(printf "%s\n" "$response" | _egrep_o "\"code\":100")
if [ ! -z "$retcode" ]; then
if [ "$retcode" ]; then
_info "Successfully removed the TXT record." _info "Successfully removed the TXT record."
_namecom_logout _namecom_logout
return 0 return 0
@ -111,9 +111,9 @@ _namecom_rest() {
export _H1="Content-Type: application/json" export _H1="Content-Type: application/json"
export _H2="Api-Session-Token: $sessionkey" export _H2="Api-Session-Token: $sessionkey"
if [ "$method" != "GET" ]; then if [ "$method" != "GET" ]; then
response="$(_post "$data" "$namecom_api/$param" "" "$method")"
response="$(_post "$data" "$Namecom_API/$param" "" "$method")"
else else
response="$(_get "$namecom_api/$param")"
response="$(_get "$Namecom_API/$param")"
fi fi
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
@ -121,16 +121,16 @@ _namecom_rest() {
return 1 return 1
fi fi
_debug response "$response"
_debug2 response "$response"
return 0 return 0
} }
_namecom_login() { _namecom_login() {
namecom_login_json="{\"username\":\"$namecom_username\",\"api_token\":\"$namecom_token\"}"
namecom_login_json="{\"username\":\"$Namecom_Username\",\"api_token\":\"$Namecom_Token\"}"
if _namecom_rest POST "login" "$namecom_login_json"; then if _namecom_rest POST "login" "$namecom_login_json"; then
retcode=$(printf "%s\n" "$response" | _egrep_o "\"code\":100") retcode=$(printf "%s\n" "$response" | _egrep_o "\"code\":100")
if [ ! -z "$retcode" ]; then
if [ "$retcode" ]; then
_info "Successfully logged in. Fetching session token..." _info "Successfully logged in. Fetching session token..."
sessionkey=$(printf "%s\n" "$response" | _egrep_o "\"session_token\":\".+" | cut -d \" -f 4) sessionkey=$(printf "%s\n" "$response" | _egrep_o "\"session_token\":\".+" | cut -d \" -f 4)
if [ ! -z "$sessionkey" ]; then if [ ! -z "$sessionkey" ]; then
@ -150,7 +150,7 @@ _namecom_login() {
_namecom_logout() { _namecom_logout() {
if _namecom_rest GET "logout"; then if _namecom_rest GET "logout"; then
retcode=$(printf "%s\n" "$response" | _egrep_o "\"code\":100") retcode=$(printf "%s\n" "$response" | _egrep_o "\"code\":100")
if [ ! -z "$retcode" ]; then
if [ "$retcode" ]; then
_info "Successfully logged out." _info "Successfully logged out."
else else
_err "Error logging out." _err "Error logging out."

Loading…
Cancel
Save