commit 10f13b886b8a76889f5442f7347159d3677324d0 (patch)
parent 4ee4e61 clogger 2.3.1
tree 5d5ef3fe9bc2384916ef8513233ed75495f61cb8
author Eric Wong <bofh@yhbt.net> 2022-06-16 15:54:13 +0000
committer Eric Wong <bofh@yhbt.net> 2022-06-16 16:09:56 +0000
escape env['REQUEST_METHOD'] for non-strict HTTP servers
This doesn't affect most Rack HTTP servers since they have
strict parsers, but is safer in case one doesn't...
Influenced by CVE-2022-30123.
---
ext/clogger_ext/clogger.c | 5 +++--
lib/clogger/pure.rb | 3 +--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ext/clogger_ext/clogger.c b/ext/clogger_ext/clogger.c
index 079817c..2ec9510 100644
--- a/ext/clogger_ext/clogger.c
+++ b/ext/clogger_ext/clogger.c
@@ -447,10 +447,11 @@ static void append_request(struct clogger *c)
{
VALUE tmp;
- /* REQUEST_METHOD doesn't need escaping, Rack::Lint governs it */
tmp = rb_hash_aref(c->env, g_REQUEST_METHOD);
- if (!NIL_P(tmp))
+ if (!NIL_P(tmp)) {
+ tmp = byte_xs(tmp);
rb_str_buf_append(c->log_buf, tmp);
+ }
rb_str_buf_append(c->log_buf, g_space);
diff --git a/lib/clogger/pure.rb b/lib/clogger/pure.rb
index 8f1f706..7f82992 100644
--- a/lib/clogger/pure.rb
+++ b/lib/clogger/pure.rb
@@ -118,8 +118,7 @@ private
version = env['HTTP_VERSION'] and version = " #{byte_xs(version)}"
qs = env['QUERY_STRING']
qs.empty? or qs = "?#{byte_xs(qs)}"
- "#{env['REQUEST_METHOD']} " \
- "#{request_uri(env)}#{version}"
+ "#{byte_xs(env['REQUEST_METHOD'] || '')} #{request_uri(env)}#{version}"
when :request_uri
request_uri(env)
when :request_length
glossary
--------
Commit objects reference one tree, and zero or more parents.
Single parent commits can typically generate a patch in
unified diff format via `git format-patch'.
Multiple parents means the commit is a merge.
Root commits have no ancestor. Note that it is
possible to have multiple root commits when merging independent histories.
Every commit references one top-level tree object.
git clone https://yhbt.net/clogger.git