fernet 2.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb5c9527493461aaaad3028cd173385ff0be58e
-  data.tar.gz: 7eff184a0653c03050f7b0e1a7e4886175450bb1
+  metadata.gz: 8306def467a28bb3eeda6f4eb57c0dcc0b6f73a2
+  data.tar.gz: 3f124ffeff277310fb3df669d78f4e41c26cdb4d
 SHA512:
-  metadata.gz: 92c79ba58f03bd005fca1541787d38b8521aef2942063f0c34fc1444ecded93ba2c2ef72655be11520bc07638bc270d3d330813a2ff4342f5264b75b354be2e3
-  data.tar.gz: 6f2351ba928cc24591210c00eee201f374a36e51b66181772cff7340dfe7c7df02908312293a6d40670cbd2118945c46306750e45634fc617d22993a481abc7c
+  metadata.gz: c3954ecff3c25ff7142d950303206b6a437705537fdf3add03b66d4e8489aecbcd217c99927a6ce147ba08e3907dd6fa9ebdf91146cf353ca18d5a34230da158
+  data.tar.gz: b8fb5061d5d37d287ec20fedf5df2cdd44dd103ae3d91df746037b51e8e8fa714670c48fd85abb6735ed0d4b7be46867eb5db7cb09ae3103061abcf253019907

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .rbenv-version
+.ruby-version

data/lib/fernet/encryption.rb

@@ -26,7 +26,12 @@ module Fernet
       iv = opts[:iv] || cipher.random_iv
       cipher.iv  = iv
       cipher.key = opts[:key]
-      [cipher.update(opts[:message]) + cipher.final, iv]
+      ciphertext = ""
+      if opts[:message] && !opts[:message].empty?
+        ciphertext += cipher.update(opts[:message])
+      end
+      ciphertext += cipher.final
+      [ciphertext, iv]
     end
 
     # Internal: Decrypts the provided ciphertext using a AES-128-CBC cipher with a

data/lib/fernet/token.rb

@@ -81,7 +81,8 @@ module Fernet
       )
       issued_timestamp = (opts[:now] || Time.now).to_i
 
-      payload = [DEFAULT_VERSION].pack("C") +
+      version = opts[:version] || DEFAULT_VERSION
+      payload = [version].pack("C") +
         BitPacking.pack_int64_bigendian(issued_timestamp) +
         iv +
         encrypted_message
@@ -148,8 +149,7 @@ module Fernet
     end
 
     def valid_base64?
-      decoded_token
-      true
+      !decoded_token.nil?
     rescue ArgumentError
       false
     end

data/lib/fernet/verifier.rb

@@ -9,8 +9,8 @@ module Fernet
   class Verifier
     class UnknownTokenVersion < Fernet::Error; end
 
-    attr_reader :token
-    attr_accessor :ttl, :enforce_ttl
+    attr_reader :token, :enforce_ttl
+    attr_accessor :ttl
 
     # Internal: initializes a Verifier
     #
@@ -20,12 +20,9 @@ module Fernet
     # * enforce_ttl - whether to enforce TTL, defaults to Configuration.enforce_ttl
     # * ttl         - number of seconds the token is valid
     def initialize(opts = {})
-      enforce_ttl = opts.has_key?(:enforce_ttl) ? opts[:enforce_ttl] : Configuration.enforce_ttl
-      @token = Token.new(opts.fetch(:token),
-                           secret: opts.fetch(:secret),
-                           enforce_ttl: enforce_ttl,
-                           ttl: opts[:ttl],
-                           now: opts[:now])
+      @enforce_ttl = opts.has_key?(:enforce_ttl) ? opts[:enforce_ttl] : Configuration.enforce_ttl
+      @opts = opts
+      create_token!
     end
 
     # Public: whether the verifier is valid. A verifier is valid if it's token
@@ -54,25 +51,21 @@ module Fernet
     end
     alias to_s inspect
 
