social_stream-presence 0.1.6 → 0.1.7

data/ejabberd/ejabberd_scripts/reset_connection_script

@@ -6,8 +6,6 @@
 
 require 'logger'
 require 'rest_client'
-require 'openssl'
-require 'digest/md5'
 
 
 path = "/var/log/ejabberd/scripts.log"
@@ -34,7 +32,7 @@ end
 $secure_rest_api = getOption("secure_rest_api=")
 $pass = getOption("ejabberd_password=")
 $scripts_path = getOption("scripts_path=")
-$script_title = "Reset Connection script"
+$script_title = "Reset Connection Script"
 
 
 def log(title,text)
@@ -194,6 +192,9 @@ def sendHttpRequest(url,params,encrypted_params)
 
 
     if $secure_rest_api == "true"
+	#Require libraries
+	require 'openssl'
+
 	xmpp_private_key_path = $scripts_path + "/rsa_keys/xmpp_rsa_key_private.pem";
     	web_public_key_path = $scripts_path + "/rsa_keys/web_rsa_key_public.pem";
     	xmpp_private_key = OpenSSL::PKey::RSA.new(File.read(xmpp_private_key_path))
@@ -241,6 +242,8 @@ end
 
 
 def calculateHash(request_params)
+	require 'digest/md5'
+
 	unless request_params
 		request_params = {};
 	end

data/ejabberd/ejabberd_scripts/rest_api_client_script

@@ -6,8 +6,6 @@
 
 require 'logger'
 require 'rest_client'
-require 'openssl'
-require 'digest/md5'
 
 
 path = "/var/log/ejabberd/scripts.log"
@@ -194,6 +192,9 @@ def sendHttpRequest(url,params,encrypted_params)
 
 
     if $secure_rest_api == "true"
+	#Require libraries
+	require 'openssl'
+
 	xmpp_private_key_path = $scripts_path + "/rsa_keys/xmpp_rsa_key_private.pem";
     	web_public_key_path = $scripts_path + "/rsa_keys/web_rsa_key_public.pem";
     	xmpp_private_key = OpenSSL::PKey::RSA.new(File.read(xmpp_private_key_path))
@@ -241,6 +242,8 @@ end
 
 
 def calculateHash(request_params)
+	require 'digest/md5'
+
 	unless request_params
 		request_params = {};
 	end

data/ejabberd/ejabberd_scripts/synchronize_presence_script

@@ -6,8 +6,6 @@
 
 require 'logger'
 require 'rest_client'
-require 'openssl'
-require 'digest/md5'
 
 
 path = "/var/log/ejabberd/scripts.log"
@@ -34,7 +32,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 = "Synchronize Presence Script"
 
 
 def log(title,text)
@@ -194,6 +192,9 @@ def sendHttpRequest(url,params,encrypted_params)
 
 
     if $secure_rest_api == "true"
+	#Require libraries
+	require 'openssl'
+
 	xmpp_private_key_path = $scripts_path + "/rsa_keys/xmpp_rsa_key_private.pem";
     	web_public_key_path = $scripts_path + "/rsa_keys/web_rsa_key_public.pem";
     	xmpp_private_key = OpenSSL::PKey::RSA.new(File.read(xmpp_private_key_path))
@@ -241,6 +242,8 @@ end
 
 
 def calculateHash(request_params)
+	require 'digest/md5'
+
 	unless request_params
 		request_params = {};
 	end

data/lib/social_stream/presence/version.rb

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

data/lib/social_stream/presence/xmpp_server_order.rb

@@ -5,8 +5,6 @@ require 'xmpp4r/client'
 require 'xmpp4r/message'
 require 'net/ssh'
 require 'net/sftp'
-require 'openssl'
-require 'digest/md5'
 
 
 module SocialStream
@@ -238,6 +236,9 @@ module SocialStream
               return "Keys path not exists"
             end
             
+            #Require libraries
+            require 'openssl'
+
             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"
@@ -386,6 +387,9 @@ module SocialStream
             when true
               #Authorization using asymmetric RSA keys
               begin
+                #Require libraries
+                require 'openssl'
+                
                 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))
@@ -425,6 +429,9 @@ module SocialStream
           
           
           def calculateHash(params)
+            #Require libraries
+            require 'digest/md5'
+            
             if params
               params.delete("password")
               params.delete("controller")
@@ -446,6 +453,9 @@ module SocialStream
             when true
               #Secure Mode
               begin
+                #Require libraries
+                require 'openssl'
+                
                 if params[:encrypted_params]
                   presence_root = File.expand_path("../../../../", __FILE__)
                   web_private_key_path = presence_root + "/rsa_keys/web_rsa_key_private.pem";

data/lib/tasks/presence/installer.rake

@@ -66,8 +66,10 @@ namespace :presence do
         output = SocialStream::Presence::XmppServerOrder::executeCommands(commands) 
         puts output
         
-        #Generate RSA Keys
-        Rake::Task["presence:install:generate_RSA_keys"].execute
+        if SocialStream::Presence.secure_rest_api
+          #Generate RSA Keys
+          Rake::Task["presence:install:generate_RSA_keys"].execute
+        end   
         
         puts "Installation complete"
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Aldo Gordillo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-13 00:00:00 +01:00
+date: 2011-12-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency