samorau 0.1.1 → 0.2.0

data/Rakefile

@@ -14,8 +14,9 @@ begin
     gemspec.add_dependency(%q<rest-client>, ["~> 1.2.0"])
     gemspec.add_dependency(%q<yajl-ruby>, ["~> 0.6"])
     gemspec.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
+    gemspec.add_dependency(%q<launchy>, [">= 0.3.2"])
 
-    gemspec.version = '0.1.1'
+    gemspec.version = '0.2.0'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/bin/samorau

@@ -2,6 +2,7 @@
 
 require 'optparse'
 require 'term/ansicolor'
+require 'launchy'
 require 'heroku/samorau'
 
 fn="addon-manifest.json"
@@ -88,6 +89,10 @@ when "test"
     id = ARGV.shift || abort("! no id specified; see usage")
     run ManifestCheck, fn
     run DeleteCheck, fn, :id => id, :async => async, :env => env
+  when "sso"
+    id = ARGV.shift || abort("! no id specified; see usage")
+    run ManifestCheck, fn
+    run SsoCheck, fn, :id => id, :env => env
   else
     abort "! Unknown test '#{check}'; see usage"
   end
@@ -95,6 +100,12 @@ when "run"
   abort "! missing command to run; see usage" if ARGV.empty?
   run ManifestCheck, fn
   run AllCheck, fn, :args => ARGV, :async => async, :env => env
+when "sso"
+  id = ARGV.shift || abort("! no id specified; see usage")
+  data = Yajl::Parser.parse(resolve_manifest(fn)).merge(:id => id)
+  sso = Sso.new(data)
+  puts "Opening #{sso.full_url}"
+  Launchy.open sso.full_url
 else
   abort File.read(__FILE__).split('__END__').last
 end
@@ -124,6 +135,8 @@ COMMANDS
 
   run <command>   Provisions a resource and runs command in returned ENV
 
+  sso <id>        Launches the browser on a Heroku session for the specified id
+
 TEST TYPES
 
   provision
@@ -132,6 +145,9 @@ TEST TYPES
   deprovision <id>
     Simulate a deprovision call from Heroku.
 
+  sso <id>
+    Simulate a single sign-on call from Heroku.
+
   manifest
     Confirm that the manifest is valid.  Automatically runs before all tests.
 

data/lib/heroku/samorau.rb

@@ -21,6 +21,7 @@ module Heroku
           "api" => {
             "username" => "heroku",
             "password" => generate_password,
+            "sso_salt" => generate_password(40),
             "test" => "http://localhost:4567/",
             "production" => "https://yourapp.com/",
             "config_vars" => ["MYADDON_URL"]
@@ -36,8 +37,8 @@ module Heroku
         }
       end
 
-      def self.generate_password
-        Array.new(8) { rand(256) }.pack('C*').unpack('H*').first
+      def self.generate_password(size=16)
+        Array.new(size/2) { rand(256) }.pack('C*').unpack('H*').first
       end
 
     end
@@ -246,6 +247,11 @@ module Heroku
 
     module HTTP
 
+      def get(path, params={})
+        path = "#{path}?" + params.map { |k, v| "#{k}=#{v}" }.join("&") unless params.empty?
+        request(:get, [], path)
+      end
+
       def post(credentials, path, payload=nil)
         request(:post, credentials, path, payload)
       end
@@ -315,7 +321,7 @@ module Heroku
         reader, writer = nil
 
         payload = {
-          :id => APPID,
+          :heroku_id => APPID,
           :plan => "Basic",
           :callback_url => callback
         }
@@ -421,6 +427,60 @@ module Heroku
     end
 
 
+    class Sso
+      attr_accessor :id, :url
+
+      def initialize(data)
+        @id   = data[:id]
+        @salt = data['api']['sso_salt']
+        @url  = data["api"]["test"].chomp('/')
+      end
+
+      def path
+        "/heroku/resources/#{id}"
+      end
+
+      def full_url
+        t = Time.now.to_i
+        "#{url}#{path}?token=#{make_token(t)}&timestamp=#{t}"
+      end
+
+      def make_token(t)
+        Digest::SHA1.hexdigest([@id, @salt, t].join(':'))
+      end
+    end
+
+
+    class SsoCheck < ApiCheck
+      include HTTP
+
+      def call!
+        sso = Sso.new(data)
+        t   = Time.now.to_i
+
+        test "GET #{sso.path}"
+        check "validates token" do
+          code, _ = get(sso.path, { :token => 'invalid', :timestamp => t })
+          error("expected 403, got #{code}") if code != 403
+          true
+        end
+
+        check "validates timestamp" do
+          prev = (Time.now - 60*6).to_i
+          code, _ = get(sso.path, { :token => sso.make_token(prev), :timestamp => prev })
+          error("expected 403, got #{code}") if code != 403
+          true
+        end
+
+        check "logs in" do
+          code, _ = get(sso.path, { :token => sso.make_token(t), :timestamp => t })
+          error("expected 200, got #{code}") if code != 200
+          true
+        end
+      end
+    end
+
+
     ##
     # On Testing:
     #  I've opted to not write tests for this
