1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-03-15 12:29:16 +01:00

Merge remote-tracking branch 'origin/2pcjmhw-xss-vulnerability' into dev

This commit is contained in:
Du Peng 2022-08-01 18:17:08 +02:00
commit 549a719413
3 changed files with 7 additions and 3 deletions

View File

@ -1,7 +1,8 @@
# frozen_string_literal: true
json.projects @projects do |project|
json.extract! project, :id, :name, :description, :licence_id, :slug, :state
json.extract! project, :id, :name, :licence_id, :slug, :state
json.description sanitize(project.description)
json.author_id project.author.user_id
json.project_image project.project_image.attachment.medium.url if project.project_image

View File

@ -1,6 +1,7 @@
# frozen_string_literal: true
json.extract! @project, :id, :name, :description, :tags, :created_at, :updated_at, :licence_id, :slug
json.extract! @project, :id, :name, :tags, :created_at, :updated_at, :licence_id, :slug
json.description sanitize(@project.description)
json.author_id @project.author.user_id
json.project_image @project.project_image.attachment.large.url if @project.project_image
json.project_full_image @project.project_image.attachment.url if @project.project_image
@ -56,7 +57,7 @@ json.project_users @project.project_users do |pu|
end
json.project_steps_attributes @project.project_steps.order('project_steps.step_nb ASC') do |s|
json.id s.id
json.description s.description
json.description sanitize(s.description)
json.title s.title
json.project_step_images_attributes s.project_step_images.order('created_at ASC') do |si|
json.id si.id

View File

@ -74,6 +74,8 @@ module Fablab
FabManager.activate_plugins!
config.action_view.sanitized_allowed_tags = %w(a acronym hr pre table b strong i em li ul ol h1 h2 h3 h4 h5 h6 blockquote br cite sub sup ins p image iframe style)
config.after_initialize do
plugins = FabManager.plugins
plugins&.each(&:notify_after_initialize)