social_stream-presence 0.1.4 → 0.1.6

data/ejabberd/mod_sspresence/mod_sspresence.erl

@@ -52,8 +52,8 @@ 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]),
-    Login_path = string:concat(getOptionValue("scripts_path="), "/set_connection_script "),
-    os:cmd(string:join([Login_path, User ], " ")),
+    Rest_api_script_path = string:concat(getOptionValue("scripts_path="), "/rest_api_client_script "),
+    os:cmd(string:join([Rest_api_script_path, "setConnection", User ], " ")),
     ok.
 
 on_remove_connection(_SID, _JID, _SessionInfo) ->
@@ -62,8 +62,8 @@ on_remove_connection(_SID, _JID, _SessionInfo) ->
     Connected = isConnected(User),
     case Connected of
 	true -> ok;
-	_ -> Logout_path = string:concat(getOptionValue("scripts_path="), "/unset_connection_script "),
-             os:cmd(string:join([Logout_path, User ], " "))
+	_ -> Rest_api_script_path = string:concat(getOptionValue("scripts_path="), "/rest_api_client_script "),
+             os:cmd(string:join([Rest_api_script_path, "unsetConnection", User ], " "))
     end,
     ok.
 
@@ -73,19 +73,19 @@ on_presence(User, _Server, _Resource, Packet) ->
 
     case Type of
 	"presence" -> Status = getStatusFromSubel(Subel),
-		      Presence_path = string:concat(getOptionValue("scripts_path="), "/set_presence_script "),
+		      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([Presence_path, User , Status], " "));
+    		      os:cmd(string:join([Rest_api_script_path, "setPresence", User , Status], " "));
 	_ -> ok
     end,
     ok.
 
 on_unset_presence(User, _Server, _Resource, _Status) ->
     ?INFO_MSG("mod_sspresence: on_unset_presence (~p)", [User]),
-    _UPresence_path = string:concat(getOptionValue("scripts_path="), "/unset_presence_script "),
+    _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([UPresence_path, User , Status], " "));
+    %%os:cmd(string:join([_Rest_api_script_path, "unsetPresence", User , Status], " ")),
     ok.
 
 on_packet_send(_From, _To, {xmlelement, Type, _Attr, _Subel} = _Packet) ->
@@ -185,8 +185,8 @@ end.
 
 %Reset all connections
 reset_connections() ->
-	Reset_path = string:concat(getOptionValue("scripts_path="), "/reset_connection_script "),
-	os:cmd(Reset_path),
+	Rest_api_script_path = string:concat(getOptionValue("scripts_path="), "/rest_api_client_script "),
+	os:cmd(string:join([Rest_api_script_path, "resetConnection"], " ")),
 ok.
 
 

data/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 = <%= SecureRandom.hex(64).inspect %>
+  config.xmpp_server_password = <%= SecureRandom.hex(16).inspect %>
+  #Uncomment to enable REST API Security
+  #config.secure_rest_api = true
   #Remote or local mode
   config.remote_xmpp_server = false
   #Scripts path to execute ejabberd scripts: local or remote
   config.scripts_path = "/scripts_path"
   #Ejabberd module path in the xmpp server
-  config.ejabberd_module_path = "/lib/ejabberd/ebin"
+  config.ejabberd_module_path = "/usr/lib/ejabberd/ebin"
   #Uncomment to enable Social Stream Presence
   #config.enable = true
   
@@ -27,6 +29,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 = <%= SecureRandom.hex(64).inspect %>  
+  config.password = <%= SecureRandom.hex(32).inspect %>  
 
-end
+end

data/lib/social_stream-presence.rb

@@ -20,6 +20,7 @@ module SocialStream
     mattr_accessor :bosh_service
     mattr_accessor :auth_method
     mattr_accessor :xmpp_server_password
+    mattr_accessor :secure_rest_api
     mattr_accessor :remote_xmpp_server
     mattr_accessor :scripts_path
     mattr_accessor :ejabberd_module_path
@@ -34,6 +35,7 @@ module SocialStream
 
     @@auth_method = "cookie"
     @@remote_xmpp_server = false
+    @@secure_rest_api = false
     @@enable = false
     
     class << self

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   end
 end

data/lib/social_stream/presence/xmpp_server_order.rb

