From 840d4017e5a033515f31f3caf6880fd9a64cbfd3 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 28 Feb 2010 22:22:12 +0000
Subject: [PATCH] Publish rejections

---
 .gitignore                             |  2 +-
 cgi/logs.INO                           |  2 +-
 forward-suffix.part.INO                |  2 +-
 get-settings                           |  7 +++++++
 install-loggroups                      |  2 +-
 install-newsgroup                      |  2 +-
 install-weblinks                       |  1 -
 public-html/messages                   |  1 +
 setup                                  |  1 +
 stump/etc/sanitise_and_quote_email.INO |  2 +-
 xlog/bin/record                        | 21 ++++++++++++++++-----
 xlog/bin/report                        |  9 ++++++---
 12 files changed, 37 insertions(+), 15 deletions(-)
 create mode 120000 public-html/messages

diff --git a/.gitignore b/.gitignore
index 8dc5a05..d34fba3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@
 /xlog/log/*/event.log
 /xlog/log/*/event.log.[0-9]
 /xlog/log/*/event.log.[0-9].gz
-/xlog/log/*/nr-*.txt
+/xlog/log/*/public/nr-*.txt
 /crontab.part
 /stump/etc/modenv
 /stump/etc/added-headers
diff --git a/cgi/logs.INO b/cgi/logs.INO
index 9936de2..5c3510b 100755
--- a/cgi/logs.INO
+++ b/cgi/logs.INO
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -e
 cd %BASEDIR%/xlog/log
-exec ../bin/report %GROUP% "$@"
+exec ../bin/report %GROUP% %STATICFILESURL%/g.%ABBREV%/messages "$@"
diff --git a/forward-suffix.part.INO b/forward-suffix.part.INO
index bf5121a..1227565 100644
--- a/forward-suffix.part.INO
+++ b/forward-suffix.part.INO
@@ -30,7 +30,7 @@ endif
 if $local_part_suffix is +%ABBREV%-internal-log+mailout
 then
 	unseen deliver %LOGGROUPEMAILPREFIX%+%ABBREV%+log+mailout
-	pipe "%BASEDIR%/xlog/bin/record mailout %GROUP%"
+	pipe "%BASEDIR%/xlog/bin/record %PUBREJOPT% mailout %GROUP%"
 	finish
 endif
 
diff --git a/get-settings b/get-settings
index f9b3d6f..4226b29 100644
--- a/get-settings
+++ b/get-settings
@@ -18,6 +18,13 @@ export BASEDIR
 
 # derivative settings:
 
+PUBREJOPT=''
+if $PUBLISHREJECTIONS; then
+	PUBREJOPT=-P
+fi
+export PUBREJOPT
+
+
 test -f persistent-autosettings || touch persistent-autosettings
 . persistent-autosettings
 
diff --git a/install-loggroups b/install-loggroups
index d484a9a..83fea56 100755
--- a/install-loggroups
+++ b/install-loggroups
@@ -5,7 +5,7 @@ set -e
 
 case ",$NEWSADMINUSERS," in
 *,"`whoami`",*) ;;
-*)	echo >&2 "$0 must be run as one of $NEWSADMINUSERS, skipping"
+*)	echo >&2 "$0 must be run as one of $NEWSADMINUSERS, skipping"; exit 0;;
 esac
 
 exec <mailinglists_dir.part
diff --git a/install-newsgroup b/install-newsgroup
index 5ec1784..a9a660a 100755
--- a/install-newsgroup
+++ b/install-newsgroup
@@ -9,7 +9,7 @@ mkdir -p stump/tmp/messages
 mkdir -p stump/data
 mkdir -p webstump/queues/$GROUP
 mkdir -p webstump/log
-mkdir -p xlog/log/$GROUP
+mkdir -p xlog/log/$GROUP/public
 
 ngdir=webstump/config/newsgroups/$GROUP
 mkdir -p $ngdir
diff --git a/install-weblinks b/install-weblinks
index 459001c..32865b9 100755
--- a/install-weblinks
+++ b/install-weblinks
@@ -12,4 +12,3 @@ install_link () {
 install_link $BASEDIR/cgi         $CGISCRIPTDIR/g.$ABBREV
 install_link $BASEDIR/cgi/logs    $CGISCRIPTDIR/l.$ABBREV
 install_link $BASEDIR/public-html $STATICFILESDIR/g.$ABBREV
-
diff --git a/public-html/messages b/public-html/messages
new file mode 120000
index 0000000..29f59e6
--- /dev/null
+++ b/public-html/messages
@@ -0,0 +1 @@
+/home/webstump/live-mtm/xlog/log/misc.test.moderated/public
\ No newline at end of file
diff --git a/setup b/setup
index 2a7c2c0..bf60575 100755
--- a/setup
+++ b/setup
@@ -14,6 +14,7 @@ x ./install-newsgroup
 x ./install-substitutions
 x make -C webstump
 x ./install-aggregates
+x ./install-weblinks
 x ./install-loggroups
 
 echo ==== DONE ====
diff --git a/stump/etc/sanitise_and_quote_email.INO b/stump/etc/sanitise_and_quote_email.INO
index a62f349..9446cd4 100755
--- a/stump/etc/sanitise_and_quote_email.INO
+++ b/stump/etc/sanitise_and_quote_email.INO
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -p
 
-s, %OURUSER% \+ [-+/0-9a-z]* \@ (\Q %DOMAIN% | %SLIMYDOMAIN \E) \b
+s, %OURUSER% \+ [-+/0-9a-z]* \@ (\Q%DOMAIN%\E | \Q%SLIMYDOMAIN%\E) \b
 		 ,%OURUSER%+?\@$1,igx
 	unless m/^$/..0;
 
diff --git a/xlog/bin/record b/xlog/bin/record
index a628195..11c7e60 100755
--- a/xlog/bin/record
+++ b/xlog/bin/record
@@ -4,6 +4,13 @@ use strict (qw(vars));
 use IO::Handle;
 
 our %f;
+
+my $publish_rejections= 0;
+if ($ARGV[0] eq '-P') {
+    $publish_rejections= 1;
+    shift @ARGV;
+}
+
 our ($how) = @_;
 
 my $dir= $0;
@@ -77,7 +84,9 @@ sub parse_mailout () {
     while (<STDIN>) {
 	$keepheader= 1 unless m/^[ \t]/;
 	$keepheader= 0
-	    if m/^(?: received )/ix;
+	    if m/^(?: received
+		   | envelope-to
+		   )/ix;
 	$keepheader= 'mangle'
 	    if m/^(?: to
 		   | from
@@ -110,9 +119,11 @@ STDIN->error and die $!;
 
 $f{Now}= time;
 
-if ($f{Event} =~ m/^notify reject /) {
-    #$ref= $f{MessageID}
-    open I, ">$dir/nr-$f{MessageNum}.txt" or die $!;
+if ($publish_rejections &&
+    $f{Event} =~ m/^notify reject /) {
+    $f{CopyRef}= $f{MessageID};
+    $f{CopyRef} =~ s/\W/ sprintf '-%02x', ord($&) /ge;
+    open I, ">$dir/public/nr-$f{CopyRef}.txt" or die $!;
     print I $message or die $!;
     close I or die $!;
 }
@@ -125,7 +136,7 @@ my @s= map {
     $v =~ s/\t/  /g;
     $v =~ s/[\r\n]/?/g;
     $v;
-} qw(Now MessageNum MessageID From Subject Event);
+} qw(Now MessageNum MessageID From Subject Event CopyRef);
 
 print L join("\t",@s)."\n" or die $!;
 close L or die $!;
diff --git a/xlog/bin/report b/xlog/bin/report
index ee3022e..5f74769 100755
--- a/xlog/bin/report
+++ b/xlog/bin/report
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-our ($ng,@ARGV) = @ARGV;
+our ($ng,$staticfiles,@ARGV) = @ARGV;
 chdir $ng or die $!;
 
 use strict (qw(vars));
@@ -34,7 +34,7 @@ sub processlogs ($) {
 sub processline_print () {
     my @sp= @s;
     $sp[3] =~ s/\@\w{0,2}/ at .. /;
-    my @sp= map { escapeHTML($_) } @sp;
+    @sp= map { escapeHTML($_) } @sp[0..5];
     my @spu= map {
 	s/\W/ sprintf "%%%02x", ord $& /ge;
 	$_;
@@ -45,6 +45,9 @@ sub processline_print () {
 	    $sp[$i]= a({ href=>$url }, $sp[$i] );
 	}
     }
+    if (length $s[6]) {
+	$sp[5]= a({ href=>"$staticfiles/nr-$s[6].txt" }, $sp[5] );
+    }
 #print STDERR join('|',@sp),"\n";
     print Tr(td([@sp]));
 }
@@ -87,7 +90,7 @@ if ($pi =~ m,^/message/(\d+)/(.*)$,) {
     $title= "Single message ".escapeHTML($selectmid);
     $processline= \&processline_print_ifsingle;
 } elsif ($pi =~ m/^$/) {
-    $title= "Recent activity";
+    $title= "Recent activity - $ng";
 } elsif ($pi =~ m,^/queue,) {
     $title= "Activity regarding still-queued messages";
     $processline= \&processline_queue_prescan;
-- 
2.30.2