@@ -435,7 +495,7 @@ module Heroku
         run CreateCheck, data
 
         response = data[:create_response]
-        id = response["id"]
+        data.merge!(:id => response["id"])
         config = response["config"] || Hash.new
 
         if args
@@ -449,7 +509,8 @@ module Heroku
           screen.message "End of #{args.first}"
         end
 
-        run DeleteCheck, data.merge(:id => id)
+        run SsoCheck, data
+        run DeleteCheck, data
       end
 
       def run_in_env(env)

data/samorau.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{samorau}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Mizerany", "Pedro Belo", "Adam Wiggins"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-03-04}
   s.default_executable = %q{samorau}
   s.description = %q{}
   s.email = %q{pedro@heroku.com}
@@ -32,7 +32,8 @@ Gem::Specification.new do |s|
      "test/create_response_check_test.rb",
      "test/delete_check.rb",
      "test/helper.rb",
-     "test/manifest_check_test.rb"
+     "test/manifest_check_test.rb",
+     "test/sso_check_test.rb"
   ]
   s.homepage = %q{http://heroku.com}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -44,7 +45,8 @@ Gem::Specification.new do |s|
      "test/create_response_check_test.rb",
      "test/delete_check.rb",
      "test/helper.rb",
-     "test/manifest_check_test.rb"
+     "test/manifest_check_test.rb",
+     "test/sso_check_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -58,6 +60,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rest-client>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<yajl-ruby>, ["~> 0.6"])
       s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<launchy>, [">= 0.3.2"])
     else
       s.add_dependency(%q<turn>, [">= 0"])
       s.add_dependency(%q<contest>, [">= 0"])
@@ -65,6 +68,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rest-client>, ["~> 1.2.0"])
       s.add_dependency(%q<yajl-ruby>, ["~> 0.6"])
       s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
+      s.add_dependency(%q<launchy>, [">= 0.3.2"])
     end
   else
     s.add_dependency(%q<turn>, [">= 0"])
@@ -73,6 +77,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rest-client>, ["~> 1.2.0"])
     s.add_dependency(%q<yajl-ruby>, ["~> 0.6"])
     s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
+    s.add_dependency(%q<launchy>, [">= 0.3.2"])
   end
 end
 

data/test/sso_check_test.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + "/helper"
+require "heroku/samorau"
+
+class SsoCheckTest < Test::Unit::TestCase
+  include Heroku::Samorau
+
+  setup do
+    @data = Manifest.skeleton.merge :id => 123
+    @responses = [
+      [403, ""],
+      [403, ""],
+      [200, ""]
+    ]
+  end
+
+  def check ; SsoCheck ; end
+
+  test "rejects bad token" do
+    @responses[0] = [200, ""]
+    assert_invalid do |check|
+      stub :get, check, @responses
+    end
+  end
+
+  test "rejects bad timestamp do" do
+    @responses[1] = [200, ""]
+    assert_invalid do |check|
+      stub :get, check, @responses
+    end
+  end
+
+  test "accepts sso otherwise" do
+    assert_valid do |check|
+      stub :get, check, @responses
+    end
+  end
+
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -08:00
+date: 2010-03-04 00:00:00 -08:00
 default_executable: samorau
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,20 @@ dependencies:
         version: "1.0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 2
+        version: 0.3.2
+  type: :runtime
+  version_requirements: *id007
 description: ""
 email: pedro@heroku.com
 executables: 
@@ -120,6 +134,7 @@ files:
 - test/delete_check.rb
 - test/helper.rb
 - test/manifest_check_test.rb
+- test/sso_check_test.rb
 has_rdoc: true
 homepage: http://heroku.com
 licenses: []
@@ -156,3 +171,4 @@ test_files:
 - test/delete_check.rb
 - test/helper.rb
 - test/manifest_check_test.rb
+- test/sso_check_test.rb