ronin-support 1.0.0 → 1.0.2

data/lib/ronin/support/network/http.rb

@@ -152,12 +152,12 @@ module Ronin
         attr_reader :headers
 
         # The HTTP Baic-Auth user to add to every request.
-        # 
+        #
         # @return [String, nil]
         attr_reader :user
 
         # The HTTP Baic-Auth password to add to every request.
-        # 
+        #
         # @return [String, nil]
         attr_reader :password
 
@@ -276,7 +276,7 @@ module Ronin
           end
 
           case ssl
-          when true then initialize_ssl()
+          when true then initialize_ssl
           when Hash then initialize_ssl(**ssl)
           end
 
@@ -364,7 +364,7 @@ module Ronin
           @http.extra_chain_cert = extra_chain_cert if extra_chain_cert
           @http.key              = key              if key
 
-          @http.ssl_timeout = timeout     if timeout
+          @http.ssl_timeout = timeout if timeout
           @http.ssl_version = SSL::VERSIONS.fetch(version,version) if version
           @http.min_version = min_version if min_version
           @http.max_version = max_version if max_version
@@ -505,21 +505,39 @@ module Ronin
         #
         # @since 1.0.0
         #
-        def self.connect_uri(url, ssl: nil, **kwargs,&block)
-          uri = case url
-                when Addressable::URI, URI::HTTP
-                  url
-                when String
-                  Addressable::URI.parse(url)
-                else
-                  raise(ArgumentError,"url must be a URI::HTTP, Addressable::URI, or a String: #{url.inspect}")
-                end
-
-          host  = uri.host
-          port  = uri.port
-          ssl ||= uri.scheme == 'https'
+        def self.connect_uri(url, ssl:      nil,
+                                  user:     nil,
+                                  password: nil,
+                                  **kwargs, &block)
+          case url
+          when URI::HTTP
+            host       = url.host
+            port       = url.port
+            user     ||= url.user
+            password ||= url.password
+            ssl      ||= (url.scheme == 'https')
+          when String
+            uri = Addressable::URI.parse(url)
+
+            host       = uri.host
+            port       = uri.inferred_port
+            user     ||= uri.user
+            password ||= uri.password
+            ssl      ||= (uri.scheme == 'https')
+          when Addressable::URI
+            host       = url.host
+            port       = url.inferred_port
+            user     ||= url.user
+            password ||= url.password
+            ssl      ||= (url.scheme == 'https')
+          else
+            raise(ArgumentError,"url must be a URI::HTTP, Addressable::URI, or a String: #{url.inspect}")
+          end
 
-          return connect(host,port, ssl: ssl, **kwargs,&block)
+          return connect(host,port, ssl:      ssl,
+                                    user:     user,
+                                    password: password,
+                                    **kwargs, &block)
         end
 
         #
@@ -1408,9 +1426,17 @@ module Ronin
                                      password:   nil,
                                      **kwargs,
                                      &block)
