trilogy 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79779c19d22b6a05581eba7135cf2fd588a64ee33b59c8caf82a4dc51277bf5f
-  data.tar.gz: 48c88ac7fe38563810abc4f21858758f9b54f102b4abb63c81d0a41f4bd0a687
+  metadata.gz: af92055f653afc0f6a507574ae9d1e0dd41ef2bc17519d01521d64075501187d
+  data.tar.gz: b056dbc89c70f108d0038019a0da1cd80782f4b6405ffd1eb58b8ed86acaa5b4
 SHA512:
-  metadata.gz: ab915961914de4e0ed847b93aae3357fe328186cd0fdf602f322c379bdd15a3d1aa935535783bfce892cb5013b41c841581c83c42ea248cc6ff0efd7abd2d6eb
-  data.tar.gz: 6865a1c5b9c96ff4d4eefda88cc771aff23b3ff6db8534767edbdba4a929eec1f42184ae845fe02664c1e6b8c64c72aa52f5948233d8ca35f57c510c60ef42a9
+  metadata.gz: 5482a88724d329914717b423d9fd1d5ae71818a17b4104122c7c5a2f4cabd77df37e12808644a23d9dc58b9b8a728e00c486072de6e36f2d508531361a794185
+  data.tar.gz: 66e9a9c02a948844d8e806761f1c3993d4e932ebbaa59b31acb686c60044406390f3e46df364860474326bca26f68406cf8abb57bd9fb75f8d95e27c3f54bdc2

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/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,22 +261,15 @@ 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;
 
-        if (remaining_auth_data_len > 13) {
-            remaining_auth_data_len = 13;
+        // The auth plugins we support all provide exactly 21 bytes of
+        // auth_data. Reject any other values for auth_data_len.
+        if (SCRAMBLE_LEN + 1 != auth_data_len) {
+            return TRILOGY_PROTOCOL_VIOLATION;
         }
 
         CHECKED(trilogy_reader_copy_buffer(&reader, remaining_auth_data_len, out_packet->scramble + 8));
@@ -577,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.0"
+  VERSION = "2.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trilogy
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - GitHub Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A friendly MySQL-compatible library for Ruby, binding to libtrilogy