social_stream-presence 0.8.0 → 0.8.2

data/ejabberd/ejabberd_scripts/manageWebDomains

@@ -0,0 +1,170 @@
+#!/usr/bin/env ruby
+
+####################################
+#WebDomain script 
+#Add or remove web domains server by ejabberd
+#@author Aldo Gordillo < agordillos@gmail.com >
+#@version 1.0 - 27-2-2012
+####################################
+
+
+require 'logger'
+
+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 log(text)
+	$logger.info "SetWebDomain Script: " + text
+end
+
+$debug = true
+
+#Config files
+if($debug)
+	$ssconfig = '/etc/ejabberd/test/ssconfig.cfg'
+	$ejabberd = '/etc/ejabberd/test/ejabberd.cfg'
+else
+	$ssconfig = '/etc/ejabberd/ssconfig.cfg'
+	$ejabberd = '/etc/ejabberd/ejabberd.cfg'
+end
+
+$domain_not_exists = "Domain don't exists"
+$domain_exists = "Domain already exists"
+$done = "Done"
+
+def getOptionFromSSConfig(option)
+  File.open($ssconfig, '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
+
+def getWebDomains()
+	begin
+		web_domains = getOptionFromSSConfig("web_domains=");
+		#web_domains=["domain1","domain2"]
+		return getElementsFromStringArray(web_domains);
+	rescue Exception=>e
+		return [""]
+	end
+end
+
+def getElementsFromStringArray(stringArray)
+	stringArray=stringArray[1,stringArray.length-2]
+	return stringArray.split(",")
+end
+
+def getSSConfigStringFromDomainsArray(domainsArray)
+	return "[" + domainsArray.join(",") + "]"
+end
+
+def getEjabberdStringFromDomainsArray(domainsArray)
+	newDomains=[]
+	domainsArray.each do |domain|
+		newDomains << "\"" + domain + "\""
+	end
+	return "{hosts, [" + newDomains.join(" , ") + "]}."
+end
+
+
+#Write the domains array content in the corresponding configuration files
+def writeDomains(domains)
+	#SSconfig
+	ssconfigText = File.read($ssconfig)
+	newssconfig = ssconfigText.gsub(/web_domains=.*/, "web_domains=" + getSSConfigStringFromDomainsArray(domains))
+	File.open($ssconfig, "w") { |file| file.puts newssconfig }
+
+	#Ejabberd
+	ejabbberdText = File.read($ejabberd)
+	newEjabberdconfig = ejabbberdText.gsub(/^{hosts, .*/,  getEjabberdStringFromDomainsArray(domains))
+	File.open($ejabberd, "w") { |file| file.puts newEjabberdconfig }
+
+	return $done
+end
+
+
+def addDomain(domain,url)
+	if(url)
+		log("Add domain:" + domain + " with url:" + url)
+	else
+		log("Add domain:" + domain)
+	end
+	domains = getWebDomains();
+	if !domains.include?(domain)
+		domains << domain;
+		if((url)&&(url!=domain))
+			addDomainUrl(domain,url)
+		end
+		return writeDomains(domains)
+	else
+		return $domain_exists
+	end
+end
+
+def removeDomain(domain)
+	log("Remove domain:" + domain)
+	domains = getWebDomains();
+	if domains.include?(domain)
+		domains.delete(domain)
+		removeDomainUrl(domain)
+		return writeDomains(domains)
+	else
+		return $domain_not_exists
+	end
+end
+
+def updateDomain(domain,url)
+	removeDomain(domain)
+	return addDomain(domain,url)
+end
+
+def addDomainUrl(domain,url)
+	if (getOptionFromSSConfig(domain+"=")=="Undefined")
+		ssconfigText = File.read($ssconfig)
+		newssconfig = ssconfigText + "\n" + domain + "=" + url + "\n"
+		File.open($ssconfig, "w") { |file| file.puts newssconfig }
+	end
+end
+
+def removeDomainUrl(domain)
+	if (getOptionFromSSConfig(domain+"=")!="Undefined")
+		ssconfigText = File.read($ssconfig)
+		newssconfig = ssconfigText.gsub(/#{domain}=.*/, "")
+		File.open($ssconfig, "w") { |file| file.puts newssconfig }
+	end
+end
+
+
+#Main Thread
+
+begin
+	if (ARGV[0])
+		if ((ARGV[0]=="add")&&(ARGV[1]))
+			puts addDomain(ARGV[1],ARGV[2])
+			exit 0
+		elsif ((ARGV[0]=="remove")&&(ARGV[1]))
+			puts removeDomain(ARGV[1])
+			exit 0
+		elsif ((ARGV[0]=="update")&&(ARGV[1]))
+			puts updateDomain(ARGV[1],ARGV[2])
+			exit 0
+		elsif (ARGV[0]=="view")
+			puts getWebDomains()
+			exit 0
+		end
+	end
+	puts("Syntax error: ./manageWebDomains add/remove/update/view domain [url]")
+	exit 1
+rescue => e
+	puts("#{e.class.name}: #{e.message}")
+    	exit 1
+end

data/ejabberd/ejabberd_scripts/rest_api_client_script

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
-#Rest Api Client Script
-#Version: 13-12-2011
-#@author Aldo
+####################################
+#      Rest Api Client Script 
+#Generate and send requests to Social Stream presence API
+#@author Aldo Gordillo < agordillos@gmail.com >
+#@version 2.0 - 24-2-2012
+####################################
 
 
 require 'logger'
 require 'rest_client'
 
-
 path = "/var/log/ejabberd/scripts.log"
 file = File.open(path, File::WRONLY | File::APPEND | File::CREAT)
 file.sync = true
@@ -50,7 +52,7 @@ end
 #####################
 #def myHook(param1,param2)
 #    log(getMethodName,"(My message: #{param1},#{param2})")
-#    url = "http://" + getOption("web_domain=") + "/xmpp/hookRoute"
+#    url = "http://" + getWebDomainUrlFromDomain(domain) + "/xmpp/hookRoute"
 
 #    params = {}
 #    encrypted_params = {}
@@ -62,58 +64,59 @@ end
 #    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"
+def setConnection(userJid)
+    log($script_title,"#{getMethodName}(#{userJid})")
+    url = "http://" + getWebDomainUrlFromDomain(getDomainFromJid(userJid)) + "/xmpp/setConnection"
 
     params = {}
     encrypted_params = {}
-    encrypted_params[:name]=username
+    encrypted_params[:name]=getUsernameFromJid(userJid)
 
     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"
+def unsetConnection(userJid)
+    log($script_title,"#{getMethodName}(#{userJid})")
+    url = "http://" +  getWebDomainUrlFromDomain(getDomainFromJid(userJid)) + "/xmpp/unsetConnection"
 
     params = {}
     encrypted_params = {}
-    encrypted_params[:name]=username
+    encrypted_params[:name]=getUsernameFromJid(userJid)
 
     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"
+def setPresence(userJid,status)
+    log($script_title,"#{getMethodName}(#{userJid},#{status})")
+    url = "http://" + getWebDomainUrlFromDomain(getDomainFromJid(userJid)) + "/xmpp/setPresence"
 
     params = {}
     encrypted_params = {}
-    encrypted_params[:name]=username
+    encrypted_params[:name]=getUsernameFromJid(userJid)
     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"
+def unsetPresence(userJid)
+    log($script_title,"#{getMethodName}(#{userJid})")
+    url = "http://" + getWebDomainUrlFromDomain(getDomainFromJid(userJid)) + "/xmpp/unsetPresence"
 
     params = {}
     encrypted_params = {}
-    encrypted_params[:name]=username
+    encrypted_params[:name]=getUsernameFromJid(userJid)
 
     return [getMethodName,generic_api_call(url,params,encrypted_params)]
 end
 
 
+#Reset all domains connections
 def resetConnection()
     log($script_title,"Call #{getMethodName}()")
-    url = "http://" + getOption("web_domain=") + "/xmpp/resetConnection"
+    url = "http://" + getWebDomainUrlFromDomain("all") + "/xmpp/resetConnection"
 
     params = {}
     encrypted_params = {}
@@ -122,29 +125,31 @@ def resetConnection()
 end
 
 
-def synchronize()
-    log($script_title,"Call #{getMethodName}()")
-    url = "http://" + getOption("web_domain=") + "/xmpp/synchronizePresence"
-
-
+def synchronize(domain)
+    log($script_title,"Call #{getMethodName}(#{domain})")
+    url = "http://" + getWebDomainUrlFromDomain(domain) + "/xmpp/synchronizePresence"
+    
     #Get connected users using Emanagement
-    users = []
-    command = $scripts_path + "/emanagement getConnectedUsers"
+    jids = []
+    if domain=="all"
+	command = $scripts_path + "/emanagement getConnectedJids"
+    else
+	command = $scripts_path + "/emanagement getConnectedJidsByDomain " + domain
+    end
     output = %x[#{command}]
     sessions = output.split("\n")
 
     sessions.each do |session|
-      users << session.split("@")[0]
+      jids << 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(",")
+    params[:name]=jids.join(",")
 
     return [getMethodName,generic_api_call(url,params,encrypted_params)]
 end
@@ -277,6 +282,44 @@ def invokeApiCall(method,args)
 end
 
 
+def getUsernameFromJid(jid)
+	return jid.split("@")[0];
+end
+
+def getDomainFromJid(jid)
+	return jid.split("@")[1];
+end
+
+def getWebDomainUrlFromDomain(domain)
+
+	if domain=="all"
+	  return getWebDomainUrlFromDomain(getWebDomains()[0])
+	end
+
+	web_domain = getOption(domain + "=");
+	if (web_domain != "Undefined")
+		return web_domain
+	else
+		return domain
+	end
+end
+
+def getWebDomains()
+	begin
+		web_domains = getOption("web_domains=");
+		#web_domains=["domain1","domain2"]
+		return getElementsFromStringArray(web_domains);
+	rescue Exception=>e
+		return [""]
+	end
+end
+
+def getElementsFromStringArray(stringArray)
+	stringArray=stringArray[1,stringArray.length-2]
+	return stringArray.split(",")
+end
+
+
 #Main Program
 
 begin

data/ejabberd/ejabberd_scripts/synchronize_presence_script

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
-#Rest Api Client Script
-#Version: 13-12-2011
-#@author Aldo
+####################################
+#      Rest Api Client Script 
+#Generate and send requests to Social Stream presence API
+#@author Aldo Gordillo < agordillos@gmail.com >
+#@version 2.0 - 24-2-2012
+####################################
 
 
 require 'logger'
 require 'rest_client'
 
-
 path = "/var/log/ejabberd/scripts.log"
 file = File.open(path, File::WRONLY | File::APPEND | File::CREAT)
 file.sync = true
@@ -32,7 +34,7 @@ end
 $secure_rest_api = getOption("secure_rest_api=")
 $pass = getOption("ejabberd_password=")
 $scripts_path = getOption("scripts_path=")
-$script_title = "Synchronize Presence Script"
+$script_title = "Rest Api Client"
 
 
 def log(title,text)
@@ -50,7 +52,7 @@ end
 #####################
 #def myHook(param1,param2)
 #    log(getMethodName,"(My message: #{param1},#{param2})")
-#    url = "http://" + getOption("web_domain=") + "/xmpp/hookRoute"
+#    url = "http://" + getWebDomainUrlFromDomain(domain) + "/xmpp/hookRoute"
 
 #    params = {}
 #    encrypted_params = {}
@@ -62,58 +64,59 @@ end
 #    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"
+def setConnection(userJid)
+    log($script_title,"#{getMethodName}(#{userJid})")
+    url = "http://" + getWebDomainUrlFromDomain(getDomainFromJid(userJid)) + "/xmpp/setConnection"
 
     params = {}
     encrypted_params = {}
-    encrypted_params[:name]=username
+    encrypted_params[:name]=getUsernameFromJid(userJid)
 
     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"
+def unsetConnection(userJid)
+    log($script_title,"#{getMethodName}(#{userJid})")
+    url = "http://" +  getWebDomainUrlFromDomain(getDomainFromJid(userJid)) + "/xmpp/unsetConnection"
 
     params = {}
     encrypted_params = {}
-    encrypted_params[:name]=username
+    encrypted_params[:name]=getUsernameFromJid(userJid)
 
     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"
+def setPresence(userJid,status)
+    log($script_title,"#{getMethodName}(#{userJid},#{status})")
+    url = "http://" + getWebDomainUrlFromDomain(getDomainFromJid(userJid)) + "/xmpp/setPresence"
 
     params = {}
     encrypted_params = {}
-    encrypted_params[:name]=username
+    encrypted_params[:name]=getUsernameFromJid(userJid)
     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"
+def unsetPresence(userJid)
+    log($script_title,"#{getMethodName}(#{userJid})")
+    url = "http://" + getWebDomainUrlFromDomain(getDomainFromJid(userJid)) + "/xmpp/unsetPresence"
 
     params = {}
     encrypted_params = {}
-    encrypted_params[:name]=username
+    encrypted_params[:name]=getUsernameFromJid(userJid)
 
     return [getMethodName,generic_api_call(url,params,encrypted_params)]
 end
 
 
+#Reset all domains connections
 def resetConnection()
     log($script_title,"Call #{getMethodName}()")
-    url = "http://" + getOption("web_domain=") + "/xmpp/resetConnection"
+    url = "http://" + getWebDomainUrlFromDomain("all") + "/xmpp/resetConnection"
 
     params = {}
     encrypted_params = {}
@@ -122,29 +125,31 @@ def resetConnection()
 end
 
 
-def synchronize()
-    log($script_title,"Call #{getMethodName}()")
-    url = "http://" + getOption("web_domain=") + "/xmpp/synchronizePresence"
-
-
+def synchronize(domain)
+    log($script_title,"Call #{getMethodName}(#{domain})")
+    url = "http://" + getWebDomainUrlFromDomain(domain) + "/xmpp/synchronizePresence"
+    
     #Get connected users using Emanagement
-    users = []
-    command = $scripts_path + "/emanagement getConnectedUsers"
+    jids = []
+    if domain=="all"
+	command = $scripts_path + "/emanagement getConnectedJids"
+    else
+	command = $scripts_path + "/emanagement getConnectedJidsByDomain " + domain
+    end
     output = %x[#{command}]
     sessions = output.split("\n")
 
     sessions.each do |session|
-      users << session.split("@")[0]
+      jids << 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(",")
+    params[:name]=jids.join(",")
 
     return [getMethodName,generic_api_call(url,params,encrypted_params)]
 end
@@ -277,11 +282,53 @@ def invokeApiCall(method,args)
 end
 
 
+def getUsernameFromJid(jid)
+	return jid.split("@")[0];
+end
+
+def getDomainFromJid(jid)
+	return jid.split("@")[1];
+end
+
+def getWebDomainUrlFromDomain(domain)
+
+	if domain=="all"
+	  return getWebDomainUrlFromDomain(getWebDomains()[0])
+	end
+
+	web_domain = getOption(domain + "=");
+	if (web_domain != "Undefined")
+		return web_domain
+	else
+		return domain
+	end
+end
+
+def getWebDomains()
+	begin
+		web_domains = getOption("web_domains=");
+		#web_domains=["domain1","domain2"]
+		return getElementsFromStringArray(web_domains);
+	rescue Exception=>e
+		return [""]
+	end
+end
+
+def getElementsFromStringArray(stringArray)
+	stringArray=stringArray[1,stringArray.length-2]
+	return stringArray.split(",")
+end
+
+
 #Main Program
 
 begin
+	if !ARGV[0]
+		puts("Syntax Error: ./synchronize_presence_script domain")
+		exit 1
+	end
 
-	args = []
+	args = ARGV[0]
 	method = "synchronize"
 
 	if (response = invokeApiCall(method, args) and response[1])

data/ejabberd/mod_sspresence/mod_sspresence.erl

@@ -1,9 +1,10 @@
 %%%-------------------------------------------------------------------
 %%% File    : mod_sspresence.erl
-%%% Author  : Aldo
-%%% Contact:  < social-stream@dit.upm.es >
+%%% Author  : Aldo Gordillo
+%%% Contact : < social-stream@dit.upm.es >
 %%% Purpose : Process events and hooks for Social Stream Presence: http://social-stream.dit.upm.es/
 %%% Created : 1 Oct 2011
+%%% Version : 2.0
 %%%  
 %%%
 %%% http://social-stream.dit.upm.es/
@@ -50,42 +51,46 @@ stop(Host) ->
 
 
 on_register_connection(_SID, _JID, _Info) ->
-    {_A,User,_B,_C,_D,_E,_F} = _JID,
-    ?INFO_MSG("mod_sspresence: on_register_connection (~p)", [User]),
+    {_A,User,Domain,_C,_D,_E,_F} = _JID,
+    UserJid = string:join([User, Domain ], "@"),
+    ?INFO_MSG("mod_sspresence: on_register_connection (~p)", [UserJid]),
     Rest_api_script_path = string:concat(getOptionValue("scripts_path="), "/rest_api_client_script "),
-    os:cmd(string:join([Rest_api_script_path, "setConnection", User ], " ")),
+    os:cmd(string:join([Rest_api_script_path, "setConnection", UserJid ], " ")),
     ok.
 
 on_remove_connection(_SID, _JID, _SessionInfo) ->
-    {_A,User,_B,_C,_D,_E,_F} = _JID,
-    ?INFO_MSG("mod_sspresence: on_remove_connection (~p)", [User]),
-    Connected = isConnected(User),
+    {_A,User,Domain,_C,_D,_E,_F} = _JID,
+    UserJid = string:join([User, Domain ], "@"),
+    ?INFO_MSG("mod_sspresence: on_remove_connection (~p)", [UserJid]),
+    Connected = isConnected(UserJid),
     case Connected of
 	true -> ok;
 	_ -> Rest_api_script_path = string:concat(getOptionValue("scripts_path="), "/rest_api_client_script "),
-             os:cmd(string:join([Rest_api_script_path, "unsetConnection", User ], " "))
+             os:cmd(string:join([Rest_api_script_path, "unsetConnection", UserJid ], " "))
     end,
     ok.
 
-on_presence(User, _Server, _Resource, Packet) ->
-     ?INFO_MSG("mod_sspresence: on_presence (~p)", [User]),
+on_presence(User, Server, _Resource, Packet) ->
+     UserJid = string:join([User, Server ], "@"),
+     ?INFO_MSG("mod_sspresence: on_presence (~p)", [UserJid]),
      {_xmlelement, Type, _Attr, Subel} = Packet,
 
     case Type of
 	"presence" -> Status = getStatusFromSubel(Subel),
 		      Rest_api_script_path = string:concat(getOptionValue("scripts_path="), "/rest_api_client_script "),
-		      ?INFO_MSG("mod_sspresence: set_presence_script call with  user (~p) and status (~p)", [User,Status]),
-    		      os:cmd(string:join([Rest_api_script_path, "setPresence", User , Status], " "));
+		      ?INFO_MSG("mod_sspresence: set_presence_script call with  userJid (~p) and status (~p)", [UserJid,Status]),
+    		      os:cmd(string:join([Rest_api_script_path, "setPresence", UserJid , Status], " "));
 	_ -> ok
     end,
     ok.
 
-on_unset_presence(User, _Server, _Resource, _Status) ->
-    ?INFO_MSG("mod_sspresence: on_unset_presence (~p)", [User]),
+on_unset_presence(User, Server, _Resource, _Status) ->
+    UserJid = string:join([User, Server ], "@"),
+    ?INFO_MSG("mod_sspresence: on_unset_presence (~p)", [UserJid]),
     _Rest_api_script_path = string:concat(getOptionValue("scripts_path="), "/rest_api_client_script "),
     %% Wait for on_remove_connection
-    %% ?INFO_MSG("mod_sspresence: unset_presence_script call with  user (~p)", [User]),
-    %%os:cmd(string:join([_Rest_api_script_path, "unsetPresence", User , Status], " ")),
+    %% ?INFO_MSG("mod_sspresence: unset_presence_script call with  userJid (~p)", [UserJid]),
+    %%os:cmd(string:join([_Rest_api_script_path, "unsetPresence", UserJid], " ")),
     ok.
 
 on_packet_send(_From, _To, {xmlelement, Type, _Attr, _Subel} = _Packet) ->
@@ -158,9 +163,9 @@ parser(In,Option) ->
 
 
 %%Check if a user is connected (any active session with Ejabberd server)
-isConnected(User) ->
+isConnected(UserJid) ->
 
-Command = string:concat("ejabberdctl connected-users | grep ", User),
+Command = string:concat("ejabberdctl connected-users | grep ", UserJid),
 Output = os:cmd(Command),
 
 case Output of
@@ -169,11 +174,10 @@ case Output of
 
       catch lists:foreach(
 		fun(S) ->
-		        [Slug|_R] = string:tokens(S, "@"),
-		        %User.slug connected = Slug
+		        [Jid|_R] = string:tokens(S, "/"),
 			
-			case Slug of
-			  User -> throw(true);
+			case Jid of
+			  UserJid -> throw(true);
 			  _ -> false
 			end                
 

data/lib/generators/social_stream/presence/templates/initializer.rb

@@ -1,5 +1,5 @@
 SocialStream::Presence.setup do |config| 
-  #Configures XMPP Server Domain
+  #Configures Web Server Domain served by XMPP Server
   config.domain = "localhost"
   #Configures Bosh Service Path
   #config.bosh_service = "http://xmpp-proxy/http-bind"