nonnative 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 304dcea40b84eda206fe9964fe1479a54e0188f52f2a5300dbcf992101cab2b3
-  data.tar.gz: a6adb1b816c424709ab337d1b845dd106ff5141ddb6f26bfe73318c4f51bed23
+  metadata.gz: 37bb994055052e4b4e901466b837ba3b74944340a32abf820cebe66dc8fd7f37
+  data.tar.gz: 5c99b070397381627c5543189f9cc107c089a1b886a3144423a083c77e13960a
 SHA512:
-  metadata.gz: a7d8afad5ad7ff9b550c67fe73a683da85ae1bcfa611e0b25b0d570f44ebd5beba47ab50287d58206a51d6d61722bf42ae893929d2c4a99d5ea53b2e033fae91
-  data.tar.gz: 506907d924a16c49d583a91e78a7c6e17bb03e3e5d879f00f43e8d4313fb57957bf545538d2953d056ab0c3eecb94ff29ab9a1af22547c890c1a1e56e3f0335c
+  metadata.gz: f1f3a920b31c3d77b16b73e6c63bd8adc0f1b2029db821186879ea6fb25daff094970f9dccdea8285c23bbf074cf081626d51847b447255c910a79049dec6965
+  data.tar.gz: 93c9efe976dea298fbfd0e187b125991945e715d59fc55c05d7f692c38f90fa8e0e60fa2283cfdec7f89e580253824bae6139e37ddbcf519581ea25979c9e050

data/.circleci/config.yml

@@ -25,8 +25,8 @@ jobs:
             - vendor
       - run: make lint
       - run: make sec
-      - run: COVERAGE_NAME="Features" make features
-      - run: COVERAGE_NAME="Benchmarks" make benchmarks
+      - run: make features
+      - run: make benchmarks
       - store_test_results:
           path: test/reports
       - store_artifacts:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nonnative (2.11.0)
+    nonnative (2.12.0)
       concurrent-ruby (>= 1, < 2)
       config (>= 5, < 6)
       cucumber (>= 7, < 11)

data/lib/nonnative/invalid_data_socket_pair.rb

@@ -3,8 +3,8 @@
 module Nonnative
   # Socket-pair variant used by the fault-injection proxy to simulate corrupted/incoherent traffic.
   #
-  # When active, data written to the upstream socket is corrupted by shuffling the payload bytes
-  # before forwarding.
+  # When active, client requests still pass through unchanged, but responses flowing back from the
+  # upstream socket are corrupted before they reach the client.
   #
   # This behavior is enabled by calling {Nonnative::FaultInjectionProxy#invalid_data}.
   #
@@ -12,16 +12,28 @@ module Nonnative
   # @see Nonnative::SocketPairFactory
   # @see Nonnative::SocketPair
   class InvalidDataSocketPair < SocketPair
-    # Writes corrupted data to the socket by shuffling bytes.
+    LINE_DELIMITERS = ["\r\n", "\n", "\r"].freeze
+
+    # Track the accepted client socket so we can corrupt only the response path.
+    def connect(local_socket)
+      @local_socket = local_socket
+
+      super
+    ensure
+      @local_socket = nil
+    end
+
+    # Writes corrupted data to the socket by mutating payload bytes.
     #
-    # The payload must always change, otherwise short or repetitive inputs such as "test" can
-    # occasionally pass through unchanged and make fault-injection scenarios flaky.
+    # Client requests are forwarded unchanged so the upstream service can still parse them.
+    # Responses flowing back to the client are corrupted in-place, which keeps line-based clients
+    # from hanging while ensuring echoed data does not come back unchanged.
     #
     # @param socket [IO] the socket to write to
     # @param data [String] the original payload
     # @return [Integer] number of bytes written
     def write(socket, data)
-      Nonnative.logger.info "shuffling socket data '#{socket.inspect}' for 'invalid_data' pair"
+      return super unless socket.equal?(@local_socket)
 
       super(socket, corrupt(data))
     end
@@ -29,40 +41,18 @@ module Nonnative
     private
 
     def corrupt(data)
-      payload, delimiter = split_trailing_delimiter(data)
-      return "\0#{delimiter}" if payload.empty?
-
-      "#{corrupt_payload(payload)}#{delimiter}"
-    end
-
-    def split_trailing_delimiter(data)
-      index = trailing_delimiter_start(data)
-      payload = data.byteslice(0, index)
-      delimiter = data.byteslice(index, data.bytesize - index) || ''
+      # Preserve a final line ending so line-oriented clients still finish their reads.
+      delimiter = LINE_DELIMITERS.find { |candidate| data.end_with?(candidate) } || ''
+      payload = data.delete_suffix(delimiter)
 
-      [payload, delimiter]
-    end
-
-    def trailing_delimiter_start(data)
-      index = data.bytesize
-
-      while index.positive?
-        byte = data.getbyte(index - 1)
-        break unless [10, 13].include?(byte)
-
-        index -= 1
-      end
-
-      index
-    end
+      # A delimiter-only response still needs one byte we can corrupt without losing the terminator.
+      payload = "\0" if payload.empty?
 
-    def corrupt_payload(payload)
-      bytes = payload.bytes
-      corrupted = bytes.shuffle
-      return corrupted.pack('C*') unless corrupted == bytes
+      # Flip the first byte so the payload is definitely wrong without mangling the whole
+      # response structure and turning an invalid response into a timeout.
+      payload.setbyte(0, payload.getbyte(0).zero? ? 1 : 0)
 
-      corrupted[0] = (corrupted[0] + 1) % 256
-      corrupted.pack('C*')
+      "#{payload}#{delimiter}"
     end
   end
 end

data/lib/nonnative/version.rb

@@ -4,5 +4,5 @@ module Nonnative
   # The current gem version.
   #
   # @return [String]
-  VERSION = '2.11.0'
+  VERSION = '2.12.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Alejandro Falkowski