Fix XSS in openid selector. Thanks, Raghav Bisht.

[git.ikiwiki.info.git] / t / img.t

diff --git a/t/img.t b/t/img.t
index b42db26cfa02dcadd54dde698e32577df27911be..2ea3abb24c353ffb16752988c2ace6064b839539 100755 (executable)
--- a/t/img.t
+++ b/t/img.t
@@ -5,6 +5,10 @@
 # sizes, and checks if they vanish when not required in the build process any
 # more
 #
 # sizes, and checks if they vanish when not required in the build process any
 # more
 #

+# if you have trouble here, be aware that there are three debian packages that
+# can provide Image::Magick: perlmagick, libimage-magick-perl and
+# graphicsmagick-libmagick-dev-compat
+#

 package IkiWiki;
 
 use warnings;
 package IkiWiki;
 
 use warnings;


@@ -12,49 +16,84 @@ use strict;
 use Test::More;
 
 BEGIN { use_ok("IkiWiki"); }
 use Test::More;
 
 BEGIN { use_ok("IkiWiki"); }

+BEGIN { use_ok("Image::Magick"); }
+
+my $magick = new Image::Magick;
+my $SVGS_WORK = defined $magick->QueryFormat("svg");

 
 ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in"));
 
 
 ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in"));
 

-ok(! system("convert canvas:red -scale 20x20 t/tmp/in/simple.png"));
-ok(! system("convert t/tmp/in/simple.png -extent 20x10 t/tmp/in/long.png"));
-ok(! system("convert t/tmp/in/simple.png t/tmp/in/simple-svg.svg"));
+ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png"));
+
+if ($SVGS_WORK) {
+       writefile("emptysquare.svg", "t/tmp/in",
+               '<svg width="30" height="30"><rect x="0" y="0" width="30" height="30" fill="blue"/></svg>');
+}
+

 # using different image sizes for different pages, so the pagenumber selection can be tested easily
 # using different image sizes for different pages, so the pagenumber selection can be tested easily

-ok(! system("convert t/tmp/in/simple.png t/tmp/in/long.png t/tmp/in/simple-pdf.pdf"));
+ok(! system("cp t/img/twopages.pdf t/tmp/in/twopages.pdf"));
+
+my $maybe_svg_img = "";
+if ($SVGS_WORK) {
+       $maybe_svg_img = "[[!img emptysquare.svg size=10x]]";
+}

 
 writefile("imgconversions.mdwn", "t/tmp/in", <<EOF
 
 writefile("imgconversions.mdwn", "t/tmp/in", <<EOF

-[[!img simple.png]]
-[[!img simple.png size=10x]]
-[[!img simple-svg.svg size=10x]]
-[[!img simple-pdf.pdf size=10x]]
-[[!img simple-pdf.pdf size=10x pagenumber=1]]
+[[!img redsquare.png]]
+[[!img redsquare.png size=10x]]
+[[!img redsquare.png size=30x50]] expecting 30x30
+$maybe_svg_img
+[[!img twopages.pdf size=12x]]
+[[!img twopages.pdf size=16x pagenumber=1]]

 EOF
 );
 
 ok(! system("make -s ikiwiki.out"));
 
 EOF
 );
 
 ok(! system("make -s ikiwiki.out"));
 

-my $command = "perl -I. ./ikiwiki.out -set usedirs=0 -plugin img t/tmp/in t/tmp/out -verbose";
+my $command = "perl -I. ./ikiwiki.out -set usedirs=0 -templatedir=templates -plugin img t/tmp/in t/tmp/out -verbose";

 
 ok(! system($command));
 
 
 ok(! system($command));
 

+sub size($) {
+       my $filename = shift;
+       my $im = Image::Magick->new();
+       my $r = $im->Read($filename);
+       return "no image" if $r;
+       my $w = $im->Get("width");
+       my $h = $im->Get("height");
+       return "${w}x${h}";
+}
+

 my $outpath = "t/tmp/out/imgconversions";
 my $outpath = "t/tmp/out/imgconversions";

-ok(`identify $outpath/10x-simple.png` =~ "PNG 10x10 ");
-ok(`identify $outpath/10x-simple-svg.png` =~ "PNG 10x10 ");
-ok(`identify $outpath/10x-simple-pdf.png` =~ "PNG 10x10 ");
-ok(`identify $outpath/10x-p1-simple-pdf.png` =~ "PNG 10x5 ");
+my $outhtml = readfile("$outpath.html");
+
+is(size("$outpath/10x-redsquare.png"), "10x10");
+ok(! -e "$outpath/30x-redsquare.png");
+ok($outhtml =~ /width="30" height="30".*expecting 30x30/);
+
+if ($SVGS_WORK) {
+       # if this fails, you need libmagickcore-6.q16-2-extra installed
+       is(size("$outpath/10x-emptysquare.png"), "10x10");
+}
+
+is(size("$outpath/12x-twopages.png"), "12x12");
+is(size("$outpath/16x-p1-twopages.png"), "16x2");

 
 # now let's remove them again
 
 
 # now let's remove them again
 

-writefile("imgconversions.mdwn", "t/tmp/in", "nothing to see here");
+if (1) { # for easier testing
+       writefile("imgconversions.mdwn", "t/tmp/in", "nothing to see here");

 
 

-ok(! system("$command --refresh"));
+       ok(! system("$command --refresh"));

 
 

-ok(! -e "$outpath/10x-simple.png");
-ok(! -e "$outpath/10x-simple-svg.png");
-ok(! -e "$outpath/10x-simple-pdf.png");
-ok(! -e "$outpath/10x-p1-simple-pdf.png");
+       ok(! -e "$outpath/10x-simple.png");
+       ok(! -e "$outpath/10x-simple-svg.png");
+       ok(! -e "$outpath/10x-simple-pdf.png");
+       ok(! -e "$outpath/10x-p1-simple-pdf.png");

 
 

-# cleanup
-ok(! system("rm -rf t/tmp"));
+       # cleanup
+       ok(! system("rm -rf t/tmp"));
+}

 done_testing;
 
 1;
 done_testing;
 
 1;