Changeset 854

Timestamp:

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

Author:

ykerherve

Message:

Made Authen::SASL really optional

Location:

trunk/DJabberd

Files:

• Makefile.PL (modified) (1 diff)
• t/features-hook.t (modified) (2 diffs)
• t/lib/djabberd-test.pl (modified) (3 diffs)
• t/sasl-login.t (modified) (1 diff)

trunk/DJabberd/Makefile.PL

@@ -15 +15 @@
                   'Log::Log4perl'                => 0,
                   'Digest::HMAC_SHA1'            => 0,
-                  'Authen::SASL'                 => 2.13
               },
               clean      => { FILES => 't/log/*' },

trunk/DJabberd/t/features-hook.t

@@ -5 +5 @@
 require 'djabberd-test.pl';
 
+my $HAS_SASL;
+eval "use Authen::SASL 2.13";
+$HAS_SASL = 1 unless $@;
 
 sub connect_and_get_features{
@@ -54 +57 @@
   $server->kill;  
 
-  $server = Test::DJabberd::Server->new(id => 1);
-  $server->start( ); # by default we have SASL plugin enabled
-  my $client = Test::DJabberd::Client->new(server => $server, name => "client");
-  {
-     my $features = connect_and_get_features($client);
+  SKIP: {
+    skip "These tests require SASL", 8 unless $HAS_SASL;
+    $server = Test::DJabberd::Server->new(id => 1);
+    $server->start( ); # by default we have SASL plugin enabled
+    my $client = Test::DJabberd::Client->new(server => $server, name => "client");
+    {
+        my $features = connect_and_get_features($client);
 
-     like($features, qr{^<features xmlns='http://etherx.jabber.org/streams'>.*</features>$});
-     like($features, qr{<auth xmlns='http://jabber.org/features/iq-auth'/>});
-     like($features, qr{<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>.*</mechanisms>});
-     like($features, qr{<optional/>}, "our test setup makes sasl optional, bc of history of djabberd");
-     for my $mech (qw/PLAIN DIGEST-MD5 LOGIN/) {
-         like($features, qr{<mechanism>$mech</mechanism>}, "supports $mech");
-     } 
+        like($features, qr{^<features xmlns='http://etherx.jabber.org/streams'>.*</features>$});
+        like($features, qr{<auth xmlns='http://jabber.org/features/iq-auth'/>});
+        like($features, qr{<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>.*</mechanisms>});
+        like($features, qr{<optional/>}, "our test setup makes sasl optional, bc of history of djabberd");
+        for my $mech (qw/PLAIN DIGEST-MD5 LOGIN/) {
+            like($features, qr{<mechanism>$mech</mechanism>}, "supports $mech");
+        } 
 
-     like($features, qr{<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>.*</mechanisms>});
-  }
-  $server->kill;  
+        like($features, qr{<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>.*</mechanisms>});
+    }
+    $server->kill;  
+  };
 }
 

trunk/DJabberd/t/lib/djabberd-test.pl

@@ -11 +11 @@
 use DJabberd::RosterStorage::InMemoryOnly;
 use DJabberd::Util;
-use DJabberd::SASL::AuthenSASL;
 use IO::Socket::UNIX;
+
+my $HAS_SASL;
+eval "use Authen::SASL 2.13";
+unless ($@) {
+    require DJabberd::SASL::AuthenSASL;
+    $HAS_SASL = 1;
+}
 
 sub once_logged_in {
@@ -250 +256 @@
 sub standard_plugins {
     my $self = shift;
+    my @sasl;
+    @sasl = ( DJabberd::SASL::AuthenSASL->new(
+                mechanisms => "LOGIN PLAIN DIGEST-MD5",
+                optional   => "yes",
+            )) if $HAS_SASL;
     return [
             DJabberd::Authen::AllowedUsers->new(policy => "deny",
@@ -258 +269 @@
             DJabberd::Delivery::Local->new,
             DJabberd::Delivery::S2S->new,
-            DJabberd::SASL::AuthenSASL->new(
-                mechanisms => "LOGIN PLAIN DIGEST-MD5",
-                optional   => "yes",
-            ),
+            @sasl
             ];
 }

trunk/DJabberd/t/sasl-login.t

@@ -2 +2 @@
 use strict;
 use warnings;
-use Test::More tests => 46;
+use Test::More;
 use lib 't/lib';
 
 require 'djabberd-test.pl';
 
-use Authen::SASL 'Perl';
+BEGIN {
+    eval "use Authen::SASL 2.13";
+    if ($@) {
+        plan skip_all => 'Tests require Authen::SASL 2.13+';
+    }
+    else {
+        plan tests => 46;
+        eval "use Authen::SASL 'Perl';";
+    }
+}
 
 my $login_and_be = sub {