Changeset 822e9bd

Timestamp:

Oct 15, 2011, 8:17:21 PM (14 years ago)

Author:

Jed Davis <jld@panix.com>

Children:

87d7e14

Parents:

ef4074b

git-author:

Jed Davis <jld@panix.com> (10/15/11 19:57:06)

git-committer:

Jed Davis <jld@panix.com> (10/15/11 20:17:21)

Message:

Fix SASL digest-uri to be acceptable to ejabberd.

This is, approximately, 68ad6bc and 8fe68e0 from the XML-Stream
repo.  The problem is that, if example.com pointed SRV records at
foo.example.com, we'd send "xmpp/foo.example.com" (which is, arguably,
what RFC 2831 calls for, but community consensus seems to disagree)
rather than "xmpp/example.com".

ejabberd would also accept "xmpp/foo.example.com/example.com", and
that would follow RFC 2831 more closely, but I don't want to introduce
divergence from the upstream unless there's an observed interoperability
problem that would be fixed by it.

File:

• perl/modules/Jabber/lib/XML/Stream.pm (modified) (2 diffs)

perl/modules/Jabber/lib/XML/Stream.pm

@@ -2112 +2112 @@
 
     return unless defined($mechanisms);
+
+    # Here we assume that if 'to' is available, then a domain is being
+    # specified that does not match the hostname of the jabber server
+    # and that we should use that to form the bare JID for SASL auth.
+    my $domain .=  $self->{SIDS}->{$sid}->{to}
+        ? $self->{SIDS}->{$sid}->{to}
+        : $self->{SIDS}->{$sid}->{hostname};
+
+    my $authname = $username . '@' . $domain;
     
     my $sasl = new Authen::SASL(mechanism=>join(" ",@{$mechanisms}),
                                 callback=>{
-#                                           authname => $username."@".$self->{SIDS}->{$sid}->{hostname},
+                                           authname => $authname,
+
                                            user     => $username,
                                            pass     => $password
@@ -2121 +2131 @@
                                );
 
-    $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new('xmpp', $self->{SIDS}->{$sid}->{hostname});
+    $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new('xmpp', $domain);
     $self->{SIDS}->{$sid}->{sasl}->{username} = $username;
     $self->{SIDS}->{$sid}->{sasl}->{password} = $password;