Merge pull request #1228 from javierbrk/RemoveHttpClient

Remove http client

Author: ilario

packages/check-date-http/Makefile

@@ -9,8 +9,7 @@ define Package/$(PKG_NAME)
 	CATEGORY:=LibreMesh
 	MAINTAINER:=Gioacchino Mazzurco <gio@altermundi.net>
 	URL:=http://libremesh.org
-	DEPENDS:=+libuci-lua +lua \
-		+luci-lib-httpclient
+	DEPENDS:=+libuci-lua +lua 
 	PKGARCH:=all
 endef
 

packages/check-date-http/Readme.md

@@ -4,6 +4,9 @@ NTP daemon shipped with busybox is not capable to gracefully handle cases of ext
 
 Check local time against a list of HTTP(s) services, if the time skew is more then 15 minutes, restart sysntpd to force time syncronization, or reset trought date command depending on configuration.
 
+Remember to set your time zone in /etc/TZ. For argentina "echo 'UTC3' > /etc/TZ"
+will do the job
+
 ## Configurations
 You can change the behavior and the list of servers in ```/etc/config/check-date```
 

packages/check-date-http/files/etc/config/check-date

@@ -9,6 +9,4 @@ config timeserver 'http'
 	list server 'http://openwrt.org/'
 	list server 'http://eigenlab.org/'
 	list server 'http://www.google.com/'
-	list server 'http://ip4.me/'
-	list server 'http://ip6only.me/'
-	list server 'http://ip6.me/'
+

packages/check-date-http/files/usr/bin/check-date-http

@@ -4,9 +4,49 @@
 --! Copyright (C) 2019  Gioacchino Mazzurco <gio@altermundi.net>
 --! Copyright (C) 2019  Nicolas Echaniz <nicoechaniz@altermundi.net>
 
-local http = require("luci.httpclient")
 local libuci = require("uci")
 
+-- Function to get HTTP headers using netcat
+local function http_head_request(url)
+    -- Parse URL to extract host and path
+    local host = url:gsub("^https?://", ""):gsub("/.*", "")
+    local port = 80
+    
+    -- Check if port is specified in host
+    if host:match(":") then
+        host, port = host:match("([^:]+):(%d+)")
+        port = tonumber(port)
+    end
+    
+    -- Build netcat command with HTTP HEAD request
+    local cmd = string.format(
+        "printf 'HEAD / HTTP/1.1\\r\\nHost: %s\\r\\nConnection: close\\r\\n\\r\\n' | nc %s %d 2>/dev/null",
+        host, host, port
+    )
+    
+    local handle = io.popen(cmd)
+    if not handle then
+        return nil
+    end
+    
+    local response = handle:read("*a")
+    local success = handle:close()
+    
+    if not success or response == "" then
+        return nil
+    end
+    
+    -- Parse headers into a table
+    local headers = {}
+    for line in response:gmatch("[^\r\n]+") do
+        local key, value = line:match("^([^:]+):%s*(.+)$")
+        if key and value then
+            headers[key] = value
+        end
+    end
+    
+    return { headers = headers }
+end
 
 local config = libuci:cursor()
 local url = config:get("check-date", "http", "server")
@@ -19,27 +59,28 @@ restartSysntpd = (restartSysntpd == nil) or restartSysntpd
 config = nil
 
 local localCurrDate = assert(io.popen("date --utc -Iminutes", 'r'):read())
-local lFormat="(%d+)-(%d+)-(%d+)T(%d+):(%d+)UTC"
+local lFormat="(%d+)-(%d+)-(%d+)T(%d+):(%d+)"
 local lYear, lMonth, lDay, lHour, lMin = localCurrDate:match(lFormat)
 
-local httpOptions = {}
-httpOptions.rcvtimeo = 5
-httpOptions.sndtimeo = 5
-httpOptions.depth = 0 -- Avoid annoying redirects
-httpOptions.method = 'HEAD'
-local success, response, algo = pcall(http.request_raw, url, httpOptions)
-
-if(not success) then
-	print(arg[0], "HTTP request failed", url, success, response, algo)
-	os.exit(42)
-elseif response == nil then
-	print(arg[0], "The server cannot be reached", url)
-	os.exit(43)
+local response = http_head_request(url)
+
+if not response then
+    print(arg[0], "HTTP request failed", url)
+    os.exit(42)
+elseif not response.headers or not response.headers['Date'] then
+    print(arg[0], "The server cannot be reached or Date header missing", url)
+    os.exit(43)
 end
 
-local s = algo['headers']['Date']
+local s = response.headers['Date']
 local p="%a+, (%d+) (%a+) (%d+) (%d+):(%d+):(%d+) GMT"
 local day, month, year, hour, min, sec = s:match(p)
+
+if not day then
+    print(arg[0], "Could not parse Date header:", s)
+    os.exit(44)
+end
+
 local MON = { Jan="01", Feb="02", Mar="03", Apr="04", May="05", Jun="06", Jul="07", Aug="08", Sep="09", Oct="10", Nov="11", Dec="12"}
 month = MON[month]