camaleon_cms 2.8.0 → 2.8.2

data/app/controllers/camaleon_cms/admin/media_controller.rb

@@ -30,6 +30,8 @@ module CamaleonCms
 
         file = cama_uploader.fetch_file("private/#{params[:file]}")
 
+        return render plain: helpers.sanitize(file[:error]) if file.is_a?(Hash) && file[:error].present?
+
         send_file file, disposition: 'inline'
       end
 
@@ -51,16 +53,15 @@ module CamaleonCms
       def actions
         authorize! :manage, :media if params[:media_action] != 'crop_url'
         params[:folder] = params[:folder].gsub('//', '/') if params[:folder].present?
+
         case params[:media_action]
         when 'new_folder'
           params[:folder] = slugify_folder(params[:folder])
-          render partial: 'render_file_item', locals: { files: [cama_uploader.add_folder(params[:folder])] }
+          return render partial: 'render_file_item', locals: { files: [cama_uploader.add_folder(params[:folder])] }
         when 'del_folder'
-          cama_uploader.delete_folder(params[:folder])
-          render plain: ''
+          r = cama_uploader.delete_folder(params[:folder])
         when 'del_file'
-          cama_uploader.delete_file(params[:folder].gsub('//', '/'))
-          render plain: ''
+          r = cama_uploader.delete_file(params[:folder].gsub('//', '/'))
         when 'crop_url'
           user_url = params[:url].to_s
           user_url = "#{current_site.the_url(locale: nil)}#{user_url}" unless user_url.start_with?('data:', 'http')
@@ -70,16 +71,18 @@ module CamaleonCms
               else
                 cama_tmp_upload(user_url, formats: params[:formats], name: params[:name])
               end
-          if r[:error].present?
-            render plain: helpers.sanitize(r[:error])
-          else
+          if r[:error].blank?
             params[:file_upload] = r[:file_path]
             sett = { remove_source: true }
             sett[:same_name] = true if params[:same_name].present?
             sett[:name] = params[:name] if params[:name].present?
-            upload(sett)
+            return upload(sett)
           end
         end
+
+        return render plain: helpers.sanitize(r[:error]) if r[:error].present?
+
+        render plain: ''
       end
 
       # upload files from media uploader

data/app/helpers/camaleon_cms/html_helper.rb

@@ -117,7 +117,7 @@ module CamaleonCms
 
       libs = {}
       libs[:colorpicker] =
-        { js: ['camaleon_cms/admin/bootstrap-colorpicker'], css: ['camaleon_cms/admin/colorpicker.css'] }
+        { js: ['camaleon_cms/admin/bootstrap-colorpicker'], css: ['camaleon_cms/admin/colorpicker'] }
       libs[:datepicker] = { js: [] }
       libs[:datetimepicker] = { js: [], css: [] }
       libs[:tinymce] =

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -1,7 +1,21 @@
+# frozen_string_literal: true
+
 module CamaleonCms
   module UploaderHelper
+    SUSPICIOUS_PATTERNS = [
+      /<script[\s>]/i,  # Script tags
+      /on\w{3,}\s*=/i,  # Inline event handlers like oncut, onload, onclick, etc.
+      /javascript:/i,   # JavaScript in href/src attributes
+      /<iframe[\s>]/i,  # Iframes
+      /<object[\s>]/i,  # Object tags
+      /<embed[\s>]/i,   # Embed tags
+      /<base[\s>]/i,    # Base tags (can be used to manipulate URLs)
+      /data:/i          # data: URLs (which can include scripts)
+    ].freeze
+
     include ActionView::Helpers::NumberHelper
     include CamaleonCms::CamaleonHelper
+
     # upload a file into server
     # settings:
     #   folder: Directory where the file will be saved (default: "")
@@ -12,8 +26,9 @@ module CamaleonCms
     #   formats: extensions permitted, sample: jpg,png,... or generic: images | videos | audios | documents (default *)
     #   remove_source: Boolean (delete source file after saved if this is true, default false)
     #   same_name: Boolean (save the file with the same name if defined true, else search for a non used name)
-    #   versions: (String) Create addtional multiple versions of the image uploaded, sample: '300x300,505x350' ==> Will create two extra images with these dimensions
-    #       sample "test.png", versions: '200x200,450x450' will generate: thumb/test-png_200x200.png, test-png_450x450.png
+    #   versions: (String) Create additional multiple versions of the image uploaded,
+    #     sample: '300x300,505x350' ==> Will create two extra images with these dimensions
+    #     sample "test.png", versions: '200x200,450x450' will generate: thumb/test-png_200x200.png, test-png_450x450.png
     #   thumb_size: String (redefine the dimensions of the thumbnail, sample: '100x100' ==> only for images)
     #   temporal_time: if great than 0 seconds, then this file will expire (removed) in that time (default: 0)
     #     To manage jobs, please check https://edgeguides.rubyonrails.org/active_job_basics.html
