X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMID.pm;h=2613c8eb45601399ca929ab54152863b1c25f4e3;hb=09f1e000734bc431ec7b63e18959bf6f34f9c179;hp=c75aa0e166ec3709515d0a3825c789006ec5d0fd;hpb=0fea7793b22efd2596983283947ee43687e0cfac;p=public-inbox.git

diff --git a/lib/PublicInbox/MID.pm b/lib/PublicInbox/MID.pm
index c75aa0e1..2613c8eb 100644
--- a/lib/PublicInbox/MID.pm
+++ b/lib/PublicInbox/MID.pm
@@ -1,10 +1,13 @@
-# Copyright (C) 2015, all contributors <meta@public-inbox.org>
+# Copyright (C) 2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+#
+# Various Message-ID-related functions.
 package PublicInbox::MID;
 use strict;
 use warnings;
 use base qw/Exporter/;
-our @EXPORT_OK = qw/mid_clean mid_compressed mid2path/;
+our @EXPORT_OK = qw/mid_clean id_compress mid2path mid_mime mid_escape MID_ESC/;
+use URI::Escape qw(uri_escape_utf8);
 use Digest::SHA qw/sha1_hex/;
 use constant MID_MAX => 40; # SHA-1 hex length
 
@@ -12,24 +15,21 @@ sub mid_clean {
 	my ($mid) = @_;
 	defined($mid) or die "no Message-ID";
 	# MDA->precheck did more checking for us
-	$mid =~ s/\A\s*<?//;
-	$mid =~ s/>?\s*\z//;
+	if ($mid =~ /<([^>]+)>/) {
+		$mid = $1;
+	}
 	$mid;
 }
 
 # this is idempotent
-sub mid_compressed {
-	my ($mid) = @_;
-
-	# XXX dirty hack! FIXME!
-	# Some HTTP servers (apache2 2.2.22-13+deb7u5 on my system)
-	# apparently do not handle "%25" in the URL path component correctly.
-	# I'm not yet sure if it's something weird with my rewrite rules
-	# or what; will need to debug...
-	return sha1_hex($mid) if (index($mid, '%') >= 0);
+sub id_compress {
+	my ($id, $force) = @_;
 
-	return $mid if (length($mid) <= MID_MAX);
-	sha1_hex($mid);
+	if ($force || $id =~ /[^\w\-]/ || length($id) > MID_MAX) {
+		utf8::encode($id);
+		return sha1_hex($id);
+	}
+	$id;
 }
 
 sub mid2path {
@@ -38,10 +38,18 @@ sub mid2path {
 
 	unless (defined $x38) {
 		# compatibility with old links (or short Message-IDs :)
+		$mid = mid_clean($mid);
+		utf8::encode($mid);
 		$mid = sha1_hex($mid);
 		($x2, $x38) = ($mid =~ /\A([a-f0-9]{2})([a-f0-9]{38})\z/);
 	}
 	"$x2/$x38";
 }
 
+sub mid_mime ($) { $_[0]->header_obj->header_raw('Message-ID') }
+
+# RFC3986, section 3.3:
+sub MID_ESC () { '^A-Za-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@' }
+sub mid_escape ($) { uri_escape_utf8($_[0], MID_ESC) }
+
 1;