rex-socket 0.1.46 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0b0474613c0bf2b204e3ebfc5f50b29b72ea6af1f98a4bd3e125d86a97aa295
-  data.tar.gz: c01ea0331c2640f4283cbfa08baec9e44e216045e175a0a2ff5737a5483766ff
+  metadata.gz: 6894414c673fee731f0c6bcfc869f8cf31e80d0fdb1f4c8fe7e9ef3392240f87
+  data.tar.gz: c18cb6da9934c2b7ff1702672fb34e43ecddea590578e60ad7dddc557650aa64
 SHA512:
-  metadata.gz: 7b71fa7bbec1a4e63d95518939742d3f1f8ee8114ee772efcce477953bfa6fce3405c0f9ed6c8818aeaca296072c4034e69e236f5eb5b10f39124e8ab21482b2
-  data.tar.gz: b0b74b486a3416aca4c9cfdd974b670f62dfa51ca7d55a28fae7c56265129f0f9bf71a75a57f800aca4e83550b5b076e2e565c791e52a256fc2745246f6d1e85
+  metadata.gz: d8e9050d6776686079e75d45ec3541f84de8adfbf416687b95e6a659afe9ed9cb439e808caec9022e78328562362ea4b7abf6aee858c584644a913011de264a4
+  data.tar.gz: 705a73fe6836686aab49e49678a3131fa07dbdbe1925974d7280820b1275447908c29d36c21bfe714501526ba4ea40564a699c7e18e5105b5ec925a3653e7bc0

data/lib/rex/socket/comm/local.rb

@@ -6,6 +6,8 @@ require 'rex/socket/tcp'
 require 'rex/socket/ssl_tcp'
 require 'rex/socket/ssl_tcp_server'
 require 'rex/socket/udp'
+require 'rex/socket/sctp'
+require 'rex/socket/sctp_server'
 require 'rex/socket/ip'
 require 'timeout'
 
@@ -34,6 +36,8 @@ class Rex::Socket::Comm::Local
         return create_by_type(param, ::Socket::SOCK_STREAM, ::Socket::IPPROTO_TCP)
       when 'udp'
         return create_by_type(param, ::Socket::SOCK_DGRAM, ::Socket::IPPROTO_UDP)
+      when 'sctp'
+        return create_by_type(param, ::Socket::SOCK_STREAM, ::Socket::IPPROTO_SCTP)
       when 'ip'
         return create_ip(param)
       else
@@ -194,15 +198,21 @@ class Rex::Socket::Comm::Local
       sock.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_BROADCAST, true)
     end
 
-    # If a server TCP instance is being created...
+    # If a server instance is being created...
     if param.server?
       sock.listen(256)
 
       if !param.bare?
-        klass = Rex::Socket::TcpServer
-        if param.ssl
-          klass = Rex::Socket::SslTcpServer
-        end
+        if param.proto == 'tcp'
+          klass = Rex::Socket::TcpServer
+          if param.ssl
+            klass = Rex::Socket::SslTcpServer
+          end
+        elsif param.proto == 'sctp'
+            klass = Rex::Socket::SctpServer
+        else
+          raise Rex::BindFailed.new(param.localhost, param.localport), caller
+        end  
         sock.extend(klass)
 
         sock.initsock(param)
@@ -309,6 +319,9 @@ class Rex::Socket::Comm::Local
           when 'udp'
             sock.extend(Rex::Socket::Udp)
             sock.initsock(param)
+          when 'sctp'
+            sock.extend(Rex::Socket::Sctp)
+            sock.initsock(param)
         end
       end
 

data/lib/rex/socket/range_walker.rb

@@ -540,8 +540,11 @@ end
 class Host < Range
   attr_accessor :hostname
 
-  def initialize(address, hostname=nil, options=nil)
-    address = Rex::Socket.addr_atoi(address) if address.is_a? String
+  def initialize(address, hostname=nil, options={})
+    if address.is_a? String
+      options.merge!({ ipv6: Rex::Socket.is_ipv6?(address) }) if options[:ipv6].nil?
+      address = Rex::Socket.addr_atoi(address)
+    end
 
     super(address, address, options)
     @hostname = hostname

