halbebruno/cloudflare-ddns
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28 from wloot/patch-1

Browse Source 
Use 1.1.1.1 api instead of dirty hack to get ip
This commit is contained in:
Timothy Miller 2020-12-16 18:28:25 -05:00 committed by GitHub
commit 1235464e18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cloudflare-ddns.py
View File

@ -1,5 +1,3 @@
import socket
import requests.packages.urllib3.util.connection as urllib3_cn
import requests, json, sys, os
import time
@ -12,40 +10,19 @@ if(version < 3.5):
with open(PATH + "config.json") as config_file:
config = json.loads(config_file.read())
def allowed_gai_family6():
family = socket.AF_INET
if urllib3_cn.HAS_IPV6:
family = socket.AF_INET6 # force ipv6 only if it is available
return family
def allowed_gai_family4():
family = socket.AF_INET
return family
def getIPs():
a = ""
aaaa = ""
try:
urllib3_cn.allowed_gai_family = allowed_gai_family4
a = requests.get("https://www.cloudflare.com/cdn-cgi/trace").text.split("\n")
a = requests.get("https://1.1.1.1/cdn-cgi/trace").text.split("\n")
a.pop()
ajson = json.loads("{}")
for value in a:
value = value.split("=")
ajson[value[0]] = value[1]
a = ajson['ip']
except Exception as e:
print(e)
a = dict(s.split("=") for s in a)["ip"]
except Exception:
print("Warning: IPv4 not detected.")
try:
urllib3_cn.allowed_gai_family = allowed_gai_family6
aaaa = requests.get("https://www.cloudflare.com/cdn-cgi/trace").text.split("\n")
aaaa = requests.get("https://[2606:4700:4700::1111]/cdn-cgi/trace").text.split("\n")
aaaa.pop()
aaaajson = json.loads("{}")
for value in aaaa:
value = value.split("=")
aaaajson[value[0]] = value[1]
aaaa = aaaajson['ip']
aaaa = dict(s.split("=") for s in aaaa)["ip"]
except Exception:
print("Warning: IPv6 not detected.")
ips = []