--- test/html-webhacc/cc.cgi 2007/06/27 13:30:15 1.3
+++ test/html-webhacc/cc.cgi 2007/07/16 10:55:11 1.11
@@ -23,16 +23,19 @@
## 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";
+ if ($http->meta_variable ('PATH_INFO') ne '/') {
+ print STDOUT "Status: 404 Not Found\nContent-Type: text/plain; charset=us-ascii\n\n400";
exit;
}
+ require Message::DOM::DOMImplementation;
+ my $dom = Message::DOM::DOMImplementation->new;
+
+ my $input = get_input_document ($http, $dom);
+ my $inner_html_element = $http->parameter ('e');
+
+ load_text_catalog ('en'); ## TODO: conneg
+
my @nav;
print STDOUT qq[Content-Type: text/html; charset=utf-8
@@ -45,121 +48,116 @@
Web Document Conformance Checker (beta)
-
+
+- Request URI
+ <@{[htescape $input->{request_uri}]}>- Document URI
- <@{[htescape $input_uri]}>- Internet Media Type
- @{[htescape $input_format]}<@{[htescape $input->{uri}]}>
yet
push @nav, ['#document-info' => 'Information'];
- require Message::DOM::DOMImplementation;
- my $dom = Message::DOM::DOMImplementation->____new;
+if (defined $input->{s}) {
+
+ print STDOUT qq[
+
Base URI
+
<@{[htescape $input->{base_uri}]}>
+
Internet Media Type
+
@{[htescape $input->{media_type}]}
+ @{[$input->{media_type_overridden} ? '(overridden)' : '']}
+
Character Encoding
+
@{[defined $input->{charset} ? ''.htescape ($input->{charset}).'' : '(none)']}
+ @{[$input->{charset_overridden} ? '(overridden)' : '']}
+
+
+];
+
+ print_http_header_section ($input);
+
my $doc;
my $el;
- if ($input_format eq 'text/html') {
+ if ($input->{media_type} eq 'text/html') {
require Encode;
require Whatpm::HTML;
+
+ $input->{charset} ||= 'ISO-8859-1'; ## TODO: for now.
- $s = Encode::decode ('utf-8', $s);
+ my $t = Encode::decode ($input->{charset}, $input->{s});
print STDOUT qq[
-
Character Encoding
-
(none)
-
-
-
Document Source
-];
- push @nav, ['#source-string' => 'Source'];
- print_source_string (\$s);
- print STDOUT qq[
-
-
Parse Errors
-
-];
+];
push @nav, ['#parse-errors' => 'Parse Error'];
my $onerror = sub {
my (%opt) = @_;
+ my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level});
if ($opt{column} > 0) {
- print STDOUT qq[
- Line $opt{line} column $opt{column}: ];
+ print STDOUT qq[
- Line $opt{line} column $opt{column}
\n];
} else {
- $opt{line}--;
- print STDOUT qq[ - Line $opt{line}: ];
+ $opt{line} = $opt{line} - 1 || 1;
+ print STDOUT qq[
- Line $opt{line}
\n];
}
- print STDOUT qq[@{[htescape $opt{type}]} \n];
+ $type =~ tr/ /-/;
+ $type =~ s/\|/%7C/g;
+ $msg .= qq[ [Description]];
+ print STDOUT qq[- $msg
\n];
};
$doc = $dom->create_document;
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);
}
- print STDOUT qq[
-
+ 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[
-Character Encoding
- (none)
-
-
+ print_source_string_section (\($input->{s}), $input->{charset});
+ } elsif ({
+ 'text/xml' => 1,
+ 'application/xhtml+xml' => 1,
+ 'application/xml' => 1,
+ }->{$input->{media_type}}) {
+ require Message::DOM::XMLParserTemp;
-
-
Document Source
-];
- push @nav, ['#source-string' => 'Source'];
- print_source_string (\$t);
print STDOUT qq[
-
-
Parse Errors
-
-];
+];
push @nav, ['#parse-errors' => 'Parse Error'];
my $onerror = sub {
my $err = shift;
my $line = $err->location->line_number;
- print STDOUT qq[
- Line $line column ];
- print STDOUT $err->location->column_number, ": ";
- print STDOUT htescape $err->text, "
\n";
+ print STDOUT qq[- Line $line column ];
+ print STDOUT $err->location->column_number, "
- ";
+ print STDOUT htescape $err->text, "
\n";
return 1;
};
- open my $fh, '<', \$s;
+ open my $fh, '<', \($input->{s});
$doc = Message::DOM::XMLParserTemp->parse_byte_stream
- ($fh => $dom, $onerror, charset => 'utf-8');
+ ($fh => $dom, $onerror, charset => $input->{charset});
- print STDOUT qq[
-
+ print STDOUT qq[
+
];
+ print_source_string_section (\($input->{s}), $doc->input_encoding);
} else {
+ ## TODO: Change HTTP status code??
print STDOUT qq[
-
-
-
Media type @{[htescape $input_format]} is not supported!
+
Media type @{[htescape $input->{media_type}]} is not supported!
Document Errors
-
-];
+];
push @nav, ['#document-errors' => 'Document Error'];
require Whatpm::ContentChecker;
my $onerror = sub {
my %opt = @_;
- print STDOUT qq[
- ],
- htescape get_node_path ($opt{node}),
- ": ", htescape $opt{type}, "
\n";
+ my ($type, $cls, $msg) = get_text ($opt{type}, $opt{level});
+ $type =~ tr/ /-/;
+ $type =~ s/\|/%7C/g;
+ $msg .= qq[ [Description]];
+ print STDOUT qq[- ] . get_node_link ($opt{node}) .
+ qq[
\n- ], $msg, "
\n";
};
+ my $elements;
if ($el) {
- Whatpm::ContentChecker->check_element ($el, $onerror);
+ $elements = Whatpm::ContentChecker->check_element ($el, $onerror);
} else {
- Whatpm::ContentChecker->check_document ($doc, $onerror);
+ $elements = Whatpm::ContentChecker->check_document ($doc, $onerror);
}
- print STDOUT qq[
-
+ 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};
+ $_->{is_header} = $_->{is_header} ? 1 : 0;
+ }
+ }
+ }
+
+ print STDOUT '];
+ }
+
+ 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[
+
Input Error: @{[htescape ($input->{error_status_text})]}
+
@@ -221,19 +303,64 @@
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[- ], htescape $1, "
\n";
- $i++;
+sub print_http_header_section ($) {
+ my $input = shift;
+ 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[];
+} # print_http_header_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[- ], htescape $1, "
\n";
+ $i++;
+ }
+ if ($$s =~ /\G([^\x0A]+)/gc) {
+ print STDOUT qq[- ], htescape $1, "
\n";
+ }
+ } else {
+ print STDOUT q[];
+ }
+ print STDOUT "
' . htescape ($child->tag_name) .
+ my $child_nsuri = $child->namespace_uri;
+ $r .= qq[] . 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 $_] }
+ for my $attr (sort {$a->[0] cmp $b->[0]} map { [$_->name, $_->value, $_->namespace_uri, 'node-'.refaddr $_] }
@{$child->attributes}) {
- $r .= qq'' . htescape ($attr->[0]) . ' = '; ## ISSUE: case?
+ $r .= qq[] . htescape ($attr->[0]) . ' = '; ## ISSUE: case?
$r .= '' . htescape ($attr->[1]) . '
';
}
- if ($node->has_child_nodes) {
+ if ($child->has_child_nodes) {
$r .= '';
- unshift @node, @{$child->child_nodes}, '
';
+ unshift @node, @{$child->child_nodes}, '
';
+ } else {
+ $r .= '';
}
} elsif ($nt == $child->TEXT_NODE) {
- $r .= qq'' . htescape ($child->data) . '
' . htescape ($child->data) . '
<[CDATA[' . htescape ($child->data) . '
]]><[CDATA[' . htescape ($child->data) . '
]]><!--' . htescape ($child->data) . '
-->- Document
';
+ $r .= qq'- Document';
+ $r .= qq[
];
+ $r .= qq[- @{[scalar get_text ('manakaiIsHTML:'.($child->manakai_is_html?1:0))]}
];
+ $r .= qq[- @{[scalar get_text ('manakaiCompatMode:'.$child->manakai_compat_mode)]}
];
+ unless ($child->manakai_is_html) {
+ $r .= qq[- XML version =
@{[htescape ($child->xml_version)]} ];
+ if (defined $child->xml_encoding) {
+ $r .= qq[- XML encoding =
@{[htescape ($child->xml_encoding)]} ];
+ } else {
+ $r .= qq[- XML encoding = (null)
];
+ }
+ $r .= qq[- XML standalone = @{[$child->xml_standalone ? 'true' : 'false']}
];
+ }
+ $r .= qq[
];
if ($child->has_child_nodes) {
- $r .= '';
- unshift @node, @{$child->child_nodes}, '
';
+ $r .= '';
+ unshift @node, @{$child->child_nodes}, '
';
}
} elsif ($nt == $child->DOCUMENT_TYPE_NODE) {
- $r .= qq'<!DOCTYPE>';
- $r .= '- Name =
@{[htescape ($child->name)]}
';
- $r .= '- Public identifier =
@{[htescape ($child->public_id)]}
';
- $r .= '- System identifier =
@{[htescape ($child->system_id)]}
';
+ $r .= qq'<!DOCTYPE>';
+ $r .= qq[- Name =
@{[htescape ($child->name)]}
];
+ $r .= qq[- Public identifier =
@{[htescape ($child->public_id)]}
];
+ $r .= qq[- System identifier =
@{[htescape ($child->system_id)]}
];
$r .= '
<?@{[htescape ($child->target)]}?>';
- $r .= '- @{[htescape ($child->data)]}
<?@{[htescape ($child->target)]} @{[htescape ($child->data)]}
?>- @{[$child->node_type]} @{[htescape ($child->node_name)]}
'; # error
+ $r .= qq'- @{[$child->node_type]} @{[htescape ($child->node_name)]}
'; # error
}
}
@@ -312,6 +454,7 @@
$rs = '"' . $node->data . '"';
$node = $node->parent_node;
} elsif ($node->node_type == 9) {
+ @r = ('') unless @r;
$rs = '';
$node = $node->parent_node;
} else {
@@ -323,6 +466,196 @@
return join '/', @r;
} # get_node_path
+sub get_node_link ($) {
+ return qq[] .
+ htescape (get_node_path ($_[0])) . qq[];
+} # get_node_link
+
+{
+ my $Msg = {};
+
+sub load_text_catalog ($) {
+ my $lang = shift; # MUST be a canonical lang name
+ open my $file, '<', "cc-msg.$lang.txt" or die "$0: cc-msg.$lang.txt: $!";
+ while (<$file>) {
+ if (s/^([^;]+);([^;]*);//) {
+ my ($type, $cls, $msg) = ($1, $2, $_);
+ $msg =~ tr/\x0D\x0A//d;
+ $Msg->{$type} = [$cls, $msg];
+ }
+ }
+} # load_text_catalog
+
+sub get_text ($) {
+ my ($type, $level) = @_;
+ $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 ($type, $Msg->{$type}->[0], $msg);
+ } elsif ($type =~ s/:([^:]*)$//) {
+ unshift @arg, $1;
+ redo;
+ }
+ }
+ return ($type, '', htescape ($_[0]));
+} # get_text
+
+}
+
+sub get_input_document ($$) {
+ my ($http, $dom) = @_;
+
+ my $request_uri = $http->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);
+ if ($res->is_success or $http->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->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->parameter ('s');
+ $r->{uri} = q;
+ $r->{request_uri} = q;
+ $r->{base_uri} = q;
+ $r->{charset} = ''.$http->parameter ('_charset_');
+ $r->{charset} =~ s/\s+//g;
+ $r->{charset} = 'utf-8' if $r->{charset} eq '';
+ $r->{header_field} = [];
+ }
+
+ my $input_format = $http->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 .
@@ -336,4 +669,4 @@
=cut
-## $Date: 2007/06/27 13:30:15 $
+## $Date: 2007/07/16 10:55:11 $