added domain check, corrected string formatting issue.

This commit is contained in:
diseq 2018-05-23 21:35:29 +02:00
parent 0b52d79cb0
commit 0246f0aa7a

View File

@ -15,6 +15,7 @@
dns_one_add() { dns_one_add() {
mysubdomain=$(printf -- "%s" "$1" | rev | cut -d"." -f3- | rev) mysubdomain=$(printf -- "%s" "$1" | rev | cut -d"." -f3- | rev)
mydomain=$(printf -- "%s" "$1" | rev | cut -d"." -f1-2 | rev)
txtvalue=$2 txtvalue=$2
# get credentials # get credentials
@ -35,17 +36,23 @@ dns_one_add() {
# Login with user and password # Login with user and password
postdata="loginDomain=true" postdata="loginDomain=true"
postdata=postdata+"&displayUsername=$ONECOM_USER&username=$ONECOM_USER" postdata="$postdata&displayUsername=$ONECOM_USER"
postdata=postdata+"&targetDomain=" postdata="$postdata&username=$ONECOM_USER"
postdata=postdata+"&password1=$ONECOM_PASSWORD" postdata="$postdata&targetDomain="
postdata=postdata+"&loginTarget=" postdata="$postdata&password1=$ONECOM_PASSWORD"
postdata="$postdata&loginTarget="
_debug postdata "$postdata"
response="$(_post "$postdata" "https://www.one.com/admin/login.do" "" "POST")" response="$(_post "$postdata" "https://www.one.com/admin/login.do" "" "POST")"
_debug response "$response"
JSESSIONID="$(grep "JSESSIONID=" "$HTTP_HEADER" | grep "^Set-Cookie:" | _tail_n 1 | _egrep_o 'JSESSIONID=[^;]*;' | tr -d ';')" JSESSIONID="$(grep "JSESSIONID=" "$HTTP_HEADER" | grep "^Set-Cookie:" | _tail_n 1 | _egrep_o 'JSESSIONID=[^;]*;' | tr -d ';')"
export _H1="Cookie: ${JSESSIONID}" export _H1="Cookie: ${JSESSIONID}"
# check for domain name
response="$(_get "https://www.one.com/admin/dns-overview.do")" response="$(_get "https://www.one.com/admin/dns-overview.do")"
CSRF_G_TOKEN="$(grep "CSRF_G_TOKEN=" "$HTTP_HEADER" | grep "^Set-Cookie:" | _tail_n 1 | _egrep_o 'CSRF_G_TOKEN=[^;]*;' | tr -d ';')" CSRF_G_TOKEN="$(grep "CSRF_G_TOKEN=" "$HTTP_HEADER" | grep "^Set-Cookie:" | _tail_n 1 | _egrep_o 'CSRF_G_TOKEN=[^;]*;' | tr -d ';')"
@ -53,14 +60,41 @@ dns_one_add() {
mycsrft=$(echo "${CSRF_G_TOKEN}" | sed -n 's/CSRF_G_TOKEN=\(.*\)/\1/p') mycsrft=$(echo "${CSRF_G_TOKEN}" | sed -n 's/CSRF_G_TOKEN=\(.*\)/\1/p')
# Update the IP address for domain entry
postdata="csrft=$mycsrft"
response="$(_post "$postdata" "https://www.one.com/admin/ajax-dns-entries.do" "" "POST")"
response="$(echo "$response" | _normalizeJson)"
_debug response "$response"
domain=$(printf -- "%s" "$response" | sed -n "s/.*,\"nsView\":{[^}]*,\"domain\":\"\([^\"]*\)\".*/\1/p")
if [ "$mydomain" = "$domain" ];
then
_debug "domain matches"
else
_err "requested domain does not match."
return 1
fi
response="$(_get "https://www.one.com/admin/dns-overview.do")"
_debug response "$response"
CSRF_G_TOKEN="$(grep "CSRF_G_TOKEN=" "$HTTP_HEADER" | grep "^Set-Cookie:" | _tail_n 1 | _egrep_o 'CSRF_G_TOKEN=[^;]*;' | tr -d ';')"
export _H2="Cookie: ${CSRF_G_TOKEN}"
mycsrft=$(echo "${CSRF_G_TOKEN}" | sed -n 's/CSRF_G_TOKEN=\(.*\)/\1/p')
# create txt record # create txt record
postdata="cmd=create" postdata="cmd=create"
postdata=postdata+"&subDomain=$mysubdomain" postdata="$postdata&subDomain=$mysubdomain"
postdata=postdata+"&priority=" postdata="$postdata&priority="
postdata=postdata+"&ttl=600" postdata="$postdata&ttl=600"
postdata=postdata+"&type=TXT" postdata="$postdata&type=TXT"
postdata=postdata+"&value=$txtvalue" postdata="$postdata&value=$txtvalue"
postdata=postdata+"&csrft=$mycsrft" postdata="$postdata&csrft=$mycsrft"
response="$(_post "$postdata" "https://www.one.com/admin/dns-web-handler.do" "" "POST")" response="$(_post "$postdata" "https://www.one.com/admin/dns-web-handler.do" "" "POST")"
_debug response "$response" _debug response "$response"
@ -77,6 +111,7 @@ dns_one_add() {
dns_one_rm() { dns_one_rm() {
mysubdomain=$(printf -- "%s" "$1" | rev | cut -d"." -f3- | rev) mysubdomain=$(printf -- "%s" "$1" | rev | cut -d"." -f3- | rev)
mydomain=$(printf -- "%s" "$1" | rev | cut -d"." -f1-2 | rev)
txtvalue=$2 txtvalue=$2
# get credentials # get credentials
@ -93,10 +128,11 @@ dns_one_rm() {
# Login with user and password # Login with user and password
postdata="loginDomain=true" postdata="loginDomain=true"
postdata=postdata+"&displayUsername=$ONECOM_USER&username=$ONECOM_USER" postdata="$postdata&displayUsername=$ONECOM_USER"
postdata=postdata+"&targetDomain=" postdata="$postdata&username=$ONECOM_USER"
postdata=postdata+"&password1=$ONECOM_PASSWORD" postdata="$postdata&targetDomain="
postdata=postdata+"&loginTarget=" postdata="$postdata&password1=$ONECOM_PASSWORD"
postdata="$postdata&loginTarget="
response="$(_post "$postdata" "https://www.one.com/admin/login.do" "" "POST")" response="$(_post "$postdata" "https://www.one.com/admin/login.do" "" "POST")"
@ -104,6 +140,8 @@ dns_one_rm() {
export _H1="Cookie: ${JSESSIONID}" export _H1="Cookie: ${JSESSIONID}"
# check for domain name
response="$(_get "https://www.one.com/admin/dns-overview.do")" response="$(_get "https://www.one.com/admin/dns-overview.do")"
CSRF_G_TOKEN="$(grep "CSRF_G_TOKEN=" "$HTTP_HEADER" | grep "^Set-Cookie:" | _tail_n 1 | _egrep_o 'CSRF_G_TOKEN=[^;]*;' | tr -d ';')" CSRF_G_TOKEN="$(grep "CSRF_G_TOKEN=" "$HTTP_HEADER" | grep "^Set-Cookie:" | _tail_n 1 | _egrep_o 'CSRF_G_TOKEN=[^;]*;' | tr -d ';')"
@ -118,6 +156,17 @@ dns_one_rm() {
_debug response "$response" _debug response "$response"
domain=$(printf -- "%s" "$response" | sed -n "s/.*,\"nsView\":{[^}]*,\"domain\":\"\([^\"]*\)\".*/\1/p")
if [ "$mydomain" = "$domain" ];
then
_debug "domain matches"
else
_err "requested domain does not match."
return 1
fi
# remove _acme-challenge subdomain # remove _acme-challenge subdomain
mysubdomainid=$(printf -- "%s" "$response" | sed -n "s/.*{\"subDomain\":\"$mysubdomain\"[^}]*,\"value\":\"$txtvalue\",\"id\":\"\([0-9][0-9]*\)\"}.*/\1/p") mysubdomainid=$(printf -- "%s" "$response" | sed -n "s/.*{\"subDomain\":\"$mysubdomain\"[^}]*,\"value\":\"$txtvalue\",\"id\":\"\([0-9][0-9]*\)\"}.*/\1/p")
@ -134,12 +183,12 @@ dns_one_rm() {
# delete txt record # delete txt record
postdata="cmd=delete" postdata="cmd=delete"
postdata=postdata+"&subDomain=$mysubdomain" postdata="$postdata&subDomain=$mysubdomain"
postdata=postdata+"&priority=" postdata="$postdata&priority="
postdata=postdata+"&ttl=600" postdata="$postdata&ttl=600"
postdata=postdata+"&type=TXT" postdata="$postdata&type=TXT"
postdata=postdata+"&id=$mysubdomainid" postdata="$postdata&id=$mysubdomainid"
postdata=postdata+"&csrft=$mycsrft" postdata="$postdata&csrft=$mycsrft"
response="$(_post "$postdata" "https://www.one.com/admin/dns-web-handler.do" "" "POST")" response="$(_post "$postdata" "https://www.one.com/admin/dns-web-handler.do" "" "POST")"
_debug "$response" _debug "$response"