sinatra-security 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/sinatra/security/helpers.rb

@@ -20,7 +20,9 @@ module Sinatra
         if logged_in?
           return true
         else
-          session[:return_to] = request.fullpath
+          if should_return_to?(request.fullpath)
+            session[:return_to] = request.fullpath
+          end
           redirect "/login"
           return false
         end
@@ -41,6 +43,10 @@ module Sinatra
       def logout!
         session.delete(:user) 
       end
+
+      def should_return_to?(path)
+        !(path =~ /(jpe?g|png|gif|css|js)$/)
+      end
     end
   end
 end

data/sinatra-security.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-security}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-04-29}
+  s.date = %q{2010-05-17}
   s.description = %q{For use with Sinatra + Monk + OHM}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [

data/test/test_sinatra-security.rb

@@ -12,6 +12,24 @@ class BasicApp < Sinatra::Base
   get '/private' do
     require_login
   end
+
+  get '/css/main.css' do
+    require_login
+
+    "body { color: black }"
+  end
+
+  get '/images/:image' do
+    require_login
+
+    params[:image]
+  end
+
+  get '/js/main.js' do
+    require_login
+
+    "alert('hey')"
+  end
 end
 
 class TestSinatraSecurity < Test::Unit::TestCase
@@ -62,6 +80,29 @@ class TestSinatraSecurity < Test::Unit::TestCase
     end
   end
 
+  describe "accessing a private url with GET but as (js|css|png) etc" do
+    should "not save any return_to" do
+      get "/css/main.css"
+      assert ! session[:return_to]
+
+      get "/js/main.js"
+      assert ! session[:return_to]
+
+      get "/images/test.png"
+      assert ! session[:return_to]
+
+      get "/images/test.gif"
+      assert ! session[:return_to]
+
+      get "/images/test.jpg"
+      assert ! session[:return_to]
+
+      get "/images/test.jpeg"
+      assert ! session[:return_to]
+    end
+  end
+
+
   describe "being redirected and then logging in" do
     setup do
       get '/private'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Cyril David
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 +08:00
+date: 2010-05-17 00:00:00 +08:00
 default_executable: 
 dependencies: []