siwe 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce4aaa56993884786c2eb990729406a1ae4e0cb99d43f5dbcc6b3e0c8e0af67
-  data.tar.gz: 4dbcb76592a3c0bd4eed2e53e3a739fe9461f185772fdb70fa06dfcd43f7adec
+  metadata.gz: 933ba5a3c973570550d45cd839212a57c6a66568e17a2b107be945fc5ee1c6f3
+  data.tar.gz: 6ea0957b133e576102f9038cee3a7c4459cba2d7bbbe11d4268ac8d464e5982b
 SHA512:
-  metadata.gz: fb5e213eb8d8f50f6cf9a4c00be528bd0a5a9afdc806f95d2714534f629f3ea538bc79655330fc313b01ff85f7ac93550f2447c84baa1f5996eaf6617543630c
-  data.tar.gz: ddf5168c793f6342f9f2e49ac8112dca937832fd7e6a42fb8362250cb6c8798ddb26bf444514064f25fa29ea09ad06d1827cdfc5a1ba696667448d04eb05eee6
+  metadata.gz: 9ecf2bac358261ae3cd49f8c5ef43ddc7724360705dddaf2704cf3ba427bbb2181bc20a5189cc66bd991144cc669a8fb9555db36780f439dfa6b0d007c941202
+  data.tar.gz: d63ad437299d1386f5cfce1ce44a4d76ecd7a8bcffd3e819f3d2b625196a3b4ced5128544a1413c76447b918e901fa78b63ed4268b6785c631ba18e3675c5327

data/.rubocop.yml

@@ -32,5 +32,11 @@ Metrics/ClassLength:
 Style/OptionalBooleanParameter:
   Enabled: false
 
+Style/RegexpLiteral:
+  Enabled: false
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: false
+
 Layout/LineLength:
-  Max: 120
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    siwe (1.0.0)
+    siwe (2.0.0)
       eth (~> 0.5.1)
 
 GEM
@@ -12,7 +12,7 @@ GEM
     benchmark (0.2.0)
     diff-lcs (1.5.0)
     e2mmap (0.1.0)
-    eth (0.5.1)
+    eth (0.5.2)
       keccak (~> 1.3)
       konstructor (~> 1.0)
       openssl (~> 2.2)
@@ -22,7 +22,7 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    ipaddr (1.2.3)
+    ipaddr (1.2.4)
     jaro_winkler (1.5.4)
     keccak (1.3.0)
     konstructor (1.0.2)
@@ -30,7 +30,7 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)
     nokogiri (1.13.1-x86_64-linux)
       racc (~> 1.4)
     openssl (2.2.1)

data/LICENSE-APACHE

@@ -0,0 +1,201 @@
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   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.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

data/lib/siwe/exceptions.rb

@@ -3,14 +3,49 @@
 module Siwe
   # Used when the message is already expired. (Expires At < Time.now)
   class ExpiredMessage < StandardError
-    def initialize(msg = "Message expired.")
+    def initialize(msg = "Expired message.")
+      super
+    end
+  end
+
+  # Used when the domain is not a valid authority or is empty.
+  class InvalidDomain < StandardError
+    def initialize(msg = "Invalid domain.")
+      super
+    end
+  end
+
+  # Used when the domain doesn't match the domain provided for verification.
+  class DomainMismatch < StandardError
+    def initialize(msg = "Domain does not match provided domain for verification.")
+      super
+    end
+  end
+
+  # Used when the nonce doesn't match the nonce provided for verification.
+  class NonceMismatch < StandardError
+    def initialize(msg = "Nonce does not match provided nonce for verification.")
       super
     end
   end
 
   # Used when the address does not conform to EIP-55 or is invalid.
   class InvalidAddress < StandardError
-    def initialize(msg = "Adress does not conform to EIP-55 or is invalid.")
+    def initialize(msg = "Address does not conform to EIP-55 or is invalid.")
+      super
+    end
+  end
+
+  # Used when the message is created with an invalid URI
+  class InvalidURI < StandardError
+    def initialize(msg = "URI does not conform to RFC 3986.")
+      super
+    end
+  end
+
+  # Used when the nonce is smaller then 8 characters or is not alphanumeric
+  class InvalidNonce < StandardError
+    def initialize(msg = "Nonce size smaller then 8 characters or is not alphanumeric.")
       super
     end
   end
