bson 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 830d8156be21a282cce7f2ff5c7136c7c0cf5320
-  data.tar.gz: 1003e647f5ff7789f861838b4d7c4080237556c4
+  metadata.gz: 97406446c031dcd1d113981137d7a5f3b7cf931b
+  data.tar.gz: 71e76d81578a58363dbb4eb254521e5b5154c9ad
 SHA512:
-  metadata.gz: e1acb711445290f976f2754dbc20903f583f1f4c96efd993eb7982ace58742ebe96d0d243f35bb3c2b50e1cdfb7714065f14b2ff4ef5b75afd46c0de5eb52b9f
-  data.tar.gz: c3b549ae774b91c4af91dafca71ab78d47154c56871163cd4e31c7640f90c5557956ccae84843b85b59df13041977a96868a7cddea2f508639a5b70a921bcf34
+  metadata.gz: ce10bfb4026b5830ba571f98f99b4a02075223a5039262c855f9ddd7e676e562895f89db5013826d52b42bd9622580c32815b50731b41b6f4f53f0018ea20708
+  data.tar.gz: 009a442c08996a177318e48d41fc637fde1e72354979389123cc7e829c96e9a0051ae202a0c7fae62a308c204f37c2eacf4aaa20da57d48d2fad313727f41018

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 BSON Changelog
 ==============
 
+## 3.2.1
+
+### Bug Fixes
+
+[#39](https://github.com/mongodb/bson-ruby/pull/39) Fixed MD5 hashing of hostname in c extension.
+  (James Hudon)
+
 ## 3.2.0
 
 ### Bug Fixes

data/ext/bson/native.c

@@ -49,12 +49,12 @@
 #endif
 
 /**
- * Define the max hostname length constant if nonexistant.
+ * Define the max hostname hash length constant if nonexistant.
  *
- * @since 2.0.0
+ * @since 3.2.0
  */
-#ifndef HOST_NAME_MAX
-#define HOST_NAME_MAX 256
+#ifndef HOST_NAME_HASH_MAX
+#define HOST_NAME_HASH_MAX 256
 #endif
 
 /**
@@ -136,13 +136,12 @@ static const char rb_bson_null_byte = 0;
 static const char rb_bson_true_byte = 1;
 
 /**
- * Holds the machine id for object id generation.
+ * Holds the machine id hash for object id generation.
  *
- * @since 2.0.0
+ * @since 3.2.0
  *
- * @todo: Need to set this value properly.
  */
-static char rb_bson_machine_id[HOST_NAME_MAX];
+static char rb_bson_machine_id_hash[HOST_NAME_HASH_MAX];
 
 /**
  * The counter for incrementing object ids.
@@ -246,7 +245,7 @@ static VALUE rb_object_id_generator_next(int argc, VALUE* args, VALUE self)
   c = htonl(rb_bson_object_id_counter << 8);
 
   memcpy(&bytes, &t, 4);
-  memcpy(&bytes[4], rb_bson_machine_id, 3);
+  memcpy(&bytes[4], rb_bson_machine_id_hash, 3);
   memcpy(&bytes[7], &pid, 2);
   memcpy(&bytes[9], (unsigned char*) &c, 3);
   rb_bson_object_id_counter++;
@@ -619,12 +618,19 @@ void Init_native()
   VALUE string = rb_const_get(bson, rb_intern("String"));
   VALUE true_class = rb_const_get(bson, rb_intern("TrueClass"));
   VALUE false_class = rb_const_get(bson, rb_intern("FalseClass"));
+  // needed to hash the machine id
+  rb_require("digest/md5");
+  VALUE digest_class = rb_const_get(rb_cObject, rb_intern("Digest"));
+  VALUE md5_class = rb_const_get(digest_class, rb_intern("MD5"));
   rb_bson_utf8_string = rb_const_get(bson, rb_intern("UTF8"));
   rb_utc_method = rb_intern("utc");
 
-  // Get the object id machine id.
+  // Get the object id machine id and hash it.
+  char rb_bson_machine_id[256];
   gethostname(rb_bson_machine_id, sizeof rb_bson_machine_id);
-  rb_bson_machine_id[HOST_NAME_MAX - 1] = '\0';
+  rb_bson_machine_id[255] = '\0';
+  VALUE digest = rb_funcall(md5_class, rb_intern("digest"), 1, rb_str_new2(rb_bson_machine_id));
+  memcpy(rb_bson_machine_id_hash, RSTRING_PTR(digest), RSTRING_LEN(digest));
 
   // Integer optimizations.
   rb_undef_method(integer, "to_bson_int32");

data/lib/bson/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module BSON
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Tyler Brock
@@ -34,7 +34,7 @@ cert_chain:
   XZOS48LlWh15EG4yZo/gRzqNAW2LUIkYA5eMS2Kp6r+KV8IBUO/LaHdrXbdilpa8
   BRsuCo7UZDbFVRns04HLyjVvkj+K/ywIcdKdS0csz5M=
   -----END CERTIFICATE-----
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies: []
 description: A full featured BSON specification implementation, in Ruby
 email:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: bson
-rubygems_version: 2.4.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby Implementation of the BSON specification