verge 0.0.4 → 0.0.5

data/Rakefile

@@ -15,11 +15,16 @@ begin
     gem.add_dependency "bcrypt-ruby", ">= 2.0.5"
     gem.add_dependency "activesupport", ">= 2.3.4"
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "factory_girl", ">= 1.2.3"
+    gem.add_development_dependency "factory_girl"
     gem.add_development_dependency "rack-test", ">= 0.5.0"
     gem.add_development_dependency "do_sqlite3", ">= 0.9.0"
+    
+    gem.executables = ['verge']
   end
   Jeweler::GemcutterTasks.new
+#  Jeweler::RubyforgeTasks.new do |rubyforge|
+#    rubyforge.doc_task = "yardoc"
+#  end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/verge

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# Verge server for the command line
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'verge'
+
+Verge::Server::Exec.new(ARGV)

data/lib/verge.rb

@@ -3,10 +3,15 @@ module Verge
   
   module Server
     autoload :Base, "verge/server/base"
+    
+    autoload :Config, "verge/server/config"
+    autoload :Exec, "verge/server/exec"
 
     autoload :User, "verge/server/models"
     autoload :SignedToken, "verge/server/models"
     autoload :Token, "verge/server/models"
     autoload :Site, "verge/server/models"
   end
-end
+  
+  autoload :Client, "verge/client"
+end

data/lib/verge/client.rb

@@ -0,0 +1,25 @@
+module Verge
+  module Client
+    class << self
+      attr_accessor :server_url, :site_token
+    end
+
+    module AssetHelper
+      # Return the javascript tag that include the token if the user's authenticated
+      def verge_javascript_tag
+        "<script type=\"text/javascript\" src=\"#{Verge::Client.server_url}/token.js\"></script>"
+      end
+    end
+    
+    module PathHelper
+      # Return the path to the authentication action on the server
+      def verge_auth_url
+        "#{Verge::Client.server_url}/login"
+      end
+    end
+  end
+end
+
+# If using rails add the verge_javascript_tag to action view
+::ActionView::Base.send(:include, Verge::Client::AssetHelper) if defined? ::ActionView::Base
+::ActionView::Base.send(:include, Verge::Client::PathHelper) if defined? ::ActionView::Base

data/lib/verge/server/base.rb

@@ -15,14 +15,23 @@ module Verge
       # and password. Returns a token that should be sent back to the site
       # along with the login passed here to be verified by the site
       # as allowed to login.
-      get '/auth' do
+      post '/login' do
         extract_site
 
         user = User.authenticate(params[:login], params[:password])
         halt 401, "Bad user." if user.nil?
 
         set_cookie_for_user(user)
-        user.token.value
+        
+        result = {:token => user.token.value}
+        target = params[:redirect]
+
+        if target.nil? || target.blank?
+          # TODO: Add formatters for XML, JSON and Standard params
+          result.to_params
+        else
+          redirect(params[:redirect] + (target.index("?").nil? ? "?" : "&") + result.to_params)
+        end
       end
 
       get '/token.js' do
@@ -58,17 +67,17 @@ module Verge
       
       private
 
-      def extract_site # nodoc #
-        site = Site.find_by_uri(request.referer)
-        (site.nil? && halt(401, "Not a valid site.")) || site
-      end
+        def extract_site # nodoc #
+          site = Site.find_by_uri(params[:site] || Site::GENERIC_HOST)
+          (site.nil? && halt(401, "Not a valid site.")) || site
+        end
 
-      def set_cookie_for_user(user) # nodoc #
-        response.set_cookie("token", {
-          :value => user.token.value,
-          :path => '/'
-        })
-      end
+        def set_cookie_for_user(user) # nodoc #
+          response.set_cookie("token", {
+            :value => user.token.value,
+            :path => '/'
+          })
+        end
     end
   end
 end

data/lib/verge/server/config.rb

@@ -0,0 +1,50 @@
+module Verge
+  module Server
+    module Config
+      class << self
+        attr_reader :database_path, :site_signatures
+
+        # Make sure the DB path has a type, defaults to sqlite3 if not
+        # specified.
+        def database_path=(val)
+          @database_path = val.index("://").nil? ? "sqlite3://#{val}" : val
+          load_signatures
+        end
+
+        # Set the generic site's token, if only one token is to be shared
+        # across all sites.
+        def generic_signature=(val)
+          @site_signatures[Verge::Server::Site::GENERIC_HOST] = val
+        end
+        
+        def site_signatures=(val)
+          #::Verge::Server::Site.all.destroy!
+          
+          val.instance_eval do
+            def []=(key, val)
+              super
+              Verge::Server::Config.load_signatures
+            end
+          end
+          
+          @site_signatures = val
+          load_signatures
+        end
+
+        # Loads the signatures from the config into sites
+        def load_signatures
+          return if @site_signatures.nil?
+          @site_signatures.each do |host, signature|
+            site = Site.first(:host => host) || Site.new(:host => host)
+            site.signature = signature
+            site.save
+          end
+        end
+
+      end
+      
+      self.database_path = "sqlite3://#{Dir.pwd}/verge.sqlite3"
+      self.site_signatures = {}
+    end
+  end
+end

data/lib/verge/server/exec.rb

@@ -0,0 +1,51 @@
+require 'rubygems'
+require 'optparse'
+require 'yaml'
+
+module Verge
+  module Server
+    class Exec
+      def initialize(argv)
+        options = {}
+        signature = nil
+        database = nil
+        signature_file = nil
+
+        OptionParser.new do |opts|
+          opts.banner { "Usage: verge [options]" }
+          # Sinatra params
+          opts.on('-x')         {       options[:lock] = true }
+          opts.on('-s server')  { |val| options[:server] = val }
+          opts.on('-e env')     { |val| options[:environment] = val.to_sym }
+          opts.on('-p port')    { |val| options[:port] = val.to_i }
+
+          # Verge params
+          opts.on('-g generic-signature') { |val| signature = val }
+          opts.on('-d database')          { |val| database = val }
+          opts.on('-S signature-file')    { |val| signature_file = val }
+
+          opts.on_tail('-h', '--help', "Show this message") { puts opts ; exit }
+        end
+
+        Verge::Server::Config.database_path = database unless database.nil?
+        Verge::Server::Config.generic_signature = signature unless signature.nil?
+
+        begin
+          YAML.load_file(signature_file).each do |key, value|
+            Verge::Server::Config.site_signatures[key] = value
+          end unless signature_file.nil?
+        rescue
+          puts "Can't read signature file!"
+        end
+
+        if Verge::Server::Site.count == 0
+          token = Verge::Crypto.token
+          Verge::Server::Config.generic_signature = token
+          puts "Verge created the GENERIC_HOST token:\n#{token}\n"
+        end
+
+        Verge::Server::Base.run! options
+      end
+    end
+  end
+end

data/lib/verge/server/models.rb

@@ -6,7 +6,7 @@ require 'dm-timestamps'
 
 require 'activesupport'
 
-DataMapper::setup(:default, ENV['DATABASE_URL'] || "sqlite3:///#{Dir.pwd}/database.sqlite3")
+DataMapper::setup(:default, ENV['DATABASE_URL'] || Verge::Server::Config.database_path)
 
 module Verge
   module Server
@@ -45,8 +45,8 @@ module Verge
 
       # Attempts to find a user based on the credentials passed.
       def self.authenticate(login, password)
-        u = User.first(:login => login)
-        (u.nil? || u.password != password) && nil || u
+        user = User.first(:login => login)
+        (user.nil? || user.password != password) && nil || user
       end
 
       # Removes expired users
@@ -101,7 +101,15 @@ module Verge
       end
     end
 
+    # Datastructure representing a site that will connect and authenticate
+    # against verge. If you've setup verge with just one generic site key
+    # none of your sites will need to specify who they are and should
+    # all share that common key.
     class Site
+      # Set a value that will be used to look up keys that are not associated
+      # with a particular site
+      GENERIC_HOST = "generic.hostname"
+      
       include DataMapper::Resource
 
       property :id,         Serial, :key => true

data/spec/client_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+ 
+describe Verge::Client do
+  before :all do
+    Verge::Client.server_url = "http://login.example.com"
+  end
+  
+  it "returns the correct script tag" do
+    extend Verge::Client::AssetHelper
+
+    verge_javascript_tag.should == '<script type="text/javascript" src="http://login.example.com/token.js"></script>'
+  end
+  
+  it "should return the authentication path to the verge server" do
+    extend Verge::Client::PathHelper
+    
+    verge_auth_url.should == "http://login.example.com/login"
+  end
+end

data/spec/factories.rb

@@ -10,6 +10,10 @@ Factory.define(:site, :class => Verge::Server::Site) do |s|
   s.host { Factory.next(:host) }
 end
 
