bson_ext 1.10.2 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d278c9a30ed181d9c15cb67516357e850293be7
-  data.tar.gz: 18337c3f95e788c04cc147f6ca70d363ad85e235
+  metadata.gz: 1adf4cc8e415e8905f01a81bb7a843cc480e0718
+  data.tar.gz: 4fc4a02485a5732bbc114186a6187d8e0ded4e7c
 SHA512:
-  metadata.gz: dec066058371de96c436826fbeb6338cd13bfdf4e993aa752c9fbab3fc13a06347efa2492d9db809decb28ca1c926bdda18f3e5b4aa1322a0d4e57d37e0c1ce6
-  data.tar.gz: e66e105459077d49f22cf84a958c1de785dd731889380e4771570a6f9240ffcbebb7089e7beae16bc68a90999a688c0d2a3865fb6facc28d4f459ef1039c4381
+  metadata.gz: 19e73866ad7299986a2ecb705de815d9074be2c903000b7c04b44a4e901c3810078b07f1137ebc84966b0ec4fd32ce1cc2a6a1dbc37f0d6c13943c62b34d27f0
+  data.tar.gz: 7a8a5c6c39a00b27a929eadbf06753785b7f0dc03fe713409532f3024be0284860951e933fd36e21b7de1618d3dee0bff67ab7d9d61d221595c672436bd65bea

data.tar.gz.sig

