add ipv6 support & api call improvements

This commit is contained in:
Jiaqiu Jiang committed 2021-02-08 19:34:26 +08:00
1 parent d8d01944e0
commit 5fc71f3581
3 files changed
+108 -36

No files matched your search

+6
View File
@@ -14,6 +14,12 @@
# 最近更新 # 最近更新
2021/2/8
- 添加IPv6支持
- 优化流程,减少API调用次数
- 完善出错提示
2020/8/5 2020/8/5
- 修复 `get the wrong recordID` @C-Y-X - 修复 `get the wrong recordID` @C-Y-X
+99 -36
View File
@@ -52,6 +52,32 @@ arWanIp() {
} }
# Get WAN IPv6
arWan6Ip() {
local hostIp
local lanIps="(^$)|(^::1$)|(^fe[8-9,A-F])"
case $(uname) in
'Linux')
hostIp=$(ip -o -6 addr list | grep -Ev '\s(docker|lo)' | awk '{print $4}' | cut -d/ -f1 | grep -Ev "$lanIps")
;;
'Darwin')
hostIp=$(ifconfig | grep "inet6 " | awk '{print $2}' | grep -Ev "$lanIps")
;;
esac
if [ -z "$hostIp" ]; then
echo "arWan6Ip: No IPv6 address found, please check if you have one"
return 1
fi
echo $hostIp | tail -n 1
}
# Dnspod Bridge # Dnspod Bridge
# Arg: type data # Arg: type data
@@ -70,26 +96,48 @@ arDdnsApi() {
} }
# Fetch Domain Ip # Dnspod Domain ID & Record ID
# Arg: domain # Arg: record-type domain subdomain
arDdnsInfo() { arDdnsId() {
local domainId local domainId
local recordId local recordId
local recordIp local errMsg
# Get domain ID # Get domain ID
domainId=$(arDdnsApi "Domain.Info" "domain=$1") domainId=$(arDdnsApi "Domain.Info" "domain=$2")
domainId=$(echo $domainId | sed 's/.*"id":"\([0-9]*\)".*/\1/') domainId=$(echo $domainId | sed 's/.*"id":"\([0-9]*\)".*/\1/')
if ! [ "$domainId" -gt 0 ] 2>/dev/null ;then
errMsg=$(echo $domainId | sed 's/.*"message":"\([^\"]*\)".*/\1/')
echo "arDdnsId: $errMsg"
return 1
fi
# Get Record ID # Get Record ID
recordId=$(arDdnsApi "Record.List" "domain_id=$domainId&sub_domain=$2&record_type=A") recordId=$(arDdnsApi "Record.List" "domain_id=$domainId&sub_domain=$3&record_type=$1")
recordId=$(echo $recordId | sed 's/.*"id":"\([0-9]*\)".*/\1/') recordId=$(echo $recordId | sed 's/.*"id":"\([0-9]*\)".*/\1/')
if ! [ "$recordId" -gt 0 ] 2>/dev/null ;then
errMsg=$(echo $recordId | sed 's/.*"message":"\([^\"]*\)".*/\1/')
echo "arDdnsId: $errMsg"
return 1
fi
echo $domainId $recordId
}
# Fetch Record Ip
# Arg: domain-id record-id
arDdnsRecordIp() {
local recordIp
# Last IP # Last IP
recordIp=$(arDdnsApi "Record.Info" "domain_id=$domainId&record_id=$recordId") recordIp=$(arDdnsApi "Record.Info" "domain_id=$1&record_id=$2")
recordIp=$(echo $recordIp | sed 's/.*,"value":"\([0-9\.]*\)".*/\1/') recordIp=$(echo $recordIp | sed 's/.*,"value":"\([0-9a-fA-F\.\:]*\)".*/\1/')
# Output IP # Output IP
case "$recordIp" in case "$recordIp" in
@@ -98,50 +146,47 @@ arDdnsInfo() {
return 0 return 0
;; ;;
*) *)
echo "Get Record Info Failed!" errMsg=$(echo $recordIp | sed 's/.*"message":"\([^\"]*\)".*/\1/')
echo "arDdnsRecordIp: $errMsg"
return 1 return 1
;; ;;
esac esac
} }
# Update Domain Ip # Update Record Ip
# Arg: main-domain sub-domain # Arg: domain-id record-id sub-domain update-ip
arDdnsUpdate() { arDdnsUpdate() {
local domainId local recordType
local recordId
local recordRs local recordRs
local recordIp local recordIp
local recordCd local recordCd
local errMsg
local hostIp=$(arWanIp) if [[ "$4" =~ ^[0-9a-zA-Z\:]+$ ]]; then
recordType="AAAA"
# Get domain ID elif [[ "$4" =~ ^[0-9\.]+$ ]]; then
domainId=$(arDdnsApi "Domain.Info" "domain=$1") recordType="A"
domainId=$(echo $domainId | sed 's/.*"id":"\([0-9]*\)".*/\1/') else
echo "arDdnsRecordUpdate: bad ip address"
# Get Record ID return 1
recordId=$(arDdnsApi "Record.List" "domain_id=$domainId&sub_domain=$2&record_type=A") fi
recordId=$(echo $recordId | sed 's/.*"id":"\([0-9]*\)".*/\1/')
# Update IP # Update IP
recordRs=$(arDdnsApi "Record.Ddns" "domain_id=$domainId&record_id=$recordId&sub_domain=$2&record_type=A&value=$hostIp&record_line=%e9%bb%98%e8%ae%a4") recordRs=$(arDdnsApi "Record.Modify" "domain_id=$1&record_id=$2&sub_domain=$3&record_type=$recordType&value=$4&record_line=%e9%bb%98%e8%ae%a4")
recordIp=$(echo $recordRs | sed 's/.*,"value":"\([0-9\.]*\)".*/\1/') recordIp=$(echo $recordRs | sed 's/.*,"value":"\([0-9a-fA-F\.\:]*\)".*/\1/')
recordCd=$(echo $recordRs | sed 's/.*{"code":"\([0-9]*\)".*/\1/') recordCd=$(echo $recordRs | sed 's/.*{"code":"\([0-9]*\)".*/\1/')
# Output IP # Output IP
if [ "$recordIp" = "$hostIp" ]; then if [ "$recordIp" = "$4" ] && [ "$recordCd" = "1" ]; then
if [ "$recordCd" = "1" ]; then echo $recordIp
echo $recordIp return 0
return 0
fi
# Echo error message
echo $recordRs | sed 's/.*,"message":"\([^"]*\)".*/\1/'
return 1
else else
echo "Update Failed! Please check your network." # Echo error message
errMsg=$(echo $recordRs | sed 's/.*,"message":"\([^"]*\)".*/\1/')
echo "arDdnsRecordUpdate: $errMsg"
return 1 return 1
fi fi
@@ -152,18 +197,36 @@ arDdnsUpdate() {
arDdnsCheck() { arDdnsCheck() {
local postRs local postRs
local ddnsIds
local lastIP local lastIP
local hostIp
local hostIp=$(arWanIp) if [ $# -eq 3 ] && [ $3 -eq 6 ]; then
hostIp=$(arWan6Ip)
if [ $? -ne 0 ]; then
echo "$hostIp"
return 1
fi
ddnsIds=$(arDdnsId "AAAA" "$1" "$2")
else
hostIp=$(arWanIp)
ddnsIds=$(arDdnsId "A" "$1" "$2")
fi
if [ $? -ne 0 ]; then
echo "$ddnsIds"
return 1
fi
echo "Updating Domain: $2.$1" echo "Updating Domain: $2.$1"
echo "Domain IDs: $ddnsIds"
echo "Host Ip: $hostIp" echo "Host Ip: $hostIp"
lastIP=$(arDdnsInfo "$1" "$2") lastIP=$(arDdnsRecordIp $(echo $ddnsIds))
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "lastIP: $lastIP" echo "lastIP: $lastIP"
if [ "$lastIP" != "$hostIp" ]; then if [ "$lastIP" != "$hostIp" ]; then
postRs=$(arDdnsUpdate "$1" "$2") postRs=$(arDdnsUpdate $(echo $ddnsIds) $2 $hostIp)
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "postRs: $postRs" echo "postRs: $postRs"
return 0 return 0
+3
View File
@@ -9,4 +9,7 @@ arToken="12345,7676f344eaeaea9074c123451234512d"
# Place each domain you want to check as follows # Place each domain you want to check as follows
# you can have multiple arDdnsCheck blocks # you can have multiple arDdnsCheck blocks
# add 4 or 6 to tail will specify the IP version used, default 4
# IPv6:
# arDdnsCheck "test.org" "subdomain6" 6
arDdnsCheck "test.org" "subdomain" arDdnsCheck "test.org" "subdomain"