+Factory.define(:generic_site, :class => Verge::Server::Site) do |site|
+  site.host Verge::Server::Site::GENERIC_HOST
+end
+
 Factory.define(:signed_token, :class => Verge::Server::SignedToken) do |s|
   s.token_id 1
   s.site_id 1

data/spec/server_config_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+ 
+describe Verge::Server::Config do
+  before :all do
+    Verge::Server::Site.all.destroy
+    Verge::Server::Token.all.destroy
+
+    @token = Verge::Crypto::token
+  end
+
+  it "has a default database path" do
+    Verge::Server::Config.database_path.should_not be_nil
+  end
+  
+  it "sets sqlite3 as the db type if not specified" do
+    Verge::Server::Config.database_path = "login.db"
+    Verge::Server::Config.database_path.should == "sqlite3://login.db"
+  end
+  
+  it "sets the generic site's token" do
+    Verge::Server::Config.generic_signature = @token
+    Verge::Server::Config.site_signatures[Verge::Server::Site::GENERIC_HOST].should == @token
+  end
+
+  it "has the GENERIC_HOST with the specified token" do
+    Verge::Server::Config.generic_signature = @token
+    Verge::Server::Site.count.should == 1
+  end
+  
+end

data/spec/server_exec_spec.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+ 
+describe Verge::Server::Config do
+  before :each do
+  end
+  
+  it "should setup the database path for the server" do
+  end
+end

data/spec/{verge_spec.rb → server_spec.rb}

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-module VergeSpecHelper
-  def valid_auth_request_for_user(user)
-    {:login => user.login, :password => "0rbital"}
+module ServerSpecHelper
+  def valid_auth_request(user, redirect = nil, site = nil)
+    {:login => user.login, :password => "0rbital", :redirect => redirect, :site => site}
   end
   
   def new_user_credentials_for_site(site)
@@ -12,13 +12,13 @@ module VergeSpecHelper
 end
 
 describe Verge::Server do
-  include VergeSpecHelper
+  include ServerSpecHelper
 
   before :each do
-    @site = Factory(:site)
-    header("Referer", @site.host)
+    Verge::Server::Site.all.destroy!
+    @site = Factory(:generic_site)
   end
-  
+
   describe "GET to /token.js" do
     it "echos cookie back in javascript" do
       login = "astro"
@@ -31,7 +31,7 @@ describe Verge::Server do
       last_response.body.should =~ /#{login}/
       last_response.body.should =~ /#{token}/
     end
-    
+
     it "echos nothing if no cookies are sent" do
       get '/token.js'
       last_response.body.should == ""
@@ -58,25 +58,39 @@ describe Verge::Server do
   end
   
 
-  describe 'GET to /auth' do
+  describe 'POST to /login' do
     before :each do
       @user = Factory(:user)
     end
 
     it 'fails with empty request' do
-      get '/auth'
+      post '/login'
       last_response.status.should == 401
     end
 
     it 'returns a code when valid' do
-      get '/auth', valid_auth_request_for_user(@user)
-      last_response.body.should == @user.token.value
+      post '/login', valid_auth_request(@user)
+      last_response.body.should == "token=#{@user.token.value}"
     end
     
     it 'sets a cookie on success' do
-      get '/auth', valid_auth_request_for_user(@user)
+      post '/login', valid_auth_request(@user)
       last_response.headers["Set-Cookie"].should == "token=#{@user.token.value}; path=/"
     end
+    
+    it 'redirects to the desired target with the token' do
+      post '/login', valid_auth_request(@user, "http://example.com")
+
+      last_response.status.should == 302
+      last_response.headers["Location"].should == "http://example.com?token=#{@user.token.value}"
+    end
+
+    it 'redirects to the desired target with the token and detects other url params' do
+      post '/login', valid_auth_request(@user, "http://example.com?snowball=cat")
+
+      last_response.status.should == 302
+      last_response.headers["Location"].should == "http://example.com?snowball=cat&token=#{@user.token.value}"
+    end
   end
   
   describe "POST to /create" do
@@ -85,8 +99,7 @@ describe Verge::Server do
     end
     
     it "fails if site not found" do
-      header("Referer", "BAD://SITE")
-      post '/create'
+      post '/create', {:site => "bad.site"}
 
       last_response.status.should == 401
     end
@@ -102,13 +115,10 @@ describe Verge::Server do
     before :each do
       @user = Factory(:user)
       @signed_token = @user.token.signed_tokens.first(:site_id => @site.id)
