From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.204.141.209 with SMTP id n17cs22823bku; Thu, 1 Jul 2010 06:54:26 -0700 (PDT) Received: by 10.231.32.69 with SMTP id b5mr1806605ibd.153.1277992465077; Thu, 01 Jul 2010 06:54:25 -0700 (PDT) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id f14si8934301ibb.93.2010.07.01.06.54.24; Thu, 01 Jul 2010 06:54:25 -0700 (PDT) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 170781858373; Thu, 1 Jul 2010 09:54:22 -0400 (EDT) Received: from smtp.chost.de (setoy.chost.de [217.160.209.225]) by rubyforge.org (Postfix) with ESMTP id E2E04185836D for ; Thu, 1 Jul 2010 09:48:30 -0400 (EDT) Received: (qmail 19877 invoked by uid 5015); 1 Jul 2010 13:48:33 -0000 Received: (nullmailer pid 10633 invoked by uid 8193); Thu, 01 Jul 2010 13:48:29 -0000 From: Sascha Silbe To: sup-devel Date: Thu, 1 Jul 2010 13:48:13 +0000 Message-Id: <1277992093-10600-1-git-send-email-sascha-pgp@silbe.org> X-Mailer: git-send-email 1.7.1 Mail-Followup-To: Subject: [sup-devel] [PATCH] parse_header: don't use empty or invalid Message-ID header X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org If Message-ID contains only invalid characters (or none at all), sanitize_message_id will return an empty string. As Message.parse_header only checked for header existance, not validity, sup-dump could produce a dump file that sup-sync would choke on. We now fall back to a fake id for both missing and invalid Message-ID headers. --- lib/sup/message.rb | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/sup/message.rb b/lib/sup/message.rb index a13fc0c..f273988 100644 --- a/lib/sup/message.rb +++ b/lib/sup/message.rb @@ -77,14 +77,15 @@ class Message def parse_header encoded_header header = SavingHash.new { |k| decode_header_field encoded_header[k] } - @id = if header["message-id"] + @id = '' + if header["message-id"] mid = header["message-id"] =~ /<(.+?)>/ ? $1 : header["message-id"] - sanitize_message_id mid - else - id = "sup-faked-" + Digest::MD5.hexdigest(raw_header) - from = header["from"] + @id = sanitize_message_id mid + end + if (not @id.include? '@') || @id.length < 6 + @id = "sup-faked-" + Digest::MD5.hexdigest(raw_header) + #from = header["from"] #debug "faking non-existent message-id for message from #{from}: #{id}" - id end @from = Person.from_address(if header["from"] -- 1.7.1 _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel