social_stream-presence 0.8.0 → 0.8.2

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.8.0"
+    VERSION = "0.8.2"
   end
 end

data/lib/social_stream/presence/xmpp_server_order.rb

@@ -32,54 +32,53 @@ module SocialStream
               executeEmanagementCommand("removeBuddyFromRoster",[userSid,buddySid])
           end   
           
-          
-
-          def synchronizePresence
+         
+          # Presence synchronization
+          def synchronizePresence(webDomain)
             if isEjabberdNodeUp
-              output = executeEmanagementCommand("getConnectedUsers",[])
-              user_slugs = output.split("\n")
-              synchronizePresenceForSlugs(user_slugs)
+              if (webDomain=="all")
+                output = executeEmanagementCommand("getConnectedJids",[])
+              else
+                output = executeEmanagementCommand("getConnectedJidsByDomain",[webDomain])
+              end
+              user_jids = output.split("\n")
+              synchronizePresenceForJids(user_jids)
             else
               resetPresence
               return "Xmpp Server Down: Reset Connected Users"
             end  
           end
           
-          
-          def removeAllRosters
-              executeEmanagementCommand("removeAllRosters",[])
+          def synchronizePresenceForJids(user_jids)
+            domains = getDomainsFromJids(user_jids)
+            domains.each do |domain|
+              user_slugs = getSlugsFromJids(user_jids,domain)
+              synchronizePresenceForSlugs(user_slugs,domain) 
+            end 
           end
-          
-          
-          def synchronizeRosters
-            commands = []
-            
-            #"Remove all rosters"
-            commands << buildCommand("emanagement","removeAllRosters",[])
 
-            #"Populate rosters"
-            users = User.all
-            checkedUsers = []
-            site_name = I18n.t('site.name').delete(' ')
-          
-            users.each do |user|
-              checkedUsers << user.slug
-              contacts = user.contact_actors(:type=>:user)
-              contacts.each do |contact|
-                unless checkedUsers.include?(contact.slug)
-                  domain = SocialStream::Presence.domain
-                  user_sid = user.slug + "@" + domain
-                  contact_sid = contact.slug + "@" + domain
-                  commands << buildCommand("emanagement","setBidireccionalBuddys",[user_sid,contact_sid,user.name,contact.name,site_name,site_name])
+          def getSlugsFromJids(user_jids,domain)
+            user_slugs = []
+            user_jids.each do |user_jid|
+                if(user_jid.split("@")[1]==domain)
+                  user_slugs << user_jid.split("@")[0] 
                 end
-              end
-            end
-            
-            executeCommands(commands)
+             end
+             return user_slugs
           end
           
-     
-          def synchronizePresenceForSlugs(user_slugs)
+          def getDomainsFromJids(user_jids)
+            domains = []
+            user_jids.each do |user_jid|
+                domain=user_jid.split("@")[1]
+                if !domains.include?(domain) 
+                  domains << domain
+                end
+             end
+             return domains
+          end
+                  
+          def synchronizePresenceForSlugs(user_slugs,domain)
             
             #Check connected users
             users = User.find_all_by_connected(true)
@@ -101,6 +100,7 @@ module SocialStream
           end
           
           
+          #Reset presence for all domains
           def resetPresence
             users = User.find_all_by_connected(true)
     
@@ -111,6 +111,40 @@ module SocialStream
           end
           
           
+                    
+          # Rosters synchronization  
+          def removeAllRosters(webDomain)
+              executeEmanagementCommand("removeAllRostersByDomain",[webDomain])
+          end
+          
+          
+          def synchronizeRosters(webDomain)
+            commands = []
+            
+            #"Remove all rosters"
+            commands << buildCommand("emanagement","removeAllRostersByDomain",[webDomain])
+
+            #"Populate rosters"
+            users = User.all
+            checkedUsers = []
+            site_name = I18n.t('site.name').delete(' ')
+          
+            users.each do |user|
+              checkedUsers << user.slug
+              contacts = user.contact_actors(:type=>:user)
+              contacts.each do |contact|
+                unless checkedUsers.include?(contact.slug)
+                  user_sid = user.slug + "@" + webDomain
+                  contact_sid = contact.slug + "@" + webDomain
+                  commands << buildCommand("emanagement","setBidireccionalBuddys",[user_sid,contact_sid,user.name,contact.name,site_name,site_name])
+                end
+              end
+            end
+            
+            executeCommands(commands)
+          end
+          
+          
           #Installation methods
           
           def copyFolderToXmppServer(oPath,dPath)
@@ -183,8 +217,8 @@ module SocialStream
             autoconf.push("scripts_path=" + SocialStream::Presence.scripts_path)
             autoconf.push("ejabberd_password=" + SocialStream::Presence.xmpp_server_password)
             autoconf.push("secure_rest_api=" + SocialStream::Presence.secure_rest_api.to_s)
-            autoconf.push("server_domain=" + SocialStream::Presence.domain)
             autoconf.push("cookie_name=" + Rails.application.config.session_options[:key])
+            autoconf.push("web_domains=[" + SocialStream::Presence.config.domain + "]")
             
             #Param options
             if options
@@ -337,7 +371,7 @@ module SocialStream
             output=""
             commands.each do |command|
                 response = %x[#{command}]
-                output = output + "\n" + response;
+                output = output + response + "\n";
             end
             return output
           end
@@ -354,7 +388,7 @@ module SocialStream
                   commands.each do |command|
                     response = session.exec!(command)
                     if response != nil
-                      output = output + "\n" + response
+                      output = output + response + "\n";
                     end
                   end
                 end
@@ -506,10 +540,40 @@ module SocialStream
             return hash
           end
         
+        
+        
+          #Multidomain tasks
+          def addWebDomain(domain,url)
+            commands = []
+            if url
+              commands << buildCommand("manageWebDomains","add",[domain,url])
+            else
+              commands << buildCommand("manageWebDomains","add",[domain])
+            end
+            return executeCommands(commands) 
+          end
+          
+          def removeWebDomain(domain)
+            commands = []
+            commands << buildCommand("manageWebDomains","remove",[domain])
+            return executeCommands(commands) 
+          end
+        
+          def updateWebDomain(domain,url)
+            commands = []
+            if url
+              commands << buildCommand("manageWebDomains","update",[domain,url])
+            else
+              commands << buildCommand("manageWebDomains","update",[domain])
+            end
+            return executeCommands(commands)
+          end
+        
+        
          #Xmpp client manage methods
           
           def getSocialStreamUserSid
-            #XMPP DOMAIN
+            #WEB DOMAIN
             domain = SocialStream::Presence.domain
             #SS Username
             ss_name = SocialStream::Presence.social_stream_presence_username

data/lib/tasks/presence/multidomain.rake

@@ -0,0 +1,45 @@
+namespace :presence do
+  desc 'Add web domains to Xmpp Server'
+  task :multidomain => [ 'presence:multidomain:add', 'presence:multidomain:remove' ,
+  'presence:multidomain:update']
+
+  namespace :multidomain do
+
+    desc "Add new web domain to XMPP Server"
+    task :add, [:domain, :url] => :environment do |t, args| 
+      puts "Starting presence:multidomain:add"
+      unless args[:domain]
+        puts "Please specify a web domain"
+        puts "Syntax: rake presence:multidomain:add[domain,[url]]"
+        return
+      end
+      response = SocialStream::Presence::XmppServerOrder::addWebDomain(args[:domain],args[:url])
+      puts response
+    end
+
+    desc "Remove web domain from the XMPP Server"
+    task :remove, [:domain] => :environment do |t, args| 
+      puts "Starting presence:multidomain:remove"
+      unless args[:domain]
+        puts "Please specify a web domain"
+        puts "Syntax: rake presence:multidomain:remove[domain]"
+        return
+      end
+      response = SocialStream::Presence::XmppServerOrder::removeWebDomain(args[:domain])
+      puts response
+    end
+    
+    desc "Update web domain of XMPP Server"
+    task :update, [:domain, :url] => :environment do |t, args| 
+      puts "Starting presence:multidomain:update"
+      unless args[:domain]
+        puts "Please specify a web domain"
+        puts "Syntax: rake presence:multidomain:update[domain,[url]]"
+        return
+      end
+      response = SocialStream::Presence::XmppServerOrder::updateWebDomain(args[:domain],args[:url])
+      puts response
+    end
+
+  end
+end

data/lib/tasks/presence/synchronize.rake

@@ -5,17 +5,31 @@ namespace :presence do
   namespace :synchronize do
 
     desc "Synchronize user presence"
-    task :connections => :environment do
+    task :connections, [:domain] => :environment do |t, args| 
       puts "Starting presence:synchronize:connections"
-      SocialStream::Presence::XmppServerOrder::synchronizePresence
+      unless args[:domain]
+        puts "No web domain specified"
+        domain = SocialStream::Presence.domain
+        puts "Executing  rake presence:synchronize:connections[" + domain + "]"
+      else
+        domain = args[:domain]
+      end
+      SocialStream::Presence::XmppServerOrder::synchronizePresence(domain)
       puts "Synchronization complete"
     end
 
     desc "Synchronize Xmpp Server database with Social Stream Rails Application database"
     desc "Remove all rosters and populate rosters from Social Stream data."
-    task :rosters => :environment do
+    task :rosters, [:domain] => :environment do |t, args| 
         puts "Starting presence:synchronize:rosters"
-        SocialStream::Presence::XmppServerOrder::synchronizeRosters
+        unless args[:domain]
+          puts "No web domain specified"
+          domain = SocialStream::Presence.domain
+          puts "Executing  rake presence:synchronize:rosters[" + domain + "]"
+        else
+          domain = args[:domain]
+        end
+        SocialStream::Presence::XmppServerOrder::synchronizeRosters(domain)
         puts "Rosters Synchronization complete"
     end
   end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-presence
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 0
-  version: 0.8.0
+  prerelease: 
+  version: 0.8.2
 platform: ruby
 authors: 
 - Aldo Gordillo
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-23 00:00:00 +01:00
+date: 2012-02-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 16
-        - 2
         version: 0.16.2
   type: :runtime
   version_requirements: *id001
@@ -40,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -53,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -66,8 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -79,8 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -157,9 +141,8 @@ files:
 - ejabberd/ejabberd_scripts/development_scripts/start_ejabberd.sh
 - ejabberd/ejabberd_scripts/development_scripts/stop_ejabberd.sh
 - ejabberd/ejabberd_scripts/emanagement
-- ejabberd/ejabberd_scripts/reset_connection_script
+- ejabberd/ejabberd_scripts/manageWebDomains
 - ejabberd/ejabberd_scripts/rest_api_client_script
-- ejabberd/ejabberd_scripts/set_script_header.sh
 - ejabberd/ejabberd_scripts/synchronize_presence_script
 - ejabberd/installer.sh
 - ejabberd/mod_admin_extra/mod_admin_extra.beam
@@ -181,6 +164,7 @@ files:
 - lib/social_stream/presence/xmpp_server_order.rb
 - lib/social_stream/views/settings/presence.rb
 - lib/tasks/presence/installer.rake
+- lib/tasks/presence/multidomain.rake
 - lib/tasks/presence/synchronize.rake
 - social_stream-presence.gemspec
 - spec/demo/.gitignore
@@ -254,21 +238,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: social_stream-presence
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Presence capabilities for Social Stream, the core for building social network websites

data/ejabberd/ejabberd_scripts/reset_connection_script

@@ -1,300 +0,0 @@
-#!/usr/bin/env ruby
-#Rest Api Client Script
-#Version: 13-12-2011
-#@author Aldo
-
-
-require 'logger'
-require 'rest_client'
-
-
-path = "/var/log/ejabberd/scripts.log"
-file = File.open(path, File::WRONLY | File::APPEND | File::CREAT)
-file.sync = true
-$logger = Logger.new(file)
-$logger.level = Logger::DEBUG
-
-def getOption(option)
-  File.open('/etc/ejabberd/ssconfig.cfg', 'r') do |f1|  
-    while line = f1.gets  
-      line = line.gsub(/\n/,'')
-      if line.match(/^#/)
-        #Comments
-      elsif line.match(/^#{option}/)
-        return line.gsub(/#{option}/,'')
-      end  
-    end  
-  end
-  return "Undefined"
-end
-
-#Constants
-$secure_rest_api = getOption("secure_rest_api=")
-$pass = getOption("ejabberd_password=")
-$scripts_path = getOption("scripts_path=")
-$script_title = "Reset Connection Script"
-
-
-def log(title,text)
-	$logger.info title + ": " + text
-end
-
-def getMethodName
-  caller[0] =~ /`(.*?)'/
-  $1
-end
-
-
-#####################
-#####  Example  #####
-#####################
-#def myHook(param1,param2)
-#    log(getMethodName,"(My message: #{param1},#{param2})")
-#    url = "http://" + getOption("web_domain=") + "/xmpp/hookRoute"
-
-#    params = {}
-#    encrypted_params = {}
-#    #Add params to sent in clear
-#    params[:param1_in_server]=param1
-#    #Add params to sent cipher
-#    encrypted_params[:param2_in_server]=param2
-
-#    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-#end
-
-def setConnection(username)
-    log($script_title,"#{getMethodName}(#{username})")
-    url = "http://" + getOption("web_domain=") + "/xmpp/setConnection"
-
-    params = {}
-    encrypted_params = {}
-    encrypted_params[:name]=username
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-def unsetConnection(username)
-    log($script_title,"#{getMethodName}(#{username})")
-    url = "http://" + getOption("web_domain=") + "/xmpp/unsetConnection"
-
-    params = {}
-    encrypted_params = {}
-    encrypted_params[:name]=username
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-def setPresence(username,status)
-    log($script_title,"#{getMethodName}(#{username},#{status})")
-    url = "http://" + getOption("web_domain=") + "/xmpp/setPresence"
-
-    params = {}
-    encrypted_params = {}
-    encrypted_params[:name]=username
-    encrypted_params[:status]=status
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-def unsetPresence(username)
-    log($script_title,"#{getMethodName}(#{username})")
-    url = "http://" + getOption("web_domain=") + "/xmpp/unsetPresence"
-
-    params = {}
-    encrypted_params = {}
-    encrypted_params[:name]=username
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-def resetConnection()
-    log($script_title,"Call #{getMethodName}()")
-    url = "http://" + getOption("web_domain=") + "/xmpp/resetConnection"
-
-    params = {}
-    encrypted_params = {}
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-def synchronize()
-    log($script_title,"Call #{getMethodName}()")
-    url = "http://" + getOption("web_domain=") + "/xmpp/synchronizePresence"
-
-
-    #Get connected users using Emanagement
-    users = []
-    command = $scripts_path + "/emanagement getConnectedUsers"
-    output = %x[#{command}]
-    sessions = output.split("\n")
-
-    sessions.each do |session|
-      users << session.split("@")[0]
-    end
-    #Finish
-
-
-    #In this cases users always will be sent in clear (not cipher)
-    #(Too much data to cipher)
-    #Anyway, we must to build the hash to pass the authentication
-    params = {}
-    encrypted_params = {}
-    params[:name]=users.join(",")
-
-    return [getMethodName,generic_api_call(url,params,encrypted_params)]
-end
-
-
-
-#Params must include the password and all the parameters to be sent in clear.
-#Anyway, If "secure_rest_api" is disable, encrypted_params will be send in clear.
-def generic_api_call(url,params,encrypted_params)
-
-  begin
-    unless params
- 	params = {}
-    end
-
-    unless encrypted_params
- 	 encrypted_params = {}
-    end
-
-    params[:password]=$pass
-
-    response=sendHttpRequest(url,params,encrypted_params)
-    puts response.body
-
-    if response.body.include?("Ok")
-    	return true
-    else
-    	return false
-    end
-
-  rescue => e
-    log($script_title,"#{e.class.name}: #{e.message}")
-    puts("#{e.class.name}: #{e.message}")
-    return false
-  end
-end
-
-
-#Send HTTP Request to Social Stream Presence API
-def sendHttpRequest(url,params,encrypted_params)
-
-    unless params[:password]
-	return "params[:password] required in sendHttpRequest";
-    end
-
-
-    if $secure_rest_api == "true"
-	#Require libraries
-	require 'openssl'
-
-	xmpp_private_key_path = $scripts_path + "/rsa_keys/xmpp_rsa_key_private.pem";
-    	web_public_key_path = $scripts_path + "/rsa_keys/web_rsa_key_public.pem";
-    	xmpp_private_key = OpenSSL::PKey::RSA.new(File.read(xmpp_private_key_path))
-    	web_public_key = OpenSSL::PKey::RSA.new(File.read(web_public_key_path))
-
-	request_params = {};
-
-	#Copy non encypted params
-        params.each do |key,value|
-	  unless key.to_s == "password"
-		request_params[key] = value
-	  end 
-        end
-
-	#Include encrypted params
-	if encrypted_params and encrypted_params.empty? == false
-	  request_params[:encrypted_params] = web_public_key.public_encrypt(encrypted_params.to_s)
-	end
-	
-	#Generating stamp
-	#1 Get constant password
-	password = params[:password];
-	#2 Generating timestamp
-	timestamp = Time.now.utc.to_s
-	#3 Calculating Hash
-    	hash = calculateHash(request_params)
-
-	#Add cipher stamp to the request
-	request_params[:password] = xmpp_private_key.private_encrypt(password+"#####"+timestamp+"#####"+hash)
-	
-	#Replace previous params
-	params = request_params
-    else
-	#Non secure mode: send encrypted params in clear
-	if encrypted_params
-	  encrypted_params.each do |key,value|
-	      params[key] = value
-	  end
-	end
-    end
-    
-    response = RestClient.get url, :params => params
-    return response
-end
-
-
-def calculateHash(request_params)
-	require 'digest/md5'
-
-	unless request_params
-		request_params = {};
-	end
-
-	hash = "";
-        request_params.each do |key,value|
-              hash = hash + key.to_s + value.to_s
-        end
-        return Digest::MD5.hexdigest(hash)
-end
-
-
-
-
-def invokeApiCall(method,args)
-	length = args.length;
-	case length
-	when 0
-	  return send(method)
-	when 1
-	  return send(method,args[0])
-	when 2
-	  return send(method,args[0],args[1])
-	when 3
-	  return send(method,args[0],args[1],args[2])
-	when 4
-	  return send(method,args[0],args[1],args[2],args[3])
-	else
-	  return send(method,args)
-	end
-end
-
-
-#Main Program
-
-begin
-
-	args = []
-	method = "resetConnection";
-
-	if (response = invokeApiCall(method, args) and response[1])
-	  	puts $script_title  + ": #{response[0]} [OK]"
-	  	log( $script_title  , "#{response[0]} [OK]" )
-	else
-	  	puts $script_title  + ": #{response[0]} [FAIL]"
-	  	log( $script_title  , "#{response[0]} [FAIL]" )
-	end
-
-rescue => e
-	log($script_title,"#{e.class.name}: #{e.message}")
-   	puts("#{e.class.name}: #{e.message}")
-    	exit 1
-end
-