Changeset 851 for trunk/DJabberd/lib/DJabberd/IQ.pm

Timestamp:

02/11/09 21:57:06 (13 months ago)

Author:

ykerherve

Message:

Finished resource conflit handling per RFC 3920
this introduced a medium change in the way DJabberd
do JID registration. Now, register_jid takes a bare_jid and
a resource instead of a fulljid so that we can generate a
resource in case of conflict as RECOMMENDED. XEP 0078 behaviour
is kept unchanged though.

Files:

• trunk/DJabberd/lib/DJabberd/IQ.pm (modified) (8 diffs)

trunk/DJabberd/lib/DJabberd/IQ.pm

@@ -496 +496 @@
     my $digest   = $get->("digest");
 
-    return unless $username =~ /^\w+$/;
+    # "Both the username and the resource are REQUIRED for client
+    # authentication" Section 3.1 of XEP 0078
+    return unless $username && $username =~ /^\w+$/;
+    return unless $resource;
 
     my $vhost = $conn->vhost;
@@ -518 +521 @@
 
         # register
-        my $jid = DJabberd::JID->new("$authjid/$resource");
+        my $jid = DJabberd::JID->new("$authjid");
 
         unless ($jid) {
@@ -527 +530 @@
         my $regcb = DJabberd::Callback->new({
             registered => sub {
-                $conn->set_bound_jid($jid);
+                (undef, my $fulljid) = @_;
+                $conn->set_bound_jid($fulljid);
                 $DJabberd::Stats::counter{'auth_success'}++;
                 $iq->send_result;
@@ -540 +544 @@
         });
 
-        $vhost->register_jid($jid, $conn, $regcb);
+        $vhost->register_jid($jid, $resource, $conn, $regcb);
     };
 
@@ -627 +631 @@
     };
 
-    my $resource = $get->("resource")
-                 || Digest::SHA1::sha1_hex(rand() . rand() . rand());
+    my $resource = $get->("resource") || DJabberd::JID->rand_resource;
 
     my $vhost = $conn->vhost;
@@ -669 +672 @@
 
     # register
-    my $jid = DJabberd::JID->new("$authjid/$resource");
+    my $jid = DJabberd::JID->new($authjid);
 
     unless ($jid) {
@@ -678 +681 @@
     my $regcb = DJabberd::Callback->new({
         registered => sub {
-            $conn->set_bound_jid($jid);
+            (undef, my $fulljid) = @_;
+            $conn->set_bound_jid($fulljid);
             $DJabberd::Stats::counter{'auth_success'}++;
             my $xml = <<EOX;
-<iq id='$id' type='result'>
+<iq id='$fulljid' type='result'>
     <bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>
-        <jid>$jid</jid>
+        <jid>$fulljid</jid>
     </bind>
 </iq>
@@ -699 +703 @@
     });
 
-    $vhost->register_jid($jid, $conn, $regcb);
+    $vhost->register_jid($jid, $resource, $conn, $regcb);
     return 1;
 }