/g' | tr '@' '\n' | grep edit.php | grep "$fulldomain")"
- _debug3 "subdomain_csv: $subdomain_csv"
-
- # The above beauty ends with striping out rows that do not have an
- # href to edit.php and do not have the domain name we are looking for.
- # So all we should be left with is CSV of table of subdomains we are
- # interested in.
-
- # Now we have to read through this table and extract the data we need
- lines="$(echo "$subdomain_csv" | wc -l)"
- i=0
- found=0
- DNSdataid=""
- while [ "$i" -lt "$lines" ]; do
- i="$(_math "$i" + 1)"
- line="$(echo "$subdomain_csv" | sed -n "${i}p")"
- _debug3 "line: $line"
- DNSname="$(echo "$line" | _egrep_o 'edit.php.*' | cut -d '>' -f 2 | cut -d '<' -f 1)"
- _debug2 "DNSname: $DNSname"
- if [ "$DNSname" = "$fulldomain" ]; then
- DNStype="$(echo "$line" | sed 's/| ' -f 2 | cut -d '<' -f 1)"
- _debug2 "DNStype: $DNStype"
- if [ "$DNStype" = "TXT" ]; then
- DNSdataid="$(echo "$line" | _egrep_o 'data_id=.*' | cut -d = -f 2 | cut -d '>' -f 1)"
- _debug2 "DNSdataid: $DNSdataid"
- DNSvalue="$(echo "$line" | sed 's/ | ' -f 2 | cut -d '<' -f 1)"
- if _startswith "$DNSvalue" """; then
- # remove the quotation from the start
- DNSvalue="$(echo "$DNSvalue" | cut -c 7-)"
- fi
- if _endswith "$DNSvalue" "..."; then
- # value was truncated, remove the dot dot dot from the end
- DNSvalue="$(echo "$DNSvalue" | sed 's/...$//')"
- elif _endswith "$DNSvalue" """; then
- # else remove the closing quotation from the end
- DNSvalue="$(echo "$DNSvalue" | sed 's/......$//')"
- fi
- _debug2 "DNSvalue: $DNSvalue"
-
- if [ -n "$DNSdataid" ] && _startswith "$txtvalue" "$DNSvalue"; then
- # Found a match. But note... Website is truncating the
- # value field so we are only testing that part that is not
- # truncated. This should be accurate enough.
- _debug "Deleting TXT record for $fulldomain, $txtvalue"
- _freedns_delete_txt_record "$FREEDNS_COOKIE" "$DNSdataid"
- return $?
- fi
-
- fi
- fi
- done
+ echo "$htmlpage" | grep "value=\""$txtvalue"\"" >/dev/null
+ if [ "$?" = "0" ]; then
+ # Found a match... delete the record and return
+ _info "Deleting TXT record for $fulldomain, $txtvalue"
+ _freedns_delete_txt_record "$FREEDNS_COOKIE" "$dataid"
+ return $?
+ fi
done
- # If we get this far we did not find a match (after two attempts)
+ # If we get this far we did not find a match
# Not necessarily an error, but log anyway.
- _debug3 "$subdomain_csv"
_info "Cannot delete TXT record for $fulldomain, $txtvalue. Does not exist at FreeDNS"
return 0
}
@@ -271,6 +197,33 @@ _freedns_retrieve_subdomain_page() {
return 0
}
+# usage _freedns_retrieve_data_page login_cookies data_id
+# echo page retrieved (html)
+# returns 0 success
+_freedns_retrieve_data_page() {
+ export _H1="Cookie:$1"
+ export _H2="Accept-Language:en-US"
+ data_id="$2"
+ url="https://freedns.afraid.org/subdomain/edit.php?data_id=$2"
+
+ _debug "Retrieve data page for ID $data_id from FreeDNS"
+
+ htmlpage="$(_get "$url")"
+
+ if [ "$?" != "0" ]; then
+ _err "FreeDNS retrieve data page failed bad RC from _get"
+ return 1
+ elif [ -z "$htmlpage" ]; then
+ _err "FreeDNS returned empty data page"
+ return 1
+ fi
+
+ _debug3 "htmlpage: $htmlpage"
+
+ printf "%s" "$htmlpage"
+ return 0
+}
+
# usage _freedns_add_txt_record login_cookies domain_id subdomain value
# returns 0 success
_freedns_add_txt_record() {
@@ -324,3 +277,95 @@ _freedns_delete_txt_record() {
_info "Deleted acme challenge TXT record for $fulldomain at FreeDNS"
return 0
}
+
+# usage _freedns_domain_id domain_name
+# echo the domain_id if found
+# return 0 success
+_freedns_domain_id() {
+ # Start by escaping the dots in the domain name
+ search_domain="$(echo "$1" | sed 's/\./\\./g')"
+
+ # Sometimes FreeDNS does not return the subdomain page but rather
+ # returns a page regarding becoming a premium member. This usually
+ # happens after a period of inactivity. Immediately trying again
+ # returns the correct subdomain page. So, we will try twice to
+ # load the page and obtain our domain ID
+ attempts=2
+ while [ "$attempts" -gt "0" ]; do
+ attempts="$(_math "$attempts" - 1)"
+
+ htmlpage="$(_freedns_retrieve_subdomain_page "$FREEDNS_COOKIE")"
+ if [ "$?" != "0" ]; then
+ if [ "$using_cached_cookies" = "true" ]; then
+ _err "Has your FreeDNS username and password changed? If so..."
+ _err "Please export as FREEDNS_User / FREEDNS_Password and try again."
+ fi
+ return 1
+ fi
+
+ domain_id="$(echo "$htmlpage" | tr -d "[:space:]" | sed 's/ |