mongo 2.10.5 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8527a8f3a30fbe793408b726ac3cd9c751aa2abae43f62122280c196f3885bb5
-  data.tar.gz: 92efeea394a0070ebeefb63c66cdfe33535ebf09a7bdc4373cf50d15df1bf3ba
+  metadata.gz: abc1ceb1549c601a0b9d34ae3df301219e1de84ebdda6747734b9228395fa860
+  data.tar.gz: b5dc267b2fc65cfaef33a3e0966edd9b90fb35c414e996d2bd778d0c43ff9cc3
 SHA512:
-  metadata.gz: 50ebc39f36eab6b9de4cc20c0864f0d2bbdf8331c40690564c8bbe1260ca2df263ba9d1e0746b928b687de378f3194d53b1319648fbc061bf8b9861c406325e3
-  data.tar.gz: 0706a73de3f10992c3e8ad1fec0aec150221c122d98dae4fe95c05a6371c1c34987fa54041cefbebfe82e502161ac13515b09e059fdb6296a603c6acdc32d3de
+  metadata.gz: 7688c5325d3a4746ba6c2975dbdaf4aaf15929d49d467ff27cc3ec9a437ea1e34913436307c0ee845f3f8c53d9fdfdbfd6037fa71aa6479a33e165a3111651d8
+  data.tar.gz: 910a844b6907a24914990a4697e74ceff60bddfc160464f43f83f0a7fd94eb10eb8a098afc696f35eee68603c26213432dba5ae573e3cc71f8a0fd464ae89d2a

data/CONTRIBUTING.md

@@ -5,46 +5,18 @@ Thank you for your interest in contributing to the MongoDB Ruby driver.
 We are building this software together and appreciate and encourage
 contributions from the community.
 
