From dd107ea3d822f14f08198135ae2fc5b3b1d454b6 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 26 Apr 2021 19:33:46 +0000 Subject: Fix regex bug, support HTML comments I added \s* after to match any potential newline (and, for good measure, whitespace) after . One would usually rather have this: My header than this: My header --- lib/Apache/Inject.pm | 18 ++++++++++++------ lib/Apache/Inject/Handler.pm | 11 +++++++++-- 2 files changed, 21 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/Apache/Inject.pm b/lib/Apache/Inject.pm index 09bf18a..89c0db8 100644 --- a/lib/Apache/Inject.pm +++ b/lib/Apache/Inject.pm @@ -180,6 +180,18 @@ file, as well as the contents of the C and C files, concatenates them intelligently and prints their combined contents. +=head1 CAVEATS + +Apache::Inject::Handler uses regular expressions to determine the +proper location of the injected header. It supports all valid HTML. +However, it does not take into account that embedded CSS and +JavaScript code can contain strings that look like valid opening +and closing HTML tags. + +On FreeBSD, you may need to enable the accf_http kernel module in +order for the tests to work. Note that Apache::Inject works fine +without the module; it is only the tests that require it. + =head1 DIAGNOSTICS Apache::Inject and Apache::Inject::Handler log all errors and @@ -220,12 +232,6 @@ cannot retrieve the current document root from Apache. =back -=head1 CAVEATS - -On FreeBSD, you may need to enable the accf_http kernel module in -order for the tests to work. Note that Apache::Inject works fine -without the module; it is only the tests that require it. - =head1 AUTHOR John Ankarström, Ejohn [at] ankarstrom.seE diff --git a/lib/Apache/Inject/Handler.pm b/lib/Apache/Inject/Handler.pm index 0e054e7..ae81fbb 100644 --- a/lib/Apache/Inject/Handler.pm +++ b/lib/Apache/Inject/Handler.pm @@ -12,8 +12,11 @@ use Apache2::RequestUtil (); my $doc = qr{ \A (? \s* + ( )? \s* ( ]*> )? \s* + ( )? \s* ( ]*> )? \s* + ( )? \s* ( ]*> .*? \s* | ( ]*> \s* | ]*> \s* @@ -21,12 +24,16 @@ my $doc = qr{ | ]*> .*? \s* | ]*> .*? \s* | ]*> \s* + | \s* )+ )? - (]*>)? + ( )? \s* + ( ]*> )? \s* )? (? .*? ) - (? \s* )? + (? \s* + ( )? \s* + )? \z }xmsi; -- cgit v1.2.3