Software / code / prosody
Changeset
11011:c079103c9172
mod_proxy65: Log invalid greetings escaped instead of as base64
Makes it easier to see human-readable parts and thus identifying the
garbage. Also consistent with mod_c2s and others.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 16 Jul 2020 10:26:36 +0200 |
| parents | 11010:6b27cb706b89 |
| children | 11012:027af78d8125 |
| files | plugins/mod_proxy65.lua |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_proxy65.lua Wed May 27 19:47:52 2020 +0200 +++ b/plugins/mod_proxy65.lua Thu Jul 16 10:26:36 2020 +0200 @@ -12,7 +12,6 @@ local jid_compare, jid_prep = require "util.jid".compare, require "util.jid".prep; local st = require "util.stanza"; local sha1 = require "util.hashes".sha1; -local b64 = require "util.encodings".base64.encode; local server = require "net.server"; local portmanager = require "core.portmanager"; @@ -45,7 +44,7 @@ end -- else error, unexpected input conn:write("\5\255"); -- send (SOCKS version 5, no acceptable method) conn:close(); - module:log("debug", "Invalid SOCKS5 greeting received: '%s'", b64(data)); + module:log("debug", "Invalid SOCKS5 greeting received: %q", data); else -- connection request --local head = string.char( 0x05, 0x01, 0x00, 0x03, 40 ); -- ( VER=5=SOCKS5, CMD=1=CONNECT, RSV=0=RESERVED, ATYP=3=DOMAIMNAME, SHA-1 size ) if #data == 47 and data:sub(1,5) == "\5\1\0\3\40" and data:sub(-2) == "\0\0" then @@ -67,7 +66,7 @@ else -- error, unexpected input conn:write("\5\1\0\3\0\0\0"); -- VER, REP, RSV, ATYP, BND.ADDR (sha), BND.PORT (2 Byte) conn:close(); - module:log("debug", "Invalid SOCKS5 negotiation received: '%s'", b64(data)); + module:log("debug", "Invalid SOCKS5 negotiation received: %q", data); end end end
