warden-hmac-authentication 0.5.3 → 0.5.4

data/bin/warden-hmac-authentication

@@ -1,68 +1,16 @@
 #!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'warden-hmac-authentication' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-begin
-  require 'trollop'
-rescue LoadError => e
-  puts ""
-  puts ""
-  puts "============= ERROR ================"
-  puts ""
-  puts "You need trollop installed or in your gemfile to use the signer"
-  puts ""
-  puts "============= ERROR ================"
-  puts ""
-  puts ""
-  exit(-1)
-end
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-require 'hmac/signer'
+require 'rubygems'
+require 'bundler/setup'
 
-opts = Trollop::options do
-  
-  version "warden-hmac-sign 0.3.0 (c) 2011 Felix Gilcher, Florian Gilcher"
-    banner <<-EOS
-  warden-hmac-authentication is used to create and validate signed urls for
-  usage with the HMAC authentication scheme used by 
-  https://github.com/Asquera/warden-hmac-authentication
-
-  Usage:
-         warden-hmac-authentication [options] <command> url
-  
-  where command is one of
-  
-    sign: signs the given url 
-    validate: validates the given url
-    
-  and where [options] are:
-  
-  EOS
-  
-  opt :algorithm, "The hashing algorithm to use for the HMAC", :type => :string, :default => "sha1"
-  opt :secret, "The shared secret for the HMAC", :type => :string, :required => true
-  opt :"auth-param", "The name for the auth param in the url", :default => "auth"
-  opt :"date", "The date to use for the signature (defaults to now)"
-end
-
-cmd = ARGV.shift
-Trollop::die "You must give a command" if cmd.nil?
-Trollop::die "You command must be one of [sign, validate]" unless ["sign", "validate"].include? cmd
-Trollop::die "You must provide a URL" if ARGV.empty?
-url = ARGV.shift
-
-secret = opts.delete(:secret)
-algorithm = opts.delete(:algorithm)
-
-signer = HMAC::Signer.new(algorithm)
-
-if "sign" == cmd
-  puts signer.sign_url(url, secret, opts)
-else
-  success = signer.validate_url_signature(url, secret, opts)
-  if success
-    puts "URL #{url} is valid"
-    exit 0
-  else
-    puts "URL #{url} does not contain a valid signature"
-    exit 1
-  end
-end
+load Gem.bin_path('warden-hmac-authentication', 'warden-hmac-authentication')

data/lib/hmac/signer.rb

@@ -182,6 +182,7 @@ module HMAC
     # @option opts [String]             :nonce ('')           The nonce to use in the signature
     # @option opts [String, #strftime]  :date (Time.now)      The date to use in the signature
     # @option opts [Hash]               :headers ({})         A list of optional headers to include in the signature
+    # @option opts [String,Symbol]      :method ('GET')       The HTTP method to use in the signature
     #                                   
     # @option opts [String]             :auth_scheme ('HMAC')   The name of the authorization scheme used in the Authorization header and to construct various header-names
     # @option opts [String]             :auth_param ('auth')   The name of the authentication param to use for query based authentication
@@ -201,8 +202,10 @@ module HMAC
     
       date = opts[:date] || Time.now.gmtime
       date = date.gmtime.strftime('%a, %e %b %Y %T GMT') if date.respond_to? :strftime
+
+      method = opts[:method] ? opts[:method].to_s.upcase : "GET"
     
-      signature = generate_signature(:secret => secret, :method => "GET", :path => uri.path, :date => date, :nonce => opts[:nonce], :query => uri.query_values, :headers => opts[:headers])
+      signature = generate_signature(:secret => secret, :method => method, :path => uri.path, :date => date, :nonce => opts[:nonce], :query => uri.query_values, :headers => opts[:headers])
       
       if opts[:query_based]
         auth_params = opts[:extra_auth_params].merge({

data/lib/hmac/strategies/base.rb

@@ -93,7 +93,7 @@ module Warden
   
         private
           def config
-            if env["warden"].config[:scope_defaults][scope][:hmac]
+            if (env["warden"].config[:scope_defaults][scope] && env["warden"].config[:scope_defaults][scope][:hmac])
               env["warden"].config[:scope_defaults][scope][:hmac]
             else
               {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: warden-hmac-authentication
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000Z
+date: 2012-01-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2154430420 !ruby/object:Gem::Requirement
+  requirement: &2160133740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154430420
+  version_requirements: *2160133740
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2154429940 !ruby/object:Gem::Requirement
+  requirement: &2160132880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154429940
+  version_requirements: *2160132880
 - !ruby/object:Gem::Dependency
   name: warden
-  requirement: &2154429480 !ruby/object:Gem::Requirement
+  requirement: &2160131880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154429480
+  version_requirements: *2160131880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154428920 !ruby/object:Gem::Requirement
+  requirement: &2160130760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154428920
+  version_requirements: *2160130760
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2154428340 !ruby/object:Gem::Requirement
+  requirement: &2160129280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154428340
+  version_requirements: *2160129280
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &2154421440 !ruby/object:Gem::Requirement
+  requirement: &2160128600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154421440
+  version_requirements: *2160128600
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2154420320 !ruby/object:Gem::Requirement
+  requirement: &2160127940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154420320
+  version_requirements: *2160127940
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2154419880 !ruby/object:Gem::Requirement
+  requirement: &2160127140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154419880
+  version_requirements: *2160127140
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &2154419300 !ruby/object:Gem::Requirement
+  requirement: &2160126080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154419300
+  version_requirements: *2160126080
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &2154418520 !ruby/object:Gem::Requirement
+  requirement: &2160124740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154418520
+  version_requirements: *2160124740
 description: ! "This gem provides request authentication via [HMAC](http://en.wikipedia.org/wiki/Hmac).
   The main usage is request based, noninteractive\n  authentication for API implementations.
   Two strategies are supported that differ mainly in how the authentication information