* Use HTML::Entities in process and service instead of sani (which sucks)

diff --git a/scripts/process.in b/scripts/process.in
index 43387b27ec4e74f95c134f369f960c1000fcb3d8..9f3fffc1dcf3e26225089638d9a5ee9f933f882e 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -12,10 +12,13 @@ use Debbugs::Mail qw(send_mail_message encode_headers);
 use Debbugs::Packages qw(getpkgsrc);
 use Debbugs::User qw(read_usertags write_usertags);
 
+use HTML::Entities qw(encode_entities);
+
 # TODO DLA; needs config reworking and errorlib reworking
 # use warnings;
 # use strict;
 
+use Debbugs::Status qw(:versions);
 use Debbugs::Config qw(:globals);
 my $lib_path = $gLibPath;
 
@@ -772,7 +775,7 @@ END
     &htmllog($newref ? "Report" : "Information", "forwarded",
              join(', ',"$gSubmitList\@$gListDomain",@resentccs),
              "<code>$gBug#$ref</code>".
-             (length($data->{package})? "; Package <code>".&sani($data->{package})."</code>" : '').
+             (length($data->{package})? "; Package <code>".encode_entities($data->{package})."</code>" : '').
              ".");
     &sendmessage(<<END,["$gSubmitList\@$gListDomain",@resentccs],[@bccs]);
 Subject: $gBug#$ref: $newsubject
@@ -795,13 +798,13 @@ END
         &htmllog($newref ? "Report" : "Information", "forwarded",
                  $resentccval,
                  "<code>$gBug#$ref</code>".
-                 (length($data->{package}) ? "; Package <code>".&sani($data->{package})."</code>" : '').
+                 (length($data->{package}) ? "; Package <code>".encode_entities($data->{package})."</code>" : '').
                  ".");
     } else {
         &htmllog($newref ? "Report" : "Information", "stored",
                  "",
                  "<code>$gBug#$ref</code>".
-                 (length($data->{package}) ? "; Package <code>".&sani($data->{package})."</code>" : '').
+                 (length($data->{package}) ? "; Package <code>".encode_entities($data->{package})."</code>" : '').
                  ".");
     }
     &sendmessage(<<END,[@resentccs],[@bccs]);
@@ -819,10 +822,10 @@ ${source_pr_header}$fwd
 END
 }
 
-$htmlbreak= length($brokenness) ? "<p>\n".&sani($brokenness)."\n<p>\n" : '';
+$htmlbreak= length($brokenness) ? "<p>\n".encode_entities($brokenness)."\n<p>\n" : '';
 $htmlbreak =~ s/\n\n/\n<P>\n\n/g;
 if (length($resentccval)) {
-    $htmlbreak = "  Copy sent to <code>".&sani($resentccval)."</code>.".
+    $htmlbreak = "  Copy sent to <code>".encode_entities($resentccval)."</code>.".
         $htmlbreak;
 }
 unless (exists $header{'x-debbugs-no-ack'}) {
@@ -1087,7 +1090,7 @@ sub htmllog {
     print(AP
           "\6\n".
           "<strong>$whatobj $whatverb</strong>".
-          ($where eq '' ? "" : " to <code>".&sani($where)."</code>").
+          ($where eq '' ? "" : " to <code>".encode_entities($where)."</code>").
           ":<br>\n". $desc.
           "\n\3\n") || &quit("writing db-h/$hash/$ref.log (lh): $!");
     close(AP) || &quit("closing db-h/$hash/$ref.log (lh): $!");

diff --git a/scripts/service.in b/scripts/service.in
index 4730b8bd5064c2c7647afc0044477f1328392775..fc5055fc02ddd5b4ee4a306f3dbcf2a7d1cebe1e 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -9,6 +9,7 @@ use MIME::Parser;
 use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
 use Debbugs::Mail qw(send_mail_message);
 use Debbugs::User;
+use HTML::Entities qw(encode_entities);
 
 use Debbugs::Config qw(:globals);
 $lib_path = $gLibPath;
@@ -1194,8 +1195,8 @@ print(AP
       "\2\n$repliedshow\n\5\n$reply\n\3\n".
       "\6\n".
       "<strong>Request received</strong> from <code>".
-      &sani($header{'from'})."</code>\n".
-      "to <code>".&sani($controlrequestaddr)."</code>\n".
+      encode_entities($header{'from'})."</code>\n".
+      "to <code>".encode_entities($controlrequestaddr)."</code>\n".
       "\3\n".
       "\7\n",@{escapelog(@log)},"\n\3\n") || &quit("writing db-h/-1.log: $!");
 close(AP) || &quit("open db-h/-1.log: $!");
@@ -1427,9 +1428,9 @@ sub savebug {
     open(L,">>db-h/$hash/$ref.log") || &quit("opening db-h/$hash/$ref.log: $!");
     print(L
           "\6\n".
-          "<strong>".&sani($action)."</strong>\n".
-          "Request was from <code>".&sani($header{'from'})."</code>\n".
-          "to <code>".&sani($controlrequestaddr)."</code>. \n".
+          "<strong>".encode_entities($action)."</strong>\n".
+          "Request was from <code>".encode_entities($header{'from'})."</code>\n".
+          "to <code>".encode_entities($controlrequestaddr)."</code>. \n".
           "\3\n".
           "\7\n",@{escapelog(@log)},"\n\3\n") || &quit("writing db-h/$hash/$ref.log: $!");
     close(L) || &quit("closing db-h/$hash/$ref.log: $!");