clogger 1.0.1 → 1.1.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.0.1.GIT
+DEF_VER=v1.1.0.GIT
 
 LF='
 '

data/README

@@ -114,7 +114,7 @@ development.  Patches should always be sent inline
 All feedback (bug reports, user/development discussion, patches, pull
 requests) go to the mailing list.
 
-* mailto:clogger@librelist.com
+* mailto:clogger@librelist.org
 
 Do not send HTML mail or attachments.  Do not top post.
 

data/clogger.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.authors = ["cloggers"]
   s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = readme_description
-  s.email = %q{clogger@librelist.com}
+  s.email = %q{clogger@librelist.org}
   s.extra_rdoc_files = extra_rdoc_files(manifest)
   s.files = manifest
   s.rdoc_options = rdoc_options

data/ext/clogger_ext/clogger.c

@@ -161,7 +161,7 @@ static void init_buffers(struct clogger *c)
 static inline int need_escape(unsigned c)
 {
 	assert(c <= 0xff);
-	return !!(c == '\'' || c == '"' || c <= 0x1f);
+	return !!(c == '\'' || c == '"' || c <= 0x1f || c >= 0x7f);
 }
 
 /* we are encoding-agnostic, clients can send us all sorts of junk */
@@ -572,8 +572,7 @@ static void append_cookie(struct clogger *c, VALUE key)
 		cookie = g_dash;
 	} else {
 		cookie = rb_hash_aref(c->cookies, key);
-		if (NIL_P(cookie))
-			cookie = g_dash;
+		cookie = NIL_P(cookie) ? g_dash : byte_xs(cookie);
 	}
 	rb_str_buf_append(c->log_buf, cookie);
 }
@@ -890,10 +889,12 @@ static VALUE clogger_call(VALUE self, VALUE env)
 	env = rb_check_convert_type(env, T_HASH, "Hash", "to_hash");
 
 	if (c->wrap_body) {
+		/* XXX: we assume the existence of the GVL here: */
 		if (c->reentrant < 0) {
 			VALUE tmp = rb_hash_aref(env, g_rack_multithread);
 			c->reentrant = Qfalse == tmp ? 0 : 1;
 		}
+
 		if (c->reentrant) {
 			self = rb_obj_dup(self);
 			c = clogger_get(self);

data/lib/clogger/pure.rb

@@ -98,7 +98,9 @@ private
   def byte_xs(s)
     s = s.dup
     s.force_encoding(Encoding::BINARY) if defined?(Encoding::BINARY)
-    s.gsub!(/(['"\x00-\x1f])/) { |x| "\\x#{$1.unpack('H2').first.upcase}" }
+    s.gsub!(/(['"\x00-\x1f\x7f-\xff])/) do |x|
+      "\\x#{$1.unpack('H2').first.upcase}"
+    end
     s
   end
 
@@ -175,7 +177,7 @@ private
         t = Time.now
         time_format(t.to_i, t.usec, op[1], op[2])
       when OP_COOKIE
-        (env['rack.request.cookie_hash'][op[1]] rescue "-") || "-"
+        (byte_xs(env['rack.request.cookie_hash'][op[1]]) rescue "-") || "-"
       else
         raise "EDOOFUS #{op.inspect}"
       end

data/test/test_clogger.rb

@@ -390,6 +390,15 @@ class TestClogger < Test::Unit::TestCase
     assert_equal "a\\x0Ab\n", str.string
   end
 
+  def test_escape_crazy_delete
+    str = StringIO.new
+    app = lambda { |env| [302, {}, [] ] }
+    cl = Clogger.new(app, :logger => str, :format => "$http_cookie")
+    @req["HTTP_COOKIE"] = "a\x7f\xff"
+    cl.call(@req)
+    assert_equal "a\\x7F\\xFF\n", str.string
+  end
+
   def test_request_uri_fallback
     str = StringIO.new
     app = lambda { |env| [ 200, {}, [] ] }
@@ -415,9 +424,9 @@ class TestClogger < Test::Unit::TestCase
     cl = Clogger.new(app,
         :format => '$cookie_foo $cookie_quux',
         :logger => str)
-    req = @req.merge('HTTP_COOKIE' => "foo=bar;quux=h&m")
+    req = @req.merge('HTTP_COOKIE' => "foo=bar;quux=h%7F&m")
     status, headers, body = cl.call(req)
-    assert_equal "bar h&m\n", str.string
+    assert_equal "bar h\\x7F&m\n", str.string
   end
 
   def test_bogus_app_response

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clogger
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - cloggers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 Z
+date: 2011-12-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -50,7 +50,7 @@ dependencies:
 description: |-
   \Clogger is Rack middleware for logging HTTP requests.  The log format
   is customizable so you can specify exactly which fields to log.
-email: clogger@librelist.com
+email: clogger@librelist.org
 executables: []
 
 extensions: 
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: clogger
-rubygems_version: 1.8.5
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: configurable request logging for Rack