-JIRA Tickets
-------------
-
-The Ruby driver team uses MongoDB JIRA to schedule and track work.
-To report a problem with the driver, please [create a new
-issue](https://jira.mongodb.org/secure/CreateIssue!default.jspa) in the Ruby
-JIRA project. A ticket is appreciated, though not necessary, when submitting
-a pull request.
-
-Please consult [JIRA issues](https://jira.mongodb.org/browse/RUBY)
-for existing known issues in the driver.
-
-Environment
------------
-
-We recommend using [rbenv](https://github.com/sstephenson/rbenv) to set up
-the Ruby development and testing environments, though other tools like
-[RVM](https://rvm.io/) will also work. The driver currently supports
-MRI 1.9.3-2.6 and JRuby 9.1-9.2.
-
-A MongoDB cluster is required to run the tests. Setup procedures and
-recommendations for various clusters, as well as how to configure the
-driver's test suite, are covered in the [spec
-readme](https://github.com/mongodb/mongo-ruby-driver/blob/master/spec/README.md).
-
-The driver is tested on [Evergreen](https://github.com/evergreen-ci/evergreen),
-MongoDB's in house continuous integration platform. After a pull request
-is created, one of the Ruby driver team engineers will schedule continous
-integration builds on Evergreen.
-
 Pull Requests
 -------------
 
-Pull requests should be made against the master (development) branch and
+Pull requests should be made against the `master` branch and
 include relevant tests, if applicable. The Ruby driver team will backport
 the changes to the stable branches, if needed.
 
-Talk To Us
-----------
+JIRA Tickets
+------------
+
+The Ruby driver team uses [MongoDB JIRA](https://jira.mongodb.org/browse/RUBY)
+to schedule and track work.
 
-We would love to hear from you. If you want to work on something or have
-questions please reach out to us by creating a [question](https://jira.mongodb.org/secure/CreateIssue.jspa?pid=10005&issuetype=6)
-in JIRA.
+A JIRA ticket is not required when submitting a pull request, but is
+appreciated especially for non-trivial changes.

data/LICENSE

@@ -175,7 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright (C) 2009-2019 MongoDB, Inc.
+   Copyright (C) 2009-2020 MongoDB, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -1,6 +1,11 @@
-MongoDB Ruby Driver [![Code Climate][codeclimate-img]][codeclimate-url] [![Gem Version][rubygems-img]][rubygems-url]
------
-The officially supported Ruby driver for [MongoDB](http://www.mongodb.org).
+MongoDB Ruby Driver
+[![Gem Version][rubygems-img]][rubygems-url]
+[![Inline docs][inch-img]][inch-url]
+================================================================
+
+The officially supported Ruby driver for [MongoDB](https://www.mongodb.org/).
+
+The Ruby driver supports Ruby 2.3-3.0 and JRuby 9.2.
 
 
 Documentation
@@ -9,89 +14,88 @@ Documentation
 High level documentation and usage examples are located
 [here](http://docs.mongodb.org/ecosystem/drivers/ruby/).
 
-API docs can be found [here](http://api.mongodb.org/ruby/).
+API documentation for the most recent release can be found
+[here](https://docs.mongodb.com/ruby-driver/current/api/).
+To build API documentation for the master branch, check out the
+repository locally and run `rake docs`.
 
 
-Support & Feedback
-------------------
+Support
+-------
+
+Commercial support for the driver is available through the
+[MongoDB Support Portal](https://support.mongodb.com/).
 
-For issues, questions or feedback related to the Ruby driver, please look into
-our [support channels](http://www.mongodb.org/about/support). Please
-do not email any of the Ruby developers directly with issues or
-questions - you're more likely to get an answer quickly on the [mongodb-user list](http://groups.google.com/group/mongodb-user) on Google Groups.
+For questions, discussions or general technical support, please visit the
+[MongoDB Community Forum](https://developer.mongodb.com/community/forums/tags/c/drivers-odms-connectors/7/ruby-driver).
+
+Please see [Technical Support](https://docs.mongodb.com/manual/support/) page
+in the documentation for other support resources.
 
 
 Bugs & Feature Requests
 -----------------------
 
-Do you have a bug to report or a feature request to make?
+To report a bug in the driver or request a feature specific to the Ruby driver:
 
-1. Visit [our issue tracker](https://jira.mongodb.org) and login (or create an account if necessary).
-2. Navigate to the [RUBY](https://jira.mongodb.org/browse/RUBY) project.
-3. Click 'Create Issue' and fill out all the applicable form fields.
+1. Visit [our issue tracker](https://jira.mongodb.org/) and login
+(or create an account if you do not have one already).
+2. Navigate to the [RUBY project](https://jira.mongodb.org/browse/RUBY).
+3. Click 'Create Issue' and fill out all of the applicable form fields.
 
-When reporting an issue, please keep in mind that all information in JIRA for all driver projects (ex. RUBY, CSHARP, JAVA) and the Core Server (ex. SERVER) project is **PUBLICLY** visible.
+When creating an issue, please keep in mind that all information in JIRA
+for the RUBY project, as well as the core server (the SERVER project),
+is publicly visible.
 
-**PLEASE DO**
+**PLEASE DO:**
 
-* Provide as much information as possible about the issue.
-* Provide detailed steps for reproducing the issue.
-* Provide any applicable code snippets, stack traces and log data.
-* Specify version information for the driver and MongoDB.
+- Provide as much information as possible about the issue.
+- Provide detailed steps for reproducing the issue.
+- Provide any applicable code snippets, stack traces and log data.
+  Do not include any sensitive data or server logs.
+- Specify version numbers of the driver and MongoDB server.
 
-**PLEASE DO NOT**
+**PLEASE DO NOT:**
 
-* Provide any sensitive data or server logs.
-* Report potential security issues publicly (see 'Security Issues').
+- Provide any sensitive data or server logs.
+- Report potential security issues publicly (see 'Security Issues' below).
 
 
 Security Issues
 ---------------
 
-If you’ve identified a potential security related issue in a driver or any other
-MongoDB project, please report it by following the [instructions here](http://docs.mongodb.org/manual/tutorial/create-a-vulnerability-report).
-
-
-Running Tests
--------------
-
-The driver uses RSpec as its primary testing tool. Most tests require a
-running MongoDB server. To test the driver against a single-node (standalone)
-deployment, first launch a server:
-
-    mkdir /tmp/mrb
-    mongod --dbpath /tmp/mrb --bind_ip 127.0.0.1 --setParameter enableTestCommands=1
+If you have identified a potential security-related issue in the Ruby driver
+(or any other MongoDB product), please report it by following the
+[instructions here](http://docs.mongodb.org/manual/tutorial/create-a-vulnerability-report).
 
-... then run the tests:
 
-    bundle exec rake
+Product Feature Requests
+------------------------
 
-It is possible to run tests in a specific file, as well as use other
-test invocations supported by RSpec:
+To request a feature which is not specific to the Ruby driver, or which
+affects more than the driver alone (for example, a feature which requires
+MongoDB server support), please submit your idea through the
+[MongoDB Feedback Forum](https://feedback.mongodb.com/forums/924286-drivers).
 
-    bundle exec rspec path/to/spec.rb:42
 
-Note that certain user accounts have to be created for individual tests to
-succeed, and they are not created when the individual tests are run. The
-user accounts are created if you run `rake` as mentioned above, and you can
-also create them by running:
-
-    bundle exec rake spec:prepare
+Running Tests
+-------------
 
-For further information about supported cluster configurations and how to
-configure the test suite, please see the README in the spec directory.
+Please refer to [spec/README.md](spec/README.md) for instructions on how
+to run the driver's test suite.
 
 
 Release History
 ---------------
 
-Full release notes and release history are available [here](https://github.com/mongodb/mongo-ruby-driver/releases).
+Full release notes and release history are available [on the GitHub releases
+page](https://github.com/mongodb/mongo-ruby-driver/releases).
 
 
 License
 -------
 
- Copyright (C) 2009-2019 MongoDB, Inc.
+ Copyright (C) 2009-2020 MongoDB, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -107,5 +111,5 @@ License
 
 [rubygems-img]: https://badge.fury.io/rb/mongo.svg
 [rubygems-url]: http://badge.fury.io/rb/mongo
-[codeclimate-img]: https://codeclimate.com/github/mongodb/mongo-ruby-driver.svg?branch=master
-[codeclimate-url]: https://codeclimate.com/github/mongodb/mongo-ruby-driver?branch=master
+[inch-img]: http://inch-ci.org/github/mongodb/mongo-ruby-driver.svg?branch=master
+[inch-url]: http://inch-ci.org/github/mongodb/mongo-ruby-driver

data/Rakefile

@@ -1,19 +1,36 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-
-begin
-  require 'bundler'
-  require 'bundler/gem_tasks'
-rescue LoadError
-  raise '[FAIL] Bundler not found! Install it with ' +
-        '`gem install bundler; bundle install`.'
-end
-
-default_groups = [:default, :testing]
-Bundler.require(*default_groups)
+# -*- mode: ruby -*-
 
+require 'bundler'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+# TODO move the mongo require into the individual tasks that actually need it
+require 'mongo'
+
+ROOT = File.expand_path(File.join(File.dirname(__FILE__)))
+
+$: << File.join(ROOT, 'spec/shared/lib')
+
+require 'mrss/spec_organizer'
+
+CLASSIFIERS = [
+  [%r,^mongo/server,, :unit_server],
+  [%r,^mongo,, :unit],
+  [%r,^kerberos,, :unit],
+  [%r,^integration/sdam_error_handling,, :sdam_integration],
+  [%r,^integration/cursor_reaping,, :cursor_reaping],
+  [%r,^integration/query_cache,, :query_cache],
+  [%r,^integration/transactions_examples,, :tx_examples],
+  [%r,^(atlas|integration),, :integration],
+  [%r,^spec_tests/sdam_integration,, :spec_sdam_integration],
+  [%r,^spec_tests,, :spec],
+]
+
+RUN_PRIORITY = %i(
+  tx_examples
+  unit unit_server
+  integration sdam_integration cursor_reaping query_cache
+  spec spec_sdam_integration
+)
 
 tasks = Rake.application.instance_variable_get('@tasks')
 tasks['release:do'] = tasks.delete('release')
@@ -29,10 +46,35 @@ namespace :spec do
   task :prepare do
     $: << File.join(File.dirname(__FILE__), 'spec')
 
+    require 'support/utils'
     require 'support/spec_setup'
     SpecSetup.new.run
   end
 
+  desc 'Waits for sessions to be available in the deployment'
+  task :wait_for_sessions do
+    $: << File.join(File.dirname(__FILE__), 'spec')
+
+    require 'support/utils'
+    require 'support/spec_config'
+    require 'support/client_registry'
+
+    client = ClientRegistry.instance.global_client('authorized')
+    client.database.command(ping: 1)
+    deadline = Time.now + 300
+    loop do
+      begin
+        client.cluster.validate_session_support!
+        break
+      rescue Mongo::Error::SessionsNotSupported
+        if Time.now >= deadline
+          raise "Sessions did not become supported in 300 seconds"
+        end
+        client.cluster.scan!
+      end
+    end
+  end
+
   desc 'Prints configuration used by the test suite'
   task :config do
     $: << File.join(File.dirname(__FILE__), 'spec')
@@ -40,17 +82,35 @@ namespace :spec do
     # Since this task is usually used for troubleshooting of test suite
     # configuration, leave driver log level at the default of debug to
     # have connection diagnostics printed during handshakes and such.
+    require 'support/utils'
     require 'support/spec_config'
     require 'support/client_registry'
     SpecConfig.instance.print_summary
   end
 
-  task :ci => ['spec:prepare', :spec]
+  def spec_organizer
+    Mrss::SpecOrganizer.new(
+      root: ROOT,
+      classifiers: CLASSIFIERS,
+      priority_order: RUN_PRIORITY,
+    )
+  end
+
+  task :ci => ['spec:prepare'] do
+    spec_organizer.run
+  end
+
+  desc 'Show test buckets'
+  task :buckets do
+    spec_organizer.ordered_buckets.each do |category, paths|
+      puts "#{category || 'remaining'}: #{paths&.join(' ') || '<none>'}"
+    end
+  end
 end
 
 namespace :release do
   task :check_private_key do
-    unless File.exists?('gem-private_key.pem')
+    unless File.exist?('gem-private_key.pem')
       raise "No private key present, cannot release"
     end
   end

data/lib/mongo/active_support.rb

@@ -1,4 +1,7 @@
-# Copyright (C) 2019 MongoDB Inc.
+# frozen_string_literal: true
+# encoding: utf-8
+
+# Copyright (C) 2019-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/address/ipv4.rb

@@ -1,4 +1,7 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# frozen_string_literal: true
+# encoding: utf-8
+
+# Copyright (C) 2014-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -78,17 +81,44 @@ module Mongo
       #   ipv4.socket(5, :ssl => true)
       #
       # @param [ Float ] socket_timeout The socket timeout.
-      # @param [ Hash ] ssl_options SSL options.
       # @param [ Hash ] options The options.
       #
       # @option options [ Float ] :connect_timeout Connect timeout.
+      # @option options [ true | false ] :ssl Whether to use TLS.
+      # @option options [ String ] :ssl_ca_cert
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ Array<OpenSSL::X509::Certificate> ] :ssl_ca_cert_object
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_ca_cert_string
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_cert
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ OpenSSL::X509::Certificate ] :ssl_cert_object
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_cert_string
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_key
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ OpenSSL::PKey ] :ssl_key_object
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_key_pass_phrase
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_key_string
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ true, false ] :ssl_verify
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ true, false ] :ssl_verify_certificate
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ true, false ] :ssl_verify_hostname
+      #   Same as the corresponding Client/Socket::SSL option.
       #
       # @return [ Mongo::Socket::SSL, Mongo::Socket::TCP ] The socket.
       #
       # @since 2.0.0
-      def socket(socket_timeout, ssl_options = {}, options = {})
-        unless ssl_options.empty?
-          Socket::SSL.new(host, port, host_name, socket_timeout, Socket::PF_INET, ssl_options.merge(options))
+      # @api private
+      def socket(socket_timeout, options = {})
+        if options[:ssl]
+          Socket::SSL.new(host, port, host_name, socket_timeout, Socket::PF_INET, options)
         else
           Socket::TCP.new(host, port, socket_timeout, Socket::PF_INET, options)
         end

data/lib/mongo/address/ipv6.rb

@@ -1,4 +1,7 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# frozen_string_literal: true
+# encoding: utf-8
+
+# Copyright (C) 2014-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -92,17 +95,44 @@ module Mongo
       #   ipv4.socket(5, :ssl => true)
       #
       # @param [ Float ] socket_timeout The socket timeout.
-      # @param [ Hash ] ssl_options SSL options.
       # @param [ Hash ] options The options.
       #
       # @option options [ Float ] :connect_timeout Connect timeout.
+      # @option options [ true | false ] :ssl Whether to use TLS.
+      # @option options [ String ] :ssl_ca_cert
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ Array<OpenSSL::X509::Certificate> ] :ssl_ca_cert_object
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_ca_cert_string
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_cert
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ OpenSSL::X509::Certificate ] :ssl_cert_object
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_cert_string
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_key
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ OpenSSL::PKey ] :ssl_key_object
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_key_pass_phrase
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ String ] :ssl_key_string
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ true, false ] :ssl_verify
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ true, false ] :ssl_verify_certificate
+      #   Same as the corresponding Client/Socket::SSL option.
+      # @option options [ true, false ] :ssl_verify_hostname
+      #   Same as the corresponding Client/Socket::SSL option.
       #
       # @return [ Mongo::Socket::SSL, Mongo::Socket::TCP ] The socket.
       #
       # @since 2.0.0
-      def socket(socket_timeout, ssl_options = {}, options = {})
-        unless ssl_options.empty?
-          Socket::SSL.new(host, port, host_name, socket_timeout, Socket::PF_INET6, ssl_options.merge(options))
+      # @api private
+      def socket(socket_timeout, options = {})
+        if options[:ssl]
+          Socket::SSL.new(host, port, host_name, socket_timeout, Socket::PF_INET6, options)
         else
           Socket::TCP.new(host, port, socket_timeout, Socket::PF_INET6, options)
         end

data/lib/mongo/address/unix.rb

@@ -1,4 +1,7 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# frozen_string_literal: true
+# encoding: utf-8
+
+# Copyright (C) 2014-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -63,7 +66,6 @@ module Mongo
       #   address.socket(5)
       #
       # @param [ Float ] socket_timeout The socket timeout.
-      # @param [ Hash ] ssl_options SSL options - ignored.
       # @param [ Hash ] options The options.
       #
       # @option options [ Float ] :connect_timeout Connect timeout.
@@ -71,7 +73,8 @@ module Mongo
       # @return [ Mongo::Socket::Unix ] The socket.
       #
       # @since 2.0.0
-      def socket(socket_timeout, ssl_options = {}, options = {})
+      # @api private
+      def socket(socket_timeout, options = {})
         Socket::Unix.new(host, socket_timeout, options)
       end
     end

data/lib/mongo/address/validator.rb

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+# Copyright (C) 2017-2020 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+
+  class Address
+
+    # @api private
+    module Validator
+
+      # Takes an address string in ipv4/ipv6/hostname/socket path format and
+      # validates its format.
+      def validate_address_str!(address_str)
+        case address_str
+        when /\A\[[\d:]+\](?::(\d+))?\z/
+          # ipv6 with optional port
+          if port_str = $1
+            validate_port_str!(port_str)
+          end
+        when /\A\//, /\.sock\z/
+          # Unix socket path.
+          # Spec requires us to validate that the path has no unescaped
+          # slashes, but if this were to be the case, parsing would have
+          # already failed elsewhere because the URI would've been split in
+          # a weird place.
+          # The spec also allows relative socket paths and requires that
+          # socket paths end in ".sock". We accept all paths but special case
+          # the .sock extension to avoid relative paths falling into the
+          # host:port case below.
+        when /[\/\[\]]/
+          # Not a host:port nor an ipv4 address with optional port.
+          # Possibly botched ipv6 address with e.g. port delimiter present and
+          # port missing, or extra junk before or after.
+          raise Error::InvalidAddress,
+            "Invalid hostname: #{address_str}"
+        when /:.*:/m
+          raise Error::InvalidAddress,
+            "Multiple port delimiters are not allowed: #{address_str}"
+        else
+          # host:port or ipv4 address with optional port number
+          host, port = address_str.split(':')
+          if host.empty?
+            raise Error::InvalidAddress, "Host is empty: #{address_str}"
+          end
+
+          validate_hostname!(host)
+
+          if port && port.empty?
+            raise Error::InvalidAddress, "Port is empty: #{address_str}"
+          end
+
+          validate_port_str!(port)
+        end
+      end
+
+      private
+
+      # Validates format of the hostname, in particular for further use as
+      # the origin in same origin verification.
+      #
+      # The hostname must have been normalized to remove the trailing dot if
+      # it was obtained from a DNS record. This method prohibits trailing dots.
+      def validate_hostname!(host)
+        # Since we are performing same origin verification during SRV
+        # processing, prohibit leading dots in hostnames, trailing dots
+        # and runs of multiple dots. DNS resolution of SRV records yields
+        # hostnames with trailing dots, those trailing dots are removed
+        # during normalization process prior to validation.
+        if host.start_with?('.')
+          raise Error::InvalidAddress, "Hostname cannot start with a dot: #{host}"
+        end
+        if host.end_with?('.')
+          raise Error::InvalidAddress, "Hostname cannot end with a dot: #{host}"
+        end
+        if host.include?('..')
+          raise Error::InvalidAddress, "Runs of multiple dots are not allowed in hostname: #{host}"
+        end
+      end
+
+      def validate_port_str!(port)
+        unless port.nil? || (port.length > 0 && port.to_i > 0 && port.to_i <= 65535)
+          raise Error::InvalidAddress,
+            "Invalid port: #{port}. Port must be an integer greater than 0 and less than 65536"
+        end
+      end
+    end
+  end
+end