guillotine 0.0.5 → 0.1.0

data/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'sinatra'
+gem 'addressable'
 
 group :test do
   gem 'rack-test'

data/guillotine.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'guillotine'
-  s.version           = '0.0.5'
+  s.version           = '0.1.0'
   s.date              = '2011-08-17'
   s.rubyforge_project = 'guillotine'
 

data/lib/guillotine/app.rb

@@ -1,7 +1,10 @@
 require 'sinatra/base'
+require 'addressable/uri'
 
 module Guillotine
   class App < Sinatra::Base
+    set :required_host, nil
+
     get "/:code" do
       code = params[:code]
       if url = settings.db.find(code)
@@ -12,16 +15,26 @@ module Guillotine
     end
 
     post "/" do
-      url  = params[:url].to_s
+      url  = Addressable::URI.parse params[:url]
       code = params[:code]
 
-      if url.empty?
-        halt 422, "Invalid url: #{url.inspect}"
+      if !(url && url.scheme =~ /^https?$/)
+        halt 422, "Invalid url: #{url}"
+      end
+
+      case settings.required_host
+      when String
+        if url.host != settings.required_host
+          halt 422, "URL must be from #{settings.required_host}"
+        end
+      when Regexp
+        if url.host.to_s !~ settings.required_host
+          halt 422, "URL must match #{settings.required_host.inspect}"
+        end
       end
-      url.strip!
 
       begin
-        if code = settings.db.add(url, code)
+        if code = settings.db.add(url.to_s.strip, code)
           redirect code
         else
           halt 422, "Unable to shorten #{url}"

data/lib/guillotine.rb

@@ -2,7 +2,7 @@ require 'base64'
 require 'digest/md5'
 
 module Guillotine
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 
   dir = File.expand_path '../guillotine', __FILE__
   autoload :App, "#{dir}/app"

data/test/app_test.rb

@@ -38,8 +38,8 @@ class AppTest < Guillotine::TestCase
   end
 
   def test_clashing_urls_raises_error
-    code = ADAPTER.add '123'
-    post '/', :url => '456', :code => code
+    code = ADAPTER.add 'http://github.com/123'
+    post '/', :url => 'http://github.com/456', :code => code
     assert_equal 422, last_response.status
   end
 
@@ -53,6 +53,38 @@ class AppTest < Guillotine::TestCase
     assert_equal 'http://example.org/SWtBvQ', last_response.headers['location']
   end
 
+  def test_rejects_non_http_urls
+    post '/', :url => 'ftp://abc.com'
+    assert_equal 422, last_response.status
+  end
+
+  def test_reject_shortened_url_from_other_domain
+    Guillotine::App.set :required_host, 'abc.com'
+    post '/', :url => 'http://github.com'
+    assert_equal 422, last_response.status
+    assert_match /must be from abc\.com/, last_response.body
+
+    post '/', :url => 'http://abc.com/def'
+    assert_equal 302, last_response.status
+  ensure
+    Guillotine::App.set :required_host, nil
+  end
+
+  def test_reject_shortened_url_from_other_domain_by_regex
+    Guillotine::App.set :required_host, /abc\.com$/
+    post '/', :url => 'http://github.com'
+    assert_equal 422, last_response.status
+    assert_match /must match \/abc\\.com/, last_response.body
+
+    post '/', :url => 'http://abc.com/def'
+    assert_equal 302, last_response.status
+
+    post '/', :url => 'http://www.abc.com/def'
+    assert_equal 302, last_response.status
+  ensure
+    Guillotine::App.set :required_host, nil
+  end
+
   def app
     Guillotine::App
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guillotine
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70280178489080 !ruby/object:Gem::Requirement
+  requirement: &70175244899260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70280178489080
+  version_requirements: *70175244899260
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70280178488700 !ruby/object:Gem::Requirement
+  requirement: &70175244898880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280178488700
+  version_requirements: *70175244898880
 description: Adaptable private URL shortener
 email: technoweenie@gmail.com
 executables: []