rex-socket 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f946c5cc7215552b58adcf60f5311e83525b26dc
-  data.tar.gz: 284b383b909b5e670ea0cdf324342e6a1382b83e
+  metadata.gz: 902535274c4d182988dbaa9575b42dfb98fa04f4
+  data.tar.gz: b5b5ae8fed2ba779b2bb9a457f904feaf955495d
 SHA512:
-  metadata.gz: bf121014ba89e58b75ed715195b4f42696ca90bad6af254a09bd988b08d82d7f705d667419120558a314dedc8b6b9fef6caf5c17f09578ab897e910953cb74e2
-  data.tar.gz: 31a9106b784350b7da638534b42d798da001bca87d141c5531b6588b951d4304a05396aa8e5d4291bfa3a036447abb41590e4e76e4306483d68502c0cba38c8e
+  metadata.gz: 8fed81f4863ea30cda9ef78637e41f4505faf7fb077a112fb667c06add342513ddfc62e0950a3048d6658be66c35dec998910ac6e212e9e5c72333eb3a624b7b
+  data.tar.gz: 6cfd80dd79ddfe0ce788cf08aafc3eb71e866dba3555c7e8323a16efb2497228f69133a541dc6ca7813d93897c0a6010e2e05c64b438fd9682e12c5b5fbb34af

data/lib/rex/socket.rb

@@ -745,6 +745,24 @@ module Socket
     return peer_name
   end
 
+  #
+  # Returns peer information (host + port) in host:port format.
+  #
+  def peerinfo
+    if (pi = getpeername_as_array)
+      return pi[1] + ':' + pi[2].to_s
+    end 
+  end 
+
+  #
+  # Returns local information (host + port) in host:port format.
+  #
+  def localinfo
+    if (pi = getlocalname)
+      return pi[1] + ':' + pi[2].to_s
+    end 
+  end 
+
   #
   # Returns a string that indicates the type of the socket, such as 'tcp'.
   #

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

@@ -52,10 +52,10 @@ class Rex::Socket::Comm::Local
 
     case param.proto
       when 'tcp'
-        if (param.server?)
+        if param.server?
           sock  = TCPServer.new(param.localport, param.localhost)
           klass = Rex::Socket::TcpServer
-          if (param.ssl)
+          if param.ssl
             klass = Rex::Socket::SslTcpServer
           end
           sock.extend(klass)
@@ -63,13 +63,13 @@ class Rex::Socket::Comm::Local
         else
           sock = TCPSocket.new(param.peerhost, param.peerport)
           klass = Rex::Socket::Tcp
-          if (param.ssl)
+          if param.ssl
             klass = Rex::Socket::SslTcp
           end
           sock.extend(klass)
         end
       when 'udp'
-        if (param.server?)
+        if param.server?
           sock = UDPServer.new(param.localport, param.localhost)
           klass = Rex::Socket::UdpServer
           sock.extend(klass)
@@ -101,7 +101,7 @@ class Rex::Socket::Comm::Local
     # Configure broadcast support
     sock.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_BROADCAST, true)
 
-    if (param.bare? == false)
+    if !param.bare?
       sock.extend(::Rex::Socket::Ip)
       sock.initsock(param)
     end
@@ -117,59 +117,41 @@ class Rex::Socket::Comm::Local
   #
   def self.create_by_type(param, type, proto = 0)
 
-    # Whether to use IPv6 addressing
-    usev6 = false
-
     # Detect IPv6 addresses and enable IPv6 accordingly
-    if ( Rex::Socket.support_ipv6?())
-
-      # Allow the caller to force IPv6
-      if (param.v6)
-        usev6 = true
-      end
-
-      # Force IPv6 mode for non-connected UDP sockets
-      if (type == ::Socket::SOCK_DGRAM and not param.peerhost)
-        # FreeBSD allows IPv6 socket creation, but throws an error on sendto()
-        # Windows 7 SP1 and newer also fail to sendto with IPv6 udp sockets
-        unless Rex::Compat.is_freebsd or Rex::Compat.is_windows
-          usev6 = true
-        end
-      end
+    if Rex::Socket.support_ipv6?
 
       local = Rex::Socket.resolv_nbo(param.localhost) if param.localhost
       peer  = Rex::Socket.resolv_nbo(param.peerhost) if param.peerhost
 
-      if (local and local.length == 16)
-        usev6 = true
-      end
+      # Enable IPv6 dual-bind mode for unbound UDP sockets on Linux
+      if type == ::Socket::SOCK_DGRAM && Rex::Compat.is_linux && !local && !peer
+        param.v6 = true
 
