From de653854e58fe20239df67a0bd5db0576d7ddf89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ug=CC=A7is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Mon, 27 Jan 2014 11:41:56 +0200
Subject: Use strong parameters.

---
 .../refinery/blog/admin/categories_controller.rb          |  5 +++++
 app/controllers/refinery/blog/admin/posts_controller.rb   | 15 ++++++++++++---
 app/controllers/refinery/blog/blog_controller.rb          |  2 +-
 app/controllers/refinery/blog/posts_controller.rb         | 10 ++++++++--
 4 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/refinery/blog/admin/categories_controller.rb b/app/controllers/refinery/blog/admin/categories_controller.rb
index 0a3b7b9..e9f2f89 100644
--- a/app/controllers/refinery/blog/admin/categories_controller.rb
+++ b/app/controllers/refinery/blog/admin/categories_controller.rb
@@ -6,6 +6,11 @@ module Refinery
         crudify :'refinery/blog/category',
                 :order => 'title ASC'
 
+        private
+
+        def category_params
+          params.require(:category).permit(:title)
+        end
       end
     end
   end
diff --git a/app/controllers/refinery/blog/admin/posts_controller.rb b/app/controllers/refinery/blog/admin/posts_controller.rb
index 81bdc81..d01bba9 100644
--- a/app/controllers/refinery/blog/admin/posts_controller.rb
+++ b/app/controllers/refinery/blog/admin/posts_controller.rb
@@ -38,12 +38,12 @@ module Refinery
         def create
           # if the position field exists, set this object as last object, given the conditions of this class.
           if Refinery::Blog::Post.column_names.include?("position")
-            params[:post].merge!({
+            post_params.merge!({
               :position => ((Refinery::Blog::Post.maximum(:position, :conditions => "")||-1) + 1)
             })
           end
 
-          if (@post = Refinery::Blog::Post.create(params[:post])).valid?
+          if (@post = Refinery::Blog::Post.create(post_params)).valid?
             (request.xhr? ? flash.now : flash).notice = t(
               'refinery.crudify.created',
               :what => "'#{@post.title}'"
@@ -75,7 +75,16 @@ module Refinery
           end
         end
 
+      private
+
+        def post_params
+          params.require(:post).permit(:title, :body, :custom_teaser, :tag_list,
+            :draft, :published_at, :custom_url, :user_id, :browser_title,
+            :meta_description, :source_url, :source_url_title, :category_ids => [])
+        end
+
       protected
+
         def find_post
           @post = Refinery::Blog::Post.find_by_slug_or_id(params[:id])
         end
@@ -85,7 +94,7 @@ module Refinery
         end
 
         def check_category_ids
-          params[:post][:category_ids] ||= []
+          post_params[:category_ids] ||= []
         end
       end
     end
diff --git a/app/controllers/refinery/blog/blog_controller.rb b/app/controllers/refinery/blog/blog_controller.rb
index 6327199..0c50c95 100644
--- a/app/controllers/refinery/blog/blog_controller.rb
+++ b/app/controllers/refinery/blog/blog_controller.rb
@@ -10,7 +10,7 @@ module Refinery
       protected
 
         def find_page
-          @page = Refinery::Page.find_by_link_url(Refinery::Blog.page_url)
+          @page = Refinery::Page.find_by(:link_url => Refinery::Blog.page_url)
         end
     end
   end
diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb
index 20ac12b..1cc9698 100644
--- a/app/controllers/refinery/blog/posts_controller.rb
+++ b/app/controllers/refinery/blog/posts_controller.rb
@@ -2,7 +2,7 @@ module Refinery
   module Blog
     class PostsController < BlogController
 
-      before_filter :paginate_all_blog_posts, :except => [:archive]
+      before_filter :find_all_blog_posts, :except => [:archive]
       before_filter :find_blog_post, :only => [:show, :comment, :update_nav]
       before_filter :find_tags
 
@@ -37,7 +37,7 @@ module Refinery
       end
 
       def comment
-        @comment = @post.comments.create(params[:comment])
+        @comment = @post.comments.create(comment_params)
         if @comment.valid?
           if Comment::Moderation.enabled? or @comment.ham?
             begin
@@ -81,6 +81,12 @@ module Refinery
         @posts = Post.live.tagged_with(@tag_name).page(params[:page])
       end
 
+    private
+
+      def comment_params
+        params.require(:comment).permit(:name, :email, :message)
+      end
+
     protected
       def canonical?
         Refinery::I18n.default_frontend_locale != Refinery::I18n.current_frontend_locale
-- 
cgit v1.2.3