aws-sessionstore-dynamodb 2.2.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee27fa01f65650a13304791dc345e3ee4b0c9ae10b734a54f57acb72706f4963
-  data.tar.gz: 269c66dbd952cd68d76fc3e1fcec8559fc945f4c745cc4987fb33e42c3c0bd1c
+  metadata.gz: c47a85cf680544f7ae67c8001202f12183ef7c820ae2a08807ae577b43ab610a
+  data.tar.gz: fe33ca1aaf6a21a3e12064290c329184ed071bde6765103c656ecbb200334d37
 SHA512:
-  metadata.gz: 68ff2d325413b24ef06bfe8a40f83f209afc93858af6322c648f4f82daac0096b90f7b2521bc5eac4e0d562636db2eea30d7931f97990d69b1f346866005506c
-  data.tar.gz: 5653d32a3a00b7bfbfaee3ddd9449d9a92cb3c369dd31a7fc887194f5a3b12dea141ac6d12f82db552ee82087956c8c0b88803f9bf25c460ea8fc894a58bd0fc
+  metadata.gz: 525409e21cd2766373652e93bd7f5284b6e8f277a6715b06f126dcfa3286cb26882665786e4cb8c9d06c4b5bf202334b6dde66e25ddf6ba79dc1afc0ac19c165
+  data.tar.gz: 2842691bc6bda28038e4bf93fb63672b06aba06bcbc09b7a82d1a851ab58388bd13f33b62bef804963fba73b57a0169257a875be1e57ee3fbde125084bdc8c8e

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+3.0.1 (2024-11-16)
+------------------
+
+* Issue - `Configuration` now takes environment variables with precedence over YAML configuration.
+
+* Issue - Use ENV variables that are prefixed by `AWS_`.
+
+3.0.0 (2024-10-29)
+------------------
+
+* Feature - Uses `rack ~> 3` as the minimum.
+
+* Feature - Drop support for Ruby 2.5 and 2.6.
+
+* Feature - Support additional configuration options through ENV.
+
+* Feature - Moves error classes into the `Errors` module.
+
+* Issue - Set `RackMiddleware`'s `#find_session`, `#write_session`, and `#delete_session` as public.
+
+* Issue - Validate `Configuration` has a secret key on `RackMiddleware#initialize` instead of on `#find_session`.
+
 2.2.0 (2024-01-25)
 ------------------
 

data/LICENSE

@@ -1,12 +1,175 @@
-Copyright 2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-Licensed under the Apache License, Version 2.0 (the "License"). You
-may not use this file except in compliance with the License. A copy of
-the License is located at
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    http://aws.amazon.com/apache2.0/
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-or in the "license" file accompanying this file. This file 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.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

data/VERSION

@@ -1 +1 @@
-2.2.0
+3.0.1

data/lib/aws/session_store/dynamo_db/configuration.rb

@@ -1,264 +1,190 @@
-require 'yaml'
+# frozen_string_literal: true
+
 require 'aws-sdk-dynamodb'
 
 module Aws::SessionStore::DynamoDB
-  # This class provides a Configuration object for all DynamoDB transactions
-  # by pulling configuration options from Runtime, a YAML file, the ENV and
-  # default settings.
+  # This class provides a Configuration object for all DynamoDB session store operations
+  # by pulling configuration options from Runtime, the ENV, a YAML file, and default
+  # settings, in that order.
+  #
+  # # Environment Variables
+  # The Configuration object can load default values from your environment. All configuration
+  # keys are supported except for `:dynamo_db_client` and `:error_handler`. The keys take the form
+  # of AWS_DYNAMO_DB_SESSION_<KEY_NAME>. Example:
   #
-  # == Environment Variables
-  # The Configuration object can load default values from your environment. An example
-  # of setting and environment variable is below:
+  #     export AWS_DYNAMO_DB_SESSION_TABLE_NAME='Sessions'
+  #     export AWS_DYNAMO_DB_SESSION_TABLE_KEY='id'
   #
