mojodna-xmpp4r 0.4.0.2 → 0.4.0.3

data/lib/xmpp4r/pubsub/helper/oauth_service_helper.rb

@@ -10,9 +10,9 @@ module Jabber
       def get_subscriptions_from_all_nodes(oauth_consumer, oauth_token)
         iq = basic_pubsub_query(:get)
 
+        entities = iq.pubsub.add(REXML::Element.new('subscriptions'))
         iq.pubsub.add(create_oauth_node(oauth_consumer, oauth_token))
 
-        entities = iq.pubsub.add(REXML::Element.new('subscriptions'))
         res = nil
         @stream.send_with_id(iq) { |reply|
           if reply.pubsub.first_element('subscriptions')
@@ -33,9 +33,9 @@ module Jabber
         sub.attributes['node'] = node
         sub.attributes['jid'] = @stream.jid.strip.to_s
 
-        sub.add(create_oauth_node(oauth_consumer, oauth_token))
-
         iq.pubsub.add(sub)
+        iq.pubsub.add(create_oauth_node(oauth_consumer, oauth_token))
+
         res = nil
         @stream.send_with_id(iq) do |reply|
           pubsubanswer = reply.pubsub
@@ -47,15 +47,15 @@ module Jabber
       end
 
       # override #unsubscribe_from to add an oauth element
-      def unsubscribe_from(node, oauth_consumer, oauth_token, subid=nil)
+      def unsubscribe_from(node, oauth_consumer, oauth_token, subid = nil)
         iq = basic_pubsub_query(:set)
         unsub = PubSub::Unsubscribe.new
         unsub.node = node
         unsub.jid = @stream.jid.strip
 
-        unsub.add(create_oauth_node(oauth_consumer, oauth_token))
-
         iq.pubsub.add(unsub)
+        iq.pubsub.add(create_oauth_node(oauth_consumer, oauth_token))
+
         ret = false
         @stream.send_with_id(iq) { |reply|
           ret = reply.kind_of?(Jabber::Iq) and reply.type == :result
@@ -65,8 +65,13 @@ module Jabber
 
     protected
 
-      # add the OAuth sauce (XEP-235)
-      def create_oauth_node(oauth_consumer, oauth_token)
+      # add the OAuth sauce (XEP-0235)
+      # The `options` hash may contain the following parameters:
+      #  :oauth_nonce            => nonce (one will be generated otherwise)
+      #  :oauth_timestamp        => timestamp (one will be generated otherwise)
+      #  :oauth_signature_method => signature method (defaults to HMAC-SHA1)
+      #  :oauth_version          => OAuth version (defaults to "1.0")
+      def create_oauth_node(oauth_consumer, oauth_token, options = {})
         require 'oauth/signature/hmac/sha1'
         require 'cgi'
 
@@ -75,31 +80,47 @@ module Jabber
           "uri"    => [@stream.jid.strip.to_s, @pubsubjid.strip.to_s] * "&",
           "parameters" => {
             "oauth_consumer_key"     => oauth_consumer.key,
+            "oauth_nonce"            => options[:oauth_nonce] || OAuth::Helper.generate_nonce,
+            "oauth_timestamp"        => options[:oauth_timestamp] || OAuth::Helper.generate_timestamp,
             "oauth_token"            => oauth_token.token,
-            "oauth_signature_method" => "HMAC-SHA1"
+            "oauth_signature_method" => options[:oauth_signature_method] || "HMAC-SHA1",
+            "oauth_version"          => options[:oauth_version] || "1.0"
           }
 
-        signature = OAuth::Signature.sign(request, :consumer => oauth_consumer, :token => oauth_token)
+        request.sign!(:consumer => oauth_consumer, :token => oauth_token)
 
+        # TODO create XMPPElements for OAuth elements
         oauth = REXML::Element.new("oauth")
-        oauth.attributes['xmlns'] = 'urn:xmpp:oauth'
+        oauth.attributes['xmlns'] = 'urn:xmpp:tmp:oauth'
 
         oauth_consumer_key = REXML::Element.new("oauth_consumer_key")
-        oauth_consumer_key.text = oauth_consumer.key
+        oauth_consumer_key.text = request.oauth_consumer_key
         oauth.add(oauth_consumer_key)
 
         oauth_token_node = REXML::Element.new("oauth_token")
-        oauth_token_node.text = oauth_token.token
+        oauth_token_node.text = request.oauth_token
         oauth.add(oauth_token_node)
 
         oauth_signature_method = REXML::Element.new("oauth_signature_method")
-        oauth_signature_method.text = "HMAC-SHA1"
+        oauth_signature_method.text = request.oauth_signature_method
         oauth.add(oauth_signature_method)
 
         oauth_signature = REXML::Element.new("oauth_signature")
-        oauth_signature.text = signature
+        oauth_signature.text = request.oauth_signature
         oauth.add(oauth_signature)
 
+        oauth_timestamp = REXML::Element.new("oauth_timestamp")
+        oauth_timestamp.text = request.oauth_timestamp
+        oauth.add(oauth_timestamp)
+
+        oauth_nonce = REXML::Element.new("oauth_nonce")
+        oauth_nonce.text = request.oauth_nonce
+        oauth.add(oauth_nonce)
+
+        oauth_version = REXML::Element.new("oauth_version")
+        oauth_version.text = request.oauth_version
+        oauth.add(oauth_version)
+
         oauth
       end
     end

data/lib/xmpp4r/xmpp4r.rb

@@ -8,7 +8,7 @@ module Jabber
   # XMPP4R Version number.  This is the ONLY place where the version number
   # should be specified.  This constant is used to determine the version of
   # package tarballs and generated gems.
-  XMPP4R_VERSION = '0.4.0.2'
+  XMPP4R_VERSION = '0.4.0.3'
 end
 
 require 'xmpp4r/client'

data/xmpp4r.gemspec

@@ -300,5 +300,5 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.3.1"
   s.specification_version = 2
   s.summary = "XMPP4R is an XMPP/Jabber library for Ruby."
-  s.version = "0.4.0.2"
+  s.version = "0.4.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-xmpp4r
 version: !ruby/object:Gem::Version 
-  version: 0.4.0.2
+  version: 0.4.0.3
 platform: ruby
 authors: 
 - Lucas Nussbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -07:00
+date: 2009-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: []