Changeset 844

Timestamp:

02/11/09 21:56:50 (13 months ago)

Author:

ykerherve

Message:

Configured SASL to use no_integrity/no_confidentiality as this
will probably not work with Danga::Socket (more tests required)

Files:

• trunk/DJabberd/lib/DJabberd/Stanza/SASL.pm (modified) (3 diffs)

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

@@ -75 +75 @@
     my $saslmgr;
     $vhost->run_hook_chain( phase => "GetSASLManager",
-                           args  => [ conn => $conn ],
-                           methods => {
-                               get => sub {
-                                    (undef, $saslmgr) = @_;
-                               },
-                           },
-                           fallback => $fallback,
+                            args  => [ conn => $conn ],
+                            methods => {
+                                get => sub {
+                                     (undef, $saslmgr) = @_;
+                                },
+                            },
+                            fallback => $fallback,
     );
     die "no SASL" unless $saslmgr; 
@@ -90 +90 @@
         unless $saslmgr->is_mechanism_supported($mechanism);
 
+    ## we don't support it for now
+    my $opts = { no_integrity => 1 };
     $saslmgr->mechanism($mechanism);
-    my $sasl_conn = $saslmgr->server_new("xmpp", $vhost->server_name);
+    my $sasl_conn = $saslmgr->server_new("xmpp", $vhost->server_name, $opts);
     $conn->{sasl} = $sasl_conn;
 
@@ -153 +155 @@
     $conn->xmllog->info($xml);
     $conn->write(\$xml);
+    if ($sasl_conn->property('ssf') > 0) {
+        $conn->log->info("SASL: Securing socket");
+        $conn->log->warn("This will probably NOT work");
+        $sasl_conn->securesocket($conn);
+    }
+    else {
+        $conn->log->info("SASL: Not securing socket");
+    }
     $conn->restart_stream;
 }