Merge pull request #3030 from DigitalCurationCentre/remove_vulnerabil…

…ity_XSS_hack

Remove vulnerability xss hack

app/models/application_record.rb

@@ -8,4 +8,10 @@ class ApplicationRecord < ActiveRecord::Base
 
   self.abstract_class = true
 
+  def sanitize_fields(*attrs)
+    attrs.each do |attr|
+      send("#{attr}=", ActionController::Base.helpers.sanitize(send(attr)))
+    end
+  end
+
 end

app/models/plan.rb

@@ -203,6 +203,15 @@ class Plan < ApplicationRecord
   end
   alias super_settings settings
 
+  # =============
+  # = Callbacks =
+  # =============
+
+  # sanitise html tags e.g remove unwanted 'script'
+  before_validation lambda { |data|
+    data.sanitize_fields(:title, :identifier, :description)
+  }
+
   # =================
   # = Class methods =
   # =================
@@ -227,7 +236,7 @@ def self.load_for_phase(plan_id, phase_id)
   # Returns Plan
   def self.deep_copy(plan)
     plan_copy = plan.dup
-    plan_copy.title = "Copy of " + plan.title
+    plan_copy.title = "Copy of #{plan.title}"
     plan_copy.feedback_requested = false
     plan_copy.save!
     plan.answers.each do |answer|

app/models/user.rb

@@ -160,6 +160,9 @@ class User < ApplicationRecord
   # = Callbacks =
   # =============
 
+  # sanitise html tags from fields
+  before_validation ->(data) { data.sanitize_fields(:firstname, :surname) }
+
   after_update :clear_department_id, if: :saved_change_to_org_id?
 
   after_update :delete_perms!, if: :saved_change_to_org_id?, unless: :can_change_org?