rex-socket 0.1.53 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4e2765900a58243437c2588d16bc2c3fcd65b58f042707a1ebca28d2240786d
-  data.tar.gz: b7e46d8ab59b275872e48c418de39f07c615a2fdc480ad7ce0a8cf033eb5297f
+  metadata.gz: 0d6178ec17a488e30e67e5f38c47a37ef101779a01819acc9fe5f0e77e21137a
+  data.tar.gz: 850e34b302ac851ef01ed341fdb361e60c6256a3be7ebec6f52398046884b041
 SHA512:
-  metadata.gz: 87cdca34534ff3ba9c085659200b40f71802ea51bc023e82bd918df19c3e5b70b2f9132dd954d121655d21a90e2a32bbea0fbed48543877f22ca404cac4d3ee9
-  data.tar.gz: 3bb326d55b4b6c3f6741df0bcf6073b329bba6934e5a5ac45cae1a6716b53301f1d8b3bebc80d40de0ed1c55a67e5c6fc37846fe5eb9524f294d373b6fc984c8
+  metadata.gz: 0e6be5fbc26e756be673e373c521ddac5b1b98a999ee5c78d9d9d009a68d9de1d5a40f2915ebb226a0349c4dd097d76779c2181396be31756f2a95c77f0fabff
+  data.tar.gz: 9bcd47ba675dd95f6eb4d5164e94ed5c82d1ac0f36513a20b2c77a37089f6a3cbe0705027ad363e153a700e45e9493b449e6659dc73e6256d20e83188e15c089

data/.github/workflows/verify.yml

@@ -30,7 +30,7 @@ jobs:
     timeout-minutes: 40
 
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         ruby:
           - '2.7'
@@ -39,20 +39,20 @@ jobs:
           - '3.2'
         os:
           - ubuntu-20.04
+          - windows-2019
+          - macos-11
           - ubuntu-latest
         exclude:
           - { os: ubuntu-latest, ruby: '2.7' }
           - { os: ubuntu-latest, ruby: '3.0' }
-        test_cmd:
-          - bundle exec rspec
 
     env:
       RAILS_ENV: test
 
-    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }} - ${{ matrix.test_cmd }}
+    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -60,9 +60,6 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
-      - name: ${{ matrix.test_cmd }}
+      - name: rspec
         run: |
-          echo "${CMD}"
-          bash -c "${CMD}"
-        env:
-          CMD: ${{ matrix.test_cmd }}
+          bundle exec rspec

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.53"
+    VERSION = "0.1.54"
   end
 end

data/lib/rex/socket.rb

@@ -672,37 +672,57 @@ module Socket
   #       is no concurrent use of the same locals and this is safe.
   def self.tcp_socket_pair
     lsock   = nil
+    last_child_error = nil
+    accept_timeout = 10
     rsock   = nil
     laddr   = '127.0.0.1'
     lport   = 0
     threads = []
     mutex   = ::Mutex.new
 
-    threads << Rex::ThreadFactory.spawn('TcpSocketPair', false) {
+    threads << Rex::ThreadFactory.spawn('TcpSocketPair', false) do
       server = nil
-      mutex.synchronize {
-        threads << Rex::ThreadFactory.spawn('TcpSocketPairClient', false) {
-          mutex.synchronize {
-            rsock = ::TCPSocket.new( laddr, lport )
-          }
-        }
-        server = ::TCPServer.new(laddr, 0)
-        if (server.getsockname =~ /127\.0\.0\.1:/)
-          # JRuby ridiculousness
-          caddr, lport = server.getsockname.split(":")
-          caddr = caddr[1,caddr.length]
-          lport = lport.to_i
+      begin
+        mutex.synchronize do
+          threads << Rex::ThreadFactory.spawn('TcpSocketPairClient', false) do
+            mutex.synchronize do
+              begin
+                rsock = ::TCPSocket.new( laddr, lport )
+              rescue => e
+                last_child_error = "#{e.class} - #{e.message}"
+                raise
+              end
+            end
+          end
+          server = ::TCPServer.new(laddr, 0)
+          if (server.getsockname =~ /127\.0\.0\.1:/)
+            # JRuby ridiculousness
+            caddr, lport = server.getsockname.split(":")
+            caddr = caddr[1,caddr.length]
+            lport = lport.to_i
+          else
+            # Sane implementations where Socket#getsockname returns a
+            # sockaddr
+            lport, caddr = ::Socket.unpack_sockaddr_in( server.getsockname )
+          end
+        end
+
+        readable, _writable, _errors = ::IO.select([server], nil, nil, accept_timeout)
+        if readable && readable.any?
+          lsock, _ = server.accept_nonblock
         else
-          # Sane implementations where Socket#getsockname returns a
-          # sockaddr
-          lport, caddr = ::Socket.unpack_sockaddr_in( server.getsockname )
+          raise RuntimeError, "rsock didn't connect in #{accept_timeout} seconds"
         end
-      }
-      lsock, _ = server.accept
-      server.close
-    }
+      ensure
+        server.close if server
+      end
+    end
 
-    threads.each { |t| t.join }
+    threads.each.with_index do |thread, i|
+      thread.join
+    rescue => e
+      raise "Thread #{i} - error #{e} - last child error: #{last_child_error}"
+    end
 
     return [lsock, rsock]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.53
+  version: 0.1.54
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake