kensa 0.4.2 → 1.0.0.beta1

data/test/provision_response_check_test.rb

@@ -1,13 +1,13 @@
-require File.dirname(__FILE__) + "/helper"
+require 'test/helper'
 
 class ProvisionResponseCheckTest < Test::Unit::TestCase
-  include Heroku::Sensei
+  include Heroku::Kensa
 
   def check ; ProvisionResponseCheck ; end
 
   setup do
     @response = { "id" => "123" }
-    @data = Manifest.skeleton.merge(:provision_response => @response)
+    @data = Manifest.new.skeleton.merge(:provision_response => @response)
     @data['api']['config_vars'] << "MYADDON_CONFIG"
   end
 

data/test/resources/runner.rb

@@ -0,0 +1 @@
+exit(1) if ARGV.first == 'fail'

data/test/resources/{test_server.rb → server.rb}

@@ -25,8 +25,10 @@ helpers do
     Digest::SHA1.hexdigest([params[:id], 'SSO_SALT', params[:timestamp]].join(':'))
   end
   
-  def login
+  def login(heroku_user=true)
+    session.clear
     session[:logged_in] = true
+    session[:heroku]    = heroku_user
     redirect '/'
   end
 end
@@ -62,26 +64,68 @@ post '/invalid-missing-auth/heroku/resources' do
 end
 
 
+delete '/working/heroku/resources/:id' do
+  heroku_only!
+  "Ok"
+end
+
+
 get '/working/heroku/resources/:id' do
   unauthorized! unless params[:id] && params[:token]
   unauthorized! unless params[:timestamp].to_i > (Time.now-60*2).to_i
   unauthorized! unless params[:token] == make_token
+  response.set_cookie('heroku-nav-data', params['nav-data'])
   login
 end
 
 get '/notoken/heroku/resources/:id' do
   unauthorized! unless params[:id] && params[:token]
   unauthorized! unless params[:timestamp].to_i > (Time.now-60*2).to_i
+  response.set_cookie('heroku-nav-data', params['nav-data'])
   login
 end
 
 get '/notimestamp/heroku/resources/:id' do
   unauthorized! unless params[:id] && params[:token]
   unauthorized! unless params[:token] == make_token
+  response.set_cookie('heroku-nav-data', params['nav-data'])
+  login
+end
+
+get '/nolayout/heroku/resources/:id' do
+  unauthorized! unless params[:id] && params[:token]
+  unauthorized! unless params[:timestamp].to_i > (Time.now-60*2).to_i
+  unauthorized! unless params[:token] == make_token
+  response.set_cookie('heroku-nav-data', params['nav-data'])
+  login(false)
+end
+
+get '/nocookie/heroku/resources/:id' do
+  unauthorized! unless params[:id] && params[:token]
+  unauthorized! unless params[:timestamp].to_i > (Time.now-60*2).to_i
+  unauthorized! unless params[:token] == make_token
+  login
+end
+
+get '/badcookie/heroku/resources/:id' do
+  unauthorized! unless params[:id] && params[:token]
+  unauthorized! unless params[:timestamp].to_i > (Time.now-60*2).to_i
+  unauthorized! unless params[:token] == make_token
+  response.set_cookie('heroku-nav-data', 'wrong value')
   login
 end
 
 get '/' do
   unauthorized! unless session[:logged_in]
-  "OK"
-end
+  haml :index
+end
+
+__END__
+
+@@ index
+%html
+  %body
+    - if session[:heroku]
+      #heroku-header
+        %h1 Heroku
+    %h1 Sample Addon

data/test/sso_check_test.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + "/helper"
+require 'test/helper'
 
 class SsoCheckTest < Test::Unit::TestCase
-  include Heroku::Sensei
+  include Heroku::Kensa
 
   setup do
-    @data = Manifest.skeleton.merge :id => 123
+    @data = Manifest.new.skeleton.merge :id => 123
     @data['api']['sso_salt'] = 'SSO_SALT'
   end
 
@@ -25,4 +25,25 @@ class SsoCheckTest < Test::Unit::TestCase
     assert_invalid
   end
 
+  test "reject omitted sso salt" do
+    @data['api'].delete 'sso_salt'
+    @data['api']['test'] += "working"
+    assert_invalid
+  end
+
+  test "reject missing heroku layout" do
+    @data['api']['test'] += "nolayout"
+    assert_invalid
+  end
+
+  test "reject missing cookie" do
+    @data['api']['test'] += "nocookie"
+    assert_invalid
+  end
+
+  test "reject invalid cookie value" do
+    @data['api']['test'] += "badcookie"
+    assert_invalid
+  end
+
 end

data/test/sso_test.rb

@@ -0,0 +1,58 @@
+require 'test/helper'
+
+class SsoTest < Test::Unit::TestCase
+  include Heroku::Kensa
+
+  setup do
+    @data = Manifest.new.skeleton.merge(:id => 1)
+    @data['api']['test'] = 'http://localhost:4567/'
+    @data['api']['sso_salt'] = 'SSO_SALT'
+  end
+
+  teardown { Timecop.return }
+
+  context 'sso' do
+    setup { @sso = Sso.new @data }
+
+    test 'builds path' do
+      assert_equal '/heroku/resources/1', @sso.path
+    end
+
+    test 'builds full url' do
+      Timecop.freeze Time.utc(2010, 1)
+      expected = 'http://localhost:4567/heroku/resources/1?token=b6010f6fbb850887a396c2bc0ab23974003008f6&timestamp=1262304000'
+
+      assert @sso.full_url.include?(expected)
+    end
+  end
+
+  context 'sso without salt' do
+    setup do
+      @data['api'].delete 'sso_salt'
+      @sso = Sso.new @data
+    end
+
+    test 'builds full url' do
+      expected = 'http://localhost:4567/heroku/resources/1'
+
+      assert @sso.full_url.include?(expected)
+    end
+  end
+
+  context 'sso in a specific environment' do
+    setup do
+      env = 'production'
+      @data[:env] = env
+      @data['api'][env] = 'http://localhost:7654/'
+
+      @sso = Sso.new @data
+    end
+
+    test 'builds full url' do
+      Timecop.freeze Time.utc(2010, 1)
+      expected = 'http://localhost:7654/heroku/resources/1?token=b6010f6fbb850887a396c2bc0ab23974003008f6&timestamp=1262304000'
+
+      assert @sso.full_url.include?(expected)
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kensa
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
+  - 1
+  - 0
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - beta1
+  version: 1.0.0.beta1
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 -07:00
+date: 2010-07-19 00:00:00 -07:00
 default_executable: kensa
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,9 +45,23 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: timecop
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 5
+        version: 0.3.5
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -55,25 +70,25 @@ dependencies:
         - 9
         version: "0.9"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
+        - 4
         - 0
-        version: 1.2.0
+        version: 1.4.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -82,11 +97,11 @@ dependencies:
         - 6
         version: "0.6"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: term-ansicolor
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -95,11 +110,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: launchy
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -109,11 +124,11 @@ dependencies:
         - 2
         version: 0.3.2
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mechanize
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -123,32 +138,38 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 description: ""
 email: pedro@heroku.com
 executables: 
 - kensa
 extensions: []
 
-extra_rdoc_files: 
-- TODO
+extra_rdoc_files: []
+
 files: 
 - .gitignore
 - Rakefile
-- TODO
-- a-server.rb
 - bin/kensa
 - kensa.gemspec
 - lib/heroku/kensa.rb
-- server.rb
+- lib/heroku/kensa/check.rb
+- lib/heroku/kensa/client.rb
+- lib/heroku/kensa/http.rb
+- lib/heroku/kensa/manifest.rb
+- lib/heroku/kensa/sso.rb
 - set-env.sh
+- test/all_check_test.rb
 - test/deprovision_check.rb
 - test/helper.rb
 - test/manifest_check_test.rb
+- test/manifest_test.rb
 - test/provision_check_test.rb
 - test/provision_response_check_test.rb
-- test/resources/test_server.rb
+- test/resources/runner.rb
+- test/resources/server.rb
 - test/sso_check_test.rb
+- test/sso_test.rb
 has_rdoc: true
 homepage: http://heroku.com
 licenses: []
@@ -167,11 +188,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -180,10 +203,14 @@ signing_key:
 specification_version: 3
 summary: ""
 test_files: 
+- test/all_check_test.rb
 - test/deprovision_check.rb
 - test/helper.rb
 - test/manifest_check_test.rb
+- test/manifest_test.rb
 - test/provision_check_test.rb
 - test/provision_response_check_test.rb
-- test/resources/test_server.rb
+- test/resources/runner.rb
+- test/resources/server.rb
 - test/sso_check_test.rb
+- test/sso_test.rb

data/TODO

@@ -1,8 +0,0 @@
-
-[ ] heroku-addon test -n delete  # run specific test [create | delete | sharing]
-[ ] heroku-addon test  # run full test suite
-[ ] heroku-addon repl command # runs create, set ENVs, then delete on exit
-[ ] heroku-addon push  # push manifest to heroku
-
-[X] heroku-addon check # check correctnes of JSON
-[X] heroku-addon init  # generate skeleton manifest

data/a-server.rb

@@ -1,21 +0,0 @@
-require 'sinatra'
-require 'yajl'
-require 'restclient'
-
-post "/heroku/resources" do
-  request.body.rewind
-  input = Yajl::Parser.parse(request.body.read)
-  resp = { :id => 123, :config => { "FOO" => "bar" } }
-  #resp = { :id => 456 }
-  json = Yajl::Encoder.encode(resp)
-  fork do
-    sleep 2
-    p input
-    RestClient.put(input["callback_url"], json)
-  end
-  "{}"
-end
-
-delete "/heroku/resources/:id" do
-  "ok"
-end

data/server.rb

@@ -1,13 +0,0 @@
-require 'sinatra'
-require 'yajl'
-require 'restclient'
-
-post "/heroku/resources" do
-  resp = { :id => 123, :config => { "FOO" => "bar" } }
-  #resp = { :id => 123 }
-  Yajl::Encoder.encode(resp)
-end
-
-delete "/heroku/resources/:id" do
-  "ok"
-end