zookeeper 1.2.3-java → 1.2.4-java

data/CHANGELOG

@@ -1,3 +1,9 @@
+v1.2.4 fix buffer overflow in CZookeeper client_id code
+  
+  * the 'passwd' part of the struct is a char[16], but isn't null terminated.
+    use rb_str_new with an explicit length, rather than rb_str_new2 which
+    uses strlen().
+    
 v1.2.3 ensure that all threads are woken up on shutdown
 
   * There was an edge case where a call would be queued up and its thread

data/ext/Rakefile

@@ -17,7 +17,7 @@ namespace :zkrb do
   end
 
   task :clobber => :clean do
-    rm_rf %w[Makefile c lib bin include]
+    rm_rf %w[Makefile c lib bin include ._c]
   end
 end
 

data/ext/c_zookeeper.rb

@@ -84,6 +84,8 @@ class CZookeeper
 
     log_level = ENV['ZKC_DEBUG'] ? ZOO_LOG_LEVEL_DEBUG : ZOO_LOG_LEVEL_ERROR
 
+    logger.info { "initiating connection to #{@host}" }
+
     zkrb_init(@host)#, :zkc_log_level => log_level)
 
     start_event_thread

data/ext/extconf.rb

@@ -26,7 +26,7 @@ end
 
 ZK_DEBUG = (ENV['DEBUG'] or ARGV.any? { |arg| arg == '--debug' })
 ZK_DEV = ENV['ZK_DEV']
-DEBUG_CFLAGS = " -O0 -ggdb3 -DHAVE_DEBUG"
+DEBUG_CFLAGS = " -O0 -ggdb3 -DHAVE_DEBUG -fstack-protector-all"
 
 if ZK_DEBUG
   $stderr.puts "*** Setting debug flags. ***"
@@ -61,6 +61,9 @@ Dir.chdir(HERE) do
       raise "'#{cmd}' failed" unless system(cmd)
     end
 
+    # clean up stupid apple rsrc fork bullshit
+    FileUtils.rm_f(Dir['**/._*'].select{|p| test(?f, p)})
+
     Dir.chdir(BUNDLE_PATH) do        
       configure = "./configure --prefix=#{HERE} --with-pic --without-cppunit --disable-dependency-tracking #{$EXTRA_CONF} 2>&1"
       configure = "env CFLAGS='#{DEBUG_CFLAGS}' #{configure}" if ZK_DEBUG

data/ext/zkrb.c

@@ -885,15 +885,15 @@ static VALUE method_client_id(VALUE self) {
   char buf[32];
   const clientid_t *cid = zoo_client_id(zk->zh);
 
-  if (strlen(cid->passwd) != 16) { 
-    zkrb_debug("passwd is not null-terminated");
-  } else {
-    hexbufify(buf, cid->passwd, 16);
-    zkrb_debug("password in hex is: %s", buf);
-  }
+/*  if (strlen(cid->passwd) != 16) { */
+/*    zkrb_debug("passwd is not null-terminated");*/
+/*  } else {*/
+/*    hexbufify(buf, cid->passwd, 16);*/
+/*    zkrb_debug("password in hex is: %s", buf);*/
+/*  }*/
 
   VALUE session_id = LL2NUM(cid->client_id);
-  VALUE passwd = rb_str_new2(cid->passwd);
+  VALUE passwd = rb_str_new(cid->passwd, 16);
 
   VALUE client_id_obj = rb_class_new_instance(0, RARRAY_PTR(rb_ary_new()), ZookeeperClientId);
 

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
   DRIVER_VERSION = '3.3.5'
 end

data/spec/support/10_spawn_zookeeper.rb

@@ -7,6 +7,10 @@ module Zookeeper
     !!ENV['TRAVIS']
   end
 
+  def self.default_cnx_host
+    ENV['ZK_DEFAULT_HOST'] || 'localhost'
+  end
+
   @test_port ||= spawn_zookeeper? ? 21811 : 2181
 
   class << self
@@ -14,7 +18,7 @@ module Zookeeper
   end
 
   def self.default_cnx_str
-    "localhost:#{test_port}"
+    "#{default_cnx_host}:#{test_port}"
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-23 00:00:00 Z
+date: 2012-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: backports