social_stream 0.12.1 → 0.12.2

data/documents/config/routes.rb

@@ -19,4 +19,4 @@ Rails.application.routes.draw do
       end
     end
   end
-end
+end

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.4.1".freeze
+    VERSION = "0.4.2".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.24')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.25')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
   s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')

data/events/db/migrate/20111102145626_add_more_fields_to_events.rb

@@ -0,0 +1,24 @@
+class AddMoreFieldsToEvents < ActiveRecord::Migration
+  def change
+    add_column :events, :description, :string
+    add_column :events, :place, :string
+    add_column :events, :isabel_event, :string
+    add_column :events, :machine_id, :int
+    add_column :events, :repeat, :string
+    add_column :events, :at_job, :int
+    add_column :events, :parent_id, :int
+    add_column :events, :character, :int
+    add_column :events, :public_read, :int
+    add_column :events, :marte_event, :int
+    add_column :events, :marte_room, :int
+    add_column :events, :spam, :int
+    add_column :events, :notes, :int
+    add_column :events, :location, :text
+    add_column :events, :streamming_url, :text
+    add_column :events, :permalink, :string
+    add_column :events, :cm_event_id, :int
+    add_column :events, :vc_mode, :int
+    add_column :events, :other_participation_url, :text
+    add_column :events, :web_interface, :int
+  end
+end

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.0.16".freeze
+    VERSION = "0.0.17".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.24')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.25')
   s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.12.1".freeze
+  VERSION = "0.12.2".freeze
 end

data/presence/app/assets/javascripts/store.js