-  #   export DYNAMO_DB_SESSION_TABLE_NAME='Sessions'
+  # # Locking Strategy
+  # By default, locking is disabled for session store access. To enable locking, set the
+  # `:enable_locking` option to true. The locking strategy is pessimistic, meaning that only one
+  # read can be made on a session at once. While the session is being read by the process with the
+  # lock, other processes may try to obtain a lock on the same session but will be blocked.
+  # See the initializer for how to configure the pessimistic locking strategy to your needs.
   #
-  # == Handling Errors
-  # There are two configurable options for error handling: :raise_errors and :error_handler.
+  # # Handling Errors
+  # There are two configurable options for error handling: `:raise_errors` and `:error_handler`.
   #
-  # If you would like to use the Default Error Handler, you can decide to set :raise_errors
-  # to true or false depending on whether you want all errors, regadless of class, to be raised
+  # If you would like to use the Default Error Handler, you can decide to set `:raise_errors`
+  # to true or false depending on whether you want all errors, regardless of class, to be raised
   # up the stack and essentially throw a 500.
   #
-  # If you decide to use your own Error Handler. You may pass it in for the value of the key
-  # :error_handler as a cofniguration object. You must implement the BaseErrorHandler class.
+  # If you decide to use your own Error Handler, you must implement the `BaseErrorHandler`
+  # class and pass it into the `:error_handler` option.
   # @see BaseHandler Interface for Error Handling for DynamoDB Session Store.
   #
-  # == Locking Strategy
-  # By default, locking is not implemented for the session store. You must trigger the
-  # locking strategy through the configuration of the session store. Pessimistic locking,
-  # in this case, means that only one read can be made on a session at once. While the session
-  # is being read by the process with the lock, other processes may try to obtain a lock on
-  # the same session but will be blocked. See the accessors with lock in their name for
-  # how to configure the pessimistic locking strategy to your needs.
-  #
-  # == DynamoDB Specific Options
+  # # DynamoDB Specific Options
   # You may configure the table name and table hash key value of your session table with
-  # the :table_name and :table_key options. You may also configure performance options for
-  # your table with the :consistent_read, :read_capacity, write_capacity. For more information
-  # about these configurations see CreateTable method for Amazon DynamoDB.
+  # the `:table_name` and `:table_key` options. You may also configure performance options for
+  # your table with the `:consistent_read`, `:read_capacity`, `:write_capacity`. For more information
+  # about these configurations see
+  # {https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/DynamoDB/Client.html#create_table-instance_method CreateTable}
+  # method for Amazon DynamoDB.
   #
   class Configuration
