From a87b92db7b738cf86deac15d69f4159b2f87d79e Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sat, 11 Sep 2010 11:04:19 +0200 Subject: revises implementation and documentation of csrf_meta_tags, and aliases csrf_meta_tag to it for backwards compatibilty --- actionpack/lib/action_view/helpers/csrf_helper.rb | 28 ++++++++++++++++++----- 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'actionpack/lib/action_view') diff --git a/actionpack/lib/action_view/helpers/csrf_helper.rb b/actionpack/lib/action_view/helpers/csrf_helper.rb index 3d03f6aac6..092855b578 100644 --- a/actionpack/lib/action_view/helpers/csrf_helper.rb +++ b/actionpack/lib/action_view/helpers/csrf_helper.rb @@ -1,14 +1,30 @@ +require 'active_support/core_ext/string/strip' + module ActionView # = Action View CSRF Helper module Helpers module CsrfHelper - # Returns a meta tag with the cross-site request forgery protection token - # for forms to use. Place this in your head. - def csrf_meta_tag - if protect_against_forgery? - %(\n).html_safe - end + # Returns meta tags "csrf-param" and "csrf-token" with the name of the cross-site + # request forgery protection parameter and token, respectively. + # + # + # <%= csrf_meta_tags %> + # + # + # These are used to generate the dynamic forms that implement non-remote links with + # :method. + # + # Note that regular forms generate hidden fields, and that Ajax calls are whitelisted, + # so they do not use these tags. + def csrf_meta_tags + <<-METAS.strip_heredoc.html_safe if protect_against_forgery? + + + METAS end + + # For backwards compatibility. + alias csrf_meta_tag csrf_meta_tags end end end -- cgit v1.2.3