@@ -1 +1,2 @@
-0~]�W8��2	��:wA�X����|M�5Tv��l��z��^�?g�1���Eל�.�|!D;M#��$潊H(��S��H��?�k�Y���R'YN�3�YP�������7� ���P{�	:�c�i��֞��쪣�Z�
�0�r襕�੒���\�e�]��?0y���ğ	)8`����!�͆��oj�Qujt��4��q��Cs~4���$�]��:B�Džh�=u��0�_%��I�J����S�a
+}���
���Օ�ؖ�"fg����͛��6�az��3_
+�#��-}zeUI	*��\;��?X�1i�)�rFiӳ��)��I�xF�����,�u����E|}���Z�s>+���yT������)'_8a��J�rJ5͊�q�W��#��

data/VERSION

@@ -1 +1 @@
-1.10.2
+1.11.1

data/ext/cbson/cbson.c

@@ -22,6 +22,7 @@
 
 #include "ruby.h"
 #include "version.h"
+#include <arpa/inet.h>
 
 /* Ensure compatibility with early releases of Ruby 1.8.5 */
 #ifndef RSTRING_PTR
@@ -115,7 +116,7 @@ struct deserialize_opts {
 #define STR_NEW(p,n)                                                    \
     ({                                                                  \
         VALUE _str = rb_enc_str_new((p), (n), rb_utf8_encoding());      \
-        rb_encoding* internal_encoding = rb_default_internal_encoding(); \
+        rb_encoding* internal_encoding = rb_default_internal_encoding();\
         if (internal_encoding) {                                        \
             _str = rb_str_export_to_enc(_str, internal_encoding);       \
         }                                                               \
@@ -167,11 +168,11 @@ static void write_utf8(bson_buffer_t buffer, VALUE string, int allow_null) {
     }
 #define FREE_INTSTRING(buffer) free(buffer)
 #else
-#define INT2STRING(buffer, i)                   \
-    {                                           \
+#define INT2STRING(buffer, i)                           \
+    {                                                   \
         int vslength = snprintf(NULL, 0, "%d", i) + 1;  \
-        *buffer = malloc(vslength);             \
-        snprintf(*buffer, vslength, "%d", i);   \
+        *buffer = malloc(vslength);                     \
+        snprintf(*buffer, vslength, "%d", i);           \
     }
 #define FREE_INTSTRING(buffer) free(buffer)
 #endif
@@ -435,10 +436,10 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
             const char* cls = rb_obj_classname(value);
             if (strcmp(cls, "BSON::Binary") == 0 ||
                 strcmp(cls, "ByteBuffer") == 0) {
-                const char subtype = strcmp(cls, "ByteBuffer") ?
-                    (const char)FIX2INT(rb_funcall(value, rb_intern("subtype"), 0)) : 2;
                 VALUE string_data = rb_funcall(value, rb_intern("to_s"), 0);
                 int length = RSTRING_LENINT(string_data);
+                const char subtype = strcmp(cls, "ByteBuffer") ?
+                    (const char)FIX2INT(rb_funcall(value, rb_intern("subtype"), 0)) : 2;
                 write_name_and_type(buffer, key, 0x05);
                 if (subtype == 2) {
                     const int other_length = length + 4;
@@ -453,8 +454,8 @@ static int write_element(VALUE key, VALUE value, VALUE extra, int allow_id) {
                 break;
             }
             if (strcmp(cls, "BSON::ObjectId") == 0) {
-                VALUE as_array = rb_funcall(value, rb_intern("to_a"), 0);
                 int i;
+                VALUE as_array = rb_funcall(value, rb_intern("to_a"), 0);
                 write_name_and_type(buffer, key, 0x07);
                 for (i = 0; i < 12; i++) {
                     char byte = (char)FIX2INT(rb_ary_entry(as_array, i));
@@ -658,9 +659,10 @@ static void write_doc(bson_buffer_t buffer, VALUE hash, VALUE check_keys, VALUE
 
     // we have to check for an OrderedHash and handle that specially
     if (strcmp(rb_obj_classname(hash), "BSON::OrderedHash") == 0) {
-        VALUE keys = rb_funcall(hash, rb_intern("keys"), 0);
         int i;
-                for(i = 0; i < RARRAY_LEN(keys); i++) {
+        VALUE keys = rb_funcall(hash, rb_intern("keys"), 0);
+
+        for(i = 0; i < RARRAY_LEN(keys); i++) {
             VALUE key = rb_ary_entry(keys, i);
             VALUE value = rb_hash_aref(hash, key);
 
@@ -739,10 +741,11 @@ static VALUE get_value(const char* buffer, int* position,
             int size;
             memcpy(&size, buffer + *position, 4);
             if (strcmp(buffer + *position + 5, "$ref") == 0) { // DBRef
-                int offset = *position + 10;
                 VALUE argv[2];
-                int collection_length = *(int*)(buffer + offset) - 1;
                 unsigned char id_type;
+                int offset = *position + 10;
+                int collection_length = *(int*)(buffer + offset) - 1;
+
                 offset += 4;
 
                 argv[0] = STR_NEW(buffer + offset, collection_length);
@@ -766,9 +769,9 @@ static VALUE get_value(const char* buffer, int* position,
 
             value = rb_ary_new();
             while (*position < end) {
+                VALUE to_append;
                 unsigned char type = (unsigned char)buffer[(*position)++];
                 int key_size = (int)strlen(buffer + *position);
-                VALUE to_append;
 
                 *position += key_size + 1; // just skip the key, they're in order.
                 to_append = get_value(buffer, position, type, opts);
@@ -847,11 +850,11 @@ static VALUE get_value(const char* buffer, int* position,
             int pattern_length = (int)strlen(buffer + *position);
             VALUE pattern = STR_NEW(buffer + *position, pattern_length);
             int flags_length;
-            VALUE argv[3];
+            VALUE argv[3], flags_str;
             *position += pattern_length + 1;
 
             flags_length = (int)strlen(buffer + *position);
-            VALUE flags_str = STR_NEW(buffer + *position, flags_length);
+            flags_str = STR_NEW(buffer + *position, flags_length);
             argv[0] = pattern;
             argv[1] = flags_str;
             value = rb_class_new_instance(2, argv, BSONRegex);
@@ -951,13 +954,13 @@ static VALUE get_value(const char* buffer, int* position,
 }
 
 static VALUE elements_to_hash(const char* buffer, int max, struct deserialize_opts * opts) {
-    VALUE hash = rb_class_new_instance(0, NULL, OrderedHash);
     int position = 0;
+    VALUE hash = rb_class_new_instance(0, NULL, OrderedHash);
     while (position < max) {
+        VALUE value;
         unsigned char type = (unsigned char)buffer[position++];
         int name_length = (int)strlen(buffer + position);
         VALUE name = STR_NEW(buffer + position, name_length);
-        VALUE value;
         position += name_length + 1;
         value = get_value(buffer, &position, type, opts);
         rb_funcall(hash, element_assignment_method, 2, name, value);
@@ -969,6 +972,7 @@ static VALUE method_deserialize(VALUE self, VALUE bson, VALUE opts) {
     const char* buffer = RSTRING_PTR(bson);
     int remaining = RSTRING_LENINT(bson);
     struct deserialize_opts deserialize_opts;
+
     deserialize_opts.compile_regex = 1;
     if (rb_funcall(opts, rb_intern("has_key?"), 1, ID2SYM(rb_intern("compile_regex"))) == Qtrue && 
         rb_hash_aref(opts, ID2SYM(rb_intern("compile_regex"))) == Qfalse) {

data/ext/cbson/version.h

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-#define VERSION "1.10.2"
+#define VERSION "1.11.1"

data/ext/csasl/csasl.c

@@ -0,0 +1,167 @@
+// Copyright (C) 2014 MongoDB, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <ruby.h>
+#include <sasl/sasl.h>
+#include <sasl/saslutil.h>
+
+static void mongo_sasl_conn_free(void* data) {
+  sasl_conn_t *conn = (sasl_conn_t*) data;
+  // Ideally we would use sasl_client_done() but that's only available as of cyrus sasl 2.1.25
+  if(conn) sasl_done();
+}
+
+static sasl_conn_t* mongo_sasl_context(VALUE self) {
+  sasl_conn_t* conn;
+  VALUE context;
+  context = rb_iv_get(self, "@context");
+  Data_Get_Struct(context, sasl_conn_t, conn);
+  return conn;
+}
+
+static VALUE a_init(VALUE self, VALUE user_name, VALUE host_name, VALUE service_name, VALUE canonicalize_host_name)
+{
+  if (sasl_client_init(NULL) == SASL_OK) {
+    rb_iv_set(self, "@valid", Qtrue);
+    rb_iv_set(self, "@user_name", user_name);
+    rb_iv_set(self, "@host_name", host_name);
+    rb_iv_set(self, "@service_name", service_name);
+    rb_iv_set(self, "@canonicalize_host_name", canonicalize_host_name);
+  }
+
+  else {
+    rb_iv_set(self, "@valid", Qfalse);
+  }
+
+  return self;
+}
+
+static VALUE valid(VALUE self) {
+  return rb_iv_get(self, "@valid");
+}
+
+int is_sasl_failure(int result)
+{
+  if (result < 0) {
+    return 1;
+  }
+
+  return 0;
+}
+
+static int sasl_interact(VALUE self, int id, const char **result, unsigned *len) {
+  switch (id) {
+    case SASL_CB_AUTHNAME:
+    case SASL_CB_USER:
+    {
+      VALUE user_name;
+      user_name = rb_iv_get(self, "@user_name");
+      *result = RSTRING_PTR(user_name);
+      if (len) {
+        *len = RSTRING_LEN(user_name);
+      }
+      return SASL_OK;
+    }
+  }
+
+  return SASL_FAIL;
+}
+
+static VALUE initialize_challenge(VALUE self) {
+  int result;
+  char encoded_payload[4096];
+  const char *raw_payload;
+  unsigned int raw_payload_len, encoded_payload_len;
+  const char *mechanism_list = "GSSAPI";
+  const char *mechanism_selected = "GSSAPI";
+  VALUE context;
+  sasl_conn_t *conn;
+  sasl_callback_t client_interact [] = {
+    { SASL_CB_AUTHNAME, (int (*)(void))sasl_interact, (void*)self },
+    { SASL_CB_USER, (int (*)(void))sasl_interact, (void*)self },
+    { SASL_CB_LIST_END, NULL, NULL }
+  };
+
+  const char *servicename = RSTRING_PTR(rb_iv_get(self, "@service_name"));
+  const char *hostname = RSTRING_PTR(rb_iv_get(self, "@host_name"));
+
+  result = sasl_client_new(servicename, hostname, NULL, NULL, client_interact, 0, &conn);
+
+  if (result != SASL_OK) {
+    sasl_dispose(&conn);
+    return Qfalse;
+  }
+
+  context = Data_Wrap_Struct(rb_cObject, NULL, mongo_sasl_conn_free, conn);
+  rb_iv_set(self, "@context", context);
+
+  result = sasl_client_start(conn, mechanism_list, NULL, &raw_payload, &raw_payload_len, &mechanism_selected);
+  if (is_sasl_failure(result)) {
+    return Qfalse;
+  }
+
+  if (result != SASL_CONTINUE) {
+    return Qfalse;
+  }
+
+  result = sasl_encode64(raw_payload, raw_payload_len, encoded_payload, sizeof(encoded_payload), &encoded_payload_len);
+  if (is_sasl_failure(result)) {
+    return Qfalse;
+  }
+
+  encoded_payload[encoded_payload_len] = 0;
+  return rb_str_new(encoded_payload, encoded_payload_len);
+}
+
+static VALUE evaluate_challenge(VALUE self, VALUE rb_payload) {
+  char base_payload[4096], payload[4096];
+  const char *step_payload, *out;
+  unsigned int step_payload_len, payload_len, base_payload_len, outlen;
+  int result;
+  sasl_conn_t *conn = mongo_sasl_context(self);
+
+  StringValue(rb_payload);
+  step_payload = RSTRING_PTR(rb_payload);
+  step_payload_len = RSTRING_LEN(rb_payload);
+
+  result = sasl_decode64(step_payload, step_payload_len, base_payload, sizeof(base_payload), &base_payload_len);
+  if (is_sasl_failure(result)) {
+    return Qfalse;
+  }
+
+  result = sasl_client_step(conn, base_payload, base_payload_len, NULL, &out, &outlen);
+  if (is_sasl_failure(result)) {
+  	return Qfalse;
+  }
+
+  result = sasl_encode64(out, outlen, payload, sizeof(payload), &payload_len);
+  if (is_sasl_failure(result)) {
+    return Qfalse;
+  }
+
+  return rb_str_new(payload, payload_len);
+}
+
+VALUE c_GSSAPI_authenticator;
+
+void Init_csasl() {
+  VALUE mongo, sasl;
+  mongo = rb_const_get(rb_cObject, rb_intern("Mongo"));
+  sasl = rb_const_get(mongo, rb_intern("Sasl"));
+  c_GSSAPI_authenticator = rb_define_class_under(sasl, "GSSAPIAuthenticator", rb_cObject);
+  rb_define_method(c_GSSAPI_authenticator, "initialize", a_init, 4);
+  rb_define_method(c_GSSAPI_authenticator, "initialize_challenge", initialize_challenge, 0);
+  rb_define_method(c_GSSAPI_authenticator, "evaluate_challenge", evaluate_challenge, 1);
+  rb_define_method(rb_cObject, "valid?", valid, 0);
+}

data/ext/csasl/extconf.rb

@@ -0,0 +1,8 @@
+require 'mkmf'
+find_header('sasl/sasl.h')
+
+if have_library('sasl2', 'sasl_version')
+  create_makefile('csasl/csasl')
+else
+  abort "libsasl (cyrus sasl) is required in the system to install the mongo_kerberos gem."
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bson_ext
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.1
 platform: ruby
 authors:
 - Emily Stolfo
@@ -34,7 +34,7 @@ cert_chain:
   JrZM8w8wGbIOeLtoQqa7HB/jOYbTahH7KMNh2LHAbOR93hNIJxVRa4iwxiMQ75tN
   9WUIAJ4AEtjwRg1Bz0OwDo3aucPCBpx77+/FWhv7JYY=
   -----END CERTIFICATE-----
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -42,14 +42,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.11.1
 description: C extensions to accelerate the Ruby BSON serialization. For more information
   about BSON, see http://bsonspec.org.  For information about MongoDB, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
@@ -68,6 +68,8 @@ files:
 - ext/cbson/encoding_helpers.h
 - ext/cbson/extconf.rb
 - ext/cbson/version.h
+- ext/csasl/csasl.c
+- ext/csasl/extconf.rb
 homepage: http://www.mongodb.org
 licenses:
 - Apache License Version 2.0

metadata.gz.sig

@@ -1 +1 @@
-c�S�:w���}�j
���4�wz&�n�X�猪@�N71����͎y�1i�U���o�`
!�9�?��[��K�t�%!Y?���;��[�72D����L(��n?	K)h�]p$�S�3㣑x��	�|BG L1��S�!�,�dIIz2%c��yǞ�u�����[�J�4�� M5B�Y�"f��(ghɘ����>	9��k���������"������+��;(�{��GiNcjdc�W�O�٨�3��
+.k�B��m�$�Ĕ׃���/�_$V{�%T��β*9.�9,l�j۫�Z���W\��q5t�O�ڢ�E
�o�sxQi�3�!���~L�LP+pW�
մ`~eV��#UG,Ҵ������p��SL�(\K���?L���iӉj8-��8a:�;rS�HD?�K���=�C��dr��q�Zu,(����7��4�����e��CӪ�e��lŠ@qI8�F_ҬM�pP(O�J��f�J� R7�?���.�\�����#%H