-  private
-    def must_verify?
-      @must_verify || @valid.nil?
-    end
-
-    def acceptable_clock_skew?
-      @issued_at < (now + MAX_CLOCK_SKEW)
-    end
-
-    def signatures_match?
-      regenerated_bytes = @regenerated_mac.bytes.to_a
-      received_bytes    = @received_signature.bytes.to_a
-      received_bytes.inject(0) do |accum, byte|
-        accum |= byte ^ regenerated_bytes.shift
-      end.zero?
+    # Public: sets the enforce_ttl configuration
+    #
+    # * val - whether to enforce TTL, defaults to Configuration.enforce_ttl
+    def enforce_ttl=(val)
+      @enforce_ttl = val
+      create_token!
     end
 
-    def now
-      @now ||= Time.now
+  private
+    def create_token!
+      @token = Token.new(@opts.fetch(:token),
+                           secret: @opts.fetch(:secret),
+                           enforce_ttl: enforce_ttl,
+                           ttl: @opts[:ttl],
+                           now: @opts[:now])
     end
   end
 end

data/lib/fernet/version.rb

@@ -1,3 +1,3 @@
 module Fernet
-  VERSION = "2.1"
+  VERSION = "2.1.1"
 end

data/spec/fernet_spec.rb

@@ -67,7 +67,7 @@ describe Fernet do
       config.ttl = 0
     end
     token = Fernet.generate(secret, 'password1')
-    verifier = Fernet.verifier(secret, token)
+    verifier = Fernet.verifier(secret, token, now: Time.now + 999999)
     verifier.enforce_ttl = false
     expect(verifier.valid?).to eq(true)
     expect(verifier.message).to eq('password1')

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

data/spec/token_spec.rb

@@ -9,7 +9,7 @@ describe Fernet::Token, 'validation' do
                                        message: 'hello')
 
     bogus_hmac = "1" * 32
-    Fernet::Encryption.stub(hmac_digest: bogus_hmac)
+    allow(Fernet::Encryption).to receive(:hmac_digest).and_return(bogus_hmac)
 
     token = Fernet::Token.new(generated.to_s, secret: secret)
 
@@ -46,10 +46,29 @@ describe Fernet::Token, 'validation' do
   end
 
   it 'is invalid with an unknown token version' do
-    token = Fernet::Token.new(Base64.urlsafe_encode64("xxxxxx"), secret: secret)
+    invalid1 = Fernet::Token.generate(message: 'message', version: 0x00, secret: secret)
+    invalid2 = Fernet::Token.generate(message: 'message', version: 0x81, secret: secret)
+    valid    = Fernet::Token.generate(message: 'message', secret: secret)
+
+    [invalid1, invalid2].each do |token|
+      expect(token.valid?).to eq(false)
+      expect(token.errors[:version]).to include("is unknown")
+    end
+    expect(valid.valid?).to eq(true)
+  end
 
-    expect(token.valid?).to eq(false)
-    expect(token.errors[:version]).to include("is unknown")
+  it 'is invalid with bad base64 encodings' do
+    token = Fernet::Token.generate(message: 'message', secret: secret)
+    invalid = Fernet::Token.new("\n#{token}", secret: secret)
+
+    ["\n#{token}", "#{token} ", "#{token}+",
+      token.to_s.gsub(/(.)$/, "1"),
+      token.to_s.gsub(/(.)$/, "+"),
+      token.to_s.gsub(/(.)$/, "\\"),
+    ].each do |invalid_string|
+      invalid = Fernet::Token.new(invalid_string, secret: secret)
+      expect(invalid.valid?).to be(false)
+    end
   end
 end
 
@@ -76,4 +95,12 @@ describe Fernet::Token, 'message' do
 
     expect(token.message).to eq('hello')
   end
+
+  it 'correctly handles an empty message' do
+    token = Fernet::Token.generate(secret: secret,
+                                   message: '')
+    token.valid? or raise "invalid token"
+
+    expect(token.message).to eq('')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fernet
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: 2.1.1
 platform: ruby
 authors:
 - Harold Giménez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: valcro
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Easily generate and verify AES encrypted HMAC based authentication tokens