@@ -5,6 +5,9 @@ require 'xmpp4r/client'
 require 'xmpp4r/message'
 require 'net/ssh'
 require 'net/sftp'
+require 'openssl'
+require 'digest/md5'
+
 
 module SocialStream
   module Presence
@@ -111,18 +114,18 @@ module SocialStream
           
           #Installation methods
           
-          def copyFolder(oPath,dPath)
+          def copyFolderToXmppServer(oPath,dPath)
             if SocialStream::Presence.remote_xmpp_server
               #Remote mode
-              copyRemoteFolder(oPath,dPath)
+              copyFolderToXmppServerRemote(oPath,dPath)
             else
               #Local mode
-              SocialStream::Presence::XmppServerOrder::executeCommand("cp -r " + oPath + "/* " + dPath)
+              executeCommand("cp -r " + oPath + "/* " + dPath)
             end
           end
           
           
-          def copyRemoteFolder(localPath,remotePath)
+          def copyFolderToXmppServerRemote(localPath,remotePath)
             begin
               if SocialStream::Presence.ssh_password             
                
@@ -150,7 +153,15 @@ module SocialStream
           end
           
           
-          def recursiveCopyFolder(localPath,remotePath,sftp) 
+          def recursiveCopyFolder(localPath,remotePath,sftp)
+            
+            #Check if localPath is a file
+            if File.file?(localPath) and File.file?(remotePath)
+              puts "Copy files..."
+              sftp.upload(localPath, remotePath)
+              return
+            end
+            
             # Create directory if not exits
             sftp.mkdir(remotePath)
             # Upload files to the remote host        
@@ -172,6 +183,7 @@ 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])
             
@@ -220,6 +232,53 @@ module SocialStream
             end
           end
           
+          def generateRSAKeys(keysPath)
+            
+            unless File.directory?(keysPath)
+              return "Keys path not exists"
+            end
+            
+            web_public_key_path=keysPath+"/web_rsa_key_public.pem"
+            web_private_key_path=keysPath+"/web_rsa_key_private.pem"
+            xmpp_public_key_path=keysPath+"/xmpp_rsa_key_public.pem"
+            xmpp_private_key_path=keysPath+"/xmpp_rsa_key_private.pem"
+            
+            # .generate creates an object containing both keys
+            web_rsa_key = OpenSSL::PKey::RSA.generate( 1024 )
+            xmpp_rsa_key = OpenSSL::PKey::RSA.generate( 1024 )
+            
+            #Write keys as PEM's
+
+            #Public Key
+            web_rsa_key_public = web_rsa_key.public_key
+            xmpp_rsa_key_public = xmpp_rsa_key.public_key
+            output_public = File.new(web_public_key_path, "w")
+            output_public.puts web_rsa_key_public
+            output_public.close
+            output_public = File.new(xmpp_public_key_path, "w")
+            output_public.puts xmpp_rsa_key_public
+            output_public.close
+            puts "New Web Server public key stored in #{web_public_key_path}\n"
+            #puts "New Web Server public key:\n#{web_rsa_key_public}\n"
+            puts "New Xmpp Server public key stored in #{xmpp_public_key_path}\n"
+            #puts "New Xmpp Server public key:\n#{xmpp_rsa_key_public}\n"
+                       
+            #Private Key
+            web_rsa_key_private = web_rsa_key.to_pem
+            xmpp_rsa_key_private = xmpp_rsa_key.to_pem
+            output_private = File.new(web_private_key_path, "w")
+            output_private.puts web_rsa_key_private
+            output_private.close
+            output_private = File.new(xmpp_private_key_path, "w")
+            output_private.puts xmpp_rsa_key_private
+            output_private.close
+            puts "New Web Server private key stored in #{web_private_key_path}\n"
+            #puts "New Web Server private key:\n#{web_rsa_key_private}\n"
+            puts "New Xmpp Server private key stored in #{xmpp_private_key_path}\n"
+            #puts "New Xmpp Server private key:\n#{xmpp_rsa_key_private}\n"
+            
+            puts "Finish"
+          end
           
           #Execution commands manage  
         
@@ -264,38 +323,56 @@ module SocialStream
             return output
           end
         
+          def executeLocalCommand(command)
+            puts "Executing " + parsingCommand(command)
+            return executeLocalCommands([command])
+          end
+        
           def executeLocalCommands(commands)