@@ -36,6 +51,8 @@ module CamaleonCms
         uploaded_io = File.open(cama_resize_upload(uploaded_io.path, settings[:dimension]))
       end
 
+      return { error: 'Potentially malicious content found!' } if file_content_unsafe?(uploaded_io)
+
       settings = settings.to_sym
       settings[:uploaded_io] = uploaded_io
       settings = {
@@ -54,10 +71,13 @@ module CamaleonCms
         same_name: false,
         versions: '',
         thumb_size: nil
-      }.merge(settings)
+      }.merge!(settings)
       hooks_run('before_upload', settings)
       res = { error: nil }
 
+      # guard against path traversal
+      return { error: 'Invalid file path' } unless cama_uploader.class.valid_folder_path?(settings[:folder])
+
       # formats validations
       return { error: "#{ct('file_format_error')} (#{settings[:formats]})" } unless cama_uploader.class.validate_file_format(
         uploaded_io.path, settings[:formats]
@@ -194,7 +214,7 @@ module CamaleonCms
     # Return: (String) file path where saved this cropped
     # sample: cama_resize_and_crop(my_file, 200, 200, {gravity: :north_east, overwrite: false})
     def cama_resize_and_crop(file, w, h, settings = {})
-      settings = { gravity: :north_east, overwrite: true, output_name: '' }.merge(settings)
+      settings = { gravity: :north_east, overwrite: true, output_name: +'' }.merge!(settings)
       img = MiniMagick::Image.open(file)
       if file.end_with? '.svg'
         img.format 'jpg'
@@ -300,10 +320,11 @@ module CamaleonCms
 
     # resize image if the format is correct
     # return resized file path
-    def cama_resize_upload(image_path, dimesion, args = {})
-      if cama_uploader.class.validate_file_format(image_path, 'image') && dimesion.present?
-        r = { file: image_path, w: dimesion.split('x')[0], h: dimesion.split('x')[1], w_offset: 0, h_offset: 0,
-              resize: !dimesion.split('x')[2] || dimesion.split('x')[2] == 'resize', replace: true, gravity: :north_east }.merge(args)
+    def cama_resize_upload(image_path, dimension, args = {})
+      if cama_uploader.class.validate_file_format(image_path, 'image') && dimension.present?
+        r = { file: image_path, w: dimension.split('x')[0], h: dimension.split('x')[1], w_offset: 0, h_offset: 0,
+              resize: !dimension.split('x')[2] || dimension.split('x')[2] == 'resize',
+              replace: true, gravity: :north_east }.merge!(args)
         hooks_run('on_uploader_resize', r)
         image_path = if r[:w].present? && r[:h].present?
                        cama_resize_and_crop(r[:file], r[:w], r[:h], { overwrite: r[:replace], gravity: r[:gravity] })
@@ -334,7 +355,7 @@ module CamaleonCms
                                       data
                                     } # permit to read custom attributes from aws file and add to file parsed object
           },
-          custom_uploader: nil # posibility to use custom file uploader
+          custom_uploader: nil # possibility to use custom file uploader
         }
         hooks_run('on_uploader', args)
         return args[:custom_uploader] if args[:custom_uploader].present?
@@ -355,13 +376,30 @@ module CamaleonCms
     end
 
     def slugify_folder(val)
-      splitted_folder = val.split('/')
-      splitted_folder[-1] = slugify(splitted_folder.last)
-      splitted_folder.join('/')
+      split_folder = val.split('/')
+      split_folder[-1] = slugify(split_folder.last)
+      split_folder.join('/')
     end
 
     private
 
+    def file_content_unsafe?(uploaded_io)
+      file = uploaded_io.is_a?(ActionDispatch::Http::UploadedFile) ? uploaded_io.tempfile : uploaded_io
+      file_content_unsafe = nil
+
+      file.set_encoding(Encoding::BINARY) if file.respond_to?(:binmode) && file.respond_to?(:set_encoding)
+
+      file_content = file.read
+      SUSPICIOUS_PATTERNS.each do |pattern|
+        if file_content =~ pattern
+          Rails.logger.info { "Potentially malicious content found: #{pattern.inspect}" }
+          break file_content_unsafe = pattern.inspect
+        end
+      end
+
+      file_content_unsafe
+    end
+
     # helper for resize and crop method
     def cama_crop_offsets_by_gravity(gravity, original_dimensions, cropped_dimensions)
       original_width, original_height = original_dimensions

