mach 0.0.1 → 0.0.2

data/.gitignore

@@ -19,3 +19,6 @@ doc/
 .rbenv-version
 bin
 gems
+
+Gemfile.lock
+tags

data/examples/client.rb

@@ -1,36 +1,112 @@
 #!/usr/bin/env ruby
 require 'bundler/setup'
 require 'mach'
-require 'base64'
 require 'multi_json'
+require 'optparse'
+require 'date'
 
-def get_credentials
-  connection = Faraday.new(:url => "http://localhost:9595") do |c|
-    c.adapter Faraday.default_adapter
-  end
-  credentials_response = connection.post { |req| req.url "/credentials" } # first request is to store the client delta
-  credentials = MultiJson.decode(credentials_response.body)
+def credentials
+  @credentials ||= (
+    env_credentials ||
+    lambda {
+      connection = Faraday.new(:url => creds_server) do |c|
+        c.adapter Faraday.default_adapter
+      end
+      credentials_response = connection.post { |req| req.url "/credentials" } # first request is to store the client delta
+      MultiJson.decode(credentials_response.body)
+    }.call
+  ).tap { |credentials| puts "Using credentials: #{credentials.inspect}" }
+end
+
+def env_credentials
+  @env_credentials ||= ENV['CREDENTIALS'] && Hash[%w{id secret}.zip(ENV['CREDENTIALS'].split(":"))]
+end
+
+def creds_server
+  @creds_server ||= ENV['CREDS_SERVER'] || "http://localhost:9090"
+end
+
+def validating_server
+  @validating_server ||= ENV['VALIDATING_SERVER'] || "http://localhost:9494"
+end
+
+def env_resource
+  @env_resource ||= ENV['RESOURCE'] || '/'
 end
 
 def make_request(id, secret)
   #make a request using those credentials
-  connection = Faraday.new(:url => "http://localhost:9494") do |c|
+  connection = Faraday.new(:url => validating_server) do |c|
     c.request :hmac_authentication, id, secret
     c.adapter Faraday.default_adapter
   end
-  res = connection.get { |req| req.url '/' }
+  res = connection.get { |req| req.url env_resource }
   [res.status, res.body]
 end
 
 def make_valid_request
-  credentials = get_credentials
   make_request(credentials["id"], credentials["secret"])
 end
 
 def make_invalid_request
-  credentials = get_credentials
   make_request(credentials["id"], "XXX")
 end
 
-p make_valid_request
-p make_invalid_request
+def make_request_with_given_credentials(url, id, secret)
+  connection = Faraday.new(:url => url) do |c|
+    c.request :hmac_authentication, id, secret
+    c.adapter Faraday.default_adapter
+  end
+  res = connection.get
+  p [res.status, res.body]
+  [res.status, res.body]
+end
+
+options = {:id => "x", :secret => "y"}
+#options = {:id => "GnW4HUDf1zJ8YFcJbSQYm6sgDmzKVbuY", :secret => "Yi1z+//6qfsa6FXvPRraRc4YjPhfopLaq1O0U2x8ZyU="}
+options = {:id => "qsa96BTnxLCQB8JcML1QxW4LKswGyiY7", :secret => 'zcXzUmZmqLifHVtXmgo8ro13ZfN1ZpN1zRhez+sYh+c='}
+options = {:id => "test_id", :secret => 'secret'}
+
+opt_parser = OptionParser.new do |opt|
+  opt.banner = "Usage: client [OPTIONS]"
+  opt.separator  ""
+  opt.separator  "Options"
+
+  opt.on("-i ID", "--id ID", String, "the mac id") do |id|
+    options[:id] = id
+  end
+
+  opt.on("-d SECRET","--secret SECRET", String, "the mac secret") do |secret|
+    options[:secret] = secret
+  end
+
+  opt.on("-u URL","--url URL", String, "the url to hit") do |url|
+    options[:url] = url
+  end
+
+  opt.on("-g", "--good", "a valid request getting credentials from the credential store") do
+    options[:good] = true
+  end
+
+  opt.on("-b", "--bad", "an invalid request getting credentials from the credential store") do
+    options[:bad] = true
+  end
+
+  opt.on_tail("-h","--help","help") do
+    puts opt_parser
+  end
+end
+
+opt_parser.parse!
+
+if options[:good]
+  p make_valid_request
+elsif options[:bad]
+  p make_invalid_request
+else
+  raise "You need to supply an id and a secret" unless options[:id] && options[:secret]
+  raise "You need to supply a url to hit" unless options[:url]
+  options[:secret] = Base64.strict_encode64(options[:secret])
+  p options
+  make_request_with_given_credentials(options[:url], options[:id], options[:secret])
+end

data/examples/validating_server.ru

@@ -19,7 +19,6 @@ class App < Sinatra::Base
   use Mach::Rack::RequestValidator
 
   get '/' do
-    p (Mach::RequestValidator.valid?(request)) ? "Request is valid" : "Request is not valid"
     'OK'
   end
 end

data/lib/mach/configuration.rb

@@ -5,12 +5,14 @@ require 'base64'
 module Mach
   class Configuration
 
-    attr_reader :credential_store, :data_store, :stale_request_window
+    attr_reader :credential_store, :data_store, :stale_request_window, :ignore_validation_failure, :logger
 
     def initialize
       @stale_request_window = 10
       @data_store = Mach::Persistence::InMemoryStore.configure({})
       @credential_store = Hash.new
+      @ignore_validation_failure = false
+      @logger = Logger.new(STDOUT)
     end
 
     def with_credential_store(store, options = {})
@@ -30,6 +32,14 @@ module Mach
       @stale_request_window = num_seconds
     end
 
+    def with_logger(logger)
+      @logger = logger
+    end
+
+    def ignore_validation_failure!
+      @ignore_validation_failure = true
+    end
+
     private
     def camelize(string)
       string.split(/[^a-z0-9]/i).map{|w| w.capitalize}.join

data/lib/mach/validation/request_validator.rb

@@ -16,8 +16,18 @@ module Mach
           Mach::Validation::SignatureValidator.valid?(hmac_request)
         #need to make sure we store the nonce
         Nonce.persist(hmac_request.mac_id, hmac_request.mac_nonce, hmac_request.mac_timestamp.to_i) if valid
+       
+        logger.warn("WARNING: Request Validation failed") unless valid
+        if !valid && Mach.configuration.ignore_validation_failure
+          logger.warn("WARNING: Ignoring Request Validation failure, Are you sure you want to do it?")
+          return true
+        end  
         valid
       end
+
+      def logger
+        Mach.config.logger
+      end
     end
   end
 end

data/lib/mach/version.rb

@@ -1,3 +1,3 @@
 module Mach
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mach
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -179,22 +179,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1737604513296395942
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1737604513296395942
 requirements: []
 rubyforge_project: mach
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: HMAC authentication stuff
-test_files: []
+test_files:
+- spec/normalized_string_spec.rb
+- spec/signature_spec.rb
+- spec/spec_helper.rb