social_stream 0.15.4 → 0.15.5

data/presence/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

data/social_stream.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.7')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.8')
   s.add_runtime_dependency('social_stream-documents', '~> 0.5.2')
   s.add_runtime_dependency('social_stream-events', '~> 0.2.0')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.0.4')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.0.5')
  
   # Development Gem dependencies
   #

data/spec/support/optimizations.rb

@@ -0,0 +1,4 @@
+# http://blog.plataformatec.com.br/2011/12/three-tips-to-improve-the-performance-of-your-test-suite/
+#
+Devise.stretches = 1
+Rails.logger.level = 4

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 15
-  - 4
-  version: 0.15.4
+  - 5
+  version: 0.15.5
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-09 00:00:00 +01:00
+date: 2011-12-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 39
         segments: 
         - 0
         - 10
-        - 7
-        version: 0.10.7
+        - 8
+        version: 0.10.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -75,12 +75,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 0
-        - 4
-        version: 0.0.4
+        - 5
+        version: 0.0.5
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -1062,6 +1062,7 @@ files:
 - linkser/app/controllers/links_controller.rb
 - linkser/app/controllers/linkser_controller.rb
 - linkser/app/models/link.rb
+- linkser/app/views/links/_error.html.erb
 - linkser/app/views/links/_link.html.erb
 - linkser/app/views/links/_link_preview.html.erb
 - linkser/app/views/links/create.js.erb
@@ -1223,12 +1224,9 @@ files:
 - presence/ejabberd/ejabberd_scripts/development_scripts/stop_ejabberd.sh
 - presence/ejabberd/ejabberd_scripts/emanagement
 - presence/ejabberd/ejabberd_scripts/reset_connection_script
-- presence/ejabberd/ejabberd_scripts/set_connection_script
-- presence/ejabberd/ejabberd_scripts/set_presence_script
+- presence/ejabberd/ejabberd_scripts/rest_api_client_script
 - presence/ejabberd/ejabberd_scripts/set_script_header.sh
 - presence/ejabberd/ejabberd_scripts/synchronize_presence_script
-- presence/ejabberd/ejabberd_scripts/unset_connection_script
-- presence/ejabberd/ejabberd_scripts/unset_presence_script
 - presence/ejabberd/installer.sh
 - presence/ejabberd/mod_admin_extra/mod_admin_extra.beam
 - presence/ejabberd/mod_admin_extra/mod_admin_extra.erl
@@ -1357,6 +1355,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/components.rb
 - spec/support/db.rb
+- spec/support/optimizations.rb
 has_rdoc: true
 homepage: http://social-stream.dit.upm.es/
 licenses: []

