james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #605 from DakuTree/develop

Browse Source 
Fix SVG XSS
This commit is contained in:
Jeff 2017-03-22 23:54:10 -07:00 committed by GitHub
commit 997f321741
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
.htaccess
View File

@ -12,7 +12,7 @@
</FilesMatch> </FilesMatch>
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine on RewriteEngine On
# rather than link to images/ha/hash and have an ugly filename, # rather than link to images/ha/hash and have an ugly filename,
# we link to images/hash/tags.ext; mod_rewrite splits things so # we link to images/hash/tags.ext; mod_rewrite splits things so
@ -25,12 +25,6 @@
RewriteRule ^(.*)$ index.php?q=$1&%{QUERY_STRING} [L] RewriteRule ^(.*)$ index.php?q=$1&%{QUERY_STRING} [L]
</IfModule> </IfModule>
<IfModule mod_php5.c>
php_flag register_globals 0
php_flag magic_quotes_gpc 0
php_flag magic_quotes_runtime 0
</IfModule>
<IfModule mod_expires.c> <IfModule mod_expires.c>
ExpiresActive On ExpiresActive On
<FilesMatch "([0-9a-f]{32}|\.(gif|jpe?g|png|css|js))$"> <FilesMatch "([0-9a-f]{32}|\.(gif|jpe?g|png|css|js))$">
@ -43,19 +37,31 @@
#ExpiresByType text/plain "now" #ExpiresByType text/plain "now"
</IfModule> </IfModule>
<ifmodule mod_deflate.c> <IfModule mod_deflate.c>
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css
AddOutputFilterByType DEFLATE application/x-javascript application/javascript AddOutputFilterByType DEFLATE application/x-javascript application/javascript
</ifmodule> </IfModule>
AddType audio/mp4 f4a f4b m4a #EXT: handle_pixel
AddType audio/ogg oga ogg opus AddType image/jpeg jpg jpeg
AddType image/jpeg jpg jpeg AddType image/gif gif
AddType image/bmp bmp AddType image/png png
AddType image/svg+xml svg svgz
#EXT: handle_ico
AddType image/x-icon ico ani cur AddType image/x-icon ico ani cur
AddType image/webp webp
#EXT: handle_flash
AddType application/x-shockwave-flash swf
#EXT: handle_mp3
AddType audio/mpeg mp3
#EXT: handle_svg
AddType image/svg+xml svg svgz
#EXT: handle_video
AddType video/x-flv flv
AddType video/mp4 f4v f4p m4v mp4 AddType video/mp4 f4v f4p m4v mp4
AddType audio/mp4 f4a f4b m4a
AddType video/ogg ogv AddType video/ogg ogv
AddType video/webm webm AddType video/webm webm
AddType video/x-flv flv

2
ext/handle_svg/main.php
View File

@ -3,7 +3,7 @@
* Name: Handle SVG * Name: Handle SVG
* Author: Shish <webmaster@shishnet.org> * Author: Shish <webmaster@shishnet.org>
* Link: http://code.shishnet.org/shimmie2/ * Link: http://code.shishnet.org/shimmie2/
* Description: Handle SVG files. (No thumbnail is generated for SVG files) * Description: Handle static SVG files. (No thumbnail is generated for SVG files)
*/ */
class SVGFileHandler extends Extension { class SVGFileHandler extends Extension {

4
ext/handle_svg/theme.php
View File

@ -5,9 +5,7 @@ class SVGFileHandlerTheme extends Themelet {
$ilink = make_link("get_svg/{$image->id}/{$image->id}.svg"); $ilink = make_link("get_svg/{$image->id}/{$image->id}.svg");
// $ilink = $image->get_image_link(); // $ilink = $image->get_image_link();
$html = " $html = "
<object data='$ilink' type='image/svg+xml' data-width='{$image->width}' data-height='{$image->height}' id='main_image' class='shm-main-image'> <img src='$ilink' id='main_image' class='shm-main-image' data-width='{$image->width}' data-height='{$image->height}' />
<embed src='$ilink' type='image/svg+xml' />
</object>
"; ";
$page->add_block(new Block("Image", $html, "main", 10)); $page->add_block(new Block("Image", $html, "main", 10));
} }