data/lib/rex/socket/sctp.rb

@@ -0,0 +1,66 @@
+# -*- coding: binary -*-
+require 'rex/socket'
+require 'rex/io/stream'
+
+class ::Socket
+  IPPROTO_SCTP = 132
+  SOL_SCTP     = 132
+end
+
+###
+#
+# This class provides methods for interacting with a SCTP client connection.
+#
+###
+module Rex::Socket::Sctp
+
+  include Rex::Socket
+  include Rex::IO::Stream
+
+  ##
+  #
+  # Factory
+  #
+  ##
+
+  #
+  # Creates the client using the supplied hash.
+  #
+  # @see create_param
+  # @see Rex::Socket::Parameters.from_hash
+  def self.create(hash = {})
+    hash['Proto'] = 'sctp'
+    self.create_param(Rex::Socket::Parameters.from_hash(hash))
+  end
+
+  #
+  # Wrapper around the base socket class' creation method that automatically
+  # sets the parameter's protocol to SCTP.
+  #
+  def self.create_param(param)
+    param.proto = 'sctp'
+    Rex::Socket.create_param(param)
+  end
+
+  ##
+  #
+  # Stream mixin implementations
+  #
+  ##
+
+  #
+  # Calls shutdown on the SCTP connection.
+  #
+  def shutdown(how = ::Socket::SHUT_RDWR)
+    begin
+      return (super(how) == 0)
+    rescue ::Exception
+    end
+  end
+
+  # returns socket type
+  def type?
+    return 'sctp'
+  end
+
+end

data/lib/rex/socket/sctp_server.rb

@@ -0,0 +1,75 @@
+# -*- coding: binary -*-
+require 'rex/socket'
+require 'rex/socket/sctp'
+require 'rex/io/stream_server'
+
+###
+#
+# This class provides methods for interacting with a SCTP server.  It
+# implements the Rex::IO::StreamServer interface.
+#
+###
+module  Rex::Socket::SctpServer
+
+  include Rex::Socket
+  include Rex::IO::StreamServer
+
+  ##
+  #
+  # Factory
+  #
+  ##
+
+  #
+  # Creates the server using the supplied hash.
+  #
+  def self.create(hash = {})
+    hash['Proto'] = 'sctp'
+    hash['Server'] = true
+    self.create_param(Rex::Socket::Parameters.from_hash(hash))
+  end
+
+  #
+  # Wrapper around the base class' creation method that automatically sets
+  # the parameter's protocol to SCTP and sets the server flag to true.
+  #
+  def self.create_param(param)
+    param.proto  = 'sctp'
+    param.server = true
+    Rex::Socket.create_param(param)
+  end
+
+  #
+  # Accepts a child connection.
+  #
+  def accept(opts = {})
+    t = super()
+
+    # jRuby compatibility
+    if t.respond_to?('[]')
+      t = t[0]
+    end
+
+    if (t)
+      t.extend(Rex::Socket::Sctp)
+      t.context = self.context
+
+      pn = t.getpeername_as_array
+
+      # We hit a "getpeername(2)" from Ruby
+      return nil unless pn
+
+      t.peerhost = pn[1]
+      t.peerport = pn[2]
+
+      ln = t.getlocalname
+
+      t.localhost = ln[1]
+      t.localport = ln[2]
+    end
+
+    t
+  end
+
+end
+

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.46"
+    VERSION = "0.1.48"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.46
+  version: 0.1.48
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2023-01-31 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -163,6 +163,8 @@ files:
 - lib/rex/socket/ip.rb
 - lib/rex/socket/parameters.rb
 - lib/rex/socket/range_walker.rb
+- lib/rex/socket/sctp.rb
+- lib/rex/socket/sctp_server.rb
 - lib/rex/socket/ssh_factory.rb
 - lib/rex/socket/ssl.rb
 - lib/rex/socket/ssl_tcp.rb