[PATCH 2/2] WIP

[Eric Wong <e@yhbt.net>]

---
 lib/PublicInbox/NNTP.pm | 25 +++++++++++++++++++++----
 t/v2writable.t          |  3 ---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 277657e6..1de0b84d 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -78,11 +78,28 @@ sub process_line ($$) {
 	my ($self, $l) = @_;
 	my ($req, @args) = split(/[ \t]/, $l);
 	return 1 unless defined($req); # skip blank line
-	$req = $self->can('cmd_'.lc($req));
-	return res($self, '500 command not recognized') unless $req;
-	return res($self, r501) unless args_ok($req, scalar @args);
+	my $cmd = $self->can('cmd_'.lc($req));
+	return res($self, '500 command not recognized') unless $cmd;
+	unless (args_ok($cmd, scalar @args)) {
+		# check for Message-IDs with spaces
+		open DBG, '>>', '/tmp/dbg';
+		DBG->autoflush(1);
+		use Data::Dumper; print DBG Dumper([$req, \@args, $l]);
+		if ($req =~ /\A(?:article|head|body|over|stat)\z/i) {
+			my (undef, $mid) = split(/[ \t]/, $l, 2);
+			return res($self, r501) if $mid !~ /\A<[^>]+>\z/;
+			@args = $mid;
+		} elsif ($req =~ /\A(?:hdr|xhdr)\z/i && scalar(@args) > 2) {
+			my (undef, $fld, $mid) = split(/[ \t]/, $l, 3);
+			return res($self, r501) if $mid !~ /\A<[^>]+>\z/;
+			@args = ($fld, $mid);
+			use Data::Dumper; print DBG Dumper([$fld, $mid]);
+		} else {
+			return res($self, r501);
+		}
+	}
 
-	my $res = eval { $req->($self, @args) };
+	my $res = eval { $cmd->($self, @args) };
 	my $err = $@;
 	if ($err && $self->{sock}) {
 		local $/ = "\n";
diff --git a/t/v2writable.t b/t/v2writable.t
index 8167e4de..be15e353 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -181,9 +181,6 @@ EOF
 		is_deeply($n->xhdr('Message-ID', $num),
 			 { $num => $mid }, "XHDR lookup OK on num $num");
 
-		# FIXME NNTP.pm doesn't handle spaces in Message-ID
-		next if $mid =~ / /;
-
 		is_deeply($n->xhdr('Message-ID', $mid),
 			 { $mid => $mid }, "XHDR lookup OK on MID $mid ($num)");
 	}