maitre_d 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b27a7d6903d91dea29a32af183b05a2b87689190
-  data.tar.gz: 511c60706f0fd6d560d8930afb2eeac0815bb33e
+  metadata.gz: 3384d15408a2e029d8419521510854402d0055a1
+  data.tar.gz: 2bcb69e276cc0d4024eb15a9f0f7de061ae61d67
 SHA512:
-  metadata.gz: 894af66d98c2dd376de02fd6925d330fad5dc40c1dc223e0c06bc470c67120c6f1a68ae685b4f8b6987f5a372a85c739b27e4216be447a77fef71db4f9625d13
-  data.tar.gz: d01c6f9f505f9fe2a129ffac826eebb074139cfa678a0cc0a6eca961b6094d12590cf0b88b56b4b0ce936416400d94302fe7edc74870da9bf469910d4c0a4a3b
+  metadata.gz: 264cb01a7047ac115042b6c9b4de13c1571e737498aa76b1a20df878b834703304703da4da8a6c37e0e81ce85b83278549f45966dd018faa05e0c1fbb531c9ca
+  data.tar.gz: 37046db0c44e4f92902023a11fff7ee6faeab9b673813beab5505d930f29b0bd584e0a1d0378e14e80df81eeedb4e001baa7d277e6d5d59495737c2fd6e2a724

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.2.0
+  - 2.3.4
+  - 2.4.1
 script: bundle exec rspec spec

data/README.textile

@@ -2,7 +2,7 @@ h1. Maître d'
 
 "!https://secure.travis-ci.org/flying-sphinx/maitre_d.png!":http://travis-ci.org/flying-sphinx/maitre_d
 
-Rack APIs powered by Grape for managing Heroku and CloudControl add-ons.
+Rack APIs powered by Sliver for managing Heroku and CloudControl add-ons.
 
 Maître d' manages all the authorisation checking for API requests and provides simple hooks for you to write just the code you need to handle provisioning, plan changes, deprovisioning and single-sign-on (SSO) requests.
 
@@ -10,7 +10,7 @@ h2. Installing
 
 Add the following to your Gemfile:
 
-<pre><code>gem 'maitre_d', '~> 0.5.0'</code></pre>
+<pre><code>gem 'maitre_d', '~> 0.6.0'</code></pre>
 
 h3. With Rails
 

data/lib/maitre_d/api/authenticated.rb

@@ -1,12 +1,8 @@
 class MaitreD::API::Authenticated
   include Sliver::Action
 
-  def skip?
-    return false if valid_authorization?
-
-    response.body   = ['401 Unauthorized']
-    response.status = 401
-    true
+  def self.guards
+    [MaitreD::API::AuthenticationGuard]
   end
 
   def call
@@ -14,12 +10,12 @@ class MaitreD::API::Authenticated
     response.status ||= 200
   end
 
-  private
-
   def configuration
     environment['maitre_d.configuration']
   end
 
+  private
+
   def listener
     configuration.listener.new
   end
@@ -31,15 +27,4 @@ class MaitreD::API::Authenticated
   def provider_id
     configuration.provider_id_from params
   end
-
-  def valid_authorization?
-    valid_authorization.strip == environment['HTTP_AUTHORIZATION'].strip
-  end
-
-  def valid_authorization
-    encoded_authorization = Base64.encode64(
-      "#{configuration.id}:#{configuration.password}"
-    )
-    "Basic #{encoded_authorization}"
-  end
 end

data/lib/maitre_d/api/authentication_guard.rb

@@ -0,0 +1,24 @@
+class MaitreD::API::AuthenticationGuard < Sliver::Hook
+  def continue?
+    valid_authorization?
+  end
+
+  def respond
+    response.status = 401
+    response.body   = ['401 Unauthorized']
+    response.headers['Content-Length'] = response.body.first.length.to_s
+  end
+
+  private
+
+  def valid_authorization?
+    valid_authorization.strip == action.request.env['HTTP_AUTHORIZATION'].strip
+  end
+
+  def valid_authorization
+    encoded_authorization = Base64.encode64(
+      "#{action.configuration.id}:#{action.configuration.password}"
+    )
+    "Basic #{encoded_authorization}"
+  end
+end

data/lib/maitre_d/api/sso.rb

