rex-socket 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63508bcf572f70073bf97d0e02fefc113862dd596c349b698efadeaa39e1e684
-  data.tar.gz: fc699f97f15cdf6301d484b5c26532c9177a4e58d4bef99ca9b7b4bd0833c8d8
+  metadata.gz: b0bf99960d66db7491db5490f75d4c87a8bfde429dcc76a4e4e1d07306cf61b8
+  data.tar.gz: 7e665ba1dba7574c1fa7adb9523b9e8781daff17185daef8300cc0d1f5cd8d0b
 SHA512:
-  metadata.gz: e5e7ea9a929fa979e8155da874b4bb1f5f1f10157e4ce017e65a8384b7e6deb86e1b5b87e3513959e9fe306b9be8bf7ef0ec5472a865722c4cbb6dce7ee463af
-  data.tar.gz: 34080d04f0950a7bfb43189c98390ed8e72dea4167b2f4bfa0ec186bd5ae2ce57cfcaff07788e34fc8ab9418c52861a5c2057668f42408b6619cb23e3526916b
+  metadata.gz: a15da2ba7b185bf822db6f467fde6ae641008861f2758c865b9c66b524904dffd02add948e18cb544105747aaf8ce5f90f3083c8eaa18ac84284917ff29fe9cf
+  data.tar.gz: c6585bddb9cc7b52f29f3d9f193200132801fbb141162550f9d6a9553af51a853a3946c3c42fca55dbaed217a88cd68372066db5d76a8bcbc356a780c6bde61a

data/.github/workflows/verify.yml

@@ -0,0 +1,57 @@
+name: Verify
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - '*'
+
+jobs:
+  test:
+    runs-on: ubuntu-16.04
+    timeout-minutes: 40
+
+    strategy:
+      fail-fast: true
+      matrix:
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0
+        test_cmd:
+          - bundle exec rspec
+
+    env:
+      RAILS_ENV: test
+
+    name: Ruby ${{ matrix.ruby }} - ${{ matrix.test_cmd }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Setup bundler
+        run: |
+          gem install bundler
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+      - name: Bundle install
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: ${{ matrix.test_cmd }}
+        run: |
+          echo "${CMD}"
+          bash -c "${CMD}"
+        env:
+          CMD: ${{ matrix.test_cmd }}

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rex-socket.gemspec
 gemspec
+
+group :development do
+  gem 'pry-byebug'
+end

data/lib/rex/socket.rb

@@ -174,7 +174,7 @@ module Socket
   end
 
   #
-  # Wrapper for +::Socket.gethostbyname+ that takes special care to see if the
+  # Wrapper for +::Addrinfo.getaddrinfo+ that takes special care to see if the
   # supplied address is already an ASCII IP address.  This is necessary to
   # prevent blocking while waiting on a DNS reverse lookup when we already
   # have what we need.
@@ -186,26 +186,14 @@ module Socket
       return [hostname]
     end
 
-    res = ::Socket.gethostbyname(hostname)
-    return [] if not res
+    res = ::Addrinfo.getaddrinfo(hostname, 0, ::Socket::AF_UNSPEC, ::Socket::SOCK_STREAM)
 
-    # Shift the first three elements out, leaving just the list of
-    # addresses
-    res.shift # name
-    res.shift # alias hostnames
-    res.shift # address_family
+    res.map! do |address_info|
+      address_info.ip_address
+    end
 
-    # Rubinius has a bug where gethostbyname returns dotted quads instead of
-    # NBO, but that's what we want anyway, so just short-circuit here.
-    if res[0] =~ MATCH_IPV4 || res[0] =~ MATCH_IPV6
-      unless accept_ipv6
-        res.reject!{ |ascii| ascii =~ MATCH_IPV6 }
-      end
-    else
-      unless accept_ipv6
-        res.reject!{ |nbo| nbo.length != 4 }
-      end
-      res.map!{ |nbo| self.addr_ntoa(nbo) }
+    unless accept_ipv6
+      res.reject! { |ascii| ascii =~ MATCH_IPV6 }
     end
 
     res
@@ -217,7 +205,9 @@ module Socket
   # not occur.  This is done in order to prevent delays, such as would occur
   # on Windows.
   #
+  # @deprecated Please use {#getaddress}, {#resolv_nbo}, or similar instead.
   def self.gethostbyname(host)
+    warn "NOTE: #{self}.#{__method__} is deprecated, use getaddress, resolve_nbo, or similar instead. It will be removed in the next Major version"
     if is_ipv4?(host)
       return [ host, [], 2, host.split('.').map{ |c| c.to_i }.pack("C4") ]
     end
@@ -259,15 +249,18 @@ module Socket
   #
   # Resolves a host to raw network-byte order.
   #
-  def self.resolv_nbo(host)
-    self.gethostbyname( Rex::Socket.getaddress(host, true) )[3]
+  def self.resolv_nbo(host, accepts_ipv6 = true)
+    ip_address = Rex::Socket.getaddress(host, accepts_ipv6)
+    IPAddr.new(ip_address).hton
   end
 
   #
   # Resolves a host to raw network-byte order.
   #
   def self.resolv_nbo_list(host)
-    Rex::Socket.getaddresses(host).map{|addr| self.gethostbyname(addr)[3] }
+    Rex::Socket.getaddresses(host).map do |addresses|
+      IPAddr.new(addresses).hton
+    end
   end
 
   #

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.25"
+    VERSION = "0.1.26"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -147,9 +147,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/verify.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE

data/.travis.yml

@@ -1,6 +0,0 @@
-sudo: false
-group: stable
-cache: bundler
-language: ruby
-rvm:
-  - 2.7.2