-      
-      header("Referer", @site.host)
     end
  
     it "fails if no regisered site is found" do
-      header("Referer", "BAD://SITE")
-      get "/verify/anything"
+      get "/verify/anything", {:site => "bad.site"}
 
       last_response.status.should == 401
     end

data/verge.gemspec

@@ -5,13 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{verge}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Elliot"]
-  s.date = %q{2009-10-20}
+  s.date = %q{2009-11-02}
+  s.default_executable = %q{verge}
   s.description = %q{Simple system that grants trusted sites tokens if users have successfully authenticated. So they are free to interact with each other securely.}
   s.email = %q{adam@wartube.com}
+  s.executables = ["verge"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -23,18 +25,25 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "bin/verge",
      "lib/verge.rb",
+     "lib/verge/client.rb",
      "lib/verge/crypto.rb",
      "lib/verge/server/base.rb",
+     "lib/verge/server/config.rb",
+     "lib/verge/server/exec.rb",
      "lib/verge/server/models.rb",
      "lib/verge/server/views/token.js.erb",
+     "spec/client_spec.rb",
      "spec/crypto_spec.rb",
      "spec/factories.rb",
      "spec/models_spec.rb",
      "spec/rcov.opts",
+     "spec/server_config_spec.rb",
+     "spec/server_exec_spec.rb",
+     "spec/server_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/verge_spec.rb",
      "verge.gemspec"
   ]
   s.homepage = %q{http://github.com/adamelliot/verge}
@@ -43,11 +52,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Lightweight centralized authentication system built on Sinatra}
   s.test_files = [
-    "spec/crypto_spec.rb",
+    "spec/client_spec.rb",
+     "spec/crypto_spec.rb",
      "spec/factories.rb",
      "spec/models_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/verge_spec.rb"
+     "spec/server_config_spec.rb",
+     "spec/server_exec_spec.rb",
+     "spec/server_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -60,7 +72,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 2.0.5"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<factory_girl>, [">= 1.2.3"])
+      s.add_development_dependency(%q<factory_girl>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<do_sqlite3>, [">= 0.9.0"])
     else
@@ -69,7 +81,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bcrypt-ruby>, [">= 2.0.5"])
       s.add_dependency(%q<activesupport>, [">= 2.3.4"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<factory_girl>, [">= 1.2.3"])
+      s.add_dependency(%q<factory_girl>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_dependency(%q<do_sqlite3>, [">= 0.9.0"])
     end
@@ -79,7 +91,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bcrypt-ruby>, [">= 2.0.5"])
     s.add_dependency(%q<activesupport>, [">= 2.3.4"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<factory_girl>, [">= 1.2.3"])
+    s.add_dependency(%q<factory_girl>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0.5.0"])
     s.add_dependency(%q<do_sqlite3>, [">= 0.9.0"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: verge
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Adam Elliot
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 -06:00
-default_executable: 
+date: 2009-11-02 00:00:00 -07:00
+default_executable: verge
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test
@@ -94,8 +94,8 @@ dependencies:
     version: 
 description: Simple system that grants trusted sites tokens if users have successfully authenticated. So they are free to interact with each other securely.
 email: adam@wartube.com
-executables: []
-
+executables: 
+- verge
 extensions: []
 
 extra_rdoc_files: 
@@ -108,18 +108,25 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/verge
 - lib/verge.rb
+- lib/verge/client.rb
 - lib/verge/crypto.rb
 - lib/verge/server/base.rb
+- lib/verge/server/config.rb
+- lib/verge/server/exec.rb
 - lib/verge/server/models.rb
 - lib/verge/server/views/token.js.erb
+- spec/client_spec.rb
 - spec/crypto_spec.rb
 - spec/factories.rb
 - spec/models_spec.rb
 - spec/rcov.opts
+- spec/server_config_spec.rb
+- spec/server_exec_spec.rb
+- spec/server_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/verge_spec.rb
 - verge.gemspec
 has_rdoc: true
 homepage: http://github.com/adamelliot/verge
@@ -150,8 +157,11 @@ signing_key:
 specification_version: 3
 summary: Lightweight centralized authentication system built on Sinatra
 test_files: 
+- spec/client_spec.rb
 - spec/crypto_spec.rb
 - spec/factories.rb
 - spec/models_spec.rb
+- spec/server_config_spec.rb
+- spec/server_exec_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
-- spec/verge_spec.rb