cuba-csrf 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae35f030c53ae173c8271c445993701b070d7565
-  data.tar.gz: 5b686325d6e707461182e3be78c57b4f41b9fa84
+  metadata.gz: 94e98c48283db2c21543133020a4c7e1bb6a13d1
+  data.tar.gz: 412e34ab4a7759974478bfb6fdc24de8a09f44ff
 SHA512:
-  metadata.gz: 19fe159769620cb10305d0c2bd2c7b729ddd5d1bcea8ea8c8eaa2a5f4d1e7f583ecb69dd6abb5f45ded7fd45d8dff7031741825a00a90cbffa925d8936d5469c
-  data.tar.gz: 6e60f4477fcc17a4ab6ad57db483c5d1c241ff3a4eb59eb5b375157d3547fafa05a0b5751902ac0d8ac0597710dc47e94f6483cbb1fa491362491ba4a917afa6
+  metadata.gz: 6cc9730a59a1f11814b6cc035f988402919af9339cf597c6c54c08eb9bd5f3ee7908b67bb4fdbb6be91dba03662d2adf10aa3f208aa306eccd7595ac9b33ccb3
+  data.tar.gz: 139fde650e30b59734b81ee0f925c202806919b1de39ed0cf242797ddebe78d242cbe155a0be3941040b08260aabcae38c8dd1d90e4739929ab6318256438716

data/README.md

@@ -31,11 +31,7 @@ require "cuba/csrf"
 Cuba.plugin(Cuba::CSRF)
 
 Cuba.define do
-  begin
-    protect_from_forgery!
-  rescue Cuba::CSRF::InvalidToken
-    # In this case, if the verification fails
-    # we want to reset user's session.
+  unless csrf_safe?
     session.clear
 
     res.status = 403

data/cuba-csrf.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cuba-csrf"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.summary = "CSRF protection for Cuba applications."
   s.description = s.summary
   s.authors = ["Francesco Rodríguez", "Mayn Kjær"]

data/lib/cuba/csrf.rb

@@ -2,10 +2,8 @@ require "cuba"
 require "securerandom"
 
 module Cuba::CSRF
-  InvalidToken = Class.new(StandardError)
-
-  def protect_from_forgery!
-    raise InvalidToken unless _csrf_safe?
+  def csrf_safe?
+    req.get? || req.head? || req[:csrf_token] == csrf_token
   end
 
   def csrf_token
@@ -15,8 +13,4 @@ module Cuba::CSRF
   def csrf_tag
     %Q(<input type="hidden" name="csrf_token" value="#{csrf_token}">)
   end
-
-  def _csrf_safe?
-    req.get? || req.head? || req[:csrf_token] == csrf_token
-  end
 end

data/test/csrf.rb

@@ -18,11 +18,7 @@ scope do
 
   test "safe http methods" do
     Cuba.define do
-      protect_from_forgery!
-
-      on default do
-        res.write("safe")
-      end
+      raise unless csrf_safe?
     end
 
     assert_no_raise do
@@ -33,25 +29,25 @@ scope do
 
   test "invalid csrf param" do
     Cuba.define do
-      protect_from_forgery!
+      raise unless csrf_safe?
     end
 
-    assert_raise(Cuba::CSRF::InvalidToken) do
+    assert_raise do
       post "/", "csrf_token" => nil
     end
 
-    assert_raise(Cuba::CSRF::InvalidToken) do
+    assert_raise do
       post "/", "csrf_token" => ""
     end
 
-    assert_raise(Cuba::CSRF::InvalidToken) do
+    assert_raise do
       post "/", "csrf_token" => "nonsense"
     end
   end
 
   test "valid csrf param" do
     Cuba.define do
-      protect_from_forgery!
+      raise unless csrf_safe?
 
       on get do
         res.write(csrf_token)
@@ -83,14 +79,14 @@ scope do
     end
 
     Cuba.define do
-      protect_from_forgery!
+      raise unless csrf_safe?
 
       on "app" do
         run(App)
       end
     end
 
-    assert_raise(Cuba::CSRF::InvalidToken) do
+    assert_raise do
       post "/app"
     end
   end
@@ -120,7 +116,7 @@ scope do
       post "/"
     end
 
-    assert_raise(Cuba::CSRF::InvalidToken) do
+    assert_raise do
       post "/app"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba-csrf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Francesco Rodríguez