--- test/html-webhacc/cc.cgi 2007/07/01 06:21:46 1.7 +++ test/html-webhacc/cc.cgi 2007/09/11 08:25:23 1.21 @@ -2,12 +2,10 @@ use strict; use lib qw[/home/httpd/html/www/markup/html/whatpm - /home/wakaba/work/manakai/lib - /home/wakaba/public_html/-temp/wiki/lib]; + /home/wakaba/work/manakai2/lib]; use CGI::Carp qw[fatalsToBrowser]; use Scalar::Util qw[refaddr]; - -use SuikaWiki::Input::HTTP; ## TODO: Use some better CGI module +use Time::HiRes qw/time/; sub htescape ($) { my $s = $_[0]; @@ -15,24 +13,26 @@ $s =~ s//>/g; $s =~ s/"/"/g; - $s =~ s!([\x00-\x09\x0B-\x1F\x7F-\x80])!sprintf 'U+%04X', ord $1!ge; + $s =~ s{([\x00-\x09\x0B-\x1F\x7F-\xA0\x{FEFF}\x{FFFC}-\x{FFFF}])}{ + sprintf 'U+%04X', ord $1; + }ge; return $s; } # htescape -my $http = SuikaWiki::Input::HTTP->new; - -## TODO: _charset_ - - my $input_format = $http->parameter ('i') || 'text/html'; - my $inner_html_element = $http->parameter ('e'); - my $input_uri = 'thismessage:/'; + use Message::CGI::HTTP; + my $http = Message::CGI::HTTP->new; - my $s = $http->parameter ('s'); - if (length $s > 1000_000) { - print STDOUT "Status: 400 Document Too Long\nContent-Type: text/plain; charset=us-ascii\n\nToo long"; + if ($http->get_meta_variable ('PATH_INFO') ne '/') { + print STDOUT "Status: 404 Not Found\nContent-Type: text/plain; charset=us-ascii\n\n400"; exit; } + binmode STDOUT, ':utf8'; + $| = 1; + + require Message::DOM::DOMImplementation; + my $dom = Message::DOM::DOMImplementation->new; + load_text_catalog ('en'); ## TODO: conneg my @nav; @@ -45,94 +45,224 @@ -

Web Document Conformance Checker (beta)

+

Web Document Conformance Checker +(beta)