-
-    # Default configuration options
-    DEFAULTS = {
-      :table_name => "sessions",
-      :table_key => "session_id",
-      :consistent_read => true,
-      :read_capacity => 10,
-      :write_capacity => 5,
-      :raise_errors => false,
-      # :max_age => 7*3600*24,
-      # :max_stale => 3600*5,
-      :enable_locking => false,
-      :lock_expiry_time => 500,
-      :lock_retry_delay => 500,
-      :lock_max_wait_time => 1,
-      :secret_key => nil
-    }
-
-    ### Feature options
-
-    # @return [String] Session table name.
-    attr_reader :table_name
-
-    # @return [String] Session table hash key name.
-    attr_reader :table_key
-
-    # @return [true] If a strongly consistent read is used
-    # @return [false] If an eventually consistent read is used.
-    # See AWS DynamoDB documentation for table consistent_read for more
-    # information on this setting.
-    attr_reader :consistent_read
-
-    # @return [Integer] Maximum number of reads consumed per second before
-    #   DynamoDB returns a ThrottlingException. See AWS DynamoDB documentation
-    #   for table read_capacity for more information on this setting.
-    attr_reader :read_capacity
-
-    # @return [Integer] Maximum number of writes consumed per second before
-    #   DynamoDB returns a ThrottlingException. See AWS DynamoDB documentation
-    #   for table write_capacity for more information on this setting.
-    attr_reader :write_capacity
-
-    # @return [true] All errors are raised up the stack when default ErrorHandler
-    #   is used.
-    # @return [false] Only specified errors are raised up the stack when default
-    #   ErrorHandler is used.
-    attr_reader :raise_errors
-
-    # @return [Integer] Maximum number of seconds earlier
-    #   from the current time that a session was created.
-    attr_reader :max_age
-
-    # @return [Integer] Maximum number of seconds
-    #   before the current time that the session was last accessed.
-    attr_reader :max_stale
-
-    # @return [true] Pessimistic locking strategy will be implemented for
-    #   all session accesses.
-    # @return [false] No locking strategy will be implemented for
-    #   all session accesses.
-    attr_reader :enable_locking
-
-    # @return [Integer] Time in milleseconds after which lock will expire.
-    attr_reader :lock_expiry_time
-
-    # @return [Integer] Time in milleseconds to wait before retrying to obtain
-    #   lock once an attempt to obtain lock has been made and has failed.
-    attr_reader :lock_retry_delay
-
-    # @return [Integer] Maximum time in seconds to wait to acquire lock
-    #   before giving up.
-    attr_reader :lock_max_wait_time
-
-    # @return [String] The secret key for HMAC encryption.
-    attr_reader :secret_key
-
-    # @return [String,Pathname]
-    attr_reader :config_file
-
-    ### Client and Error Handling options
-
-    # @return [DynamoDB Client] DynamoDB client.
-    attr_reader :dynamo_db_client
-
-    # @return [Error Handler] An error handling object that handles all exceptions
-    #   thrown during execution of the AWS DynamoDB Session Store Rack Middleware.
-    #   For more information see the Handling Errors Section.
-    attr_reader :error_handler
+    # @api private
+    MEMBERS = {
+      table_name: 'sessions',
+      table_key: 'session_id',
+      secret_key: nil,
+      consistent_read: true,
+      read_capacity: 10,
+      write_capacity: 5,
+      raise_errors: false,
+      error_handler: nil,
+      max_age: nil,
+      max_stale: nil,
+      enable_locking: false,
+      lock_expiry_time: 500,
+      lock_retry_delay: 500,
+      lock_max_wait_time: 1,
+      config_file: nil,
+      dynamo_db_client: nil
+    }.freeze
 
     # Provides configuration object that allows access to options defined
-    # during Runtime, in a YAML file, in the ENV and by default.
+    # during Runtime, in the ENV, in a YAML file, and by default.
     #
-    # @option options [String] :table_name ("Sessions") Name of the session
-    #   table.
-    # @option options [String] :table_key ("id") The hash key of the sesison
-    #   table.
-    # @option options [Boolean] :consistent_read (true) If true, a strongly
-    #   consistent read is used. If false, an eventually consistent read is
-    #   used.
-    # @option options [Integer] :read_capacity (10) The maximum number of
-    #   strongly consistent reads consumed per second before
-    #   DynamoDB raises a ThrottlingException. See AWS DynamoDB documentation
-    #   for table read_capacity for more information on this setting.
+    # @option options [String] :table_name ("sessions") Name of the session table.
+    # @option options [String] :table_key ("session_id") The hash key of the session table.
+    # @option options [String] :secret_key Secret key for HMAC encryption.
+    # @option options [Boolean] :consistent_read (true) If true, a strongly consistent read is used.
+    #   If false, an eventually consistent read is used.
+    #   @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/HowItWorks.ReadConsistency.html
+    # @option options [Integer] :read_capacity (10) The maximum number of strongly consistent reads
+    #   consumed per second before DynamoDB raises a ThrottlingException.
+    #   @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/read-write-operations.html
     # @option options [Integer] :write_capacity (5) The maximum number of writes
     #   consumed per second before DynamoDB returns a ThrottlingException.
