trilogy 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc4650b825c98729088e61bc236c2eff05aa0f3d535266452c24102af549c76
-  data.tar.gz: 630c3fbf67cf7c1b0dc70e680bd7bce7983217034706bff5abe9e71eb0de5f42
+  metadata.gz: ff98f0678711dd36bae4c5f8a7e0f399d3391f393816bc8df4c4281dbfd5d53f
+  data.tar.gz: 13914f66cde555a81814e4f2b1761895bb1e33b026a2e7d8e3b74888862e9b69
 SHA512:
-  metadata.gz: 67596acf1ce6f0ac50008cce49cecff33cf7f33053a2e24a3ed70cc702beb71d9a5c92a8d72b6ff25d1c4d588ab84fcfccbba9d155d52739044ce1eb302f18ad
-  data.tar.gz: d00a2e65e8fb73fa0bfb7a82054007a619075fbd5863602958119047df08e0881425b3612b947542449ee988cc2b21557925b29b26992958d5aa6d48ccf7f150
+  metadata.gz: 8f629502bc41dc22b8ebb65a00fb207d0bd41951d085b7bdd1d9de9956caf2b2c5f9504a533194b6fc5de30883330305482128091f4d417913b576233bf199e6
+  data.tar.gz: 2342f373109f087b89e6802a2d7e6c05f4c6c1ed938a820af404b87c961b8ef455dad3c3ec1d8b32270340583a3cbb31bf38251d9ff0a7fa892c13c3f55c8307

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require "rake/extensiontask"
+require "rake/testtask"
 
 Rake::ExtensionTask.new do |ext|
   ext.name  = "cext"
@@ -7,9 +8,12 @@ Rake::ExtensionTask.new do |ext|
   ext.lib_dir = "lib/trilogy"
 end
 
-task :test => :compile do
-  system('script/test')
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
 end
+task :test => :compile
 
 task :default => :test
 

data/ext/trilogy-ruby/cext.c

@@ -31,10 +31,39 @@ struct trilogy_ctx {
     unsigned int query_flags;
 };
 
+static void free_trilogy(void *ptr)
+{
+    struct trilogy_ctx *ctx = ptr;
+    if (ctx->conn.socket != NULL) {
+        trilogy_free(&ctx->conn);
+    }
+    xfree(ptr);
+}
+
+static size_t trilogy_memsize(const void *ptr) {
+    const struct trilogy_ctx *ctx = ptr;
+    size_t memsize = sizeof(struct trilogy_ctx);
+    if (ctx->conn.socket != NULL) {
+        memsize += sizeof(trilogy_sock_t);
+    }
+    memsize += ctx->conn.packet_buffer.cap;
+    return memsize;
+}
+
+const rb_data_type_t trilogy_data_type = {
+    .wrap_struct_name = "trilogy",
+    .function = {
+        .dmark = NULL,
+        .dfree = free_trilogy,
+        .dsize = trilogy_memsize,
+    },
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
+};
+
 static struct trilogy_ctx *get_ctx(VALUE obj)
 {
     struct trilogy_ctx *ctx;
-    Data_Get_Struct(obj, struct trilogy_ctx, ctx);
+    TypedData_Get_Struct(obj, struct trilogy_ctx, &trilogy_data_type, ctx);
     return ctx;
 }
 
@@ -91,20 +120,11 @@ static void handle_trilogy_error(struct trilogy_ctx *ctx, int rc, const char *ms
     }
 }
 
-static void free_trilogy(struct trilogy_ctx *ctx)
-{
-    if (ctx->conn.socket != NULL) {
-        trilogy_free(&ctx->conn);
-    }
-}
-
 static VALUE allocate_trilogy(VALUE klass)
 {
     struct trilogy_ctx *ctx;
 
-    VALUE obj = Data_Make_Struct(klass, struct trilogy_ctx, NULL, free_trilogy, ctx);
-
-    memset(ctx->server_version, 0, sizeof(ctx->server_version));
+    VALUE obj = TypedData_Make_Struct(klass, struct trilogy_ctx, &trilogy_data_type, ctx);
 
     ctx->query_flags = TRILOGY_FLAGS_DEFAULT;
 
@@ -826,6 +846,17 @@ static VALUE rb_trilogy_close(VALUE self)
     return Qnil;
 }
 