-            output="No command received";
+            if commands.empty?
+              return "No command received";
+            end
+            output=""
             commands.each do |command|
-                output = %x[#{command}];
+                response = %x[#{command}]
+                output = output + "\n" + response;
             end
             return output
           end
         
           def executeRemoteCommands(commands)
-            output="No command received";
+            if commands.empty?
+              return "No command received";
+            end
             
             begin
+              output="";
               if SocialStream::Presence.ssh_password
                 Net::SSH.start( SocialStream::Presence.ssh_domain, SocialStream::Presence.ssh_user, :password => SocialStream::Presence.ssh_password, :auth_methods => ["password"]) do |session|
                   commands.each do |command|
-                    output = session.exec!(command)
+                    response = session.exec!(command)
+                    if response != nil
+                      output = output + "\n" + response
+                    end
                   end
                 end
               else
                 #SSH with authentication key instead of password
                 Net::SSH.start( SocialStream::Presence.ssh_domain, SocialStream::Presence.ssh_user) do |session|
                   commands.each do |command|
-                    output = session.exec!(command)
+                    response = session.exec!(command)
+                    if response != nil
+                      output = output + "\n" + response
+                    end
                   end
                 end
               end
             rescue Exception => e
               case e
                 when Net::SSH::AuthenticationFailed
-                  output = "AuthenticationFailed on remote access"
+                  return "ERROR: AuthenticationFailed on remote access"
                 else
-                  output = "Unknown exception in executeRemoteCommands method: #{e.to_s}"
+                  return "ERROR: Unknown exception in executeRemoteCommands method: #{e.to_s}"
               end
             end  
  
@@ -303,6 +380,97 @@ module SocialStream
           end
 
         
+          #Authorization methods
+          def authorization(params)
+            case SocialStream::Presence.secure_rest_api
+            when true
+              #Authorization using asymmetric RSA keys
+              begin
+                presence_root = File.expand_path("../../../../", __FILE__)
+                xmpp_public_key_path = presence_root + "/rsa_keys/xmpp_rsa_key_public.pem";
+                xmpp_public_key = OpenSSL::PKey::RSA.new(File.read(xmpp_public_key_path))
+                
+                stamp = xmpp_public_key.public_decrypt( params[:password] )
+               
+                #stamp = password#####timestamp#####hash
+                stampParams=stamp.split("#####")
+                password = stampParams[0]
+                timestamp = stampParams[1]
+                hash = stampParams[2]
+                
+                myHash = calculateHash(params)
+                
+                #Evaluating Hash
+                if (myHash != hash)
+                  #Hash not valid
+                  return false
+                end
+                
+                #Evaluating Timestamp
+                if ((Time.now.utc - Time.parse(timestamp).utc).to_int > (10*60))
+                  #Timestamp not valid
+                  return false
+                end
+
+                #Evaluating Password
+                return ( password == SocialStream::Presence.xmpp_server_password )
+              rescue
+                return false
+              end
+            else
+              #Basic authorization
+              return ( params[:password] and params[:password] == SocialStream::Presence.xmpp_server_password )
+            end
+          end
+          
+          
+          def calculateHash(params)
+            if params
+              params.delete("password")
+              params.delete("controller")
+              params.delete("action")
+            else
+              params = {};
+            end
+            
+            hash = "";
+            params.each do |key,value|
+              hash = hash + key.to_s + value.to_s
+            end
+            return Digest::MD5.hexdigest(hash)
+          end
+        
+        
+          def decryptParams(params)     
+            case SocialStream::Presence.secure_rest_api
+            when true
+              #Secure Mode
+              begin
+                if params[:encrypted_params]
+                  presence_root = File.expand_path("../../../../", __FILE__)
+                  web_private_key_path = presence_root + "/rsa_keys/web_rsa_key_private.pem";
+                  private_key = OpenSSL::PKey::RSA.new(File.read(web_private_key_path))
+                  
+                  clear_params_hash_string = private_key.private_decrypt( params[:encrypted_params] )
+                  clear_params = getHashFromHashString(clear_params_hash_string)
+                  params.delete("encrypted_params")
+                  
+                  clear_params.each do |key,value|
+                    params[key] = value
+                  end
+                end
+              
+                return params
+              rescue
+                return "Error in function: decryptParam(param)"
+              end
+              
+            else
+              #Non Secure Mode
+              return params
+            end
+          end
+        
         
          #Help methods
          
@@ -316,6 +484,16 @@ module SocialStream
               #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
+          
+          def getHashFromHashString(hashString)
+            hash={}
+            hashString[1..-2].split(/, /).each {|entry|
+              entryMap=entry.split(/=>/); 
+              value_str = entryMap[1]; 
+              hash[entryMap[0].strip[1..-1].to_sym] = value_str.nil? ? "" : value_str.strip[1..-2]
+            }
+            return hash
+          end
         
          #Xmpp client manage methods
           

data/lib/tasks/presence/installer.rake

@@ -1,6 +1,6 @@
 namespace :presence do
   desc 'Copy ejabberd files to the xmpp server and write configuration files'
-  task :install => [ 'presence:install:copy_xmpp_server_files', 'presence:install_xmpp_server' , 'presence:autoconfigure_xmpp_server' ]
+  task :install => [ 'presence:install:copy_xmpp_server_files', 'presence:install_xmpp_server' , 'presence:autoconfigure_xmpp_server' , 'presence:generate_RSA_keys' ]
 
   namespace :install do
 
@@ -15,7 +15,7 @@ namespace :presence do
       #Cleaning dpath
       SocialStream::Presence::XmppServerOrder::executeCommands(["rm -r " + dpath,"mkdir -p " + dpath])
       #Copy folders
-      SocialStream::Presence::XmppServerOrder::copyFolder(opath,dpath)
+      SocialStream::Presence::XmppServerOrder::copyFolderToXmppServer(opath,dpath)
       
       puts "Social Stream Ejabberd files copied to " + dpath + " in Xmpp Server"
       puts "Copy_xmpp_server_files: Task complete"
@@ -63,9 +63,12 @@ namespace :presence do
         commands << "echo " + password + " | sudo -S " + SocialStream::Presence.scripts_path + "/sstream_ejabberd_files/installer.sh \"ejabberd_module_path=" + SocialStream::Presence.ejabberd_module_path + "\" \"scripts_path=" + SocialStream::Presence.scripts_path + "\" \"" + options + "\""
         
         #Execution order
-        output = SocialStream::Presence::XmppServerOrder::executeCommands(commands)
-        
+        output = SocialStream::Presence::XmppServerOrder::executeCommands(commands) 
         puts output
+        
+        #Generate RSA Keys
+        Rake::Task["presence:install:generate_RSA_keys"].execute
+        
         puts "Installation complete"
     end
     
@@ -96,5 +99,36 @@ namespace :presence do
       puts "Autoconfigure complete"
     end
     
+    
+    desc "Generate and distribute RSA Keys"
+    task :generate_RSA_keys => :environment do
+      puts "Starting presence:generate_RSA_keys"
+      
+      presence_root = File.expand_path("../../../../", __FILE__)
+      webKeysPath = presence_root + "/rsa_keys";
+      xmppKeysPath = SocialStream::Presence.scripts_path + "/rsa_keys";
+      
+      puts "Cleaning previous keys"
+      #Cleaning Keys path
+      SocialStream::Presence::XmppServerOrder::executeLocalCommand("rm -r " + webKeysPath)
+      SocialStream::Presence::XmppServerOrder::executeLocalCommand("mkdir -p " + webKeysPath)
+      SocialStream::Presence::XmppServerOrder::executeCommands(["rm -r " + xmppKeysPath,"mkdir -p " + xmppKeysPath])
+      
+      puts "Generating new keys"
+      #Generating RSA Keys
+      SocialStream::Presence::XmppServerOrder::generateRSAKeys(webKeysPath)
+      
+      puts "Copy keys to the Xmpp Server"
+      #Copy Xmpp Keys to the Xmpp Server
+      SocialStream::Presence::XmppServerOrder::copyFolderToXmppServer(webKeysPath,xmppKeysPath)
+      
+      #Remove not own private keys
+      puts "Removing not own private keys"
+      SocialStream::Presence::XmppServerOrder::executeLocalCommand("rm -r " + webKeysPath + "/xmpp_rsa_key_private.pem")
+      SocialStream::Presence::XmppServerOrder::executeCommands(["rm -r " + xmppKeysPath + "/web_rsa_key_private.pem"])  
+
+      puts "Generate_RSA_keys: Task complete"
+    end
+    
   end
 end