diff options
| author | Kim Alvefur <zash@zash.se> | 2020-07-16 10:26:36 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-07-16 10:26:36 +0200 |
| commit | d89a99eb4320d5b2d6067fde78be6c5706cac4ab (patch) | |
| tree | c9b00974e419cbb9ac31c082af39477074a71abb /plugins | |
| parent | 1c0950bc362d76da12c33ea7e0f87545556c2a82 (diff) | |
| download | prosody-d89a99eb4320d5b2d6067fde78be6c5706cac4ab.tar.gz prosody-d89a99eb4320d5b2d6067fde78be6c5706cac4ab.zip | |
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.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_proxy65.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/mod_proxy65.lua b/plugins/mod_proxy65.lua index 29c821e2..aacf6309 100644 --- a/plugins/mod_proxy65.lua +++ b/plugins/mod_proxy65.lua @@ -12,7 +12,6 @@ module:set_global(); 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 @@ function listener.onincoming(conn, data) 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 @@ function listener.onincoming(conn, data) 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 |