data/app/models/camaleon_cms/custom_field_group.rb

@@ -24,12 +24,9 @@ module CamaleonCms
     # -  options (textbox sample):  {"field_key":"text_box","multiple":"1","required":"1",
     #     "translate":"1"}
     #   * field_key (string) | translate (boolean) | default_value (unique value) |
-    #      default_values (array - multiple values for this field) | label_eval (boolean) |
-    #      multiple_options (array)
+    #      default_values (array - multiple values for this field) | multiple_options (array)
     #   * multiple_options (used for select, radio and checkboxes ): [{"title"=>"Option Title",
     #      "value"=>"2", "default"=>"1"}, {"title"=>"abcde", "value"=>"3"}]
-    #   * label_eval: (Boolean, default false), true => will evaluate the label and description of
-    #       current field using (eval('my_label')) to have translatable|dynamic labels
     # ****** check all options for each case in Admin::CustomFieldsHelper ****
     # SAMPLE: my_model.add_field({"name"=>"Sub Title", "slug"=>"subtitle"}, {"field_key"=>"text_box",
     #   "translate"=>true, default_value: "Get in Touch"})

data/app/models/camaleon_cms/term_taxonomy.rb

@@ -3,6 +3,12 @@ module CamaleonCms
     include CamaleonCms::Metas
     include CamaleonCms::CustomFieldsRead
 
+    TRANSLATION_TAG_HIDE_MAP = { '<!--' => '!--', '-->' => '--!' }.freeze
+    TRANSLATION_TAG_HIDE_REGEX = Regexp.new(TRANSLATION_TAG_HIDE_MAP.keys.map { |x| Regexp.escape(x) }.join('|')).freeze
+    TRANSLATION_TAG_RESTORE_MAP = { '--!' => '-->', '!--' => '<!--' }.freeze
+    TRANSLATION_TAG_RESTORE_REGEX =
+      Regexp.new(TRANSLATION_TAG_RESTORE_MAP.keys.map { |x| Regexp.escape(x) }.join('|')).freeze
+
     def self.inherited(subclass)
       super
 
@@ -22,11 +28,16 @@ module CamaleonCms
         %i[name description].each do |attr|
           next unless new_record? || attribute_changed?(attr)
 
-          self[attr] = ActionController::Base.helpers.sanitize(__send__(attr))
+          self[attr] = ActionController::Base.helpers.sanitize(
+            __send__(attr)&.gsub(TRANSLATION_TAG_HIDE_REGEX, TRANSLATION_TAG_HIDE_MAP)
+          )&.gsub(TRANSLATION_TAG_RESTORE_REGEX, TRANSLATION_TAG_RESTORE_MAP)
         end
       end
     else
-      normalizes :name, :description, with: ->(field) { ActionController::Base.helpers.sanitize(field) }
+      normalizes :name, :description, with: lambda { |field|
+        ActionController::Base.helpers.sanitize(field.gsub(TRANSLATION_TAG_HIDE_REGEX, TRANSLATION_TAG_HIDE_MAP))
+                              .gsub(TRANSLATION_TAG_RESTORE_REGEX, TRANSLATION_TAG_RESTORE_MAP)
+      }
     end
 
     # callbacks

data/app/uploaders/camaleon_cms_aws_uploader.rb

@@ -36,11 +36,11 @@ class CamaleonCmsAwsUploader < CamaleonCmsUploader
   end
 
   def fetch_file(file_name)
-    bucket.object(file_name).download_file(file_name) unless file_exists?(file_name)
+    return file_name if file_exists?(file_name)
 
-    raise ActionController::RoutingError, 'File not found' unless file_exists?(file_name)
+    return file_name if bucket.object(file_name).download_file(file_name) && file_exists?(file_name)
 
-    file_name
+    { error: 'File not found' }
   end
 
   # parse an AWS file into custom file_object

data/app/uploaders/camaleon_cms_local_uploader.rb

@@ -1,8 +1,8 @@
 class CamaleonCmsLocalUploader < CamaleonCmsUploader
   def after_initialize
-    @root_folder = @args[:root_folder] || @current_site.upload_directory
+    @root_folder = @current_site.upload_directory
 
-    FileUtils.mkdir_p(@root_folder)
+    FileUtils.mkdir_p(@root_folder) unless Dir.exist?(@root_folder)
   end
 
   def setup_private_folder