-    #   See AWS DynamoDB documentation for table write_capacity for more
-    #   information on this setting.
-    # @option options [DynamoDB Client] :dynamo_db_client
-    #   (Aws::DynamoDB::Client) DynamoDB client used to perform database
-    #   operations inside of middleware application.
-    # @option options [Boolean] :raise_errors (false) If true, all errors are
-    #   raised up the stack when default ErrorHandler. If false, Only specified
-    #   errors are raised up the stack when default ErrorHandler is used.
-    # @option options [Error Handler] :error_handler (DefaultErrorHandler)
-    #   An error handling object that handles all exceptions thrown during
-    #   execution of the AWS DynamoDB Session Store Rack Middleware.
-    #   For more information see the Handling Errors Section.
+    #   @see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/read-write-operations.html
+    # @option options [Boolean] :raise_errors (false) If true, all errors are raised up the stack
+    #   when default ErrorHandler. If false, Only specified errors are raised up the stack when
+    #   the default ErrorHandler is used.
+    # @option options [#handle_error] :error_handler (Errors::DefaultHandler) An error handling object
+    #   that handles all exceptions thrown during execution of the rack application.
     # @option options [Integer] :max_age (nil) Maximum number of seconds earlier
     #   from the current time that a session was created.
     # @option options [Integer] :max_stale (nil) Maximum number of seconds
     #   before current time that session was last accessed.
-    # @option options [String] :secret_key (nil) Secret key for HMAC encription.
-    # @option options [Integer] :enable_locking (false) If true, a pessimistic
-    #   locking strategy will be implemented for all session accesses.
-    #   If false, no locking strategy will be implemented for all session
-    #   accesses.
-    # @option options [Integer] :lock_expiry_time (500) Time in milliseconds
-    #   after which lock expires on session.
-    # @option options [Integer] :lock_retry_delay (500) Time in milleseconds to
-    #   wait before retrying to obtain lock once an attempt to obtain lock
-    #   has been made and has failed.
-    # @option options [Integer] :lock_max_wait_time (500) Maximum time
-    #   in seconds to wait to acquire lock before giving up.
-    # @option options [String] :secret_key (SecureRandom.hex(64))
-    #   Secret key for HMAC encription.
+    # @option options [Integer] :enable_locking (false) If true, a pessimistic locking strategy will be
+    #   used for all session accesses.
+    # @option options [Integer] :lock_expiry_time (500) Time in milliseconds after which the lock
+    #   expires on session.
+    # @option options [Integer] :lock_retry_delay (500) Time in milliseconds to wait before retrying
+    #   to obtain lock once an attempt to obtain the lock has been made and has failed.
+    # @option options [Integer] :lock_max_wait_time (500) Maximum time in seconds to wait to acquire the
+    #   lock before giving up.
+    # @option options [String, Pathname] :config_file
+    #   Path to a YAML file that contains configuration options.
+    # @option options [Aws::DynamoDB::Client] :dynamo_db_client (Aws::DynamoDB::Client.new)
+    #   DynamoDB client used to perform database operations inside of the rack application.
     def initialize(options = {})
-      @options = default_options.merge(
-        env_options.merge(
-          file_options(options).merge(symbolize_keys(options))
-        )
-      )
-      @options = client_error.merge(@options)
-      set_attributes(@options)
+      opts = options
+      opts = env_options.merge(opts)
+      opts = file_options(opts).merge(opts)
+      MEMBERS.each_pair do |opt_name, default_value|
+        opts[opt_name] = default_value unless opts.key?(opt_name)
+      end
+      opts = opts.merge(dynamo_db_client: default_dynamo_db_client(opts))
+      opts = opts.merge(error_handler: default_error_handler(opts)) unless opts[:error_handler]
+
+      set_attributes(opts)
+    end
+
+    MEMBERS.each_key do |attr_name|
+      attr_reader(attr_name)
     end
 
     # @return [Hash] The merged configuration hash.
     def to_hash
-      @options.dup
+      MEMBERS.each_with_object({}) do |(key, _), hash|
+        hash[key] = send(key)
+      end
     end
 
     private
 
-    # @return [Hash] DDB client.
-    def gen_dynamo_db_client
-      dynamo_db_client = @options[:dynamo_db_client] || Aws::DynamoDB::Client.new
-      # this used to be aws-sessionstore/version on user_agent_suffix
-      dynamo_db_client.config.user_agent_frameworks << "aws-sessionstore-dynamodb"
-      {:dynamo_db_client => dynamo_db_client}
+    def default_dynamo_db_client(options)
+      dynamo_db_client = options[:dynamo_db_client] || Aws::DynamoDB::Client.new
+      dynamo_db_client.config.user_agent_frameworks << 'aws-sessionstore-dynamodb'
+      dynamo_db_client
     end
 