@@ -22,10 +57,31 @@ module Siwe
     end
   end
 
+  # Used when the message contains a time format not compliant to ISO8601.
+  class InvalidTimeFormat < StandardError
+    def initialize(field, msg = "Invalid time format for: #{field}")
+      super
+    end
+  end
+
+  # Used when the message version is not 1.
+  class InvalidMessageVersion < StandardError
+    def initialize(msg = "Invalid message version.")
+      super
+    end
+  end
+
   # Used when the signature doesn't correspond to the address of the message.
   class InvalidSignature < StandardError
     def initialize(msg = "Signature doesn't match message.")
       super
     end
   end
+
+  # Used when the message doesn't match the RegExp.
+  class UnableToParseMessage < StandardError
+    def initialize(msg = "Unable to parse message.")
+      super
+    end
+  end
 end

data/lib/siwe/message.rb

@@ -4,26 +4,27 @@ require "time"
 require "eth"
 require "json"
 
-SIWE_DOMAIN = "^(?<domain>([^?#]*)) wants you to sign in with your Ethereum account:\\n"
-SIWE_ADDRESS = "(?<address>0x[a-zA-Z0-9]{40})\\n\\n"
-SIWE_STATEMENT = "((?<statement>[^\\n]+)\\n)?\\n"
-SIWE_URI = "(([^:?#]+):)?(([^?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))"
-SIWE_URI_LINE = "URI: (?<uri>#{SIWE_URI}?)\\n"
-SIWE_VERSION = "Version: (?<version>1)\\n"
-SIWE_CHAIN_ID = "Chain ID: (?<chain_id>[0-9]+)\\n"
-SIWE_NONCE = "Nonce: (?<nonce>[a-zA-Z0-9]{8,})\\n"
-SIWE_DATETIME = "([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9])"\
-                ":([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))"
-SIWE_ISSUED_AT = "Issued At: (?<issued_at>#{SIWE_DATETIME})"
-SIWE_EXPIRATION_TIME = "(\\nExpiration Time: (?<expiration_time>#{SIWE_DATETIME}))?"
-SIWE_NOT_BEFORE = "(\\nNot Before: (?<not_before>#{SIWE_DATETIME}))?"
-SIWE_REQUEST_ID = "(\\nRequest ID: (?<request_id>[-._~!$&'()*+,;=:@%a-zA-Z0-9]*))?"
-SIWE_RESOURCES = "(\\nResources:(?<resources>(\\n- #{SIWE_URI}?)+))?$"
-
-SIWE_MESSAGE = "#{SIWE_DOMAIN}#{SIWE_ADDRESS}#{SIWE_STATEMENT}#{SIWE_URI_LINE}#{SIWE_VERSION}#{SIWE_CHAIN_ID}"\
-               "#{SIWE_NONCE}#{SIWE_ISSUED_AT}#{SIWE_EXPIRATION_TIME}#{SIWE_NOT_BEFORE}#{SIWE_REQUEST_ID}"\
-               "#{SIWE_RESOURCES}"
-
+DOMAIN = %r{(?<domain>[^/?#]+)}.freeze
+SIWE_DOMAIN = %r{^#{DOMAIN.source} wants you to sign in with your Ethereum account:}.freeze
+
+SIWE_ADDRESS = %r{\n(?<address>0x[a-zA-Z0-9]{40})\n\n}.freeze
+SIWE_STATEMENT = %r{((?<statement>[^\n]+)\n)?}.freeze
+RFC3986 = %r{(([^:?#]+):)?(([^?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?}.freeze
+SIWE_URI_LINE = %r{\nURI: (?<uri>#{RFC3986.source}?)}.freeze
+SIWE_VERSION = %r{\nVersion: (?<version>1)}.freeze
+SIWE_CHAIN_ID = %r{\nChain ID: (?<chain_id>[0-9]+)}.freeze
+SIWE_NONCE = %r{\nNonce: (?<nonce>[a-zA-Z0-9]{8,})}.freeze
+SIWE_DATETIME = %r{([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(([Zz])|([+|\-]([01][0-9]|2[0-3]):[0-5][0-9]))}.freeze
+SIWE_ISSUED_AT = %r{\nIssued At: (?<issued_at>#{SIWE_DATETIME.source})}.freeze
+SIWE_EXPIRATION_TIME = %r{(\nExpiration Time: (?<expiration_time>#{SIWE_DATETIME.source}))?}.freeze
+SIWE_NOT_BEFORE = %r{(\nNot Before: (?<not_before>#{SIWE_DATETIME.source}))?}.freeze
+SIWE_REQUEST_ID = %r{(\nRequest ID: (?<request_id>[-._~!$&'()*+,;=:@%a-zA-Z0-9]*))?}.freeze
+SIWE_RESOURCES = %r{(\nResources:(?<resources>(\n- #{RFC3986.source}?)+))?$}.freeze
+
+SIWE_MESSAGE = Regexp.new(SIWE_DOMAIN.source + SIWE_ADDRESS.source + SIWE_STATEMENT.source + SIWE_URI_LINE.source +
+                          SIWE_VERSION.source + SIWE_CHAIN_ID.source + SIWE_NONCE.source + SIWE_ISSUED_AT.source +
+                          SIWE_EXPIRATION_TIME.source + SIWE_NOT_BEFORE.source + SIWE_REQUEST_ID.source +
+                          SIWE_RESOURCES.source)
 module Siwe
   # Class that defines the EIP-4361 message fields and some utility methods to
   # generate/validate the messages
@@ -76,47 +77,41 @@ module Siwe
 
     def initialize(domain, address, uri, version, options = {})
       @domain = domain
-      begin
-        @address = Eth::Address.new(address).to_s
-      rescue StandardError
-        raise Siwe::InvalidAddress
-      end
-      raise Siwe::InvalidAddress unless @address.eql? address
-
+      @address = address
       @uri = uri
       @version = version
       @statement = options.fetch :statement, ""
       @issued_at = options.fetch :issued_at, Time.now.utc.iso8601
       @nonce = options.fetch :nonce, Siwe::Util.generate_nonce
-      @chain_id = options.fetch :chain_id, "1"
+      @chain_id = options.fetch :chain_id, 1
       @expiration_time = options.fetch :expiration_time, ""
       @not_before = options.fetch :not_before, ""
       @request_id = options.fetch :request_id, ""
       @resources = options.fetch :resources, []
+      validate
     end
 
     def self.from_message(msg)
-      if (message = msg.match SIWE_MESSAGE)
-        new(
-          message[:domain],
-          Eth::Address.new(message[:address]).to_s,
-          message[:uri],
-          message[:version],
-          {
-            statement: message[:statement] || "",
-            issued_at: message[:issued_at],
-            nonce: message[:nonce],
-            chain_id: message[:chain_id],
-            expiration_time: message[:expiration_time] || "",
-            not_before: message[:not_before] || "",
-            request_id: message[:request_id] || "",
-            resources: message[:resources]&.split("\n- ")&.drop(1) || []
-          }
-        )
-
-      else
-        throw "Invalid message input."
-      end
+      message = msg.match SIWE_MESSAGE
+
+      raise Siwe::UnableToParseMessage unless message.to_s == msg
+
+      new(
+        message[:domain],
+        message[:address],
+        message[:uri],
+        message[:version],
+        {
+          statement: message[:statement],
+          issued_at: message[:issued_at],
+          nonce: message[:nonce],
+          chain_id: message[:chain_id].to_i,
+          expiration_time: message[:expiration_time],
+          not_before: message[:not_before],
+          request_id: message[:request_id],
+          resources: message[:resources]&.split("\n- ")&.drop(1)
+        }
+      )
     end
 
     def to_json_string
@@ -156,11 +151,61 @@ module Siwe
       )
     end
 
-    def validate(signature)
-      raise Siwe::ExpiredMessage if !@expiration_time.empty? && Time.now.utc > Time.parse(@expiration_time)
-      raise Siwe::NotValidMessage if !@not_before.empty? && Time.now.utc < Time.parse(@not_before)
+    def validate
+      # check domain
+      raise Siwe::InvalidDomain unless @domain.match %r{[^/?#]*} || @domain.empty?
+
+      # check address EIP-55
+      raise Siwe::InvalidAddress unless Eth::Address.new(@address).to_s.eql? @address
+
+      # check uri
+      raise Siwe::InvalidURI unless URI.parse(@uri)
+
+      # check version
+      raise Siwe::InvalidMessageVersion unless @version == "1"
+
+      # check if the nonce is alphanumeric and bigger then 8 characters
+      raise Siwe::InvalidNonce unless @nonce.match(%r{[a-zA-Z0-9]{8,}})
+
+      # check issued_at format
+      begin
+        Time.iso8601(@issued_at)
+      rescue ArgumentError
+        raise Siwe::InvalidTimeFormat, "issued_at"
+      end
+
+      # check exp_time
+      begin
+        Time.iso8601(@expiration_time) unless @expiration_time.nil? || @expiration_time.empty?
+      rescue ArgumentError
+        raise Siwe::InvalidTimeFormat, "expiration_time"
+      end
+
+      # check not_before
+      begin
+        Time.iso8601(@not_before) unless @not_before.nil? || @not_before.empty?
+      rescue ArgumentError
+        raise Siwe::InvalidTimeFormat, "not_before"
+      end
+
+      # check resources
+      raise Siwe::InvalidURI unless @resources.nil? || @resources.empty? || @resources.each { |uri| URI.parse(uri) }
+    end
+
+    def verify(signature, domain, time, nonce)
+      raise Siwe::DomainMismatch unless domain.nil? || domain.eql?(@domain)
+
+      raise Siwe::NonceMismatch unless nonce.nil? || nonce.eql?(@nonce)
+
+      check_time = time.nil? ? Time.now.utc : Time.iso8601(time)
+
+      raise Siwe::ExpiredMessage if (!@expiration_time.nil? && !@expiration_time.empty?) && check_time > Time.iso8601(@expiration_time)
+
+      raise Siwe::NotValidMessage if (!@not_before.nil? && !@not_before.empty?) && check_time < Time.iso8601(@not_before)
+
+      raise Siwe::InvalidSignature if signature.nil? && signature.empty?
 
-      raise Siwe::InvalidSignature if signature.empty?
+      raise Siwe::InvalidAddress unless @address.eql?(Eth::Address.new(@address).to_s)
 
       begin
         pub_key = Eth::Signature.personal_recover prepare_message, signature
@@ -181,7 +226,7 @@ module Siwe
 
       header = [greeting, address]
 
-      if @statement.empty?
+      if @statement.nil? || @statement.empty?
         header.push "\n"
       else
         header.push statement
@@ -200,7 +245,6 @@ module Siwe
       expiration_time = "Expiration Time: #{@expiration_time}"
       not_before = "Not Before: #{@not_before}"
       request_id = "Request ID: #{@request_id}"
-      resources = "Resources:\n#{@resources.map { |x| "- #{x}" }.join "\n"}"
 
       body.push expiration_time unless @expiration_time.to_s.strip.empty?
 
@@ -208,7 +252,7 @@ module Siwe
 
       body.push request_id unless @request_id.to_s.strip.empty?
 
-      body.push resources unless @resources.empty?
+      body.push "Resources:\n#{@resources.map { |x| "- #{x}" }.join "\n"}" unless @resources.nil? || @resources.empty?
 
       body = body.join "\n"
 

data/lib/siwe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Siwe
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/lib/siwe.rb

@@ -7,9 +7,17 @@ module Siwe
   autoload :Message, "siwe/message"
   autoload :Util, "siwe/util"
   autoload :ExpiredMessage, "siwe/exceptions"
+  autoload :InvalidDomain, "siwe/exceptions"
+  autoload :DomainMismatch, "siwe/exceptions"
+  autoload :NonceMismatch, "siwe/exceptions"
+  autoload :InvalidAddress, "siwe/exceptions"
+  autoload :InvalidURI, "siwe/exceptions"
+  autoload :InvalidNonce, "siwe/exceptions"
   autoload :NotValidMessage, "siwe/exceptions"
+  autoload :InvalidTimeFormat, "siwe/exceptions"
+  autoload :InvalidMessageVersion, "siwe/exceptions"
   autoload :InvalidSignature, "siwe/exceptions"
-  autoload :InvalidAddress, "siwe/exceptions"
+  autoload :UnableToParseMessage, "siwe/exceptions"
 
   class Error < StandardError; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siwe
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Spruce Systems Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eth
@@ -94,8 +94,8 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
-- LICENSE
-- LICENSE.txt
+- LICENSE-APACHE
+- LICENSE-MIT
 - README.md
 - Rakefile
 - bin/console

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 Gregório Granado Magalhães
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.