@@ -25,9 +25,11 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
   end
 
   def fetch_file(file_name)
-    raise ActionController::RoutingError, 'File not found' unless file_exists?(file_name)
+    return { error: 'Invalid file path' } if file_name.include?('..')
+
+    return file_name if file_exists?(file_name)
 
-    file_name
+    { error: 'File not found' }
   end
 
   def file_parse(key)
@@ -107,6 +109,8 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
 
   # remove an existent folder
   def delete_folder(key)
+    return { error: 'Invalid folder path' } if key.include?('..')
+
     folder = File.join(@root_folder, key)
     FileUtils.rm_rf(folder) if Dir.exist? folder
     get_media_collection.find_by_key(key).take.destroy
@@ -114,6 +118,8 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
 
   # remove an existent file
   def delete_file(key)
+    return { error: 'Invalid file path' } if key.include?('..')
+
     file = File.join(@root_folder, key)
     FileUtils.rm(file) if File.exist? file
     @instance.hooks_run('after_delete', key)

data/app/uploaders/camaleon_cms_uploader.rb

@@ -125,6 +125,14 @@ class CamaleonCmsUploader
     valid_formats.include?(File.extname(key).sub('.', '').split('?').first.try(:downcase))
   end
 
+  def self.valid_folder_path?(path)
+    return true if path == '/'
+
+    return false if path.include?('..') || File.absolute_path?(path) || path.include?('://')
+
+    true
+  end
+
   # verify if this file name already exist
   # if the file is already exist, return a new name for this file
   # sample: search_new_key("my_file/file.txt")

data/app/views/camaleon_cms/admin/settings/custom_fields/_get_items.html.erb

@@ -23,7 +23,6 @@
       <div class="panel-body">
         <%= hidden_field(:fields, :id, index: @index, value: @item_id) %>
         <%= hidden_field(:field_options, :field_key, index: @index, value: @key) %>
-        <%= hidden_field(:field_options, :label_eval, index: @index, value: @item_options_value[:label_eval].to_s.cama_true? ? 'true' : '') %>
         <%= hidden_field(:field_options, :panel_hidden, index: @index, value: @item_options_value[:panel_hidden], class: 'input-panel-hidden') %>
         <div class="form-group input-group-sm">
           <label for=""><%= t('camaleon_cms.admin.table.name') %></label><br>
@@ -182,4 +181,4 @@
   jQuery(function () {
     $('#<%= @panel_id %>').find('.translatable').Translatable();
   })
-</script>
+</script>

data/app/views/camaleon_cms/admin/settings/custom_fields/_render.html.erb

@@ -20,14 +20,14 @@
                             <input name="<%= field_name %>[<%= field.slug %>][id]" type="hidden" value="<%= field.id %>"/>
                             <input name="<%= field_name %>[<%= field.slug %>][group_number]" class="cama_custom_group_number" type="hidden" value="0"/>
                             <label>