data/presence/ejabberd/ejabberd_scripts/set_connection_script

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-#Set Connection Script
-#@author Aldo
-
-require 'logger'
-require 'rest_client'
-
-path = "/var/log/ejabberd/scripts.log"
-file = File.open(path, File::WRONLY | File::APPEND | File::CREAT)
-file.sync = true
-$logger = Logger.new(file)
-$logger.level = Logger::DEBUG
-
-def getOption(option)
-  File.open('/etc/ejabberd/ssconfig.cfg', 'r') do |f1|  
-    while line = f1.gets  
-      line = line.gsub(/\n/,'')
-      if line.match(/^#/)
-        #Comments
-      elsif line.match(/^#{option}/)
-        return line.gsub(/#{option}/,'')
-      end  
-    end  
-  end
-  return "Undefined"
-end
-
-$url = "http://" + getOption("web_domain=") + "/xmpp/setConnection"
-$pass = getOption("ejabberd_password=")
-
-
-def log(text)
-	$logger.info "Set Connection Script: " + text
-end
-
-def setConnection(username)
-  log("setConnection(#{username})")
-  RestClient.post($url, :name => username, :password => $pass)
-  return true
-
-  rescue RestClient::Exception
-    log("RestClient::Exception with setConnection(#{username})")
-end
-
-
-setConnection(ARGV[0])
-
-

data/presence/ejabberd/ejabberd_scripts/set_presence_script

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-#Set Presence Script
-#@author Aldo
-
-require 'logger'
-require 'rest_client'
-
-path = "/var/log/ejabberd/scripts.log"
-file = File.open(path, File::WRONLY | File::APPEND | File::CREAT)
-file.sync = true
-$logger = Logger.new(file)
-$logger.level = Logger::DEBUG
-
-def getOption(option)
-  File.open('/etc/ejabberd/ssconfig.cfg', 'r') do |f1|  
-    while line = f1.gets  
-      line = line.gsub(/\n/,'')
-      if line.match(/^#/)
-        #Comments
-      elsif line.match(/^#{option}/)
-        return line.gsub(/#{option}/,'')
-      end  
-    end  
-  end
-  return "Undefined"
-end
-
-$url = "http://" + getOption("web_domain=") + "/xmpp/setPresence"
-$pass = getOption("ejabberd_password=")
-
-
-def log(text)
-	$logger.info "Set Presence Script: " + text
-end
-
-def setPresence(username,status)
-  log("setPresence(#{username},#{status})")
-  RestClient.post($url, :name => username, :status => status, :password => $pass)
-  return true
-
-  rescue RestClient::Exception
-    log("RestClient::Exception with setPresence(#{username})")
-end
-
-
-setPresence(ARGV[0],ARGV[1])
-
-

data/presence/ejabberd/ejabberd_scripts/unset_connection_script

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-#Unset Connection Script
-#@author Aldo
-
-require 'logger'
-require 'rest_client'
-
-path = "/var/log/ejabberd/scripts.log"
-file = File.open(path, File::WRONLY | File::APPEND | File::CREAT)
-file.sync = true
-$logger = Logger.new(file)
-$logger.level = Logger::DEBUG
-
-def getOption(option)
-  File.open('/etc/ejabberd/ssconfig.cfg', 'r') do |f1|  
-    while line = f1.gets  
-      line = line.gsub(/\n/,'')
-      if line.match(/^#/)
-        #Comments
-      elsif line.match(/^#{option}/)
-        return line.gsub(/#{option}/,'')
-      end  
-    end  
-  end
-  return "Undefined"
-end
-
-$url = "http://" + getOption("web_domain=") + "/xmpp/unsetConnection"
-$pass = getOption("ejabberd_password=")
-
-
-def log(text)
-	$logger.info "Unset Connection: " + text
-end
-
-def unsetConnection(username)
-  log("unsetConnection(#{username})")
-  RestClient.post($url, :name => username, :password => $pass)
-  return true
-
-  rescue RestClient::Exception
-    log("RestClient::Exception with unsetConnection(#{username})")
-end
-
-
-unsetConnection(ARGV[0])
-
-

data/presence/ejabberd/ejabberd_scripts/unset_presence_script

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-#Unset Presence Script
-#@author Aldo
-
-require 'logger'
-require 'rest_client'
-
-path = "/var/log/ejabberd/scripts.log"
-file = File.open(path, File::WRONLY | File::APPEND | File::CREAT)
-file.sync = true
-$logger = Logger.new(file)
-$logger.level = Logger::DEBUG
-
-def getOption(option)
-  File.open('/etc/ejabberd/ssconfig.cfg', 'r') do |f1|  
-    while line = f1.gets  
-      line = line.gsub(/\n/,'')
-      if line.match(/^#/)
-        #Comments
-      elsif line.match(/^#{option}/)
-        return line.gsub(/#{option}/,'')
-      end  
-    end  
-  end
-  return "Undefined"
-end
-
-$url = "http://" + getOption("web_domain=") + "/xmpp/unsetPresence"
-$pass = getOption("ejabberd_password=")
-
-
-def log(text)
-	$logger.info "Unset Presence Script: " + text
-end
-
-def unsetPresence(username)
-  log("unsetPresence(#{username})")
-  RestClient.post($url, :name => username, :password => $pass)
-  return true
-
-  rescue RestClient::Exception
-    log("RestClient::Exception with unsetPresence(#{username})")
-end
-
-
-unsetPresence(ARGV[0])
-
-