Set a priority for authentication mechanisms (digest-md5, plain, anon…

…ymous) This way we don't have to worry about what order the mechanisms are in when sent from the server.
processone · Oct 30, 2009 · 6437415 · 6437415
1 parent 2715188
commit 6437415
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+v0.4.6
+	Bugfix: prioritize authentication mechanisms
+
 v0.4.5
 	Bugfix: Change DSL#write to DSL#write_to_stream. Previous way was messing with YAML
 

diff --git a/lib/blather/stream.rb b/lib/blather/stream.rb
@@ -80,7 +80,7 @@ def connection_completed # :nodoc:
     # Called by EM with data from the wire
     def receive_data(data) # :nodoc:
       Blather.logger.debug "\n#{'-'*30}\n"
-      Blather.logger.debug "<< #{data}"
+      Blather.logger.debug "STREAM IN: #{data}"
       @parser << data
 
     rescue ParseError => e

diff --git a/lib/blather/stream/features/sasl.rb b/lib/blather/stream/features/sasl.rb
@@ -6,6 +6,12 @@ class UnknownMechanism < BlatherError
       register :sasl_unknown_mechanism
     end
 
+    MECHANISMS = %w[
+      digest-md5
+      plain
+      anonymous
+    ].freeze
+
     SASL_NS = 'urn:ietf:params:xml:ns:xmpp-sasl'.freeze
     register SASL_NS
 
@@ -20,7 +26,8 @@ def receive_data(stanza)
       @node = stanza
       case stanza.element_name
       when 'mechanisms'
-        @mechanisms = stanza.children.map { |m| m.content.downcase }
+        available_mechanisms = stanza.children.map { |m| m.content.downcase }
+        @mechanisms = MECHANISMS.select { |m| available_mechanisms.include? m }
         next!
       when 'failure'
         next!