-    # @return [Hash] Default Error Handler
-    def gen_error_handler
-      default_handler = Aws::SessionStore::DynamoDB::Errors::DefaultHandler
-      error_handler = @options[:error_handler] ||
-                            default_handler.new(@options[:raise_errors])
-      {:error_handler => error_handler}
+    def default_error_handler(options)
+      Aws::SessionStore::DynamoDB::Errors::DefaultHandler.new(options[:raise_errors])
     end
 
-    # @return [Hash] Client and error objects in hash.
-    def client_error
-      gen_error_handler.merge(gen_dynamo_db_client)
-    end
+    # @return [Hash] Environment options.
+    def env_options
+      unsupported_keys = %i[dynamo_db_client error_handler]
+      (MEMBERS.keys - unsupported_keys).each_with_object({}) do |opt_name, opts|
+        key = env_key(opt_name)
+        next unless ENV.key?(key)
 
-    # @return [Hash] Default Session table options.
-    def default_options
-      DEFAULTS
+        opts[opt_name] = parse_env_value(key)
+      end
     end
 
-    # @return [Hash] Environment options that are useful for Session Handler.
-    def env_options
-      default_options.keys.inject({}) do |opts, opt_name|
-        env_var = "DYNAMO_DB_SESSION_#{opt_name.to_s.upcase}"
-        opts[opt_name] = ENV[env_var] if ENV.key?(env_var)
-        opts
+    def env_key(opt_name)
+      # legacy - remove this in aws-sessionstore-dynamodb ~> 4
+      key = "DYNAMO_DB_SESSION_#{opt_name.to_s.upcase}"
+      if ENV.key?(key)
+        Kernel.warn("The environment variable `#{key}` is deprecated.
+                     Please use `AWS_DYNAMO_DB_SESSION_#{opt_name.to_s.upcase}` instead.")
+      else
+        key = "AWS_DYNAMO_DB_SESSION_#{opt_name.to_s.upcase}"
       end
+      key
+    end
+
+    def parse_env_value(key)
+      val = ENV.fetch(key, nil)
+      Integer(val)
+    rescue ArgumentError
+      %w[true false].include?(val) ? val == 'true' : val
     end
 
     # @return [Hash] File options.
     def file_options(options = {})
-      file_path = config_file_path(options)
-      if file_path
-        load_from_file(file_path)
+      if options[:config_file]
+        load_from_file(options[:config_file])
       else
         {}
       end
     end
 
-    # Load options from YAML file
+    # Load options from the YAML file.
     def load_from_file(file_path)
-      require "erb"
-      opts = YAML.load(ERB.new(File.read(file_path)).result) || {}
-      symbolize_keys(opts)
+      require 'erb'
+      require 'yaml'
+      opts = YAML.safe_load(ERB.new(File.read(file_path)).result) || {}
+      unsupported_keys = %i[dynamo_db_client error_handler config_file]
+      opts.transform_keys(&:to_sym).reject { |k, _| unsupported_keys.include?(k) }
     end
 
-    # @return [String] Configuration path found in environment or YAML file.
-    def config_file_path(options)
-      options[:config_file] || ENV["DYNAMO_DB_SESSION_CONFIG_FILE"]
-    end
-
-    # Set accessible attributes after merged options.
     def set_attributes(options)
-      @options.keys.each do |opt_name|
-        instance_variable_set("@#{opt_name}", options[opt_name])
-      end
-    end
-
-    # @return [Hash] Hash with all symbolized keys.
-    def symbolize_keys(options)
-      options.inject({}) do |opts, (opt_name, opt_value)|
-        opts[opt_name.to_sym] = opt_value
-        opts
+      MEMBERS.each_key do |attr_name|
+        instance_variable_set("@#{attr_name}", options[attr_name])
       end
     end
   end