-      if (peer and peer.length == 16)
-        usev6 = true
+      # Check if either of the addresses is 16 octets long
+      elsif (local && local.length == 16) || (peer && peer.length == 16)
+        param.v6 = true
       end
 
-      if (usev6)
-        if (local and local.length == 4)
-          if (local == "\x00\x00\x00\x00")
+      if param.v6
+        if local && local.length == 4
+          if local == "\x00\x00\x00\x00"
             param.localhost = '::'
-          elsif (local == "\x7f\x00\x00\x01")
+          elsif local == "\x7f\x00\x00\x01"
             param.localhost = '::1'
           else
             param.localhost = '::ffff:' + Rex::Socket.getaddress(param.localhost, true)
           end
         end
 
-        if (peer and peer.length == 4)
-          if (peer == "\x00\x00\x00\x00")
+        if peer && peer.length == 4
+          if peer == "\x00\x00\x00\x00"
             param.peerhost = '::'
-          elsif (peer == "\x7f\x00\x00\x01")
+          elsif peer == "\x7f\x00\x00\x01"
             param.peerhost = '::1'
           else
             param.peerhost = '::ffff:' + Rex::Socket.getaddress(param.peerhost, true)
           end
         end
-
-        param.v6 = true
       end
     else
       # No IPv6 support
@@ -181,16 +163,23 @@ class Rex::Socket::Comm::Local
 
     # Create the socket
     sock = nil
-    if (param.v6)
+    if param.v6
       sock = ::Socket.new(::Socket::AF_INET6, type, proto)
     else
       sock = ::Socket.new(::Socket::AF_INET, type, proto)
     end
 
     # Bind to a given local address and/or port if they are supplied
-    if param.localport or param.localhost
+    if param.localport || param.localhost
       begin
-        sock.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEADDR, true)
+
+        # SO_REUSEADDR has undesired semantics on Windows, intead allowing
+        # sockets to be stolen without warning from other unprotected
+        # processes.
+        unless Rex::Compat.is_windows
+          sock.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_REUSEADDR, true)
+        end
+
         sock.bind(Rex::Socket.to_sockaddr(param.localhost, param.localport))
 
       rescue ::Errno::EADDRNOTAVAIL,::Errno::EADDRINUSE
@@ -200,17 +189,17 @@ class Rex::Socket::Comm::Local
     end
 
     # Configure broadcast support for all datagram sockets
-    if (type == ::Socket::SOCK_DGRAM)
+    if type == ::Socket::SOCK_DGRAM
       sock.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_BROADCAST, true)
     end
 
     # If a server TCP instance is being created...
-    if (param.server?)
+    if param.server?
       sock.listen(256)
 
-      if (param.bare? == false)
+      if !param.bare?
         klass = Rex::Socket::TcpServer
-        if (param.ssl)
+        if param.ssl
           klass = Rex::Socket::SslTcpServer
         end
         sock.extend(klass)
@@ -222,7 +211,7 @@ class Rex::Socket::Comm::Local
       chain = []
 
       # If we were supplied with host information
-      if (param.peerhost)
+      if param.peerhost
 
         # A flag that indicates whether we need to try multiple scopes
         retry_scopes = false
@@ -310,7 +299,7 @@ class Rex::Socket::Comm::Local
         end
       end
 
-      if (param.bare? == false)
+      if !param.bare?
         case param.proto
           when 'tcp'
             klass = Rex::Socket::Tcp
@@ -422,7 +411,7 @@ class Rex::Socket::Comm::Local
     when 'http'
       setup = "CONNECT #{host}:#{port} HTTP/1.0\r\n\r\n"
       size = sock.put(setup)
-      if (size != setup.length)
+      if size != setup.length
         raise Rex::ConnectionProxyError.new(host, port, type, "Failed to send the entire request to the proxy"), caller
       end
 
@@ -445,7 +434,7 @@ class Rex::Socket::Comm::Local
     when 'socks4'
       setup = [4,1,port.to_i].pack('CCn') + Socket.gethostbyname(host)[3] + Rex::Text.rand_text_alpha(rand(8)+1) + "\x00"
       size = sock.put(setup)
-      if (size != setup.length)
+      if size != setup.length
         raise Rex::ConnectionProxyError.new(host, port, type, "Failed to send the entire request to the proxy"), caller
       end
 
