--- test/html-webhacc/cc.cgi 2007/06/27 13:30:15 1.3 +++ test/html-webhacc/cc.cgi 2008/07/21 12:56:33 1.59 @@ -2,326 +2,311 @@ 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 + require WebHACC::Input; -sub htescape ($) { - my $s = $_[0]; - $s =~ s/&/&/g; - $s =~ s//>/g; - $s =~ s/"/"/g; - $s =~ s!([\x00-\x09\x0B-\x1F\x7F-\x80])!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:/'; - - 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"; +{ + require Message::CGI::HTTP; + my $http = Message::CGI::HTTP->new; + + require WebHACC::Output; + my $out = WebHACC::Output->new; + $out->handle (*STDOUT); + $out->set_utf8; + + if ($http->get_meta_variable ('PATH_INFO') ne '/') { + $out->http_error (404); exit; } - my @nav; - print STDOUT qq[Content-Type: text/html; charset=utf-8 + ## TODO: We need real conneg support... + my $primary_language = 'en'; + if ($ENV{HTTP_ACCEPT_LANGUAGE} =~ /ja/) { + $primary_language = 'ja'; + } + $out->load_text_catalog ($primary_language); + + $out->set_flush; + $out->http_header; + $out->html_header; + $out->unset_flush; - - - -Web Document Conformance Checker (BETA) - - - -

Web Document Conformance Checker (beta)

- -
-
-
Document URI
-
<@{[htescape $input_uri]}>
-
Internet Media Type
-
@{[htescape $input_format]}
-]; # no
yet - push @nav, ['#document-info' => 'Information']; + my $input = get_input_document ($http); + $out->input ($input); - 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); - - print STDOUT qq[ -
Character Encoding
-
(none)
- -
- -
-

Document Source

-]; - push @nav, ['#source-string' => 'Source']; - print_source_string (\$s); - print STDOUT qq[ -
- -
-

Parse Errors

- - -
-]; - } elsif ($input_format eq 'application/xhtml+xml') { - require Message::DOM::XMLParserTemp; - require Encode; - - my $t = Encode::decode ('utf-8', $s); - - print STDOUT qq[ -
Character Encoding
-
(none)
- - - -
-

Document Source

-]; - push @nav, ['#source-string' => 'Source']; - print_source_string (\$t); - print STDOUT qq[ -
- -
-

Parse Errors

- - -
-]; - } else { - print STDOUT qq[ - + check_and_print ($input => $result => $out); + + $result->generate_result_section; + + $out->nav_list; + + exit; +} -
-

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

-
-]; - push @nav, ['#result-summary' => 'Result']; +sub check_and_print ($$$) { + my ($input, $result, $out) = @_; + my $original_input = $out->input; + $out->input ($input); + + $input->generate_info_section ($result); + + $input->generate_transfer_sections ($result); + + unless (defined $input->{s}) { + $result->{conforming_min} = 0; + return; } + my $checker_class = { + 'text/cache-manifest' => 'WebHACC::Language::CacheManifest', + 'text/css' => 'WebHACC::Language::CSS', + 'text/html' => 'WebHACC::Language::HTML', + 'text/x-webidl' => 'WebHACC::Language::WebIDL', + + 'text/xml' => 'WebHACC::Language::XML', + 'application/atom+xml' => 'WebHACC::Language::XML', + 'application/rss+xml' => 'WebHACC::Language::XML', + 'image/svg+xml' => 'WebHACC::Language::XML', + 'application/xhtml+xml' => 'WebHACC::Language::XML', + 'application/xml' => 'WebHACC::Language::XML', + ## TODO: Should we make all XML MIME Types fall + ## into this category? + + ## NOTE: This type has different model from normal XML types. + 'application/rdf+xml' => 'WebHACC::Language::XML', + }->{$input->{media_type}} || 'WebHACC::Language::Default'; + + eval qq{ require $checker_class } or die "$0: Loading $checker_class: $@"; + my $checker = $checker_class->new; + $checker->input ($input); + $checker->output ($out); + $checker->result ($result); + + ## TODO: A cache manifest MUST be text/cache-manifest + ## TODO: WebIDL media type "text/x-webidl" + + $checker->generate_syntax_error_section; + $checker->generate_source_string_section; + + my @subdoc; + $checker->onsubdoc (sub { + push @subdoc, shift; + }); + + $checker->generate_structure_dump_section; + $checker->generate_structure_error_section; + $checker->generate_additional_sections; + + my $id_prefix = 0; + for my $_subinput (@subdoc) { + my $subinput = WebHACC::Input::Subdocument->new (++$id_prefix); + $subinput->{$_} = $_subinput->{$_} for keys %$_subinput; + $subinput->{base_uri} = $subinput->{container_node}->base_uri + unless defined $subinput->{base_uri}; + $subinput->{parent_input} = $input; + + $subinput->start_section ($result); + check_and_print ($subinput => $result => $out); + $subinput->end_section ($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

- - -
-]; - } - - ## TODO: Show result - - print STDOUT qq[ - - - -]; - -exit; - -sub print_source_string ($) { - my $s = $_[0]; - my $i = 1; - print STDOUT qq[
    \n]; - while ($$s =~ /\G([^\x0A]*?)\x0D?\x0A/gc) { - print STDOUT qq[
  1. ], htescape $1, "
    2. \n"; - $i++; - } - if ($$s =~ /\G([^\x0A]+)/gc) { - print STDOUT qq[
  2. ], htescape $1, "
    3. \n"; - } - print STDOUT "
"; -} # print_input_string - -sub print_document_tree ($) { - my $node = shift; - my $r = '
    '; - - my @node = ($node); - while (@node) { - my $child = shift @node; - unless (ref $child) { - $r .= $child; - next; + require Message::Util::HostPermit; + my $host_permit = new Message::Util::HostPermit; + $host_permit->add_rule (<check ($uri->uri_host, $uri->uri_port || 80)) { + my $r = WebHACC::Input::Error->new; + $r->{uri} = $request_uri; + $r->{request_uri} = $request_uri; + $r->{error_status_text} = 'Connection to the host is forbidden'; + return $r; } - my $node_id = 'node-'.refaddr $child; - my $nt = $child->node_type; - if ($nt == $child->ELEMENT_NODE) { - $r .= qq'
  1. ' . htescape ($child->tag_name) . - ''; ## ISSUE: case - - if ($child->has_attributes) { - $r .= '
      '; - for my $attr (sort {$a->[0] cmp $b->[0]} map { [$_->name, $_->value, 'node-'.refaddr $_] } - @{$child->attributes}) { - $r .= qq'
    • ' . htescape ($attr->[0]) . ' = '; ## ISSUE: case? - $r .= '' . htescape ($attr->[1]) . '
      • '; ## TODO: children - } - $r .= '
    '; + 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); + $req->header ('Accept-Encoding' => 'identity, *; q=0'); + 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 =~ /;\s*charset\s*=\s*"?([^\s;"]+)"?/i) { + $r->{charset} = lc $1; + $r->{charset} =~ tr/\\//d; + $r->{official_charset} = $r->{charset}; } - if ($node->has_child_nodes) { - $r .= '
      '; - unshift @node, @{$child->child_nodes}, '
    '; - } - } elsif ($nt == $child->TEXT_NODE) { - $r .= qq'
  2. ' . htescape ($child->data) . '
    3. '; - } elsif ($nt == $child->CDATA_SECTION_NODE) { - $r .= qq'
  3. <[CDATA[' . htescape ($child->data) . ']]>
    4. '; - } elsif ($nt == $child->COMMENT_NODE) { - $r .= qq'
  4. <!--' . htescape ($child->data) . '-->
    5. '; - } elsif ($nt == $child->DOCUMENT_NODE) { - $r .= qq'
  5. Document
    6. '; - if ($child->has_child_nodes) { - $r .= '
      '; - unshift @node, @{$child->child_nodes}, '
    '; + 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; } - } elsif ($nt == $child->DOCUMENT_TYPE_NODE) { - $r .= qq'
  6. <!DOCTYPE>
      '; - $r .= '
    • Name = @{[htescape ($child->name)]}
      • '; - $r .= '
    • Public identifier = @{[htescape ($child->public_id)]}
      • '; - $r .= '
    • System identifier = @{[htescape ($child->system_id)]}
      • '; - $r .= '
    7. '; - } elsif ($nt == $child->PROCESSING_INSTRUCTION_NODE) { - $r .= qq'
  7. <?@{[htescape ($child->target)]}?>'; - $r .= '
    • @{[htescape ($child->data)]}
    8. '; + + ## TODO: Support for HTTP Content-Encoding + + $r->{s} = ''.$res->content; + + require Whatpm::ContentType; + ($r->{official_type}, $r->{media_type}) + = Whatpm::ContentType->get_sniffed_type + (get_file_head => sub { + return substr $r->{s}, 0, shift; + }, + http_content_type_byte => $ct, + has_http_content_encoding => + defined $res->header ('Content-Encoding'), + supported_image_types => {}); } else { - $r .= qq'
  8. @{[$child->node_type]} @{[htescape ($child->node_name)]}
    9. '; # error + $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->{official_charset} = $r->{charset}; + $r->{header_field} = []; + + require Whatpm::ContentType; + ($r->{official_type}, $r->{media_type}) + = Whatpm::ContentType->get_sniffed_type + (get_file_head => sub { + return substr $r->{s}, 0, shift; + }, + http_content_type_byte => undef, + has_http_content_encoding => 0, + supported_image_types => {}); } - $r .= '
'; - print STDOUT $r; -} # print_document_tree - -sub get_node_path ($) { - my $node = shift; - my @r; - while (defined $node) { - my $rs; - if ($node->node_type == 1) { - $rs = $node->manakai_local_name; - $node = $node->parent_node; - } elsif ($node->node_type == 2) { - $rs = '@' . $node->manakai_local_name; - $node = $node->owner_element; - } elsif ($node->node_type == 3) { - $rs = '"' . $node->data . '"'; - $node = $node->parent_node; - } elsif ($node->node_type == 9) { - $rs = ''; - $node = $node->parent_node; - } else { - $rs = '#' . $node->node_type; - $node = $node->parent_node; + 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'; + $r->{official_charset} = $r->{charset}; + } elsif ($r->{charset_overridden} and $r->{charset} eq 'us-ascii') { + $r->{charset_overridden} = 0; } - unshift @r, $rs; } - return join '/', @r; -} # get_node_path + + if (length $r->{s} > 1000_000) { + $r->{error_status_text} = 'Entity-body too large'; + delete $r->{s}; + return $r; + } + + $r->{inner_html_element} = $http->get_parameter ('e'); + + 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 @@ -329,11 +314,11 @@ =head1 LICENSE -Copyright 2007 Wakaba +Copyright 2007-2008 Wakaba This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. =cut -## $Date: 2007/06/27 13:30:15 $ +## $Date: 2008/07/21 12:56:33 $