Changeset 8ff511d

Timestamp:

Oct 17, 2009, 12:35:12 AM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

6a9fbca

Parents:

ec70b79

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (10/16/09 23:25:57)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (10/17/09 00:35:12)

Message:

Tweak jabberlogin.

* Disallow logging into the same jabber account twice unless you are
  explicitly specifying a resource.

Location:

perl/modules/Jabber/lib/BarnOwl/Module

Files:

• Jabber.pm (modified) (2 diffs)
• Jabber/ConnectionManager.pm (modified) (1 diff)

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -352 +352 @@
 sub cmd_login {
     my $cmd = shift;
+    my $jidStr = shift;
     my $jid = new Net::Jabber::JID;
-    $jid->SetJID(shift);
+    $jid->SetJID($jidStr);
     my $password = '';
     $password = shift if @_;
@@ -359 +360 @@
     my $uid           = $jid->GetUserID();
     my $componentname = $jid->GetServer();
-    my $resource      = $jid->GetResource() || 'owl';
+    my $resource      = $jid->GetResource();
+
+    if ($resource eq '') {
+        my $cjidStr = $conn->baseJIDExists($jidStr);
+        if ($cjidStr) {
+            BarnOwl::error("Already logged in as $cjidStr.");
+            return;
+        }
+    }
+
+    $resource ||= 'owl';
     $jid->SetResource($resource);
-    my $jidStr = $jid->GetJID('full');
+    $jidStr = $jid->GetJID('full');
 
     if ( !$uid || !$componentname ) {

perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm

@@ -73 +73 @@
 }
 
+sub baseJIDExists {
+    my $self = shift;
+    my $jidStr = shift;
+    my $jid = new Net::Jabber::JID;
+    $jid->SetJID($jidStr);
+    my $baseJID = $jid->GetJID('base');
+
+    foreach my $cjidStr ( keys %{ $self } ) {
+        my $cJID = new Net::Jabber::JID;
+        $cJID->SetJID($cjidStr);
+        return $cjidStr if ($cJID->GetJID('base') eq $baseJID);
+    }
+    return 0;
+}
+
 sub sidExists {
     my $self = shift;