diff --git a/README.md b/README.md
index 0d942757..a2c210e8 100644
--- a/README.md
+++ b/README.md
@@ -342,7 +342,8 @@ You don't have to do anything manually!
1. UnoEuro API (https://www.unoeuro.com/)
1. INWX (https://www.inwx.de/)
1. Servercow (https://servercow.de)
-
+1. Namesilo (https://www.namesilo.com)
+1. InternetX autoDNS API (https://internetx.com)
And:
diff --git a/dnsapi/README.md b/dnsapi/README.md
index d357c053..83ef4ea7 100644
--- a/dnsapi/README.md
+++ b/dnsapi/README.md
@@ -651,6 +651,39 @@ acme.sh --issue --dns dns_servercow -d example.com -d www.example.com
```
Both, `SERVERCOW_API_Username` and `SERVERCOW_API_Password` will be saved in `~/.acme.sh/account.conf` and will be reused when needed.
+## 35. Use Namesilo.com API
+
+You'll need to generate an API key at https://www.namesilo.com/account_api.php
+Optionally you may restrict the access to an IP range there.
+
+```
+export Namesilo_Key="xxxxxxxxxxxxxxxxxxxxxxxx"
+```
+
+And now you can issue certs with:
+
+```
+acme.sh --issue --dns dns_namesilo --dnssleep 900 -d example.com -d www.example.com
+```
+
+## 37. Use autoDNS (InternetX)
+
+[InternetX](https://www.internetx.com/) offers an [xml api](https://help.internetx.com/display/API/AutoDNS+XML-API) with your standard login credentials, set them like so:
+
+```
+export AUTODNS_USER="yourusername"
+export AUTODNS_PASSWORD="password"
+export AUTODNS_CONTEXT="context"
+```
+
+Then you can issue your certificates with:
+
+```
+acme.sh --issue --dns dns_autodns -d example.com -d www.example.com
+```
+
+The `AUTODNS_USER`, `AUTODNS_PASSWORD` and `AUTODNS_CONTEXT` settings will be saved in `~/.acme.sh/account.conf` and will be reused when needed.
+
# Use custom API
If your API is not supported yet, you can write your own DNS API.
diff --git a/dnsapi/dns_autodns.sh b/dnsapi/dns_autodns.sh
new file mode 100644
index 00000000..92534489
--- /dev/null
+++ b/dnsapi/dns_autodns.sh
@@ -0,0 +1,264 @@
+#!/usr/bin/env sh
+# -*- mode: sh; tab-width: 2; indent-tabs-mode: s; coding: utf-8 -*-
+
+# This is the InternetX autoDNS xml api wrapper for acme.sh
+# Author: auerswald@gmail.com
+# Created: 2018-01-14
+#
+# export AUTODNS_USER="username"
+# export AUTODNS_PASSWORD="password"
+# export AUTODNS_CONTEXT="context"
+#
+# Usage:
+# acme.sh --issue --dns dns_autodns -d example.com
+
+AUTODNS_API="https://gateway.autodns.com"
+
+# Arguments:
+# txtdomain
+# txt
+dns_autodns_add() {
+ fulldomain="$1"
+ txtvalue="$2"
+
+ AUTODNS_USER="${AUTODNS_USER:-$(_readaccountconf_mutable AUTODNS_USER)}"
+ AUTODNS_PASSWORD="${AUTODNS_PASSWORD:-$(_readaccountconf_mutable AUTODNS_PASSWORD)}"
+ AUTODNS_CONTEXT="${AUTODNS_CONTEXT:-$(_readaccountconf_mutable AUTODNS_CONTEXT)}"
+
+ if [ -z "$AUTODNS_USER" ] || [ -z "$AUTODNS_CONTEXT" ] || [ -z "$AUTODNS_PASSWORD" ]; then
+ _err "You don't specify autodns user, password and context."
+ return 1
+ fi
+
+ _saveaccountconf_mutable AUTODNS_USER "$AUTODNS_USER"
+ _saveaccountconf_mutable AUTODNS_PASSWORD "$AUTODNS_PASSWORD"
+ _saveaccountconf_mutable AUTODNS_CONTEXT "$AUTODNS_CONTEXT"
+
+ _debug "First detect the root zone"
+
+ if ! _get_autodns_zone "$fulldomain"; then
+ _err "invalid domain"
+ return 1
+ fi
+
+ _debug _sub_domain "$_sub_domain"
+ _debug _zone "$_zone"
+ _debug _system_ns "$_system_ns"
+
+ _info "Adding TXT record"
+
+ autodns_response="$(_autodns_zone_update "$_zone" "$_sub_domain" "$txtvalue" "$_system_ns")"
+
+ if [ "$?" -eq "0" ]; then
+ _info "Added, OK"
+ return 0
+ fi
+
+ return 1
+}
+
+# Arguments:
+# txtdomain
+# txt
+dns_autodns_rm() {
+ fulldomain="$1"
+ txtvalue="$2"
+
+ AUTODNS_USER="${AUTODNS_USER:-$(_readaccountconf_mutable AUTODNS_USER)}"
+ AUTODNS_PASSWORD="${AUTODNS_PASSWORD:-$(_readaccountconf_mutable AUTODNS_PASSWORD)}"
+ AUTODNS_CONTEXT="${AUTODNS_CONTEXT:-$(_readaccountconf_mutable AUTODNS_CONTEXT)}"
+
+ if [ -z "$AUTODNS_USER" ] || [ -z "$AUTODNS_CONTEXT" ] || [ -z "$AUTODNS_PASSWORD" ]; then
+ _err "You don't specify autodns user, password and context."
+ return 1
+ fi
+
+ _debug "First detect the root zone"
+
+ if ! _get_autodns_zone "$fulldomain"; then
+ _err "zone not found"
+ return 1
+ fi
+
+ _debug _sub_domain "$_sub_domain"
+ _debug _zone "$_zone"
+ _debug _system_ns "$_system_ns"
+
+ _info "Delete TXT record"
+
+ autodns_response="$(_autodns_zone_cleanup "$_zone" "$_sub_domain" "$txtvalue" "$_system_ns")"
+
+ if [ "$?" -eq "0" ]; then
+ _info "Deleted, OK"
+ return 0
+ fi
+
+ return 1
+}
+
+#################### Private functions below ##################################
+
+# Arguments:
+# fulldomain
+# Returns:
+# _sub_domain=_acme-challenge.www
+# _zone=domain.com
+# _system_ns
+_get_autodns_zone() {
+ domain="$1"
+
+ i=2
+ p=1
+
+ while true; do
+ h=$(printf "%s" "$domain" | cut -d . -f $i-100)
+ _debug h "$h"
+
+ if [ -z "$h" ]; then
+ # not valid
+ return 1
+ fi
+
+ autodns_response="$(_autodns_zone_inquire "$h")"
+
+ if [ "$?" -ne "0" ]; then
+ _err "invalid domain"
+ return 1
+ fi
+
+ if _contains "$autodns_response" "1" >/dev/null; then
+ _zone="$(echo "$autodns_response" | _egrep_o '[^<]*' | cut -d '>' -f 2 | cut -d '<' -f 1)"
+ _system_ns="$(echo "$autodns_response" | _egrep_o '[^<]*' | cut -d '>' -f 2 | cut -d '<' -f 1)"
+ _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
+ return 0
+ fi
+
+ p=$i
+ i=$(_math "$i" + 1)
+ done
+
+ return 1
+}
+
+_build_request_auth_xml() {
+ printf "
+ %s
+ %s
+ %s
+ " "$AUTODNS_USER" "$AUTODNS_PASSWORD" "$AUTODNS_CONTEXT"
+}
+
+# Arguments:
+# zone
+_build_zone_inquire_xml() {
+ printf "
+
+ %s
+
+ 0205
+
+ 1
+ 1
+
+
+ name
+ eq
+ %s
+
+
+ " "$(_build_request_auth_xml)" "$1"
+}
+
+# Arguments:
+# zone
+# subdomain
+# txtvalue
+# system_ns
+_build_zone_update_xml() {
+ printf "
+
+ %s
+
+ 0202001
+
+
+ %s
+ 600
+ TXT
+ %s
+
+
+
+ %s
+ %s
+
+
+ " "$(_build_request_auth_xml)" "$2" "$3" "$1" "$4"
+}
+
+# Arguments:
+# zone
+_autodns_zone_inquire() {
+ request_data="$(_build_zone_inquire_xml "$1")"
+ autodns_response="$(_autodns_api_call "$request_data")"
+ ret="$?"
+
+ printf "%s" "$autodns_response"
+ return "$ret"
+}
+
+# Arguments:
+# zone
+# subdomain
+# txtvalue
+# system_ns
+_autodns_zone_update() {
+ request_data="$(_build_zone_update_xml "$1" "$2" "$3" "$4")"
+ autodns_response="$(_autodns_api_call "$request_data")"
+ ret="$?"
+
+ printf "%s" "$autodns_response"
+ return "$ret"
+}
+
+# Arguments:
+# zone
+# subdomain
+# txtvalue
+# system_ns
+_autodns_zone_cleanup() {
+ request_data="$(_build_zone_update_xml "$1" "$2" "$3" "$4")"
+ # replace 'rr_add>' with 'rr_rem>' in request_data
+ request_data="$(printf -- "%s" "$request_data" | sed 's/rr_add>/rr_rem>/g')"
+ autodns_response="$(_autodns_api_call "$request_data")"
+ ret="$?"
+
+ printf "%s" "$autodns_response"
+ return "$ret"
+}
+
+# Arguments:
+# request_data
+_autodns_api_call() {
+ request_data="$1"
+
+ _debug request_data "$request_data"
+
+ autodns_response="$(_post "$request_data" "$AUTODNS_API")"
+ ret="$?"
+
+ _debug autodns_response "$autodns_response"
+
+ if [ "$ret" -ne "0" ]; then
+ _err "error"
+ return 1
+ fi
+
+ if _contains "$autodns_response" "success" >/dev/null; then
+ _info "success"
+ printf "%s" "$autodns_response"
+ return 0
+ fi
+
+ return 1
+}
diff --git a/dnsapi/dns_namesilo.sh b/dnsapi/dns_namesilo.sh
new file mode 100755
index 00000000..dc1a4fda
--- /dev/null
+++ b/dnsapi/dns_namesilo.sh
@@ -0,0 +1,137 @@
+#!/usr/bin/env sh
+
+#Author: meowthink
+#Created 01/14/2017
+#Utilize namesilo.com API to finish dns-01 verifications.
+
+Namesilo_API="https://www.namesilo.com/api"
+
+######## Public functions #####################
+
+#Usage: dns_myapi_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+dns_namesilo_add() {
+ fulldomain=$1
+ txtvalue=$2
+
+ if [ -z "$Namesilo_Key" ]; then
+ Namesilo_Key=""
+ _err "API token for namesilo.com is missing."
+ _err "Please specify that in your environment variable."
+ return 1
+ fi
+
+ #save the api key and email to the account conf file.
+ _saveaccountconf Namesilo_Key "$Namesilo_Key"
+
+ if ! _get_root "$fulldomain"; then
+ _err "Unable to find domain specified."
+ return 1
+ fi
+
+ _debug _sub_domain "$_sub_domain"
+ _debug _domain "$_domain"
+
+ _debug txtvalue "$txtvalue"
+ if _namesilo_rest GET "dnsAddRecord?version=1&type=xml&key=$Namesilo_Key&domain=$_domain&rrtype=TXT&rrhost=$_sub_domain&rrvalue=$txtvalue"; then
+ retcode=$(printf "%s\n" "$response" | _egrep_o "300")
+ if [ "$retcode" ]; then
+ _info "Successfully added TXT record, ready for validation."
+ return 0
+ else
+ _err "Unable to add the DNS record."
+ return 1
+ fi
+ fi
+}
+
+#Usage: fulldomain txtvalue
+#Remove the txt record after validation.
+dns_namesilo_rm() {
+ fulldomain=$1
+ txtvalue=$2
+
+ if ! _get_root "$fulldomain"; then
+ _err "Unable to find domain specified."
+ return 1
+ fi
+
+ # Get the record id.
+ if _namesilo_rest GET "dnsListRecords?version=1&type=xml&key=$Namesilo_Key&domain=$_domain"; then
+ retcode=$(printf "%s\n" "$response" | _egrep_o "300")
+ if [ "$retcode" ]; then
+ _record_id=$(printf "%s\n" "$response" | _egrep_o "([^<]*)TXT$fulldomain" | _egrep_o "([^<]*)" | sed -r "s/([^<]*)<\/record_id>/\1/" | tail -n 1)
+ _debug record_id "$_record_id"
+ _info "Successfully retrieved the record id for ACME challenge."
+ else
+ _err "Unable to retrieve the record id."
+ return 1
+ fi
+ fi
+
+ # Remove the DNS record using record id.
+ if _namesilo_rest GET "dnsDeleteRecord?version=1&type=xml&key=$Namesilo_Key&domain=$_domain&rrid=$_record_id"; then
+ retcode=$(printf "%s\n" "$response" | _egrep_o "300")
+ if [ "$retcode" ]; then
+ _info "Successfully removed the TXT record."
+ return 0
+ else
+ _err "Unable to remove the DNS record."
+ return 1
+ fi
+ fi
+}
+
+#################### Private functions below ##################################
+
+# _acme-challenge.www.domain.com
+# returns
+# _sub_domain=_acme-challenge.www
+# _domain=domain.com
+_get_root() {
+ domain=$1
+ i=2
+ p=1
+
+ if ! _namesilo_rest GET "listDomains?version=1&type=xml&key=$Namesilo_Key"; then
+ return 1
+ fi
+
+ # Need to exclude the last field (tld)
+ numfields=$(echo "$domain" | _egrep_o "\." | wc -l)
+ while [ $i -le "$numfields" ]; do
+ host=$(printf "%s" "$domain" | cut -d . -f $i-100)
+ _debug host "$host"
+ if [ -z "$host" ]; then
+ return 1
+ fi
+
+ if _contains "$response" "$host"; then
+ _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
+ _domain="$host"
+ return 0
+ fi
+ p=$i
+ i=$(_math "$i" + 1)
+ done
+ return 1
+}
+
+_namesilo_rest() {
+ method=$1
+ param=$2
+ data=$3
+
+ if [ "$method" != "GET" ]; then
+ response="$(_post "$data" "$Namesilo_API/$param" "" "$method")"
+ else
+ response="$(_get "$Namesilo_API/$param")"
+ fi
+
+ if [ "$?" != "0" ]; then
+ _err "error $param"
+ return 1
+ fi
+
+ _debug2 response "$response"
+ return 0
+}