social_stream 0.14.1 → 0.15.0

data/presence/ejabberd/installer.sh

@@ -0,0 +1,267 @@
+#!/bin/bash
+
+#Social Stream Presence Ejabberd files installer
+#@author Aldo
+
+#Call example:
+#./installer.sh ejabberd_module_path="/ejabberd_module_path/" scripts_path="/scripts_path/" [key1=value1,key2=value2]
+
+#Constants
+config_files_path="/etc/ejabberd/"
+logs_path="/var/log/ejabberd/"
+installer_file_path=$(readlink -f $0)
+installer_folder_path=`dirname "$installer_file_path"`
+
+
+
+#Functions
+
+help () {
+      echo "Syntax error: ./installer [onlyconf=true] ejabberd_module_path=mpath scripts_path=spath [key1=value1,key2=value2,...]"  
+}
+
+
+msg () {
+      echo "#################################"
+      echo $1
+}
+
+
+applyOption () {
+      if [ ! $1 ] || [ ! $2 ]
+        then
+          return 1
+      fi
+      #key $1
+      #value $2
+      #string ssconfig $3
+      echo "Enable option " $1"="$2
+
+      SEPARATOR=$(echo -en "\n\b")
+      match=$1"="
+	
+     if [[ $ssconfig == *$match* ]]
+	then {
+		#Modify existing options
+ 	        repl=$1"="$2"="
+
+		if [ $2 == "remove" ]
+		 then 
+		  repl="removedVar=true="
+		fi
+
+      		ssconfig=${ssconfig/$match/$repl}
+	} else {
+		#Add new options
+		if [ ! $2 == "remove" ]
+		 then 
+		  ssconfig="${ssconfig}${SEPARATOR}${1}=${2}="
+		fi
+ 	}
+     fi
+
+      return 0
+}
+
+
+restoreFile () {
+      IFS=$(echo -en "\n\b")
+      cat /dev/null > $conffile
+      for word in $ssconfigrestore; do
+	echo $word >> $conffile
+      done
+      return 0
+}
+
+
+updateSSConfig () {
+
+if [ $1 ] && [ ${#1} -gt 2 ]
+  then {
+
+        if [ ${1:0:1} != "[" ] || [ ${1:${#1}-1:${#1}} != "]" ]
+	  then
+          echo "Malformed options"
+          help
+	  exit 1
+        fi
+
+        msg "Processing options"
+        options=${1:1:${#1}-2}
+        options=(${options//","/ })
+
+
+	#Read config file
+	ssconfig=""
+	conffile=$config_files_path/ssconfig.cfg
+
+	SAVEIFS=$IFS
+	IFS=$(echo -en "\n\b")
+
+	while read line
+	do
+	  ssconfig="${ssconfig}${line}${IFS}"
+	done < $conffile
+
+	IFS=$SAVEIFS
+
+	ssconfigrestore=$ssconfig;
+
+	#Modify ssconfig to apply options
+	for option in ${options[@]}; do
+		option=(${option//"="/ })
+		key=${option[0]}
+        	value=${option[1]}
+		applyOption $key $value
+	done
+
+
+	#Write (ssconfig) to file
+	cat /dev/null > $conffile
+	IFS=$(echo -en "\n\b")
+	for word in $ssconfig; do
+
+	  if [[ $word =~ [#] ]] || [ -z $word ]
+	    then {
+            	echo $word >> $conffile
+ 	    } else {
+                IFS=$SAVEIFS
+		arr=(${word//"="/ })
+		if [ ${#arr[@]} -lt 2 ]
+			then
+			echo "ssconfig.cfg error in line:" $word
+			restoreFile
+			exit 1
+		fi
+                word="${arr[0]}=${arr[1]}"
+		if [ ! $word == "removedVar=true" ]
+		 then
+ 			echo $word >> $conffile
+	        fi
+	    }
+          fi
+	done
+  }
+fi
+
+}
+
+
+#Main Program
+
+
+#Look for only configuration mode
+arr=(${1//"="/ })
+if [ ${#arr} -ge 2 ] && [ ${arr[0]} == "onlyconf" ] && [ ${arr[1]} == "true" ]
+  then {
+    msg "Updating ssconfig"
+    updateSSConfig $2
+    exit 0
+  }
+fi
+
+
+
+#Installer mode
+msg "Start installer"
+
+if [ $# -lt 2 ]
+  then
+    help
+    exit 1
+fi
+
+
+msg "Reading parameters..."
+
+arr=(${1//"="/ })
+
+if [ ${arr[0]} == "ejabberd_module_path" ]
+  then {
+    ejabberd_module_path=${arr[1]}
+  } else {
+    help
+    exit 1
+  }
+fi
+
+arr=(${2//"="/ })
+
+if [ ${arr[0]} == "scripts_path" ]
+  then {
+    scripts_path=${arr[1]}
+  } else {
+    help
+    exit 1
+  }
+fi
+
+
+echo "Installer path:" $installer_file_path
+echo "Ejabberd module path:" $ejabberd_module_path 
+echo "scripts_path:" $scripts_path
+echo "config_files_path:" $config_files_path
+echo "logs_path:" $logs_path
+
+
+paths=($ejabberd_module_path $scripts_path $config_files_path $logs_path )
+
+msg "Creating directories"
+
+for path in ${paths[@]}; do
+        mkdir -p $path
+done
+
+
+msg "Copying Ejabberd modules"
+cp $installer_folder_path/mod_admin_extra/mod_admin_extra.beam $ejabberd_module_path
+cp $installer_folder_path/mod_sspresence/mod_sspresence.beam $ejabberd_module_path
+
+msg "Copying scripts"
+cp -r $installer_folder_path/ejabberd_scripts/* $scripts_path
+
+
+msg "Checking and copying configuration files"
+
+if [ -e $config_files_path/ssconfig.cfg ]
+  then {
+       echo "Find ssconfig.cfg: updating ssconfig_example.cfg"
+       cp $installer_folder_path/conf/ssconfig_example.cfg $config_files_path/ssconfig_example.cfg
+    } else {
+       echo "ssconfig not exists"
+       cp $installer_folder_path/conf/ssconfig_example.cfg $config_files_path/ssconfig.cfg
+  }
+fi
+
+cp $installer_folder_path/conf/ejabberd_example.cfg $config_files_path/ejabberd_example.cfg
+echo "Updating ejabberd_example.cfg"
+
+msg "Check and copying log files"
+if [ ! -e $logs_path/scripts.log ]
+  then {
+       echo "Creating scripts.log"
+       touch $logs_path/scripts.log
+  }
+fi
+
+if [ ! -e $logs_path/auth.log ]
+  then {
+       echo "Creating auth.log"
+       touch $logs_path/auth.log
+  }
+fi
+
+
+#Processing options
+updateSSConfig $3
+
+
+msg "Complete"
+exit 0
+
+
+
+
+
+
+

data/presence/ejabberd/mod_sspresence/mod_sspresence.erl

@@ -1,10 +1,31 @@
+%%%-------------------------------------------------------------------
+%%% File    : mod_sspresence.erl
+%%% Author  : Aldo
+%%% 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
+%%%  
+%%%
+%%% http://social-stream.dit.upm.es/
+%%% Copyright © 2011 Social Stream
+%%%
+%%%-------------------------------------------------------------------
+
 -module(mod_sspresence).
+-author('aldo').
 
 -behavior(gen_mod).
 
 -include("ejabberd.hrl").
 
--export([start/2, stop/1, on_register_connection/3, on_remove_connection/3, on_presence/4, on_unset_presence/4, isConnected/1, on_packet_send/3]).
+-export([start/2, stop/1, 
+	on_register_connection/3, 
+	on_remove_connection/3, 
+	on_presence/4, 
+	on_unset_presence/4,
+	on_packet_send/3, 
+	isConnected/1
+	]).
 
 start(Host, _Opts) ->
     ?INFO_MSG("mod_sspresence starting", []),
@@ -52,34 +73,25 @@ on_presence(User, _Server, _Resource, Packet) ->
 
     case Type of
 	"presence" -> Status = getStatusFromSubel(Subel),
-		      Login_path = string:concat(getOptionValue("scripts_path="), "/set_presence_script "),
+		      Presence_path = string:concat(getOptionValue("scripts_path="), "/set_presence_script "),
 		      ?INFO_MSG("mod_sspresence: set_presence_script call with  user (~p) and status (~p)", [User,Status]),
-    		      os:cmd(string:join([Login_path, User , Status], " "));
+    		      os:cmd(string:join([Presence_path, User , Status], " "));
 	_ -> ok
     end,
     ok.
 
 on_unset_presence(User, _Server, _Resource, _Status) ->
     ?INFO_MSG("mod_sspresence: on_unset_presence (~p)", [User]),
-    Login_path = string:concat(getOptionValue("scripts_path="), "/unset_presence_script "),
+    _UPresence_path = string:concat(getOptionValue("scripts_path="), "/unset_presence_script "),
     %% Wait for on_remove_connection
     %% ?INFO_MSG("mod_sspresence: unset_presence_script call with  user (~p)", [User]),
-    %% os:cmd(string:join([Login_path, User , Status], " "));
+    %%os:cmd(string:join([UPresence_path, User , Status], " "));
     ok.
 
-on_packet_send(From, _To, {xmlelement, Type, _Attr, Subel} = _Packet) ->
+on_packet_send(_From, _To, {xmlelement, Type, _Attr, _Subel} = _Packet) ->
     case Type of
-	"message" -> 
-		{_SenderJID,Sender,_SenderDomain,_A,_B,_C,_D} = From,
-		
-		SSlogin = getOptionValue("ss_login="),
-
-		case Sender of
-			SSlogin ->
-                                Message = getMessageFromSubel(Subel),
-				execute(Message);
-                   	_ -> ok
-                end;
+	"message" ->
+               ok;
 	_ -> ok
     end.
 
@@ -105,82 +117,11 @@ getStatusFromSubel(Subel) ->
 	end. 
 
 
-getMessageFromSubel(Subel) ->
-    [{_I,_J,_K,[{_L,MessageData}]}] = Subel,
-    parseXmlCdata(MessageData).
-
-
 parseXmlCdata(Msg) ->
 	MessageString = binary_to_list(list_to_binary(io_lib:format("~p", [Msg]))),
 	lists:sublist(MessageString, 4, string:len(MessageString)-6).
 
 
-execute(Message) ->
-    %?INFO_MSG("Message vale: ~p", [Message]),
-    %?INFO_MSG("Order vale: ~p", [Order]),
-    [Order|Params] = string:tokens(Message, "&"),
-    case Order of
-	"AddItemToRoster" -> 
-	  	case length(Params) of
-			4 -> 	[UserSID,BuddySID,BuddyName,Subscription_type] = Params,
-				?INFO_MSG("Execute: ~p with params ~p", [Order,Params]),
-				[ContactName|_R] = string:tokens(BuddyName, " "),
-				[UserSlug,UserDomain] = string:tokens(UserSID, "@"),
-				[BuddySlug,BuddyDomain] = string:tokens(BuddySID, "@"),
-				addItemToRoster(UserSlug,UserDomain,BuddySlug,BuddyDomain,ContactName,"SocialStream",Subscription_type),
-				ok;
-			_ -> 	?INFO_MSG("Incorrect parameters in order ~p", [Order]),
-				ok
-	  	end,
-		ok;
-
-	"SetRosterForBidirectionalTie" -> 
-	  	case length(Params) of
-			4 -> 	[UserASID,UserBSID,UserAName,UserBName] = Params,
-				?INFO_MSG("Executing: ~p with params ~p", [Order,Params]),
-				[UserASlug,UserADomain] = string:tokens(UserASID, "@"),
-				[UserBSlug,UserBDomain] = string:tokens(UserBSID, "@"),
-				addItemToRoster(UserASlug,UserADomain,UserBSlug,UserBDomain,UserBName,"SocialStream","both"),
-				addItemToRoster(UserBSlug,UserBDomain,UserASlug,UserADomain,UserAName,"SocialStream","both"),
-				ok;
-			_ -> 	?INFO_MSG("Incorrect parameters in order ~p", [Order]),
-				ok
-	  	end,
-		ok;
-
-	"Synchronize" ->
-	synchronizePresence(),
-	ok;
-
-	"SynchronizeRosters" ->
-	synchronizeRosters(),
-	ok;
-
-	_ -> ?INFO_MSG("Command not found", []),
-		ok
-    end.
-
-
-
-%%Call ejabberdctl command add_rosteritem
-	%Command Name: add_rosteritem
-	%Needs mod_admin_extra (http://www.ejabberd.im/ejabberd-modules)
-	%ejabberdctl add_rosteritem localuser localserver buddy buddyserver nick group subs
-	%subs= none, from, to or both,
-
-	%Example
-	%ejabberdctl add_rosteritem frank-williamson trapo demo trapo NickName SocialStream from
-	%frank-williamson@trapo adds demo@trapo to its roster with subscription from, in the group SocialStream with the name Nickname
-%%
-addItemToRoster(UserSlug,UserDomain,BuddySlug,BuddyDomain,ContactName,Group,Subscription_type) ->
-	%%Command = lists:concat(["ejabberdctl add_rosteritem ", UserSlug , " ", UserDomain, " ", BuddySlug, " ", BuddyDomain , " \\'", ContactName , "\\' ", Group , " ", 					Subscription_type]),
-	%%Command = lists:concat(["ejabberdctl add_rosteritem ", UserSlug , " ", UserDomain, " ", BuddySlug, " ", BuddyDomain , " \'", ContactName , "\' ", Group , " ", 					Subscription_type]),
-	
-	[UserName|_R] = string:tokens(ContactName, " "),
-	Command = lists:concat(["ejabberdctl add_rosteritem ", UserSlug , " ", UserDomain, " ", BuddySlug, " ", BuddyDomain , " ", UserName , " ", Group , " ", 					Subscription_type]),
-	os:cmd(Command),
-	?INFO_MSG("Execute command: ~p", [Command]),
-ok.
 
 %%GETTERS CONFIG VALUES
 %%CONFIG FILE: /etc/ejabberd/ssconfig.cfg
@@ -241,19 +182,6 @@ case Output of
 end.
 
 
-%%Send all connected users to Social Stream Rails Application
-synchronizePresence() ->
-	Synchronize_path = string:concat(getOptionValue("scripts_path="), "/synchronize_presence_script "),
-	os:cmd(Synchronize_path),
-ok.
-
-
-%%Reset all rosters and wait to received data from Social Stream Rails Application
-synchronizeRosters() ->
-	SynchronizeRosters_path = string:concat(getOptionValue("scripts_path="), "/emanagement removeAllRosters"),
-	os:cmd(SynchronizeRosters_path),
-ok.
-
 
 %Reset all connections
 reset_connections() ->

data/presence/lib/generators/social_stream/presence/install_generator.rb

@@ -4,7 +4,7 @@ class SocialStream::Presence::InstallGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
   def create_initializer_file
-    copy_file 'initializer.rb', 'config/initializers/social_stream-presence.rb'
+    template 'initializer.rb', 'config/initializers/social_stream_presence.rb'
   end
 
   def create_migration_file

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

@@ -6,13 +6,15 @@ SocialStream::Presence.setup do |config|
   #Configures Authentication Method: "cookie" or "password"
   config.auth_method = "cookie"
   #Configures XMPP Server Password
-  config.xmpp_server_password = "password"
+  config.xmpp_server_password = <%= SecureRandom.hex(64).inspect %>
   #Remote or local mode
   config.remote_xmpp_server = false
   #Scripts path to execute ejabberd scripts: local or remote
   config.scripts_path = "/scripts_path"
-  #False to disable Social Stream Presence
-  #config.enable = false
+  #Ejabberd module path in the xmpp server
+  config.ejabberd_module_path = "/lib/ejabberd/ebin"
+  #Uncomment to enable Social Stream Presence
+  #config.enable = true
   
   #Parameters for remote mode
   #SSH Login
@@ -25,6 +27,6 @@ SocialStream::Presence.setup do |config|
   #Username of the the Social Stream Admin sid
   config.social_stream_presence_username = "social_stream-presence"
   #Configures Social Stream Rails App Password
-  config.password = "password"  
+  config.password = <%= SecureRandom.hex(64).inspect %>  
 
 end

data/presence/lib/social_stream/presence/xmpp_server_order.rb

@@ -4,6 +4,7 @@ require 'xmpp4r/roster'
 require 'xmpp4r/client'
 require 'xmpp4r/message'
 require 'net/ssh'
+require 'net/sftp'
 
 module SocialStream
   module Presence
@@ -108,6 +109,117 @@ module SocialStream
           end
           
           
+          #Installation methods
+          
+          def copyFolder(oPath,dPath)
+            if SocialStream::Presence.remote_xmpp_server
+              #Remote mode
+              copyRemoteFolder(oPath,dPath)
+            else
+              #Local mode
+              SocialStream::Presence::XmppServerOrder::executeCommand("cp -r " + oPath + "/* " + dPath)
+            end
+          end
+          
+          
+          def copyRemoteFolder(localPath,remotePath)
+            begin
+              if SocialStream::Presence.ssh_password             
+               
+                Net::SFTP.start(SocialStream::Presence.ssh_domain, SocialStream::Presence.ssh_user, :password => SocialStream::Presence.ssh_password, :auth_methods => ["password"] ) do |sftp|
+                  recursiveCopyFolder(localPath,remotePath,sftp)
+                end 
+                
+              else
+                #SSH with authentication key instead of password              
+                Net::SFTP.start(SocialStream::Presence.ssh_domain, SocialStream::Presence.ssh_user) do |sftp|
+                  recursiveCopyFolder(localPath,remotePath,sftp)
+                end 
+              end
+              output="Ok"
+            rescue Exception => e
+              case e
+                when Net::SSH::AuthenticationFailed
+                  output = "AuthenticationFailed on remote access"
+                else
+                  output = "Unknown exception in copyRemoteFolder method: #{e.to_s}"
+              end
+            end  
+ 
+            return output
+          end
+          
+          
+          def recursiveCopyFolder(localPath,remotePath,sftp) 
+            # Create directory if not exits
+            sftp.mkdir(remotePath)
+            # Upload files to the remote host        
+            Dir.foreach(localPath) do |f|
+              file_path = localPath + "/#{f}"
+              if File.file?(file_path)
+                sftp.upload(file_path, remotePath + "/#{f}")
+              elsif File.directory?(file_path) and f!="." and f!=".."
+                recursiveCopyFolder(file_path,remotePath + "/#{f}",sftp)
+              end
+            end
+          end
+
+          def autoconf(options)
+            autoconf=[]
+            
+            #Add autoconfiguration options
+            #autoconf.push("key=value")
+
+            autoconf.push("scripts_path=" + SocialStream::Presence.scripts_path)
+            autoconf.push("ejabberd_password=" + SocialStream::Presence.xmpp_server_password)
+            autoconf.push("server_domain=" + SocialStream::Presence.domain)
+            autoconf.push("cookie_name=" + Rails.application.config.session_options[:key])
+            
+            #Param options
+            if options
+              options.each do |option|
+                autoconf = addManualOption(autoconf,option)
+              end
+            end
+            
+            #return "[key1=value1,key2=value2,key3=value3]"
+            return "[" + autoconf.join(',') + "]"
+          end
+          
+          
+          def addManualOption(array,option)
+            
+            optionSplit = option.split("=")
+            unless optionSplit.length == 2
+              return array
+            end
+            
+            key = optionSplit[0];
+            array.each do |element|
+              if element.split("=")[0]==key
+                #Replace element
+                array[array.index(element)]=option
+                return array
+              end
+            end
+            #Add option
+            array.push(option)
+            return array
+          end
+          
+          
+          def getExecutorUser
+            if SocialStream::Presence.remote_xmpp_server
+              if SocialStream::Presence.ssh_user
+                return SocialStream::Presence.ssh_user
+              else
+                return nil
+              end
+            else
+              return %x["whoami"].gsub(/\n/,"");
+            end
+          end
+          
           
           #Execution commands manage  
         
@@ -133,11 +245,11 @@ module SocialStream
             if commands.length > 1
               puts "Executing the following commands:"
               commands.each do |command|
-                puts command
+                puts parsingCommand(command)
               end  
               puts "Command list finish"
             elsif commands.length == 1
-              puts "Executing " + commands[0]
+              puts "Executing " + parsingCommand(commands[0])
             else
               puts "No command to execute"
               return
@@ -189,7 +301,7 @@ module SocialStream
  
             return output
           end
-        
+
         
         
          #Help methods
@@ -200,7 +312,10 @@ module SocialStream
               return (nodeUp and nodeUp.strip()=="true")
           end
         
-        
+          def parsingCommand(command)
+              #Hide passwords on sudo commands: command pattern = "echo password | sudo -S order"
+              return command.gsub(/echo ([aA-zZ]+) [|] sudo -S [.]*/,"echo ****** | sudo -S \\2")
+          end
         
          #Xmpp client manage methods
           

data/presence/lib/social_stream-presence.rb

@@ -22,6 +22,7 @@ module SocialStream
     mattr_accessor :xmpp_server_password
     mattr_accessor :remote_xmpp_server
     mattr_accessor :scripts_path
+    mattr_accessor :ejabberd_module_path
     mattr_accessor :enable
     
     mattr_accessor :ssh_domain
@@ -33,7 +34,7 @@ module SocialStream
 
     @@auth_method = "cookie"
     @@remote_xmpp_server = false
-    @@enable = true
+    @@enable = false
     
     class << self
       def setup