From 48caa33d41519c5ef7d7524e7189057988a0e2f5 Mon Sep 17 00:00:00 2001
From: paulshu <paulshu18@gmail.com>
Date: Sun, 10 Sep 2017 19:08:56 +0800
Subject: [PATCH] Repair the bugs

---
 Gemfile                                   |  3 ++-
 Gemfile.lock                              | 14 ++++++++++----
 app/controllers/application_controller.rb |  2 +-
 app/controllers/events_controller.rb      |  4 ++--
 app/controllers/users_controller.rb       |  2 +-
 app/helpers/users_helper.rb               |  7 ++++---
 app/views/events/show.html.erb            |  6 +++---
 config/routes.rb                          |  2 +-
 8 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index e91c3ae..ff8e371 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,8 @@ end
 
 group :development do
   gem 'faker'
-
+  gem 'brakeman'
+  gem 'bundler-audit' #检查有没有套件有已知的漏洞需要升级
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '~> 3.0.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 30c443b..b5d3b37 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -46,7 +46,11 @@ GEM
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
+    brakeman (3.7.2)
     builder (3.2.3)
+    bundler-audit (0.6.0)
+      bundler (~> 1.2)
+      thor (~> 0.18)
     byebug (9.0.6)
     coffee-rails (4.2.1)
       coffee-script (>= 2.2.0)
@@ -89,12 +93,12 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.2.0)
     minitest (5.10.1)
     multi_json (1.12.1)
     nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     orm_adapter (0.5.0)
     puma (3.8.2)
     rack (2.0.1)
@@ -192,6 +196,8 @@ PLATFORMS
 
 DEPENDENCIES
   bootstrap-sass
+  brakeman
+  bundler-audit
   byebug
   coffee-rails (~> 4.2)
   devise
@@ -212,4 +218,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   1.14.6
+   1.15.3
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 682a07d..cd6ea53 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
 
-  # protect_from_forgery with: :exception
+  protect_from_forgery with: :exception
 
   helper_method :current_cart
 
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 245dece..c628485 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -9,10 +9,10 @@ def show
     @comments = @event.comments
 
     if params[:keyword]
-      @comments = @comments.where( "comments.content LIKE '%#{params[:keyword]}%'")
+      @comments = @comments.where( "comments.content LIKE ?", "%#{params[:keyword]}%")
     end
 
-    if params[:sort]
+    if params[:sort] && ["id DESC", "id ASC"].include?(params[:sort])  # 只有白名单内的参数可以用
       @comments = @comments.order(params[:sort])
     end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f1d232d..fd6cac4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -21,7 +21,7 @@ def update
   protected
 
   def user_params
-    params.require(:user).permit(:nickname, :role)
+    params.require(:user).permit(:nickname)
   end
 
 end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index ed49051..908e9c8 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -7,9 +7,10 @@ def user_avatar_link(user)
     email_md5 = Digest::MD5.hexdigest(user.email)
     gravatar_url = "https://www.gravatar.com/avatar/#{email_md5}"
 
-    str = "<div class ='user-link'>" + link_to(image_tag(gravatar_url), user_path(user)) + " " + user.display_name + "</div>"
-
-    str.html_safe
+    # "<div class ='user-link'>".html_safe + link_to(image_tag(gravatar_url), user_path(user)) + " " + user.display_name + "</div>".html_safe
+    content_tag(:div,
+      link_to(image_tag(gravatar_url), user_path(user)) + " " + user.display_name ,
+      :class => "user-link" )
   end
 
 end
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index 0e89067..2996fec 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -22,14 +22,14 @@
     </div>
 
     <div class="panel-body">
-      <%= raw comment.content %>
+      <%= sanitize comment.content %>
     </div>
 
     <div class="panel-footer text-right">
       <%= comment.created_at.to_s %>
 
       <% if current_user && current_user.is_admin? %>
-        <%= link_to "Highligh", highlight_event_comment_path(@event, comment), :class => "btn btn-default" %>
+        <%= link_to "Highligh", highlight_event_comment_path(@event, comment), :method => :post, :class => "btn btn-default" %>
       <% end %>
 
       <% if comment.can_deleted_by(current_user) %>
@@ -50,4 +50,4 @@
   <div class="form-group">
     <%= f.submit "Comment", :class => "btn btn-primary" %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 2cfd938..a5ccf3e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,7 @@
   resources :events do
     resources :comments do
       member do
-        get :highlight
+        post :highlight
       end
     end
   end