Changeset 27705b65

Timestamp:

Feb 5, 2011, 11:52:58 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

release-1.7

Children:

c268c9e

Parents:

22662d7

git-author:

Adam Glasgall <adam@crossproduct.net> (02/04/11 19:26:33)

git-committer:

David Benjamin <davidben@mit.edu> (02/05/11 23:52:58)

Message:

Append sender's realm to Cc'd unqualified names when replying

Currently, if you reply to a personal from a user in another realm,
that message was Cc'd to other people on their realm, and the sender
didn't specify their realm, Barnowl will try to Cc the message to
users of the same name in your realm. So, if you are 'bar@EXAMPLE.ORG'
and you get a message from 'foo@EXAMPLE.COM' cc'd to 'bletch', if you
try to reply, Barnowl will address it to foo@EXAMPLE.COM, cc'd to
'bletch', which would be bletch@EXAMPLE.ORG, which is clearly
wrong. This patch appends the sender's realm to unqualified names in
the message's Cc line when generating the reply zwrite command line.

[davidben@mit.edu: Fix up some edge case handling]

File:

• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (3 diffs)

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -15 +15 @@
     $sender =~ s/\@\Q$realm\E$//;
     return $sender;
+}
+
+sub principal_realm {
+    my $principal = shift;
+    my ($user, $realm) = split(/@/,$principal);
+    return $realm;
 }
 
@@ -184 +190 @@
 
     push @cmd, context_reply_cmd($class, $instance);
+
     if ($to ne '') {
         $to = strip_realm($to);
@@ -189 +196 @@
             my @cc = grep /^[^-]/, ($to, split /\s+/, $cc);
             my %cc = map {$_ => 1} @cc;
+            # this isn't quite right - it doesn't strip off the
+            # user if the message was addressed to them by fully qualified
+            # name
             delete $cc{strip_realm(BarnOwl::zephyr_getsender())};
             @cc = keys %cc;
+
+            my $sender_realm = principal_realm($self->sender);
+            if (BarnOwl::zephyr_getrealm() ne $sender_realm) {
+                @cc = map {
+                    if($_ !~ /@/) {
+                       "${_}\@${sender_realm}";
+                    } else {
+                        $_;
+                    }
+                } @cc;
+            }
             push @cmd, '-C', @cc;
         } else {