From f290ef80857950c1a13384e07997f1c7faa9240c Mon Sep 17 00:00:00 2001
From: Anthony <anthony.clay@zarthcode.com>
Date: Sun, 2 Jun 2024 14:55:22 -0400
Subject: [PATCH 1/2] Update cloudflare-ddns.py

My router has a locally accessible webpage that presents the public ipv6 and ipv4 addresses in a table format.  This patch allows for accessing an arbitrary url and looking for the element after given table headers using the config variables scraper_url, scraper_ipv4_label, and scraper_ipv6_label.

e.g. for an ATT BGW320-500 router, the following config.json will acquire the ipv4 and v6 addresses:

{
  "cloudflare": [
    {
      "authentication": {
        "api_token": "your secret token"
      },
      "zone_id": "your zone id",
      "subdomains": [
        {
          "name": "www",
          "proxied": true
        }
      ]
    }
  ],
  "scrape_url": "http://192.168.1.254/cgi-bin/broadbandstatistics.ha",
  "scrape_ipv4_label": "Broadband IPv4 Address",
  "scrape_ipv6_label": "Global Unicast IPv6 Address",
  "a": true,
  "aaaa": true,
  "purgeUnknownRecords": false,
  "ttl": 300
}
---
 cloudflare-ddns.py | 56 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/cloudflare-ddns.py b/cloudflare-ddns.py
index 1d56863..abf8362 100755
--- a/cloudflare-ddns.py
+++ b/cloudflare-ddns.py
@@ -15,7 +15,8 @@
 import threading
 import time
 import requests
-
+from bs4 import BeautifulSoup
+    
 CONFIG_PATH = os.environ.get('CONFIG_PATH', os.getcwd())
 
 
@@ -49,6 +50,41 @@ def deleteEntries(type):
                 "DELETE", option)
             print("🗑️ Deleted stale record " + identifier)
 
+def scrapeIPs():
+    global scrape_url
+    global scrape_ipv4_label
+    global scrape_ipv6_label
+    global ipv4_enabled
+    global ipv6_enabled
+    
+    ips = {}
+    
+    # URL of the page to scrape
+    
+    # Send a GET request to the URL
+    response = requests.get(scrape_url)
+    if response.content:
+        # Parse the HTML content using BeautifulSoup
+        soup = BeautifulSoup(response.content, "html.parser")
+        if soup:
+            # Find the table containing the IP address information
+            
+            # Extract the IPv4 and IPv6 addresses
+            if ipv4_enabled:
+                ipv4_address = soup.find('th', string=scrape_ipv4_label).find_next_sibling("td").text.strip()
+                if (ipv4_address is not None):
+                    ips["ipv4"] = {
+                        "type": "A",
+                        "ip": ipv4_address
+                    }
+            if ipv6_enabled:
+                ipv6_address = soup.find('th', string=scrape_ipv6_label).find_next_sibling("td").text.strip()
+                if (ipv6_address is not None):
+                    ips["ipv6"] = {
+                        "type": "AAAA",
+                        "ip": ipv6_address
+                    }
+    return ips
 
 def getIPs():
     a = None
@@ -56,6 +92,11 @@ def getIPs():
     global ipv4_enabled
     global ipv6_enabled
     global purgeUnknownRecords
+    global scrape_url
+
+    if scrape_url is not None:
+        return scrapeIPs()
+            
     if ipv4_enabled:
         try:
             a = requests.get(
@@ -253,6 +294,8 @@ def updateIPs(ips):
     ipv4_enabled = True
     ipv6_enabled = True
     purgeUnknownRecords = False
+    scrape_url = None
+    
 
     if sys.version_info < (3, 5):
         raise Exception("🐍 This script requires Python 3.5+")
@@ -274,6 +317,17 @@ def updateIPs(ips):
             ipv4_enabled = True
             ipv6_enabled = True
             print("⚙️ Individually disable IPv4 or IPv6 with new config.json options. Read more about it here: https://github.com/timothymiller/cloudflare-ddns/blob/master/README.md")
+        try:
+            scrape_url = config["scrape_url"]
+            if ipv4_enabled:
+                scrape_ipv4_label = config["scrape_ipv4_label"]
+            if ipv6_enabled:
+                scrape_ipv6_label = config["scrape_ipv6_label"]
+        except:
+            scrape_url = None
+            scrape_ipv4_label = None
+            scrape_ipv6_label = None
+            print("⚙️ No config detected for 'scrape_url', 'scrape_ipv[4|6]_label' - defaulting to ipify")
         try:
             purgeUnknownRecords = config["purgeUnknownRecords"]
         except:

From e4257e0fb982831df5f3df9eb49ccb9ccedefea5 Mon Sep 17 00:00:00 2001
From: Anthony <anthony.clay@zarthcode.com>
Date: Sun, 2 Jun 2024 14:58:02 -0400
Subject: [PATCH 2/2] Update requirements.txt

Added beautifulsoup4 requirement for use in scraper
---
 requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 077c95d..1f527e4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
-requests==2.31.0
\ No newline at end of file
+requests==2.31.0
+beautifulsoup4==4.12.3