From 2b5915177d4f6fd88b37e50a3f84a48236bcc1f3 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Wed, 1 Jan 2025 14:16:04 +0100 Subject: [PATCH] socketutil: remove URL from user agent, add device info (#12977) See #10186, Results in: ``` KOReader/2024.11-112 (Emulator; Linux; x64) LuaSocket/3.1.0 ``` --- frontend/socketutil.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/socketutil.lua b/frontend/socketutil.lua index 53ddf2419..bdb19885d 100644 --- a/frontend/socketutil.lua +++ b/frontend/socketutil.lua @@ -2,6 +2,7 @@ This module contains miscellaneous helper functions specific to our usage of LuaSocket/LuaSec. ]] +local Device = require("device") local Version = require("version") local http = require("socket.http") local https = require("ssl.https") @@ -16,7 +17,7 @@ local socketutil = { --- Builds a sensible UserAgent that fits Wikipedia's UA policy local socket_ua = http.USERAGENT -socketutil.USER_AGENT = "KOReader/" .. Version:getShortVersion() .. " (https://koreader.rocks/) " .. socket_ua:gsub(" ", "/") +socketutil.USER_AGENT = "KOReader/" .. Version:getShortVersion() .. " (" .. Device:info() .. "; " .. jit.os .. "; " .. jit.arch .. ") " .. socket_ua:gsub(" ", "/") -- Monkey-patch it in LuaSocket, as it already takes care of inserting the appropriate header to its requests. http.USERAGENT = socketutil.USER_AGENT