nonnative 2.11.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 304dcea40b84eda206fe9964fe1479a54e0188f52f2a5300dbcf992101cab2b3
-  data.tar.gz: a6adb1b816c424709ab337d1b845dd106ff5141ddb6f26bfe73318c4f51bed23
+  metadata.gz: 4bf1427ceb9bd3e1a93d7879934477938eb677a12f1687439e99d477ed32ddfa
+  data.tar.gz: c8db117445b7de2b9f16eec5fb36839aeeb6b0496f4e8077d9ce70852fe2b303
 SHA512:
-  metadata.gz: a7d8afad5ad7ff9b550c67fe73a683da85ae1bcfa611e0b25b0d570f44ebd5beba47ab50287d58206a51d6d61722bf42ae893929d2c4a99d5ea53b2e033fae91
-  data.tar.gz: 506907d924a16c49d583a91e78a7c6e17bb03e3e5d879f00f43e8d4313fb57957bf545538d2953d056ab0c3eecb94ff29ab9a1af22547c890c1a1e56e3f0335c
+  metadata.gz: a0c388775687f4f0832200cddf41def76228097216a80485554ed1874be54a66564946c3bdde65b3c78ce651c6664794c83d8b59e66c24e1719fb0c482295f08
+  data.tar.gz: 150f9db8f08b7ef7ea0697be96e1f4a4c779b3674d66283a7461b0f3037fc448baa3886d42f8984ddee47190ed3269d9c659badb7b333da859ce31e685c82a47

data/.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: alexfalkowski/ruby:2.4
+      - image: alexfalkowski/ruby:2.5
     working_directory: ~/nonnative
     steps:
       - checkout:
@@ -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:
@@ -35,7 +35,7 @@ jobs:
     resource_class: arm.large
   sync:
     docker:
-      - image: alexfalkowski/release:7.5
+      - image: alexfalkowski/release:7.6
     working_directory: ~/nonnative
     steps:
       - checkout:
@@ -46,7 +46,7 @@ jobs:
     resource_class: arm.large
   version:
     docker:
-      - image: alexfalkowski/release:7.5
+      - image: alexfalkowski/release:7.6
     working_directory: ~/nonnative
     steps:
       - checkout:
@@ -58,7 +58,7 @@ jobs:
     resource_class: arm.large
   wait-all:
     docker:
-      - image: alexfalkowski/ruby:2.4
+      - image: alexfalkowski/ruby:2.5
     steps:
       - run: echo "all applicable jobs finished"
     resource_class: arm.large

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    nonnative (2.11.0)
+    nonnative (2.13.0)
       concurrent-ruby (>= 1, < 2)
       config (>= 5, < 6)
-      cucumber (>= 7, < 11)
+      cucumber (>= 7, < 12)
       cucumber-cucumber-expressions (< 19)
       get_process_mem (>= 1, < 2)
       grpc (>= 1, < 2)
@@ -30,18 +30,18 @@ GEM
     config (5.6.1)
       deep_merge (~> 1.2, >= 1.2.1)
       ostruct
-    cucumber (10.2.0)
+    cucumber (11.0.0)
       base64 (~> 0.2)
       builder (~> 3.2)
       cucumber-ci-environment (> 9, < 12)
-      cucumber-core (> 15, < 17)
+      cucumber-core (>= 16.2.0, < 17)
       cucumber-cucumber-expressions (> 17, < 20)
-      cucumber-html-formatter (> 21, < 23)
+      cucumber-html-formatter (> 21, < 24)
       diff-lcs (~> 1.5)
       logger (~> 1.6)
       mini_mime (~> 1.1)
       multi_test (~> 1.1)
-      sys-uname (~> 1.3)
+      sys-uname (~> 1.5)
     cucumber-ci-environment (11.0.0)
     cucumber-core (16.2.0)
       cucumber-gherkin (> 36, < 40)
@@ -51,9 +51,9 @@ GEM
       bigdecimal
     cucumber-gherkin (39.0.0)
       cucumber-messages (>= 31, < 33)
-    cucumber-html-formatter (22.3.0)
+    cucumber-html-formatter (23.1.0)
       cucumber-messages (> 23, < 33)
-    cucumber-messages (32.2.0)
+    cucumber-messages (32.3.1)
     cucumber-tag-expressions (8.1.0)
     deep_merge (1.2.2)
     diff-lcs (1.6.2)
@@ -97,7 +97,7 @@ GEM
     netrc (0.11.0)
     nio4r (2.7.5)
     ostruct (0.6.3)
-    parallel (1.28.0)
+    parallel (2.0.1)
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
@@ -147,11 +147,11 @@ GEM
     rspec-support (3.13.7)
     rspec-wait (1.0.2)
       rspec (>= 3.4)
-    rubocop (1.86.0)
+    rubocop (1.86.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)

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.13.0'
 end

data/nonnative.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'concurrent-ruby', '>= 1', '< 2'
   spec.add_dependency 'config', '>= 5', '< 6'
-  spec.add_dependency 'cucumber', '>= 7', '< 11'
+  spec.add_dependency 'cucumber', '>= 7', '< 12'
   spec.add_dependency 'cucumber-cucumber-expressions', '< 19'
   spec.add_dependency 'get_process_mem', '>= 1', '< 2'
   spec.add_dependency 'grpc', '>= 1', '< 2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nonnative
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Alejandro Falkowski
@@ -58,7 +58,7 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ dependencies:
         version: '7'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: cucumber-cucumber-expressions
   requirement: !ruby/object:Gem::Requirement