@@ -10,6 +10,12 @@ $(document).ready(function () {
 
 
 function storePassword() {
+	
+	  //Dont store password if cookie authentication is enable
+	  if (authByCookie()) {
+			return
+	  }
+		
     if (window.sessionStorage) {
 			if (($("#user_password").length==1)&&($("#user_password").val()!="")){
         sessionStorage.setItem("ss_user_pass", $('#user_password').val());

data/presence/app/assets/javascripts/{xmpp_client.js → xmpp_client.js.erb}

@@ -3,7 +3,7 @@
 ////////////////////
 
 function log(msg) {
-    //console.log(msg)
+    console.log(msg)
 }
 
 
@@ -17,6 +17,45 @@ statusMessage['away'] = "Away";
 statusMessage['xa'] = "Away";
 statusMessage['dnd'] = "Busy";
 
+
+////////////////////
+//Connect functions
+////////////////////
+
+function connectToServerWithCookie(){
+    try {
+      connection = new Strophe.Connection(BOSH_SERVICE);
+      connection.connect(user_jid, cookie, onConnect);
+    } catch (err) {
+      //"Handle errors"
+      return false;
+    }
+}
+
+//Password: Get from chatPassword param if exists, instead try to get from sessionStorage.
+function connectToServerWithPassword(chatPassword){
+    
+    //Get Password
+    if ((chatPassword!=null)&&(chatPassword!="")){
+      var password = chatPassword;
+    } else if ((window.sessionStorage)&&(sessionStorage.getItem("ss_user_pass") != null)) {
+      var password = sessionStorage.getItem("ss_user_pass");
+    } else {
+      return false;
+    }
+    
+    try {
+        //Connect actual user to the chat
+        connection = new Strophe.Connection(BOSH_SERVICE);
+        connection.connect(user_jid, password, onConnect);
+    } catch (err) {
+        //"Handle errors"
+        return false;
+    }
+
+    return true;
+}
+
 ////////////////////
 //Strophe functions
 ////////////////////
@@ -176,6 +215,19 @@ function sendChatMessage(from,to,text){
 		return true;
 }
 
+function authByCookie(){
+	var authMethod = '<%= SocialStream::Presence.auth_method %>';
+	return authMethod=="cookie";
+}
+
+function authByPassword(){
+  var authMethod = '<%= SocialStream::Presence.auth_method %>';
+  return authMethod=="password";
+}
+
+function ifCookie(){
+	return (!(typeof cookie == 'undefined'))
+}
 
 ////////////////////
 //Audio functions

data/presence/app/controllers/xmpp_controller.rb

@@ -100,7 +100,7 @@ class XmppController < ApplicationController
       return
     end
     
-    SocialStream::Presence::XmppServerOrder::reset_presence
+    SocialStream::Presence::XmppServerOrder::resetPresence
     
     render :text => "Ok" 
   end
@@ -115,7 +115,7 @@ class XmppController < ApplicationController
     #Actual connected users
     user_slugs = params[:name]  
     
-    SocialStream::Presence::XmppServerOrder::synchronize_presence_for_slugs(user_slugs)
+    SocialStream::Presence::XmppServerOrder::synchronizePresenceForSlugs(user_slugs)
     
     render :text => "ok"
   end

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

@@ -1,4 +1,4 @@
-<% if current_subject.subject_type=="User" %>
+<% if current_user and current_subject.subject_type=="User" %>
 	
 	<% content_for :headers do %>
 	  <%= stylesheet_link_tag "chat.css", :media => "screen, projection" %>
@@ -9,49 +9,35 @@
 	  <%= javascript_include_tag 'xmpp_client'%>
 		<%= javascript_include_tag 'store'%>
   <% end %>
-	
 		
+	
 	<script type="text/javascript">
-			
-		//Global variables
+
+    //Global variables
 		var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
+		var cookie = "AuthenticationByCookie>>" + "<%=cookies[Rails.application.config.session_options[:key]]%>";
 		var domain = '<%=SocialStream::Presence.domain%>';
-    var user_name = '<%=current_user.name%>';
+		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"
-
-    function connectToServer(chatPassword){
-		  <%unless current_user.nil? %>
-				
-				//Get Password
-				if ((chatPassword!=null)&&(chatPassword!="")){
-					var password = chatPassword;
-				} else if ((window.sessionStorage)&&(sessionStorage.getItem("ss_user_pass") != null)) {
-          var password = sessionStorage.getItem("ss_user_pass");
-        } else {
-					return false;
-				}
-				
-				try {
-            //Connect actual user to the chat
-            connection = new Strophe.Connection(BOSH_SERVICE);
-            connection.connect(user_jid, password, onConnect);
-        } catch (err) {
-            //"Handle errors"
-						return false;
-        }
+		var user_jid = '<%=current_user.slug%>'+"@"+domain;
+		var sound_path = "/assets/audio/chat/onMessage";
 
-				return true;
-      <%end%>
-		}
 
 		$(document).ready(function () {	
-			if (connectToServer(null)==false){
-				refreshChatWindow();
-			}
-			initialTimer = setTimeout("updateChatWindow()", 15000);
-      initAudio();
+			
+			  if (authByCookie()){
+					if (connectToServerWithCookie()==false){
+	          refreshChatWindow();
+	        }
+				} else {
+					if (connectToServerWithPassword(null)==false){
+	          refreshChatWindow();
+	        }
+				}
+				
+				initialTimer = setTimeout("updateChatWindow()", 15000);
+	      initAudio();
+				
 		});
 		
 	</script>

data/presence/app/views/xmpp/_chat_connecting.html.erb

@@ -2,7 +2,7 @@
         <div class="header">
           <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
           <div class="header_text">
-            Chat Connecting
+            <%=t('chat.connecting')%>
           </div>
         </div>
       </div>

data/presence/app/views/xmpp/_chat_contacts.html.erb

@@ -4,17 +4,17 @@
 		    <div class="header">
 		      <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
 		      <div class="header_text">
-		        Chat
+		        <%=t('chat.title')%>
 		      </div>
 		    </div>
 				
 				<div id="status" class="dropdown">
-			    <dt><a href=""><span>Establecer estado</span></a></dt>
+			    <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
 			    <dd>
 			        <ul>
-					      <li><a href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> Disponible <span class="value">chat</span></a></li>
-					      <li><a href="#" class="option"><img class="flag" src="assets/status/away.png" alt=""/> Ausente <span class="value">away</span></a></li>
-					      <li><a href="#" class="option"><img class="flag" src="assets/status/dnd.png" alt=""/> No molestar <span class="value">dnd</span></a></li>
+					      <li><a href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">chat</span></a></li>
+					      <li><a href="#" class="option"><img class="flag" src="assets/status/away.png" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
+					      <li><a href="#" class="option"><img class="flag" src="assets/status/dnd.png" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
 			        </ul>
 			    </dd>
         </div>
@@ -30,7 +30,7 @@
 								<a title='<%=contact.name%>' class="presence_user_link" width="28">
 								  <%=image_tag(contact.logo.url, :alt => contact.name , :size => "28x28")%>
 									<% if contact.user.status %>
-									<%=image_tag("status/" + contact.user.status + ".png", :class => "presence_status") %></a>
+									  <%=image_tag("status/" + contact.user.status + ".png", :class => "presence_status") %></a>
 									<% end %>
 								</a>
               </div>

data/presence/app/views/xmpp/_chat_off.html.erb

@@ -1,18 +1,32 @@
      <script type="text/javascript">
-        $(document).ready(function () { 			
-		      if ((window.sessionStorage) && (sessionStorage.getItem("ss_user_pass") != null)) {
-		        $("#passwordFormChat").hide();
-		      } else {
-		        $("#passwordFormChat").show();
-		      }
+        $(document).ready(function () {
 					
-		      $('.connectChatButton').bind('click', function () {
-		        connectToServer($('#user_password').val());
-		      });
-					
-					$('.storePass').bind('click', function () {
-            storePassword();
-          });
+					if (authByCookie()){
+					  //Authentication by cookie
+            
+            $("#passwordFormChat").hide();
+            $('.connectChatButton').bind('click', function () {
+              connectToServerWithCookie();
+            });
+            
+					} else {
+						//Authentication by password
+            
+            if ((window.sessionStorage) && (sessionStorage.getItem("ss_user_pass") != null)) {
+              $("#passwordFormChat").hide();
+            } else {
+              $("#passwordFormChat").show();
+            }
+            
+            $('.connectChatButton').bind('click', function () {
+              connectToServerWithPassword($('#user_password').val());
+            });
+          
+            $('.storePass').bind('click', function () {
+              storePassword();
+            });
+						
+					}
 					
         });
       </script>
@@ -21,14 +35,14 @@
         <div class="header">
           <%=image_tag("btn/btn_friend.png", :class => "header_icon")%>
           <div class="header_text">
-            Chat Disconnected
+            <%=t('chat.disconnected')%>
           </div>
         </div>
       </div>
   
       <div class="chat_off">
       	<div id="passwordFormChat">
-      	  <label for="user_password" class="chatPasswordTitle">Password</label>
+      	  <label for="user_password" class="chatPasswordTitle"><%=t('chat.password')%></label>
           <input id="user_password" class="chat_password" type="password"></input>
 				</div>
 				<input class="connectChatButton storePass" value="Connect">

data/presence/app/views/xmpp/index.html

@@ -12,7 +12,6 @@
 			
 			<p> <a href="/xmpp4r_test">Test</a></p>
 			<p> <a href="/active_users">Usuarios conectados al servidor XMPP</a></p>
-			<p> <a href="/chat">Chat</a></p>
 			
     </div>
   </body>

data/presence/config/locales/en.yml

@@ -0,0 +1,11 @@
+en:
+  chat:
+    connecting: "Chat Connecting"
+    disconnected: "Chat Disconnected"
+    title: "Chat"
+    password: "Password"
+    status: 
+      choose: "Choose status"
+      available: "Available"
+      away: "Away"
+      dnd: "Busy"

data/presence/config/locales/es.yml

@@ -0,0 +1,11 @@
+es:
+  chat:
+    connecting: "Chat Conectando"
+    disconnected: "Chat Desconectado"
+    title: "Chat"
+    password: "Contraseña"
+    status:
+      choose: "Establecer estado"
+      available: "Disponible"
+      away: "Ausente"
+      dnd: "No molestar"

data/presence/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/presence/ejabberd/conf/ssconfig_example.cfg

@@ -15,6 +15,8 @@ scripts_path=/my_scripts_path
 
 #API REST
 auth_api=http://localhost/users/sign_in
+auth_by_cookie_api=http://localhost/api/me
+cookie_name=_rails_server_cookie
 set_connection_api=http://localhost/xmpp/setConnection
 unset_connection_api=http://localhost/xmpp/unsetConnection
 reset_connection_api=http://localhost/xmpp/resetConnection
@@ -30,3 +32,7 @@ ss_password=password
 
 #Ejabberd Server Password
 ejabberd_password=password
+
+#Emanagement configuration
+users_require_sudo=user1,user2,...
+verbose=false

data/presence/ejabberd/ejabberd_scripts/authentication_script

@@ -2,6 +2,8 @@
 
 require 'logger'
 require 'rest_client'
+require 'rexml/document'
+include REXML
 
 $stdout.sync = true
 $stdin.sync = true
@@ -30,6 +32,8 @@ def getOption(option)
 end
 
 $accessUrl = getOption("auth_api=")
+$accessByCookieUrl = getOption("auth_by_cookie_api=")
+$cookie_name = getOption("cookie_name=")
 $sslogin = getOption("ss_login=")
 $sspass = getOption("ss_password=")
 
@@ -75,6 +79,45 @@ def auth(username, password)
 end
 
 
+def authByCookie(username, cookie)
+  begin
+    response = RestClient.get $accessByCookieUrl, :cookies => {:"#{$cookie_name}" => cookie}
+    doc = REXML::Document.new(response.body)
+
+    slug = ""
+    doc.elements.each('user/slug') do |ele|
+      slug = ele.text
+    end
+
+    if username != "" and username == slug
+	return true
+    else
+	return false
+    end  
+
+  rescue => e
+    
+    unless e.class.name == "RestClient::Unauthorized" and e.message == "401 Unauthorized"
+	$logger.error "#{Process.pid}: Exception in authByCookie(username, cookie)"
+    	$logger.error "#{Process.pid}: #{e.class.name}: #{e.message}"
+    end
+
+    return false
+  end
+end
+
+
+def validateParameters(username,domain,password)
+	if !username or !password or !domain
+		return false
+	end
+	if (username.gsub(/\s+/, "")=="") or (password.gsub(/\s+/, "")=="") or (domain.gsub(/\s+/, "")=="")
+		return false
+	end
+	return true
+end
+
+
 loop do
   begin
     $stdin.eof? # wait for input
@@ -91,12 +134,25 @@ loop do
     
     when "auth"
       $logger.info "#{Process.pid}: Authenticating #{data[0]}@#{data[1]}"
-      #$logger.info "#{Process.pid}: With password #{data[2]}"
-      #password = data[2]
-      
-      #Authorization condition for LOGIN
-      auth(data[0], data[2])
       
+      #Parameters basic validation: validateParameters(username,domain,password)
+      if !validateParameters(data[0],data[1],data[2])
+	$logger.info "#{Process.pid}: Invalid parameters"	
+	return false
+      end
+
+      #Select authorization condition for LOGIN
+      #Authentication methods: user/password or user/cookie
+      password = data[2]	
+      if password.split(">>")[0]=="AuthenticationByCookie"
+	cookie = password.split(">>")[1]
+	$logger.info "#{Process.pid}: With username #{data[0]} and cookie #{cookie}"      	
+	authByCookie(data[0], cookie)
+      else
+	$logger.info "#{Process.pid}: With username #{data[0]} and password ******"
+	#$logger.info "#{Process.pid}: With username #{data[0]} and password #{data[2]}"
+      	auth(data[0], data[2])
+      end
       
     when "isuser"