+]; + $| = 0; + my $input = get_input_document ($http, $dom); + my $inner_html_element = $http->get_parameter ('e'); + my $char_length = 0; + my %time; + + print qq[
+
Request URI
+
<@{[htescape $input->{request_uri}]}>
Document URI
-
<@{[htescape $input_uri]}>
-
Internet Media Type
-
@{[htescape $input_format]}
+
<@{[htescape $input->{uri}]}>
]; # no
yet push @nav, ['#document-info' => 'Information']; - require Message::DOM::DOMImplementation; - my $dom = Message::DOM::DOMImplementation->____new; - my $doc; - my $el; - - if ($input_format eq 'text/html') { - require Encode; - require Whatpm::HTML; - - $s = Encode::decode ('utf-8', $s); +if (defined $input->{s}) { + $char_length = length $input->{s}; - print STDOUT qq[ + print STDOUT qq[ +
Base URI
+
<@{[htescape $input->{base_uri}]}>
+
Internet Media Type
+
@{[htescape $input->{media_type}]} + @{[$input->{media_type_overridden} ? '(overridden)' : '']}
Character Encoding
-
(none)
+
@{[defined $input->{charset} ? ''.htescape ($input->{charset}).'' : '(none)']} + @{[$input->{charset_overridden} ? '(overridden)' : '']}
+
Length
+
$char_length byte@{[$char_length == 1 ? '' : 's']}
+]; -
-

Document Source

+ my $result = {conforming_min => 1, conforming_max => 1}; + print_http_header_section ($input, $result); + + my $doc; + my $el; + + if ($input->{media_type} eq 'text/html') { + ($doc, $el) = print_syntax_error_html_section ($input, $result); + print_source_string_section (\($input->{s}), $input->{charset}); + } elsif ({ + 'text/xml' => 1, + 'application/atom+xml' => 1, + 'application/rss+xml' => 1, + 'application/svg+xml' => 1, + 'application/xhtml+xml' => 1, + 'application/xml' => 1, + }->{$input->{media_type}}) { + ($doc, $el) = print_syntax_error_xml_section ($input, $result); + print_source_string_section (\($input->{s}), $doc->input_encoding); + } else { + ## TODO: Change HTTP status code?? + print_result_unknown_type_section ($input); + } + + if (defined $doc or defined $el) { + print_structure_dump_section ($doc, $el); + my $elements = print_structure_error_section ($doc, $el, $result); + print_table_section ($elements->{table}) if @{$elements->{table}}; + print_id_section ($elements->{id}) if keys %{$elements->{id}}; + print_term_section ($elements->{term}) if keys %{$elements->{term}}; + print_class_section ($elements->{class}) if keys %{$elements->{class}}; + } + + print_result_section ($result); +} else { + print STDOUT qq[
]; + print_result_input_error_section ($input); +} + + print STDOUT qq[ + + + +]; + + for (qw/decode parse parse_xml check/) { + next unless defined $time{$_}; + open my $file, '>>', ".cc-$_.txt" or die ".cc-$_.txt: $!"; + print $file $char_length, "\t", $time{$_}, "\n"; + } + +exit; + +sub add_error ($$$) { + my ($layer, $err, $result) = @_; + if (defined $err->{level}) { + if ($err->{level} eq 's') { + $result->{$layer}->{should}++; + $result->{$layer}->{score_min} -= 2; + $result->{conforming_min} = 0; + } elsif ($err->{level} eq 'w' or $err->{level} eq 'g') { + $result->{$layer}->{warning}++; + } elsif ($err->{level} eq 'unsupported') { + $result->{$layer}->{unsupported}++; + $result->{unsupported} = 1; + } else { + $result->{$layer}->{must}++; + $result->{$layer}->{score_max} -= 2; + $result->{$layer}->{score_min} -= 2; + $result->{conforming_min} = 0; + $result->{conforming_max} = 0; + } + } else { + $result->{$layer}->{must}++; + $result->{$layer}->{score_max} -= 2; + $result->{$layer}->{score_min} -= 2; + $result->{conforming_min} = 0; + $result->{conforming_max} = 0; + } +} # add_error + +sub print_http_header_section ($$) { + my ($input, $result) = @_; + return unless defined $input->{header_status_code} or + defined $input->{header_status_text} or + @{$input->{header_field}}; + + push @nav, ['#source-header' => 'HTTP Header']; + print STDOUT qq[
+

HTTP Header

+ +

Note: Due to the limitation of the +network library in use, the content of this section might +not be the real header.

+ + +]; + + if (defined $input->{header_status_code}) { + print STDOUT qq[]; + print STDOUT qq[]; + } + if (defined $input->{header_status_text}) { + print STDOUT qq[]; + print STDOUT qq[]; + } + + for (@{$input->{header_field}}) { + print STDOUT qq[]; + print STDOUT qq[]; + } + + print STDOUT qq[
Status code@{[htescape ($input->{header_status_code})]}
Status text@{[htescape ($input->{header_status_text})]}
@{[htescape ($_->[0])]}@{[htescape ($_->[1])]}
]; +} # print_http_header_section +sub print_syntax_error_html_section ($$) { + my ($input, $result) = @_; + + require Encode; + require Whatpm::HTML; + + $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now. + + my $time1 = time; + my $t = Encode::decode ($input->{charset}, $input->{s}); + $time{decode} = time - $time1; + + print STDOUT qq[

Parse Errors