+static VALUE rb_trilogy_closed(VALUE self)
+{
+    struct trilogy_ctx *ctx = get_ctx(self);
+
+    if (ctx->conn.socket == NULL) {
+        return Qtrue;
+    } else {
+        return Qfalse;
+    }
+}
+
 static VALUE rb_trilogy_last_insert_id(VALUE self) { return ULL2NUM(get_open_ctx(self)->conn.last_insert_id); }
 
 static VALUE rb_trilogy_affected_rows(VALUE self) { return ULL2NUM(get_open_ctx(self)->conn.affected_rows); }
@@ -897,6 +928,7 @@ void Init_cext()
     rb_define_method(Trilogy, "ping", rb_trilogy_ping, 0);
     rb_define_method(Trilogy, "escape", rb_trilogy_escape, 1);
     rb_define_method(Trilogy, "close", rb_trilogy_close, 0);
+    rb_define_method(Trilogy, "closed?", rb_trilogy_closed, 0);
     rb_define_method(Trilogy, "last_insert_id", rb_trilogy_last_insert_id, 0);
     rb_define_method(Trilogy, "affected_rows", rb_trilogy_affected_rows, 0);
     rb_define_method(Trilogy, "warning_count", rb_trilogy_warning_count, 0);

data/ext/trilogy-ruby/inc/trilogy/builder.h

@@ -26,7 +26,7 @@ typedef struct {
  * buffer  - A pre-initialized trilogy_buffer_t pointer
  * seq     - The initial sequence number for the packet to be built. This is
  *           the initial number because the builder API will automatically
- *           split buffers that are larger than TRILOGY_MAX_PROTO_PACKET_LEN into
+ *           split buffers that are larger than TRILOGY_MAX_PACKET_LEN into
  *           multiple packets and increment the sequence number in each packet
  *           following the initial.
  *

data/ext/trilogy-ruby/inc/trilogy/protocol.h

@@ -370,11 +370,6 @@ typedef enum {
 #undef XX
 } TRILOGY_COLUMN_FLAG_t;
 
-/*
- * Data between client and server is exchanged in packets of max 16MByte size.
- */
-#define TRILOGY_MAX_PROTO_PACKET_LEN 0xffffff
-
 // Typical response packet types
 typedef enum {
     TRILOGY_PACKET_OK = 0x0,

data/ext/trilogy-ruby/src/protocol.c

@@ -261,16 +261,7 @@ int trilogy_parse_handshake_packet(const uint8_t *buff, size_t len, trilogy_hand
     // This space is reserved. It should be all NULL bytes but some tools or
     // future versions of MySQL-compatible clients may use it. This library
     // opts to skip the validation as some servers don't respect the protocol.
-    //
-    static const uint8_t null_filler[10] = {0};
-
-    const void *str;
-    CHECKED(trilogy_reader_get_buffer(&reader, 10, &str));
-
-    if (memcmp(str, null_filler, 10) != 0) {
-        // corrupt handshake packet
-        return TRILOGY_PROTOCOL_VIOLATION;
-    }
+    CHECKED(trilogy_reader_get_buffer(&reader, 10, NULL));
 
     if (out_packet->capabilities & TRILOGY_CAPABILITIES_SECURE_CONNECTION && auth_data_len > 8) {
         uint8_t remaining_auth_data_len = auth_data_len - 8;
@@ -579,10 +570,12 @@ int trilogy_build_auth_switch_response_packet(trilogy_builder_t *builder, const
     unsigned int auth_response_len = 0;
     uint8_t auth_response[EVP_MAX_MD_SIZE];
 
-    if (!strcmp("caching_sha2_password", auth_plugin)) {
-        trilogy_pack_scramble_sha2_hash(scramble, pass, pass_len, auth_response, &auth_response_len);
-    } else {
-        trilogy_pack_scramble_native_hash(scramble, pass, pass_len, auth_response, &auth_response_len);
+    if (pass_len > 0) {
+        if (!strcmp("caching_sha2_password", auth_plugin)) {
+            trilogy_pack_scramble_sha2_hash(scramble, pass, pass_len, auth_response, &auth_response_len);
+        } else {
+            trilogy_pack_scramble_native_hash(scramble, pass, pass_len, auth_response, &auth_response_len);
+        }
     }
 
     CHECKED(trilogy_builder_write_buffer(builder, auth_response, auth_response_len));

data/lib/trilogy/version.rb

@@ -1,3 +1,3 @@
 class Trilogy
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trilogy
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - GitHub Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler