Changeset 74

Timestamp:

2007年07月10日 08時38分58秒 (1 year ago)

Author:

rintaro

Message:

Nenshi:

• HTMLParser closes unclosed tags at document end
  
• Tweak HTML::Parser parameters
  
• HTMLSanitizer and tests
  

Location:

Nenshi/trunk

Files:

• lib/Nenshi/Filter/HTMLFormFiller.pm (modified) (1 diff)
• lib/Nenshi/Filter/HTMLSanitizer.pm (modified) (7 diffs)
• lib/Nenshi/Input.pm (modified) (5 diffs)
• lib/Nenshi/Util.pm (modified) (2 diffs)
• t/52_filter_sanitize.t (added)

Nenshi/trunk/lib/Nenshi/Filter/HTMLFormFiller.pm

@@ -10 +10 @@
 use overload 
         '&{}' => sub { my $self = shift; sub { $self->__call__(@_) } };
+
 sub new {
         my $self = bless {}, shift;

Nenshi/trunk/lib/Nenshi/Filter/HTMLSanitizer.pm

@@ -4 +4 @@
 use warnings;
 
+use Iterator::Simple qw(iterator ifilter iter);
 use Nenshi::Core qw(Attrs QName :eventkind);
 use Nenshi::Util qw(set stripentities);
+
+use overload 
+        '&{}' => sub { my $self = shift; sub { $self->__call__(@_) } };
 
 use constant SAFE_TAGS => set( qw(
@@ -40 +44 @@
         $self->{uri_attrs} = $o{uri_attrs} || URI_ATTRS;
         $self->{safe_schemes} = $o{safe_schemes} || SAFE_SCHEMES;
+        $self;
 }
 
@@ -73 +78 @@
                                 elsif($attr eq 'style') {
                                         my @decls;
+                                        # normalize new lines
                                         $value =~ s/\x0d\x0a/\n/g;
                                         $value =~ tr/\x0d\x0a/\n\n/;
-                                        $value =~ s/\\([0-9a-fA-F]{1,6})/pack('H2', $1)/eg;
+                                        # unicode escape
+                                        $value =~ s/\\([0-9a-fA-F]{1,6})\s?/pack('H*', $1)/eg;
                                         for my $decl (split ';', $value) {
                                                 next if not $decl;
                                                 my $is_evil = index($decl, 'expression') >= 0;
-                                                while($decl =~ /url\s\(([^\)]+)/g) {
+                                                while($decl =~ /url\s*\(([^\)]+)/g) {
                                                         my $scheme = _get_scheme($value);
                                                         if(not $self->{safe_schemes}->contains($scheme)) {
@@ -87 +94 @@
                                                 }
                                                 if(not $is_evil) {
-                                                        $decl =~ s/^\s+|\s+$//g;
+                                                        $decl =~ s/^\s+//s;
+                                                        $decl =~ s/\s+$//s;
                                                         push @decls, $decl;
                                                 }
@@ -105 +113 @@
                                         return;
                                 }
+                                return;
                         }
                         else {
@@ -114 +123 @@
                         return [$kind, $data, $pos];
                 }
+                return;
         }
 }
@@ -126 +136 @@
 
 1;
+

Nenshi/trunk/lib/Nenshi/Input.pm

@@ -199 +199 @@
 
         use base qw(HTML::Parser);
+        use Encode qw();
         use Iterator::Simple qw( iterator iter );
         use Nenshi::Core qw( :eventkind Stream Attrs QName );
@@ -219 +220 @@
                                 declaration => ['handle_doctype', 'self,tokens,line,column'],
                                 process => ['handle_process', 'self,token0,line,column'],
+                                start_document => [''],
+                                end_document => ['handle_enddoc', 'self,line,column'],
+                                default => ['handle_default', 'self,event,line,column'],
                         },
                         unbroken_text => 1,
                         attr_encoded => 1,
+                        strict_names => 1,
+                        empty_element_tags => 1,
                         #utf8_mode => 1,
                 );
@@ -294 +300 @@
                 $self->_enqueue(PI, [$target, $data], [$line, $col]);
         }
+        
+        sub handle_enddoc {
+                my $self = shift;
+                my($line, $col) = @_;
+                while(scalar @{$self->{_open_tags}}) {
+                        my $tag = pop @{$self->{_open_tags}};
+                        $self->_enqueue(END_, $tag, [$line, $col]);
+                }
+        }
 
         sub handle_declaration {
@@ -301 +316 @@
         }
 
+        sub handle_default {
+                my($self, $event) = @_;
+                warn "HANDLE DEFAULT: $event";
+        }
+        
         sub parse {
                 my($self) = @_;
@@ -324 +344 @@
                                         next;
                                 }
-                                
                                 if($@) {
                                         Nenshi::ParseError->throw("$@",$self->{filename},$self->current_line, $self->current_column);

Nenshi/trunk/lib/Nenshi/Util.pm

@@ -10 +10 @@
 {
         package Nenshi::Set;
+
+        use overload (
+                '|' => sub {
+                        my($self, $other) = @_;
+                        Nenshi::Set->new(keys(%$self), @$other)
+                },
+                '@{}' => sub {
+                        my($self) = @_;
+                        [keys %$self];
+                },
+                fallback => 1,
+        );
 
         sub new {
@@ -26 +38 @@
         }
 }
+
 sub set { Nenshi::Set->new(@_); }
 push @EXPORT_OK, qw(set);