social_stream-presence 0.0.13 → 0.0.14

data/app/controllers/xmpp_controller.rb

@@ -125,6 +125,10 @@ class XmppController < ApplicationController
     return params[:password] == SocialStream::Presence.xmpp_server_password
   end
   
+  def chatAuthWithCookie
+    cookie = params[:cookie]
+    render :text => "Ok"
+  end
   
   def chatWindow
     if (current_user) and (current_user.status != 'disable') and (params[:userConnected]=="true")

data/app/views/xmpp/_chat.html.erb

@@ -9,8 +9,8 @@
 	  <%= javascript_include_tag 'xmpp_client'%>
 		<%= javascript_include_tag 'store'%>
   <% end %>
-	
 		
+	
 	<script type="text/javascript">
 			
 		//Global variables
@@ -19,7 +19,13 @@
     var user_name = '<%=current_user.name%>';
 		var user_slug = '<%=current_user.slug%>';
     var user_jid = '<%=current_user.slug%>'+"@"+domain;
-		var sound_path = "/assets/audio/chat/onMessage"
+		var sound_path = "/assets/audio/chat/onMessage";
+		var cookie = "<%=cookies["_global_session"]%>";
+
+    function connectToServerWithCookie(){
+			 connection = new Strophe.Connection(BOSH_SERVICE);
+       connection.connect(user_jid, cookie, onConnect);
+		}
 
     function connectToServer(chatPassword){
 		  <%unless current_user.nil? %>

data/config/routes.rb

@@ -11,5 +11,6 @@ Rails.application.routes.draw do
   match '/xmpp/setPresence' => "Xmpp#setPresence"
   match '/xmpp/unsetPresence' => "Xmpp#unsetPresence"
   match '/chatWindow'=> "Xmpp#chatWindow"
+  match '/chatAuthWithCookie'=> "Xmpp#chatAuthWithCookie"
    
 end

data/ejabberd/conf/ssconfig_example.cfg

@@ -30,3 +30,6 @@ ss_password=password
 
 #Ejabberd Server Password
 ejabberd_password=password
+
+#Emanagement configuration
+users_require_sudo=user1,user2,...

data/ejabberd/ejabberd_scripts/emanagement

@@ -33,6 +33,7 @@ end
 #Configuration variables
 $domain = getOption("server_domain=")
 
+
 PARAMS_FOR_COMMANDS = {
 	'addBuddyToRoster' => 5,
 	'removeBuddyFromRoster' => 2,
@@ -54,6 +55,7 @@ PARAMS_FOR_COMMANDS = {
 	'sendMessageToUser' => 3,
 	'getUserResource' => 1,
 	'isEjabberdNodeStarted' => 0,
+	'checkEjabberdctlQuotedString' => 0,
 	'help' => 0,
 }
 
@@ -78,6 +80,7 @@ SYNTAX_FOR_COMMANDS = {
 	'sendMessageToUser' => 'sendMessageToUser from_name to_name msg',
 	'getUserResource' => 'getUserResource username',
 	'isEjabberdNodeStarted' => 'isEjabberdNodeStarted',
+	'checkEjabberdctlQuotedString' => 'checkEjabberdctlQuotedString',
 	'help' => 'help',
 }
 
@@ -123,7 +126,7 @@ def addBuddyToRoster(userSid,buddySid,buddyNick,buddyGroup,subscription_type)
 	buddy = buddySid.split("@")[0]
 	userDomain = userSid.split("@")[1]
 	buddyDomain = buddySid.split("@")[1]
-	command = "ejabberdctl add-rosteritem " + user + " " + userDomain + " " + buddy + " " + buddyDomain + " " + buddyNick + " " + buddyGroup + " " + subscription_type
+	command = buildCommand("ejabberdctl add-rosteritem " + user + " " + userDomain + " " + buddy + " " + buddyDomain + " " + buddyNick + " " + buddyGroup + " " + 					subscription_type)
 	%x[#{command}];
 	return "Done"
 end
@@ -134,7 +137,7 @@ def removeBuddyFromRoster(userSid,buddySid)
 	userDomain = userSid.split("@")[1]
 	buddyDomain = buddySid.split("@")[1]
 	if checkUserInRoster(buddy,getRoster(user))
-		command = "ejabberdctl delete_rosteritem " + user + " " + userDomain + " " + buddy + " " + buddyDomain
+		command = buildCommand("ejabberdctl delete_rosteritem " + user + " " + userDomain + " " + buddy + " " + buddyDomain)
 		%x[#{command}];
 		return "Done"
 	else
@@ -147,7 +150,7 @@ end
 
 def getRoster(username)
 	if checkUser(username)
-		command = "ejabberdctl get_roster " + username  + " " + $domain
+		command = buildCommand("ejabberdctl get_roster " + username  + " " + $domain)
 		%x[#{command}];
 	else
 		return "User " + username + " not found"
@@ -179,13 +182,13 @@ def removeRoster(username)
 end
 
 def removeAllRosters()
-	command = "ejabberdctl process_rosteritems delete any any any any"
+	command = buildCommand("ejabberdctl process_rosteritems delete any any any any")
 	%x[#{command}];
 	return "Done";
 end
 
 def getAllUsersWithRoster()
-	command = "ejabberdctl process_rosteritems list any any any any"
+	command = buildCommand("ejabberdctl process_rosteritems list any any any any")
 	output = %x[#{command}];
 
 	i = 0
@@ -286,7 +289,7 @@ end
 def sendStanzaUserMessage(username,msg)
 	resource = getUserResource(username);
 	stanza = "\\<\\'message\\'\\>\\<\\'body\\'\\>\\'" + msg + "\\'\\<\\'/body\\'\\>\\<\\'/message\\'\\>"
-	command = "ejabberdctl send_stanza_c2s " + username + " " + $domain + " " + resource + " " + stanza
+	command = buildCommand("ejabberdctl send_stanza_c2s " + username + " " + $domain + " " + resource + " " + stanza)
 	puts "Executing: " + command
 	%x[#{command}];
 	return "Done"
@@ -311,7 +314,7 @@ def sendPresenceWithShow(from_name,to_name,show)
 	from_sid = from_name + "@" + $domain;
 	to_sid = to_name + "@" + $domain;   
 	pres_stanza = "\\<\\'presence from=\\'\\\"\\'" + from_sid + "\\'\\\"\\' to=\\'\\\"\\'" + to_sid + "\\'\\\"\\>\\<\\'show\\'\\>\\'" + show + "\\'\\<\\'/show\\'\\>\\<\\'/presence\\'\\>" 
-	command = "ejabberdctl send_stanza_c2s " + from_name + " " + $domain + " " + resource + " " + pres_stanza
+	command = buildCommand("ejabberdctl send_stanza_c2s " + from_name + " " + $domain + " " + resource + " " + pres_stanza)
 	puts "Executing: " + command
 	%x[#{command}];
 	return "Done"
@@ -322,7 +325,7 @@ def sendPresenceStanzaWithType(from_name,to_name,presence_type)
 	from_sid = from_name + "@" + $domain;
 	to_sid = to_name + "@" + $domain;
 	pres_stanza = "\\<\\'presence type=\\'\\\"\\'" + presence_type + "\\'\\\"\\' from=\\'\\\"\\'" + from_sid + "\\'\\\"\\' to=\\'\\\"\\'" + to_sid + "\\'\\\"\\>\\<\\'/presence\\'\\>" 
-	command = "ejabberdctl send_stanza_c2s " + from_name + " " + $domain + " " + resource + " " + pres_stanza
+	command = buildCommand("ejabberdctl send_stanza_c2s " + from_name + " " + $domain + " " + resource + " " + pres_stanza)
 	puts "Executing: " + command
 	%x[#{command}];
 	return "Done"
@@ -331,14 +334,14 @@ end
 def sendMessageToUser(from_name,to_name,msg)
 	from_sid = from_name + "@" + $domain;
 	to_sid = to_name + "@" + $domain;
-	command = "ejabberdctl send_message_chat " + from_sid + " " + to_sid + " " + "\\'" + msg + "\\'";
+	command = buildCommand("ejabberdctl send_message_chat " + from_sid + " " + to_sid + " " + buildQuotedString(msg))
 	puts "Executing: " + command
 	%x[#{command}];
 	return "Done"
 end
 
 def getUserResource(username)
-	command = "ejabberdctl connected-users"
+	command = buildCommand("ejabberdctl connected-users")
 	output = %x[#{command}];
         lines = output.split("\n");
 	lines.each do |line|
@@ -356,7 +359,7 @@ end
 #More utilities
 
 def isEjabberdNodeStarted
-	command = "ejabberdctl status"
+	command = buildCommand("ejabberdctl status")
 	output = %x[#{command}]
 	if firstLine = output.split("\n")[0]
 	  return ((firstLine.split(":")[1]).strip()=="started")
@@ -364,10 +367,92 @@ def isEjabberdNodeStarted
 	return false
 end
 
+def checkEjabberdctlQuotedString
+	puts "checkForSimpleSlash: " + checkForSimpleSlash.to_s()
+	puts "checkForDoubleSlash: " + checkForDoubleSlash.to_s()
+end
+
+def checkForDoubleSlash
+	command = "ejabberdctl send_message_chat example@localhost example@localhost \\'Hello quoted string\\'"
+	if execute_as_sudo
+		command = "sudo " + command
+	end
+	#puts "Executing " + command
+	output = %x[#{command}]
+	firstLine = ""
+	lines = output.split("\n")
+	lines.each do |line|
+		if line != ""
+			firstLine = line
+			break
+		end
+	end
+
+	if firstLine==""
+		return true
+	elsif firstLine.split(":")[0]=="Error"
+		return false
+	else
+		#Unknown error		
+		return false
+	end
+end
+
+def checkForSimpleSlash
+	command = "ejabberdctl send_message_chat example@localhost example@localhost \'Hello quoted string\'"
+	if execute_as_sudo
+		command = "sudo " + command
+	end
+	#puts "Executing " + command
+	output = %x[#{command}]
+	firstLine = ""
+	lines = output.split("\n")
+	lines.each do |line|
+		if line != ""
+			firstLine = line
+			break
+		end
+	end
+
+	if firstLine==""
+		return true
+	elsif firstLine.split(":")[0]=="Error"
+		return false
+	else
+		#Unknown error		
+		return false
+	end
+end
+
+def buildQuotedString(msg)
+	if checkForSimpleSlash
+		return "\'" + msg + "\'"
+	end
+	if checkForDoubleSlash
+		return "\\'" + msg + "\\'"
+	end
+	return msg
+end
 
 
 #Help & Support methods
 
+def buildCommand(command)
+	if execute_as_sudo
+		command = "sudo " + command
+	end
+	return command
+end
+
+def execute_as_sudo
+	current_user = %x["whoami"].split("\n")[0]
+	sudo_users = getOption("users_require_sudo=")
+	sudo_users_array = sudo_users.split(",")
+	if sudo_users_array.include?(current_user)
+		return true
+	end
+end
+
 def help
 	log("Command list")
 	SYNTAX_FOR_COMMANDS.values.each do |command|

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-presence
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.13
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Aldo Gordillo
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 +02:00
+date: 2011-10-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +25,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 18
         version: 0.9.18
   type: :runtime
   version_requirements: *id001
@@ -32,6 +40,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -43,6 +53,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -184,17 +196,21 @@ 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.6.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Presence capabilities for Social Stream, the core for building social network websites