meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00
Code Issues Releases Wiki Activity

Merged r22025 from trunk to 5.0-stable (#38073).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22048 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2023-01-16 12:57:42 +00:00
parent 2b74f121cd
commit b18780bb36
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb
View File

@ -29,8 +29,8 @@ module Redmine
ALLOWED_CSS_PROPERTIES = %w[
color background-color
width
height
width min-width max-width
height min-height max-height
padding padding-left padding-right padding-top padding-bottom
margin margin-left margin-right margin-top margin-bottom
border border-left border-right border-top border-bottom border-radius border-style border-collapse border-spacing

4
test/unit/lib/redmine/wiki_formatting/common_mark/sanitization_filter_test.rb
View File

@ -97,6 +97,10 @@ if Object.const_defined?(:CommonMarker)
'<span style="color: #333; background: url(\'https://example.com/evil.svg\')">hello</span>"',
'<span style="color: #333; ">hello</span>"'
],
[
'<img src="photo.jpg" style="min-width: 100px; max-width: 200px; min-height: 100px; max-height: 200px;">',
'<img src="photo.jpg" style="min-width: 100px; max-width: 200px; min-height: 100px; max-height: 200px;">'
],
[
'<b>Lo<!-- comment -->rem</b> <a href="pants" title="foo" style="text-decoration: underline;">ipsum</a> <a href="http://foo.com/"><strong>dolor</strong></a> sit<br/>amet <style>.foo { color: #fff; }</style> <script>alert("hello world");</script>',
'<b>Lorem</b> <a href="pants" title="foo">ipsum</a> <a href="http://foo.com/"><strong>dolor</strong></a> sit<br>amet .foo { color: #fff; } '