-
-]; +
]; push @nav, ['#parse-errors' => 'Parse Error']; my $onerror = sub { my (%opt) = @_; - my ($cls, $msg) = get_text ($opt{type}, $opt{level}); + my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}); if ($opt{column} > 0) { print STDOUT qq[
Line $opt{line} column $opt{column}
\n]; } else { $opt{line} = $opt{line} - 1 || 1; print STDOUT qq[
Line $opt{line}
\n]; } + $type =~ tr/ /-/; + $type =~ s/\|/%7C/g; + $msg .= qq[ [Description]]; print STDOUT qq[
$msg
\n]; + + add_error ('syntax', \%opt => $result); }; - $doc = $dom->create_document; + my $doc = $dom->create_document; + my $el; + $time1 = time; if (defined $inner_html_element and length $inner_html_element) { $el = $doc->create_element_ns ('http://www.w3.org/1999/xhtml', [undef, $inner_html_element]); - Whatpm::HTML->set_inner_html ($el, $s, $onerror); + Whatpm::HTML->set_inner_html ($el, $t, $onerror); } else { - Whatpm::HTML->parse_string ($s => $doc, $onerror); + Whatpm::HTML->parse_string ($t => $doc, $onerror); } + $time{parse} = time - $time1; - print STDOUT qq[ -
-
-]; - } elsif ($input_format eq 'application/xhtml+xml') { - require Message::DOM::XMLParserTemp; - require Encode; - - my $t = Encode::decode ('utf-8', $s); + print STDOUT qq[]; - print STDOUT qq[ -
Character Encoding
-
(none)
- - - -
-

Document Source

-]; - push @nav, ['#source-string' => 'Source']; - print_source_string (\$t); - print STDOUT qq[ -
+ return ($doc, $el); +} # print_syntax_error_html_section +sub print_syntax_error_xml_section ($$) { + my ($input, $result) = @_; + + require Message::DOM::XMLParserTemp; + + print STDOUT qq[

Parse Errors

@@ -145,156 +275,39 @@ print STDOUT qq[
Line $line column ]; print STDOUT $err->location->column_number, "
"; print STDOUT htescape $err->text, "
\n"; - return 1; - }; - - open my $fh, '<', \$s; - $doc = Message::DOM::XMLParserTemp->parse_byte_stream - ($fh => $dom, $onerror, charset => 'utf-8'); - - print STDOUT qq[ -
-]; - } else { - print STDOUT qq[ - - - -
-

Media type @{[htescape $input_format]} is not supported!

-
-]; - push @nav, ['#result-summary' => 'Result']; - } - - - if (defined $doc or defined $el) { - print STDOUT qq[ -
-

Document Tree

-]; - push @nav, ['#document-tree' => 'Tree']; - - print_document_tree ($el || $doc); - - print STDOUT qq[ -
- -
-

Document Errors

- -
]; - push @nav, ['#document-errors' => 'Document Error']; - - require Whatpm::ContentChecker; - my $onerror = sub { - my %opt = @_; - my ($cls, $msg) = get_text ($opt{type}, $opt{level}); - print STDOUT qq[
] . get_node_link ($opt{node}) . - qq[
\n
], $msg, "
\n"; - }; - - my $elements; - if ($el) { - $elements = Whatpm::ContentChecker->check_element ($el, $onerror); - } else { - $elements = Whatpm::ContentChecker->check_document ($doc, $onerror); - } - - print STDOUT qq[
-
-]; - - if (@{$elements->{table}}) { - require JSON; - - print STDOUT qq[ -
-

Tables

- - - - -]; - - my $i = 0; - for my $table_el (@{$elements->{table}}) { - $i++; - print STDOUT qq[

] . - get_node_link ($table_el) . q[

]; - - my $table = Whatpm::HTMLTable->form_table ($table_el); - - for (@{$table->{column_group}}, @{$table->{column}}, $table->{caption}) { - next unless $_; - delete $_->{element}; - } - - for (@{$table->{row_group}}) { - next unless $_; - next unless $_->{element}; - $_->{type} = $_->{element}->manakai_local_name; - delete $_->{element}; - } - - for (@{$table->{cell}}) { - next unless $_; - for (@{$_}) { - next unless $_; - for (@$_) { - $_->{id} = refaddr $_->{element} if defined $_->{element}; - delete $_->{element}; - } - } - } - - print STDOUT '
]; - } - - print STDOUT qq[
]; - } - - if (keys %{$elements->{term}}) { - print STDOUT qq[ -
-

Terms

- -
-]; - for my $term (sort {$a cmp $b} keys %{$elements->{term}}) { - print STDOUT qq[
@{[htescape $term]}
]; - for (@{$elements->{term}->{$term}}) { - print STDOUT qq[
].get_node_link ($_).qq[
]; - } - } - print STDOUT qq[
]; - } - } - - ## TODO: Show result - print STDOUT qq[ - - - -]; + add_error ('syntax', {type => $err->text, + level => [ + $err->SEVERITY_FATAL_ERROR => 'm', + $err->SEVERITY_ERROR => 'm', + $err->SEVERITY_WARNING => 's', + ]->[$err->severity]} => $result); -exit; + return 1; + }; -sub print_source_string ($) { - my $s = $_[0]; - my $i = 1; - print STDOUT qq[
    \n]; + my $time1 = time; + open my $fh, '<', \($input->{s}); + my $doc = Message::DOM::XMLParserTemp->parse_byte_stream + ($fh => $dom, $onerror, charset => $input->{charset}); + $time{parse_xml} = time - $time1; + + print STDOUT qq[]; + + return ($doc, undef); +} # print_syntax_error_xml_section + +sub print_source_string_section ($$) { + require Encode; + my $enc = Encode::find_encoding ($_[1]); ## TODO: charset name -> Perl name + return unless $enc; + + my $s = \($enc->decode (${$_[0]})); + my $i = 1; + push @nav, ['#source-string' => 'Source']; + print STDOUT qq[
    +

    Document Source

    +
      \n]; if (length $$s) { while ($$s =~ /\G([^\x0A]*?)\x0D?\x0A/gc) { print STDOUT qq[
    1. ], htescape $1, "
    2. \n"; @@ -306,8 +319,8 @@ } else { print STDOUT q[
    3. ]; } - print STDOUT "
    "; -} # print_input_string + print STDOUT "
"; +} # print_input_string_section sub print_document_tree ($) { my $node = shift; @@ -355,6 +368,15 @@ $r .= qq[]; if ($child->has_child_nodes) { $r .= '
    '; @@ -377,6 +399,278 @@ print STDOUT $r; } # print_document_tree +sub print_structure_dump_section ($$) { + my ($doc, $el) = @_; + + print STDOUT qq[ +
    +

    Document Tree

    +]; + push @nav, ['#document-tree' => 'Tree']; + + print_document_tree ($el || $doc); + + print STDOUT qq[
    ]; +} # print_structure_dump_section + +sub print_structure_error_section ($$$) { + my ($doc, $el, $result) = @_; + + print STDOUT qq[
    +

    Document Errors

    + +
    ]; + push @nav, ['#document-errors' => 'Document Error']; + + require Whatpm::ContentChecker; + my $onerror = sub { + my %opt = @_; + my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level}, $opt{node}); + $type =~ tr/ /-/; + $type =~ s/\|/%7C/g; + $msg .= qq[ [Description]]; + print STDOUT qq[
    ] . get_node_link ($opt{node}) . + qq[
    \n
    ], $msg, "
    \n"; + add_error ('structure', \%opt => $result); + }; + + my $elements; + my $time1 = time; + if ($el) { + $elements = Whatpm::ContentChecker->check_element ($el, $onerror); + } else { + $elements = Whatpm::ContentChecker->check_document ($doc, $onerror); + } + $time{check} = time - $time1; + + print STDOUT qq[
    ]; + + return $elements; +} # print_structure_error_section + +sub print_table_section ($) { + my $tables = shift; + + push @nav, ['#tables' => 'Tables']; + print STDOUT qq[ +
    +

    Tables

    + + + + +]; + + require JSON; + + my $i = 0; + for my $table_el (@$tables) { + $i++; + print STDOUT qq[

    ] . + get_node_link ($table_el) . q[

    ]; + + ## TODO: Make |ContentChecker| return |form_table| result + ## so that this script don't have to run the algorithm twice. + my $table = Whatpm::HTMLTable->form_table ($table_el); + + for (@{$table->{column_group}}, @{$table->{column}}, $table->{caption}) { + next unless $_; + delete $_->{element}; + } + + for (@{$table->{row_group}}) { + next unless $_; + next unless $_->{element}; + $_->{type} = $_->{element}->manakai_local_name; + delete $_->{element}; + } + + for (@{$table->{cell}}) { + next unless $_; + for (@{$_}) { + next unless $_; + for (@$_) { + $_->{id} = refaddr $_->{element} if defined $_->{element}; + delete $_->{element}; + $_->{is_header} = $_->{is_header} ? 1 : 0; + } + } + } + + print STDOUT '
    ]; + } + + print STDOUT qq[
    ]; +} # print_table_section + +sub print_id_section ($) { + my $ids = shift; + + push @nav, ['#identifiers' => 'IDs']; + print STDOUT qq[ +
    +

    Identifiers

    + +
    +]; + for my $id (sort {$a cmp $b} keys %$ids) { + print STDOUT qq[
    @{[htescape $id]}
    ]; + for (@{$ids->{$id}}) { + print STDOUT qq[
    ].get_node_link ($_).qq[
    ]; + } + } + print STDOUT qq[
    ]; +} # print_id_section + +sub print_term_section ($) { + my $terms = shift; + + push @nav, ['#terms' => 'Terms']; + print STDOUT qq[ +
    +

    Terms

    + +
    +]; + for my $term (sort {$a cmp $b} keys %$terms) { + print STDOUT qq[
    @{[htescape $term]}
    ]; + for (@{$terms->{$term}}) { + print STDOUT qq[
    ].get_node_link ($_).qq[
    ]; + } + } + print STDOUT qq[
    ]; +} # print_term_section + +sub print_class_section ($) { + my $classes = shift; + + push @nav, ['#classes' => 'Classes']; + print STDOUT qq[ +
    +

    Classes

    + +
    +]; + for my $class (sort {$a cmp $b} keys %$classes) { + print STDOUT qq[
    @{[htescape $class]}
    ]; + for (@{$classes->{$class}}) { + print STDOUT qq[
    ].get_node_link ($_).qq[
    ]; + } + } + print STDOUT qq[
    ]; +} # print_class_section + +sub print_result_section ($) { + my $result = shift; + + print STDOUT qq[ +
    +

    Result

    ]; + + if ($result->{unsupported} and $result->{conforming_max}) { + print STDOUT qq[

    The conformance + checker cannot decide whether the document is conforming or + not, since the document contains one or more unsupported + features. The document might or might not be conforming.

    ]; + } elsif ($result->{conforming_min}) { + print STDOUT qq[

    No conformance-error is + found in this document.

    ]; + } elsif ($result->{conforming_max}) { + print STDOUT qq[

    This document + is likely non-conforming, but in rare case + it might be conforming.

    ]; + } else { + print STDOUT qq[

    This document is + non-conforming.

    ]; + } + + print STDOUT qq[ ++ + +]; + + my $must_error = 0; + my $should_error = 0; + my $warning = 0; + my $score_min = 0; + my $score_max = 0; + my $score_base = 20; + my $score_unit = $score_base / 100; + for ( + [Transfer => 'transfer', ''], + [Character => 'char', ''], + [Syntax => 'syntax', '#parse-errors'], + [Structure => 'structure', '#document-errors'], + ) { + $must_error += ($result->{$_->[1]}->{must} += 0); + $should_error += ($result->{$_->[1]}->{should} += 0); + $warning += ($result->{$_->[1]}->{warning} += 0); + $score_min += (($result->{$_->[1]}->{score_min} *= $score_unit) += $score_base); + $score_max += (($result->{$_->[1]}->{score_max} *= $score_unit) += $score_base); + + my $uncertain = $result->{$_->[1]}->{unsupported} ? '?' : ''; + my $label = $_->[0]; + if ($result->{$_->[1]}->{must} or + $result->{$_->[1]}->{should} or + $result->{$_->[1]}->{warning} or + $result->{$_->[1]}->{unsupported}) { + $label = qq[$label]; + } + + print STDOUT qq[]; + if ($uncertain) { + print qq[]; + } elsif ($result->{$_->[1]}->{score_min} != $result->{$_->[1]}->{score_max}) { + print qq[]; + } else { + print qq[]; + } + } + + $score_max += $score_base; + + print STDOUT qq[ + + + + + + + +
    MUST-level +ErrorsSHOULD-level +ErrorsWarningsScore
    $label$result->{$_->[1]}->{must}$uncertain$result->{$_->[1]}->{should}$uncertain$result->{$_->[1]}->{warning}$uncertain−∞..$result->{$_->[1]}->{score_max}$result->{$_->[1]}->{score_min}..$result->{$_->[1]}->{score_max}
    $result->{$_->[1]}->{score_min}
    Semantics0?0?0?−∞..$score_base
    Total$must_error?$should_error?$warning?−∞..$score_max
    + +

    Important: This conformance checking service +is under development. The result above might be wrong.

    +
    ]; + push @nav, ['#result-summary' => 'Result']; +} # print_result_section + +sub print_result_unknown_type_section ($) { + my $input = shift; + + print STDOUT qq[ +
    +

    Media type @{[htescape $input->{media_type}]} is not supported!

    +
    +]; + push @nav, ['#result-summary' => 'Result']; +} # print_result_unknown_type_section + +sub print_result_input_error_section ($) { + my $input = shift; + print STDOUT qq[
    +

    Input Error: @{[htescape ($input->{error_status_text})]}

    +
    ]; + push @nav, ['#result-summary' => 'Result']; +} # print_Result_input_error_section + sub get_node_path ($) { my $node = shift; my @r; @@ -392,6 +686,7 @@ $rs = '"' . $node->data . '"'; $node = $node->parent_node; } elsif ($node->node_type == 9) { + @r = ('') unless @r; $rs = ''; $node = $node->parent_node; } else { @@ -424,24 +719,193 @@ } # load_text_catalog sub get_text ($) { - my ($type, $level) = @_; + my ($type, $level, $node) = @_; $type = $level . ':' . $type if defined $level; my @arg; { if (defined $Msg->{$type}) { my $msg = $Msg->{$type}->[1]; - $msg =~ s/\$([0-9]+)/defined $arg[$1] ? htescape ($arg[$1]) : '(undef)'/ge; - return ($Msg->{$type}->[0], $msg); + $msg =~ s{\$([0-9]+)}{ + defined $arg[$1] ? htescape ($arg[$1]) : '(undef)'; + }ge; + $msg =~ s{{\@([A-Za-z0-9:_.-]+)}}{ + UNIVERSAL::can ($node, 'get_attribute_ns') + ? htescape ($node->get_attribute_ns (undef, $1)) : '' + }ge; + $msg =~ s{{\@}}{ + UNIVERSAL::can ($node, 'value') ? htescape ($node->value) : '' + }ge; + $msg =~ s{{local-name}}{ + UNIVERSAL::can ($node, 'manakai_local_name') + ? htescape ($node->manakai_local_name) : '' + }ge; + $msg =~ s{{element-local-name}}{ + (UNIVERSAL::can ($node, 'owner_element') and + $node->owner_element) + ? htescape ($node->owner_element->manakai_local_name) + : '' + }ge; + return ($type, $Msg->{$type}->[0], $msg); } elsif ($type =~ s/:([^:]*)$//) { unshift @arg, $1; redo; } } - return ('', htescape ($_[0])); + return ($type, '', htescape ($_[0])); } # get_text } +sub get_input_document ($$) { + my ($http, $dom) = @_; + + my $request_uri = $http->get_parameter ('uri'); + my $r = {}; + if (defined $request_uri and length $request_uri) { + my $uri = $dom->create_uri_reference ($request_uri); + unless ({ + http => 1, + }->{lc $uri->uri_scheme}) { + return {uri => $request_uri, request_uri => $request_uri, + error_status_text => 'URI scheme not allowed'}; + } + + require Message::Util::HostPermit; + my $host_permit = new Message::Util::HostPermit; + $host_permit->add_rule (<check ($uri->uri_host, $uri->uri_port || 80)) { + return {uri => $request_uri, request_uri => $request_uri, + error_status_text => 'Connection to the host is forbidden'}; + } + + require LWP::UserAgent; + my $ua = WDCC::LWPUA->new; + $ua->{wdcc_dom} = $dom; + $ua->{wdcc_host_permit} = $host_permit; + $ua->agent ('Mozilla'); ## TODO: for now. + $ua->parse_head (0); + $ua->protocols_allowed ([qw/http/]); + $ua->max_size (1000_000); + my $req = HTTP::Request->new (GET => $request_uri); + my $res = $ua->request ($req); + ## TODO: 401 sets |is_success| true. + if ($res->is_success or $http->get_parameter ('error-page')) { + $r->{base_uri} = $res->base; ## NOTE: It does check |Content-Base|, |Content-Location|, and . ## TODO: Use our own code! + $r->{uri} = $res->request->uri; + $r->{request_uri} = $request_uri; + + ## TODO: More strict parsing... + my $ct = $res->header ('Content-Type'); + if (defined $ct and $ct =~ m#^([0-9A-Za-z._+-]+/[0-9A-Za-z._+-]+)#) { + $r->{media_type} = lc $1; + } + if (defined $ct and $ct =~ /;\s*charset\s*=\s*"?(\S+)"?/i) { + $r->{charset} = lc $1; + $r->{charset} =~ tr/\\//d; + } + + my $input_charset = $http->get_parameter ('charset'); + if (defined $input_charset and length $input_charset) { + $r->{charset_overridden} + = (not defined $r->{charset} or $r->{charset} ne $input_charset); + $r->{charset} = $input_charset; + } + + $r->{s} = ''.$res->content; + } else { + $r->{uri} = $res->request->uri; + $r->{request_uri} = $request_uri; + $r->{error_status_text} = $res->status_line; + } + + $r->{header_field} = []; + $res->scan (sub { + push @{$r->{header_field}}, [$_[0], $_[1]]; + }); + $r->{header_status_code} = $res->code; + $r->{header_status_text} = $res->message; + } else { + $r->{s} = ''.$http->get_parameter ('s'); + $r->{uri} = q; + $r->{request_uri} = q; + $r->{base_uri} = q; + $r->{charset} = ''.$http->get_parameter ('_charset_'); + $r->{charset} =~ s/\s+//g; + $r->{charset} = 'utf-8' if $r->{charset} eq ''; + $r->{header_field} = []; + } + + my $input_format = $http->get_parameter ('i'); + if (defined $input_format and length $input_format) { + $r->{media_type_overridden} + = (not defined $r->{media_type} or $input_format ne $r->{media_type}); + $r->{media_type} = $input_format; + } + if (defined $r->{s} and not defined $r->{media_type}) { + $r->{media_type} = 'text/html'; + $r->{media_type_overridden} = 1; + } + + if ($r->{media_type} eq 'text/xml') { + unless (defined $r->{charset}) { + $r->{charset} = 'us-ascii'; + } elsif ($r->{charset_overridden} and $r->{charset} eq 'us-ascii') { + $r->{charset_overridden} = 0; + } + } + + if (length $r->{s} > 1000_000) { + $r->{error_status_text} = 'Entity-body too large'; + delete $r->{s}; + return $r; + } + + return $r; +} # get_input_document + +package WDCC::LWPUA; +BEGIN { push our @ISA, 'LWP::UserAgent'; } + +sub redirect_ok { + my $ua = shift; + unless ($ua->SUPER::redirect_ok (@_)) { + return 0; + } + + my $uris = $_[1]->header ('Location'); + return 0 unless $uris; + my $uri = $ua->{wdcc_dom}->create_uri_reference ($uris); + unless ({ + http => 1, + }->{lc $uri->uri_scheme}) { + return 0; + } + unless ($ua->{wdcc_host_permit}->check ($uri->uri_host, $uri->uri_port || 80)) { + return 0; + } + return 1; +} # redirect_ok + =head1 AUTHOR Wakaba . @@ -455,4 +919,4 @@ =cut -## $Date: 2007/07/01 06:21:46 $ +## $Date: 2007/09/11 08:25:23 $