-                                <%= field.options[:label_eval].present? ? eval(field.name) : field.name %>
+                                <%= field.name %>
                                 <%= raw "<em class='text-danger'>*</em>" if field.options[:required].to_s.to_bool %>
                                 <% if current_site.get_option('custom_fields_show_shortcodes') && ["post", "posttype", "category", "postTag", "site", "user", "navmenu", "theme"].include?(obj_class) %>
                                     <small class="shortcode_field"><br><%= raw cama_shortcode_print("[data field='#{field.slug}' #{"object='#{obj_class}' #{"id='#{record.id}'" if obj_class != "Theme" }" unless record.new_record?}]") %></small>
                                 <% end %>
                             </label>
                             <% if field.description.present? %>
-                                <p><small><%= field.options[:label_eval].present? ? eval(field.description) : field.description %></small></p>
+                                <p><small><%= field.description %></small></p>
                             <% end  %>
                             <div class="editor-custom-fields content-field-<%= field.id %>" data-add_field_title="<%= t('camaleon_cms.admin.button.add_new_field', default: 'Add new field')%>">
                                 <%= begin

data/config/initializers/sass.rb

@@ -1,3 +1,5 @@
+require 'sassc'
+
 module Sprockets
   # Processor engine class for the SASS/SCSS compiler. Depends on the `sass` gem.
   #
@@ -11,23 +13,23 @@ module Sprockets
       # return them path (this prefix automatically the path with current theme location)
       # Sample: .container{ background: #ffffff url(asset_theme_path('img/patterns/pattern1.jpg')); }
       def asset_theme_path(path, options = {})
-        asset_path(Autoload::Sass::Script::String.new("#{get_theme_prefix}/#{path.value}".gsub('//', '/')), options)
+        asset_path(::SassC::Script::Value::String.new("#{get_theme_prefix}/#{path.value}".gsub('//', '/')), options)
       end
 
       # return them path (this prefix automatically the path with current theme location)
       # Sample: .container{ background: #ffffff asset-theme-url('img/patterns/pattern1.jpg'); }
       def asset_theme_url(path, options = {})
-        asset_url(Autoload::Sass::Script::String.new("#{get_theme_prefix}/#{path.value}".gsub('//', '/')), options)
+        asset_url(::SassC::Script::Value::String.new("#{get_theme_prefix}/#{path.value}".gsub('//', '/')), options)
       end
 
       # return them path (this prefix automatically the path with current theme location)
       def asset_plugin_path(path, options = {})
-        asset_path(Autoload::Sass::Script::String.new("#{get_plugin_prefix}/#{path.value}"), options)
+        asset_path(::SassC::Script::Value::String.new("#{get_plugin_prefix}/#{path.value}"), options)
       end
 
       # return them path (this prefix automatically the path with current theme location)
       def asset_plugin_url(path, options = {})
-        asset_url(Autoload::Sass::Script::String.new("#{get_plugin_prefix}/#{path.value}"), options)
+        asset_url(::SassC::Script::Value::String.new("#{get_plugin_prefix}/#{path.value}"), options)
       end
 
       private
@@ -35,23 +37,17 @@ module Sprockets
       # get plugin asset prefix
       def get_plugin_prefix
         file = options[:filename]
-        res = ''
-        if file.include?('/plugins/')
-          res = "plugins/#{file.split('/plugins/').last.split('/').first}/#{if file.include?('apps/plugins/')
-                                                                              'assets/'
-                                                                            end}"
-        end
-        res
+        return '' unless file.include?('/plugins/')
+
+        "plugins/#{file.split('/plugins/').last.split('/').first}/#{file.include?('apps/plugins/') ? 'assets/' : ''}"
       end
 
       # get theme asset prefix
       def get_theme_prefix
         file = options[:filename]
-        res = ''
-        if file.include?('/themes/')
-          res = "themes/#{file.split('/themes/').last.split('/').first}/#{'assets/' if file.include?('apps/themes/')}"
-        end
-        res
+        return '' unless file.include?('/themes/')
+
+        "themes/#{file.split('/themes/').last.split('/').first}/#{'assets/' if file.include?('apps/themes/')}"
       end
     end
   end

data/lib/camaleon_cms/engine.rb

@@ -10,7 +10,7 @@ require 'aws-sdk-s3'
 require 'font-awesome-rails'
 require 'tinymce-rails'
 require 'jquery-rails'
-require 'sass-rails'
+require 'dartsass-sprockets'
 require 'cama_contact_form'
 require 'cama_meta_tag'
 

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.8.0'.freeze
+  VERSION = '2.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.2
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cama_contact_form
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: cama_meta_tag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +100,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: dartsass-sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: draper
   requirement: !ruby/object:Gem::Requirement
@@ -170,20 +212,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -240,34 +268,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cama_contact_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: cama_meta_tag
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -644,7 +644,7 @@ files:
 - app/assets/stylesheets/camaleon_cms/admin/_jquery.tagsinput.css
 - app/assets/stylesheets/camaleon_cms/admin/admin-basic-manifest.css
 - app/assets/stylesheets/camaleon_cms/admin/admin-manifest.css
-- app/assets/stylesheets/camaleon_cms/admin/colorpicker.css.scss
+- app/assets/stylesheets/camaleon_cms/admin/colorpicker.css
 - app/assets/stylesheets/camaleon_cms/admin/img/bg.png
 - app/assets/stylesheets/camaleon_cms/admin/img/colorpicker/alpha.png
 - app/assets/stylesheets/camaleon_cms/admin/img/colorpicker/hue.png
@@ -692,6 +692,7 @@ files:
 - app/assets/stylesheets/camaleon_cms/admin/uploader/uploader_manifest.css
 - app/assets/stylesheets/camaleon_cms/admin/widgets.css.scss
 - app/assets/stylesheets/camaleon_cms/bootstrap.min.css
+- app/assets/stylesheets/camaleon_cms/bootstrap.min.css.map
 - app/assets/stylesheets/fonts/glyphicons-halflings-regular.eot
 - app/assets/stylesheets/fonts/glyphicons-halflings-regular.svg
 - app/assets/stylesheets/fonts/glyphicons-halflings-regular.ttf