@@ -1,14 +1,8 @@
 class MaitreD::API::SSO
   include Sliver::Action
 
-  def skip?
-    return false if valid_token? && valid_timestamp?
-
-    response.status = 403
-    response.body   = ['403 Forbidden']
-    response.headers['Content-Length'] = response.body.first.length.to_s
-
-    true
+  def self.guards
+    [MaitreD::API::SSOGuard]
   end
 
   def call
@@ -31,17 +25,11 @@ class MaitreD::API::SSO
     response.headers['Location'] = hash[:uri]
   end
 
-  private
-
   def configuration
     environment['maitre_d.configuration']
   end
 
-  def expected_token
-    @expected_token ||= Digest::SHA1.hexdigest(
-      "#{params['id']}:#{configuration.sso_salt}:#{params['timestamp']}"
-    ).to_s
-  end
+  private
 
   def listener
     configuration.listener.new
@@ -54,12 +42,4 @@ class MaitreD::API::SSO
   def session
     environment['rack.session'] ||= {}
   end
-
-  def valid_timestamp?
-    params['timestamp'].to_i >= (Time.now - 5*60).to_i
-  end
-
-  def valid_token?
-    expected_token == params['token']
-  end
 end

data/lib/maitre_d/api/sso_guard.rb

@@ -0,0 +1,31 @@
+class MaitreD::API::SSOGuard < Sliver::Hook
+  def continue?
+    valid_token? && valid_timestamp?
+  end
+
+  def respond
+    response.status = 403
+    response.body   = ['403 Forbidden']
+    response.headers['Content-Length'] = response.body.first.length.to_s
+  end
+
+  private
+
+  def expected_token
+    @expected_token ||= Digest::SHA1.hexdigest(
+      "#{params['id']}:#{action.configuration.sso_salt}:#{params['timestamp']}"
+    ).to_s
+  end
+
+  def params
+    action.request.params
+  end
+
+  def valid_timestamp?
+    params['timestamp'].to_i >= (Time.now - 5*60).to_i
+  end
+
+  def valid_token?
+    expected_token == params['token']
+  end
+end

data/lib/maitre_d/api.rb

@@ -23,8 +23,10 @@ class MaitreD::API
   end
 end
 
+require 'maitre_d/api/authentication_guard'
 require 'maitre_d/api/authenticated'
 require 'maitre_d/api/change_plan'
 require 'maitre_d/api/create'
 require 'maitre_d/api/delete'
+require 'maitre_d/api/sso_guard'
 require 'maitre_d/api/sso'

data/maitre_d.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'maitre_d'
-  s.version     = '0.5.0'
+  s.version     = '0.6.0'
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']
   s.homepage    = 'http://github.com/flying-sphinx/maitre_d'
@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'sliver',     '~> 0.0.4'
+  s.add_runtime_dependency 'sliver',     '~> 0.2.2'
   s.add_runtime_dependency 'multi_json', '>= 1.3.0'
 
-  s.add_development_dependency 'combustion',  '0.5.1'
+  s.add_development_dependency 'combustion',  '~> 0.5'
   s.add_development_dependency 'kensa',       '2.1.0'
-  s.add_development_dependency 'rails',       '~> 4.1.0'
-  s.add_development_dependency 'rspec-rails', '~> 3.1.0'
+  s.add_development_dependency 'rails',       '~> 4.2'
+  s.add_development_dependency 'rspec-rails', '~> 3.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maitre_d
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sliver
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: kensa
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.6'
 description: A Rack API (through Grape) for Heroku add-on providers.
 email:
 - pat@freelancing-gods.com
@@ -113,10 +113,12 @@ files:
 - lib/maitre_d.rb
 - lib/maitre_d/api.rb
 - lib/maitre_d/api/authenticated.rb
+- lib/maitre_d/api/authentication_guard.rb
 - lib/maitre_d/api/change_plan.rb
 - lib/maitre_d/api/create.rb
 - lib/maitre_d/api/delete.rb
 - lib/maitre_d/api/sso.rb
+- lib/maitre_d/api/sso_guard.rb
 - lib/maitre_d/cloud_control.rb
 - lib/maitre_d/heroku.rb
 - maitre_d.gemspec
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: maitre_d
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rack APIs for Heroku add-ons