X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=scripts%2Fssoma-replay;h=34cc4671a9583b63289d5847ea6cb2a3fe52e83c;hb=refs%2Ftags%2Fv1.1.0-pre1;hp=bfcea0a3c366cf9833a6c603c5391750387e23f8;hpb=68a70c10fcf5bacc5ae6258177917ae45ab67365;p=public-inbox.git
diff --git a/scripts/ssoma-replay b/scripts/ssoma-replay
index bfcea0a3..34cc4671 100755
--- a/scripts/ssoma-replay
+++ b/scripts/ssoma-replay
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# Copyright (C) 2015-2016 all contributors
+# Copyright (C) 2015-2018 all contributors
# License: AGPL-3.0+
#
# A work-in-progress, but one day I hope this script is no longer
@@ -29,7 +29,7 @@ use strict;
use Email::Simple;
use URI::Escape qw/uri_escape_utf8/;
use File::Temp qw/tempfile/;
-my ($fh, $filename) = tempfile('pi-replay-XXXXXXXX');
+my ($fh, $filename) = tempfile('ssoma-replay-XXXXXXXX', TMPDIR => 1);
my $msg = eval {
local $/;
Email::Simple->new();
@@ -45,7 +45,9 @@ my $body = $msg->body;
my $list_id = $header_obj->header('List-Id');
my ($archive_url, $user, $domain);
if (defined $list_id) {
- ($user, $domain) = ($list_id =~ /<(.+)\@(.+)>/g);
+ # due to a bug in old versions of public-inbox, was used
+ # as the list-Id instead of as recommended in RFC2919
+ ($user, $domain) = ($list_id =~ /<([^\.@]+)[\.@](.+)>/g);
if (defined $domain) {
$archive_url = "https://$domain/$user/";
@@ -53,7 +55,8 @@ if (defined $list_id) {
if ($mid =~ /\A<(.+)>\z/) {
$mid = $1;
}
- $mid = uri_escape_utf8($mid);
+ $mid = uri_escape_utf8($mid,
+ '^A-Za-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@');
$header_obj->header_set('List-Archive', "<$archive_url>");
foreach my $h (qw(Help Unsubscribe Subscribe Owner)) {