Changeset 864

Timestamp:

04/04/09 01:04:55 (8 months ago)

Author:

ykerherve

Message:

Modified to use new SASL async API (that still live on github)

Location:

trunk/DJabberd/lib/DJabberd

Files:

• SASL/Manager/AuthenSASL.pm (modified) (1 diff)
• Stanza/SASL.pm (modified) (3 diffs)

trunk/DJabberd/lib/DJabberd/SASL/Manager/AuthenSASL.pm

@@ -36 +36 @@
     my $saslmgr    = Authen::SASL->new(
         mechanism => $mechanisms,
-        callback => {
+        callback  => {
             checkpass => sub {
                 my $sasl = shift;
-                my ($user, $pass, $realm) = @_;
+                my $args = shift;
+                my $cb   = shift;
 
-                my $success;
+                my $user = $args->{user};
+                my $pass = $args->{pass};
+
                 if ($vhost->are_hooks("CheckCleartext")) {
-                    $vhost->run_hook_chain(phase => "CheckCleartext",
-                            args  => [ username => $user, password => $pass ],
-                            methods => {
-                                accept => sub { $success = 1 },
-                                reject => sub { $success = 0 },
-                            },
+                    $vhost->run_hook_chain(
+                        phase   => "CheckCleartext",
+                        args    => [ username => $user, password => $pass ],
+                        methods => {
+                            accept => sub { $cb->(1) },
+                            reject => sub { $cb->(0) },
+                        },
                     );
                 }
-                return $success;
             },
             getsecret => sub {
                 my $sasl = shift;
-                my ($user, $authname) = @_;
-                my $pass;
+                my $args = shift;
+                my $cb   = shift;
+
+                my $user = $args->{user};
 
                 if ($vhost->are_hooks("GetPassword")) {
-                    $vhost->run_hook_chain(phase => "GetPassword",
-                            args  => [ username => $user, ],
-                            methods => {
-                                set => sub {
-                                    my (undef, $good_password) = @_;
-                                    $pass = $good_password;
-                                },
+                    $vhost->run_hook_chain(
+                        phase   => "GetPassword",
+                        args    => [ username => $user, ],
+                        methods => {
+                            set => sub {
+                                my (undef, $good_password) = @_;
+                                $cb->($good_password);
                             },
+                        },
                     );
                 }
-                return $pass;
             },
         },

trunk/DJabberd/lib/DJabberd/Stanza/SASL.pm

@@ -59 +59 @@
     $conn->log->info("Got the response $response");
 
-    my $challenge = $sasl->server_step($response);
-    return $self->send_reply($sasl, $challenge => $conn);
+    $sasl->server_step(
+        $response => sub { $self->send_reply($conn->{sasl}, shift() => $conn) },
+    );
 }
 
@@ -98 +99 @@
     my $init = $self->first_child;
     if (!$init or $init eq '=') {
-        $init = ''
+        $init = '';
     }
     else {
@@ -104 +105 @@
     }
 
-    my $challenge = $sasl_conn->server_start($init);
-    return $self->send_reply($sasl_conn, $challenge => $conn);
+    $sasl_conn->server_start(
+        $init => sub { $self->send_reply($conn->{sasl}, shift() => $conn) },
+    );
 }