1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566
|
use utf8;
use warnings;
use strict;
use Test::More;
use HTTP::Request::Common;
use HTTP::Message::PSGI ();
use Encode 2.21 'decode_utf8', 'encode_utf8', 'encode';
use File::Spec;
use JSON::MaybeXS;
use Data::Dumper;
use Scalar::Util ();
# Test cases for incoming utf8
{
package MyApp::Controller::Root;
$INC{'MyApp/Controller/Root.pm'} = __FILE__;
use base 'Catalyst::Controller';
sub heart :Path('♥') {
my ($self, $c) = @_;
$c->response->content_type('text/html');
$c->response->body("<p>This is path-heart action ♥</p>");
# We let the content length middleware find the length...
}
sub hat :Path('^') {
my ($self, $c) = @_;
$c->response->content_type('text/html');
$c->response->body("<p>This is path-hat action ^</p>");
}
sub uri_for :Path('uri_for') {
my ($self, $c) = @_;
$c->response->content_type('text/html');
$c->response->body("${\$c->uri_for($c->controller('Root')->action_for('argend'), ['♥'], '♥#X♥X', {'♥'=>'♥♥'})}");
}
sub heart_with_arg :Path('a♥') Args(1) {
my ($self, $c, $arg) = @_;
$c->response->content_type('text/html');
$c->response->body("<p>This is path-heart-arg action $arg</p>");
Test::More::is $c->req->args->[0], '♥';
}
sub base :Chained('/') CaptureArgs(0) { }
sub link :Chained('base') PathPart('♥') Args(0) {
my ($self, $c) = @_;
$c->response->content_type('text/html');
$c->response->body("<p>This is base-link action ♥</p>");
}
sub arg :Chained('base') PathPart('♥') Args(1) {
my ($self, $c, $arg) = @_;
$c->response->content_type('text/html');
$c->response->body("<p>This is base-link action ♥ $arg</p>");
}
sub capture :Chained('base') PathPart('♥') CaptureArgs(1) {
my ($self, $c, $arg) = @_;
$c->stash(capture=>$arg);
}
sub argend :Chained('capture') PathPart('♥') Args(1) {
my ($self, $c, $arg) = @_;
$c->response->content_type('text/html');
Test::More::is $c->req->args->[0], '♥';
Test::More::is $c->req->captures->[0], '♥';
Test::More::is $arg, '♥';
Test::More::is length($arg), 1, "got length of one";
$c->response->body("<p>This is base-link action ♥ ${\$c->req->args->[0]}</p>");
# Test to make sure redirect can now take an object (sorry don't have a better place for it
# but wanted test coverage.
my $location = $c->res->redirect( $c->uri_for($c->controller('Root')->action_for('uri_for')) );
Test::More::ok !ref $location;
}
sub stream_write :Local {
my ($self, $c) = @_;
$c->response->content_type('text/html');
$c->response->write("<p>This is stream_write action ♥</p>");
}
sub stream_write_fh :Local {
my ($self, $c) = @_;
$c->response->content_type('text/html');
my $writer = $c->res->write_fh;
$writer->write_encoded('<p>This is stream_write_fh action ♥</p>');
$writer->close;
}
# Stream a file with utf8 chars directly, you don't need to decode
sub stream_body_fh :Local {
my ($self, $c) = @_;
my $path = File::Spec->catfile('t', 'utf8.txt');
open(my $fh, '<', $path) || die "trouble: $!";
$c->response->content_type('text/html');
$c->response->body($fh);
}
# If you pull the file contents into a var, NOW you need to specify the
# IO encoding on the FH. Ultimately Plack at the end wants bytes...
sub stream_body_fh2 :Local {
my ($self, $c) = @_;
my $path = File::Spec->catfile('t', 'utf8.txt');
open(my $fh, '<:encoding(UTF-8)', $path) || die "trouble: $!";
my $contents = do { local $/; <$fh> };
$c->response->content_type('text/html');
$c->response->body($contents);
}
sub write_then_body :Local {
my ($self, $c) = @_;
$c->res->content_type('text/html');
$c->res->write("<p>This is early_write action ♥</p>");
$c->res->body("<p>This is body_write action ♥</p>");
}
sub file_upload :POST Consumes(Multipart) Local {
my ($self, $c) = @_;
Test::More::is $c->req->body_parameters->{'♥'}, '♥♥';
Test::More::ok my $upload = $c->req->uploads->{file};
Test::More::is $upload->charset, 'UTF-8';
my $text = $upload->slurp;
Test::More::is Encode::decode_utf8($text), "<p>This is stream_body_fh action ♥</p>\n";
my $decoded_text = $upload->decoded_slurp;
Test::More::is $decoded_text, "<p>This is stream_body_fh action ♥</p>\n";
Test::More::is $upload->filename, '♥ttachment.txt';
Test::More::is $upload->raw_basename, '♥ttachment.txt';
$c->response->content_type('text/html');
$c->response->body($decoded_text);
}
sub file_upload_utf8_param :POST Consumes(Multipart) Local {
my ($self, $c) = @_;
Test::More::is $c->req->body_parameters->{'♥'}, '♥♥';
Test::More::ok my $upload = $c->req->uploads->{'♥'};
Test::More::is $upload->charset, 'UTF-8';
my $text = $upload->slurp;
Test::More::is Encode::decode_utf8($text), "<p>This is stream_body_fh action ♥</p>\n";
my $decoded_text = $upload->decoded_slurp;
Test::More::is $decoded_text, "<p>This is stream_body_fh action ♥</p>\n";
Test::More::is $upload->filename, '♥ttachment.txt';
Test::More::is $upload->raw_basename, '♥ttachment.txt';
$c->response->content_type('text/html');
$c->response->body($decoded_text);
}
sub json :POST Consumes(JSON) Local {
my ($self, $c) = @_;
my $post = $c->req->body_data;
Test::More::is $post->{'♥'}, '♥♥';
Test::More::is length($post->{'♥'}), 2;
$c->response->content_type('application/json');
# Encode JSON also encodes to a UTF-8 encoded, binary string. This is why we don't
# have application/json as one of the things we match, otherwise we get double
# encoding.
$c->response->body(JSON::MaybeXS::encode_json($post));
}
## If someone clears encoding, they can do as they wish
sub manual_1 :Local {
my ($self, $c) = @_;
$c->clear_encoding;
$c->res->content_type('text/plain');
$c->res->content_type_charset('UTF-8');
$c->response->body( Encode::encode_utf8("manual_1 ♥"));
}
## If you do like gzip, well handle that yourself! Basically if you do some sort
## of content encoding like gzip, you must do on top of the encoding. We will fix
## the encoding plugins (Catalyst::Plugin::Compress) to do this properly for you.
#
sub gzipped :Local {
require Compress::Zlib;
my ($self, $c) = @_;
$c->res->content_type('text/plain');
$c->res->content_type_charset('UTF-8');
$c->res->content_encoding('gzip');
$c->response->body(Compress::Zlib::memGzip(Encode::encode_utf8("manual_1 ♥")));
}
sub override_encoding :Local {
my ($self, $c) = @_;
$c->res->content_type('text/plain');
$c->encoding(Encode::find_encoding('UTF-8'));
$c->encoding(Encode::find_encoding('Shift_JIS'));
$c->response->body("テスト");
}
sub stream_write_error :Local {
my ($self, $c) = @_;
$c->response->content_type('text/html');
$c->response->write("<p>This is stream_write action ♥</p>");
$c->encoding(Encode::find_encoding('Shift_JIS'));
$c->response->write("<p>This is stream_write action ♥</p>");
}
sub from_external_psgi :Local {
my ($self, $c) = @_;
my $env = HTTP::Message::PSGI::req_to_psgi( HTTP::Request::Common::GET '/root/♥');
$c->res->from_psgi_response( ref($c)->to_app->($env));
}
sub echo_arg :Local {
my ($self, $c) = @_;
$c->response->content_type('text/plain');
$c->response->body($c->req->body_parameters->{arg});
}
sub echo_param :Local {
my ($self, $c) = @_;
$c->response->content_type('text/plain');
$c->response->body($c->req->query_parameters->{arg});
}
package MyApp;
use Catalyst;
Test::More::ok(MyApp->setup('-Log=fatal'), 'setup app');
}
ok my $psgi = MyApp->psgi_app, 'build psgi app';
use Catalyst::Test 'MyApp';
{
my $res = request "/root/♥";
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is path-heart action ♥</p>', 'correct body';
is $res->content_length, 36, 'correct length';
is $res->content_charset, 'UTF-8';
}
{
my $res = request "/root/a♥/♥";
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is path-heart-arg action ♥</p>', 'correct body';
is $res->content_length, 40, 'correct length';
is $res->content_charset, 'UTF-8';
}
{
my $res = request "/root/^";
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is path-hat action ^</p>', 'correct body';
is $res->content_length, 32, 'correct length';
is $res->content_charset, 'UTF-8';
}
{
my $res = request "/base/♥";
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is base-link action ♥</p>', 'correct body';
is $res->content_length, 35, 'correct length';
is $res->content_charset, 'UTF-8';
}
{
my ($res, $c) = ctx_request POST "/base/♥?♥=♥&♥=♥♥", [a=>1, b=>'', '♥'=>'♥', '♥'=>'♥♥'];
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is base-link action ♥</p>', 'correct body';
is $res->content_length, 35, 'correct length';
is $c->req->parameters->{'♥'}[0], '♥';
is $c->req->query_parameters->{'♥'}[0], '♥';
is $c->req->body_parameters->{'♥'}[0], '♥';
is $c->req->parameters->{'♥'}[0], '♥';
is $c->req->parameters->{a}, 1;
is $c->req->body_parameters->{a}, 1;
is $res->content_charset, 'UTF-8';
}
{
my ($res, $c) = ctx_request GET "/base/♥?♥♥♥";
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is base-link action ♥</p>', 'correct body';
is $res->content_length, 35, 'correct length';
is $c->req->query_keywords, '♥♥♥';
is $res->content_charset, 'UTF-8';
}
{
my $res = request "/base/♥/♥";
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is base-link action ♥ ♥</p>', 'correct body';
is $res->content_length, 39, 'correct length';
is $res->content_charset, 'UTF-8';
}
{
my $res = request "/base/♥/♥/♥/♥";
is decode_utf8($res->content), '<p>This is base-link action ♥ ♥</p>', 'correct body';
is $res->content_length, 39, 'correct length';
is $res->content_charset, 'UTF-8';
}
{
my ($res, $c) = ctx_request POST "/base/♥/♥/♥/♥?♥=♥♥", [a=>1, b=>'2', '♥'=>'♥♥'];
## Make sure that the urls we generate work the same
my $uri_for1 = $c->uri_for($c->controller('Root')->action_for('argend'), ['♥'], '♥', {'♥'=>'♥♥'});
my $uri_for2 = $c->uri_for($c->controller('Root')->action_for('argend'), ['♥', '♥'], {'♥'=>'♥♥'});
my $uri = $c->req->uri;
is "$uri_for1", "$uri_for2";
is "$uri", "$uri_for1";
{
my ($res, $c) = ctx_request POST "$uri_for1", [a=>1, b=>'2', '♥'=>'♥♥'];
is $c->req->query_parameters->{'♥'}, '♥♥';
is $c->req->body_parameters->{'♥'}, '♥♥';
is $c->req->parameters->{'♥'}[0], '♥♥'; #combined with query and body
is $c->req->args->[0], '♥';
is length($c->req->parameters->{'♥'}[0]), 2;
is length($c->req->query_parameters->{'♥'}), 2;
is length($c->req->body_parameters->{'♥'}), 2;
is length($c->req->args->[0]), 1;
is $res->content_charset, 'UTF-8';
}
}
{
my ($res, $c) = ctx_request "/root/uri_for";
my $url = $c->uri_for($c->controller('Root')->action_for('argend'), ['♥'], '♥#X♥X', {'♥'=>'♥♥'});
is $res->code, 200, 'OK';
is decode_utf8($res->content), "$url", 'correct body'; #should do nothing
is $res->content, "$url", 'correct body';
is $res->content_length, 104, 'correct length';
is $res->content_charset, 'UTF-8';
{
my $url = $c->uri_for($c->controller->action_for('heart_with_arg'), '♥');
is "$url", 'http://localhost/root/a%E2%99%A5/%E2%99%A5', "correct $url";
}
{
my $url = $c->uri_for($c->controller->action_for('heart_with_arg'), ['♥']);
is "$url", 'http://localhost/root/a%E2%99%A5/%E2%99%A5', "correct $url";
}
}
{
my $res = request "/root/stream_write";
is $res->code, 200, 'OK GET /root/stream_write';
is decode_utf8($res->content), '<p>This is stream_write action ♥</p>', 'correct body';
is $res->content_charset, 'UTF-8';
}
{
my $res = request "/root/stream_body_fh";
is $res->code, 200, 'OK';
is decode_utf8($res->content), "<p>This is stream_body_fh action ♥</p>\n", 'correct body';
is $res->content_charset, 'UTF-8';
# Not sure why there is a trailing newline above... its not in catalyst code I can see. Not sure
# if is a problem or just an artifact of the why the test stuff works - JNAP
}
{
my $res = request "/root/stream_write_fh";
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is stream_write_fh action ♥</p>', 'correct body';
#is $res->content_length, 41, 'correct length';
is $res->content_charset, 'UTF-8';
}
{
my $res = request "/root/stream_body_fh2";
is $res->code, 200, 'OK';
is decode_utf8($res->content), "<p>This is stream_body_fh action ♥</p>\n", 'correct body';
is $res->content_length, 41, 'correct length';
is $res->content_charset, 'UTF-8';
}
{
my $res = request "/root/write_then_body";
is $res->code, 200, 'OK';
is decode_utf8($res->content), "<p>This is early_write action ♥</p><p>This is body_write action ♥</p>";
is $res->content_charset, 'UTF-8';
}
{
ok my $path = File::Spec->catfile('t', 'utf8.txt');
ok my $req = POST '/root/file_upload',
Content_Type => 'form-data',
Content => [encode_utf8('♥')=>encode_utf8('♥♥'), file=>["$path", encode_utf8('♥ttachment.txt'), 'Content-Type' =>'text/html; charset=UTF-8', ]];
ok my $res = request $req;
is decode_utf8($res->content), "<p>This is stream_body_fh action ♥</p>\n";
}
{
ok my $path = File::Spec->catfile('t', 'utf8.txt');
ok my $req = POST '/root/file_upload_utf8_param',
Content_Type => 'form-data',
Content => [encode_utf8('♥')=>encode_utf8('♥♥'), encode_utf8('♥')=>["$path", encode_utf8('♥ttachment.txt'), 'Content-Type' =>'text/html; charset=UTF-8', ]];
ok my $res = request $req;
is decode_utf8($res->content), "<p>This is stream_body_fh action ♥</p>\n";
}
{
ok my $req = POST '/root/json',
Content_Type => 'application/json',
Content => encode_json +{'♥'=>'♥♥'}; # Note: JSON does the UTF* encoding for us
ok my $res = request $req;
## decode_json expect the binary utf8 string and does the decoded bit for us.
is_deeply decode_json(($res->content)), +{'♥'=>'♥♥'}, 'JSON was decoded correctly';
}
{
ok my $res = request "/root/override_encoding";
ok my $enc = Encode::find_encoding('SHIFT_JIS');
is $res->code, 200, 'OK';
is $enc->decode($res->content), "テスト", 'correct body';
is $res->content_length, 6, 'correct length'; # Bytes over the wire
is length($enc->decode($res->content)), 3;
is $res->content_charset, 'SHIFT_JIS', 'content charset is SHIFT_JIS as expected';
}
{
my $res = request "/root/manual_1";
is $res->code, 200, 'OK';
is decode_utf8($res->content), "manual_1 ♥", 'correct body';
is $res->content_length, 12, 'correct length';
is $res->content_charset, 'UTF-8';
}
SKIP: {
eval { require Compress::Zlib; 1} || do {
skip "Compress::Zlib needed to test gzip encoding", 5 };
my $res = request "/root/gzipped";
ok my $raw_content = $res->content;
ok my $content = Compress::Zlib::memGunzip($raw_content), 'no gunzip error';
is $res->code, 200, 'OK';
is decode_utf8($content), "manual_1 ♥", 'correct body';
is $res->content_charset, 'UTF-8', 'zlib charset is set correctly';
}
{
my $res = request "/root/stream_write_error";
is $res->code, 200, 'OK';
like decode_utf8($res->content), qr[<p>This is stream_write action ♥</p><!DOCTYPE html], 'correct body';
}
{
my $res = request "/root/from_external_psgi";
is $res->code, 200, 'OK';
is decode_utf8($res->content), '<p>This is path-heart action ♥</p>', 'correct body';
is $res->content_length, 36, 'correct length';
is $res->content_charset, 'UTF-8', 'external PSGI app has expected charset';
}
{
my $utf8 = 'test ♥';
my $shiftjs = 'test テスト';
ok my $req = POST '/root/echo_arg',
Content_Type => 'form-data',
Content => [
arg0 => 'helloworld',
Encode::encode('UTF-8','♥') => Encode::encode('UTF-8','♥♥'), # Long form POST simple does not auto encode...
Encode::encode('UTF-8','♥♥♥') => [
undef, '',
'Content-Type' =>'text/plain; charset=SHIFT_JIS',
'Content' => Encode::encode('SHIFT_JIS', $shiftjs)],
arg1 => [
undef, '',
'Content-Type' =>'text/plain; charset=UTF-8',
'Content' => Encode::encode('UTF-8', $utf8)],
arg2 => [
undef, '',
'Content-Type' =>'text/plain; charset=SHIFT_JIS',
'Content' => Encode::encode('SHIFT_JIS', $shiftjs)],
arg2 => [
undef, '',
'Content-Type' =>'text/plain; charset=SHIFT_JIS',
'Content' => Encode::encode('SHIFT_JIS', $shiftjs)],
];
my ($res, $c) = ctx_request $req;
is $c->req->body_parameters->{'arg0'}, 'helloworld', 'got helloworld value';
is $c->req->body_parameters->{'♥'}, '♥♥';
is $c->req->body_parameters->{'arg1'}, $utf8, 'decoded utf8 param';
is $c->req->body_parameters->{'arg2'}[0], $shiftjs, 'decoded shiftjs param';
is $c->req->body_parameters->{'arg2'}[1], $shiftjs, 'decoded shiftjs param';
is $c->req->body_parameters->{'♥♥♥'}, $shiftjs, 'decoded shiftjs param';
}
{
my $shiftjs = 'test テスト';
my $encoded = Encode::encode('UTF-8', $shiftjs);
ok my $req = GET "/root/echo_arg?a=$encoded";
my ($res, $c) = ctx_request $req;
is $c->req->query_parameters->{'a'}, $shiftjs, 'got expected value';
}
{
my $invalid = '%e2';
# in url
{
my $req = GET "/$invalid";
my $res = request $req;
is ($res->code, '400', "Invalid url param is 400");
}
# in body
{
my $req = POST "/root/echo_arg", Content => "arg0=$invalid";
my $res = request $req;
is ($res->code, '400', "Invalid post param is 400");
}
# in query
{
# failing since 5.90080
my $req = GET "/root/echo_param?arg=$invalid";
my $res = request $req;
is ($res->code, '400', "Invalid get param is 400") or diag Dumper($res->decoded_content);
}
}
## should we use binmode on filehandles to force the encoding...?
## Not sure what else to do with multipart here, if docs are enough...
done_testing;
|