-          url  = URI(url)
-          path = url.request_uri
-          http = connect_uri(url, proxy:      proxy,
+          uri  = case url
+                 when Addressable::URI, URI::HTTP
+                   url
+                 when String
+                   Addressable::URI.parse(url)
+                 else
+                   raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                 end
+
+          path = uri.request_uri
+          http = connect_uri(uri, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
                                   user_agent: user_agent,
@@ -1451,8 +1477,16 @@ module Ronin
                                                    user:       nil,
                                                    password:   nil,
                                                    **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri  = case url
+                 when Addressable::URI, URI::HTTP
+                   url
+                 when String
+                   Addressable::URI.parse(url)
+                 else
+                   raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                 end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1494,8 +1528,16 @@ module Ronin
                                        user:       nil,
                                        password:   nil,
                                        **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri  = case url
+                 when Addressable::URI, URI::HTTP
+                   url
+                 when String
+                   Addressable::URI.parse(url)
+                 else
+                   raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                 end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1537,8 +1579,16 @@ module Ronin
                                                     user:       nil,
                                                     password:   nil,
                                                     **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri  = case url
+                 when Addressable::URI, URI::HTTP
+                   url
+                 when String
+                   Addressable::URI.parse(url)
+                 else
+                   raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                 end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1575,8 +1625,16 @@ module Ronin
                                     user:       nil,
                                     password:   nil,
                                     **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri  = case url
+                 when Addressable::URI, URI::HTTP
+                   url
+                 when String
+                   Addressable::URI.parse(url)
+                 else
+                   raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                 end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1613,8 +1671,16 @@ module Ronin
                                         user:       nil,
                                         password:   nil,
                                         **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1656,8 +1722,16 @@ module Ronin
                                                 user:       nil,
                                                 password:   nil,
                                                 **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1701,8 +1775,16 @@ module Ronin
                            password:   nil,
                            **kwargs,
                            &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1746,8 +1828,16 @@ module Ronin
                              password:   nil,
                              **kwargs,
                              &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1791,8 +1881,16 @@ module Ronin
                           password:   nil,
                           **kwargs,
                           &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1830,8 +1928,16 @@ module Ronin
                                   user:       nil,
                                   password:   nil,
                                   **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1868,8 +1974,16 @@ module Ronin
                                   user:       nil,
                                   password:   nil,
                                   **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1907,8 +2021,16 @@ module Ronin
                                user:       nil,
                                password:   nil,
                                **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1952,8 +2074,16 @@ module Ronin
                            password:   nil,
                            **kwargs,
                            &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -1997,8 +2127,16 @@ module Ronin
                            password:   nil,
                            **kwargs,
                            &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2042,8 +2180,16 @@ module Ronin
                             password:   nil,
                             **kwargs,
                             &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2087,8 +2233,16 @@ module Ronin
                            password:   nil,
                            **kwargs,
                            &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2132,8 +2286,16 @@ module Ronin
                               password:   nil,
                               **kwargs,
                               &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2171,8 +2333,16 @@ module Ronin
                                       user:       nil,
                                       password:   nil,
                                       **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2184,7 +2354,6 @@ module Ronin
           http.allowed_methods(path,**kwargs)
         end
 
-
         #
         # Performs a `PATCH` request for the given URI.
         #
@@ -2217,8 +2386,16 @@ module Ronin
                             password:   nil,
                             **kwargs,
                             &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2262,8 +2439,16 @@ module Ronin
                            password:   nil,
                            **kwargs,
                            &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2301,8 +2486,16 @@ module Ronin
                                    user:       nil,
                                    password:   nil,
                                    **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2340,8 +2533,16 @@ module Ronin
                                 user:       nil,
                                 password:   nil,
                                 **kwargs)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2385,8 +2586,16 @@ module Ronin
                                password:   nil,
                                **kwargs,
                                &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2398,8 +2607,6 @@ module Ronin
           http.propfind(path,**kwargs,&block)
         end
 
-        alias prop_find propfind
-
         #
         # Performs a `PROPPATCH` request for the given URI.
         #
@@ -2432,8 +2639,16 @@ module Ronin
                                 password:   nil,
                                 **kwargs,
                                 &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2445,8 +2660,6 @@ module Ronin
           http.proppatch(path,**kwargs,&block)
         end
 
-        alias prop_patch proppatch
-
         #
         # Performs a `PUT` request for the given URI.
         #
@@ -2479,8 +2692,16 @@ module Ronin
                           password:   nil,
                           **kwargs,
                           &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2524,8 +2745,16 @@ module Ronin
                             password:   nil,
                             **kwargs,
                             &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,
@@ -2569,8 +2798,16 @@ module Ronin
                              password:   nil,
                              **kwargs,
                              &block)
-          url  = URI(url)
-          path = url.request_uri
+          uri = case url
+                when Addressable::URI, URI::HTTP
+                  url
+                when String
+                  Addressable::URI.parse(url)
+                else
+                  raise(ArgumentError,"URL argument must be either a Addressable::URI, URI::HTTP, or a String: #{url.inspect}")
+                end
+
+          path = uri.request_uri
           http = connect_uri(url, proxy:      proxy,
                                   ssl:        ssl,
                                   headers:    headers,