@@ -455,7 +444,7 @@ class Rex::Socket::Comm::Local
         raise Rex::ConnectionProxyError.new(host, port, type, "Failed to receive a response from the proxy"), caller
       end
 
-      if (ret.nil? or ret.length < 8)
+      if ret.nil? || ret.length < 8
         raise Rex::ConnectionProxyError.new(host, port, type, "Failed to receive a complete response from the proxy"), caller
       end
       if ret[1,1] != "\x5a"
@@ -464,18 +453,18 @@ class Rex::Socket::Comm::Local
     when 'socks5'
       auth_methods = [5,1,0].pack('CCC')
       size = sock.put(auth_methods)
-      if (size != auth_methods.length)
+      if size != auth_methods.length
         raise Rex::ConnectionProxyError.new(host, port, type, "Failed to send the entire request to the proxy"), caller
       end
       ret = sock.get_once(2,30)
-      if (ret[1,1] == "\xff")
+      if ret[1,1] == "\xff"
         raise Rex::ConnectionProxyError.new(host, port, type, "The proxy requires authentication"), caller
       end
 
-      if (Rex::Socket.is_ipv4?(host))
+      if Rex::Socket.is_ipv4?(host)
         addr = Rex::Socket.gethostbyname(host)[3]
         setup = [5,1,0,1].pack('C4') + addr + [port.to_i].pack('n')
-      elsif (Rex::Socket.support_ipv6? and Rex::Socket.is_ipv6?(host))
+      elsif Rex::Socket.support_ipv6? && Rex::Socket.is_ipv6?(host)
         # IPv6 stuff all untested
         addr = Rex::Socket.gethostbyname(host)[3]
         setup = [5,1,0,4].pack('C4') + addr + [port.to_i].pack('n')
@@ -487,7 +476,7 @@ class Rex::Socket::Comm::Local
       end
 
       size = sock.put(setup)
-      if (size != setup.length)
+      if size != setup.length
         raise Rex::ConnectionProxyError.new(host, port, type, "Failed to send the entire request to the proxy"), caller
       end
 
@@ -497,7 +486,7 @@ class Rex::Socket::Comm::Local
         raise Rex::ConnectionProxyError.new(host, port, type, "Failed to receive a response from the proxy"), caller
       end
 
-      if (response.nil? or response.length < 10)
+      if response.nil? || response.length < 10
         raise Rex::ConnectionProxyError.new(host, port, type, "Failed to receive a complete response from the proxy"), caller
       end
       if response[1,1] != "\x00"
@@ -513,7 +502,6 @@ class Rex::Socket::Comm::Local
   # Registration
   #
   ##
-
   def self.register_event_handler(handler) # :nodoc:
     self.instance.register_event_handler(handler)
   end
@@ -525,5 +513,4 @@ class Rex::Socket::Comm::Local
   def self.each_event_handler(handler) # :nodoc:
     self.instance.each_event_handler(handler)
   end
-
 end

data/lib/rex/socket/tcp.rb

@@ -53,24 +53,6 @@ module Rex::Socket::Tcp
     end
   end
 
-  #
-  # Returns peer information (host + port) in host:port format.
-  #
-  def peerinfo
-    if (pi = getpeername_as_array)
-      return pi[1] + ':' + pi[2].to_s
-    end
-  end
-
-  #
-  # Returns local information (host + port) in host:port format.
-  #
-  def localinfo
-    if (pi = getlocalname)
-      return pi[1] + ':' + pi[2].to_s
-    end
-  end
-
   # returns socket type
   def type?
     return 'tcp'

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - David Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler

metadata.gz.sig

@@ -1,2 +1,3 @@
-K�N���,�$������vN�����8g�N�`��ԶVE�7l�0F��DJ���ل�`L
4����G����N0�~,�N]����vZ�~ҁ�0�A�<�/�	����ƻ�N�J�?�<
-B��<��WS�X`��?�˷������P!������M�PHS��ZZ)�y�����Ec� �r�!���������Q%���FT�=�\��k�	��zm�%􁭪)��N�X[�9[�kY��>��|�Ԡb$.5FR*
+�O`�¬ydރ��Z ��2�f�T���!����Ay$l��F�I�ӂ;�2jf=ſ7y�B4��'	J�����,��׋�^���xϴ4G�x��ވ�',@�A3x}�jv�b��;��gw��V����O�Mˬ�U
+%����2�$�ȦL
+o���FܾU�~@�o���(^����`�q.=��ezV