@@ -131,8 +131,8 @@ class WsChatController < WsController

             stripped_me = client.jid.strip.to_s

             stripped_to = Jabber::JID.new(message[:to]).strip!.to_s

             if can_save_conversation?(stripped_me, stripped_to, chat_id)

-                Rails.logger.debug ['saving send message', stripped_me]

-                History.save_message(stripped_me, stripped_me, message[:message], stripped_to, chat_id)

+                Rails.logger.debug ['saving sent message', stripped_me]

+                save_encrypted_message(message[:message], stripped_me, stripped_to, chat_id)

             end

             trigger_success message[:message]

@@ -237,9 +237,19 @@ class WsChatController < WsController

         page = message[:step]

         per_page = 10

-        trigger_failure unless find_client(me)

+        client = find_client(me)

+        trigger_failure unless client

         history = History.page_history(me, attendant || chat_id, page, per_page)

+

+        credentials = User.crendentials_for_token(session[:token])

+        found_account = credentials.detect do |c| c['jid'] == client.jid.strip.to_s end

+        user_pass = Security::decrypt(found_account['pass'], connection_store[:cipher_key], connection_store[:cipher_iv])

+

+        history.each do |record|

+            record['message'] = Security::decrypt(record['message'], Security::create_key_from_pass(user_pass), Rails.application.config.aes_iv)

+        end

+

         trigger_success history: history

     end

@@ -251,7 +261,7 @@ class WsChatController < WsController

         if can_save_conversation?(stripped_me, stripped_from, chat_id)

             Rails.logger.debug ['saving received message', stripped_me, chat_id]

-            History.save_message(stripped_me, stripped_from, body, stripped_from, chat_id)

+            save_encrypted_message(body, stripped_me, stripped_from, chat_id)

         end

         send_message 'app.chat.messageReceived',

@@ -293,4 +303,12 @@ class WsChatController < WsController

             contact =~ /^#{kick_stripped}/

         end

     end

+

+    def save_encrypted_message(message, stripped_me, stripped_to, chat_id)

+        credentials = User.crendentials_for_token(session[:token])

+        found_account = credentials.detect do |c| c['jid'] == stripped_me end

+        user_pass = Security::decrypt(found_account['pass'], connection_store[:cipher_key], connection_store[:cipher_iv])

+        encrypted_msg = Security::encrypt(message, user_pass, Rails.application.config.aes_iv)

+        History.save_message(stripped_me, stripped_me, encrypted_msg, stripped_to, chat_id)

+    end

 end

\ No newline at end of file

@@ -26,8 +26,8 @@ class WsRosterController < WsController

         initialize_storage()

         cookies = env['rack.request.cookie_hash'] # TODO: nahlasit bug na websocket-rails, lebo sa neda pristupit ku `cookies'

-        cipher_key = cookies['key']

-        cipher_iv = cookies['iv']

+        connection_store[:cipher_key] = cipher_key = cookies['key']

+        connection_store[:cipher_iv]  = cipher_iv  = cookies['iv']

         credentials = User.crendentials_for_token(session[:token])

@@ -3,13 +3,13 @@ require 'bcrypt'

 module Security

     mattr_reader :cipher_iv, :cipher_key

-    def self.encrypt(unencrypted_message, password = nil)

+    def self.encrypt(unencrypted_message, password = nil, iv = nil)

         cipher = OpenSSL::Cipher::Cipher.new('aes-256-cbc')

         cipher.encrypt()

         pass = password ? password : generate_token()

-        cipher.key = @@cipher_key = Digest::SHA1.hexdigest(pass)

-        cipher.iv  = @@cipher_iv  = cipher.random_iv

+        cipher.key = @@cipher_key = create_key_from_pass(pass)

+        cipher.iv  = @@cipher_iv  = iv || cipher.random_iv

         encrypted = cipher.update(unencrypted_message)

         encrypted << cipher.final

@@ -42,4 +42,8 @@ module Security

         cookies[:key] = @@cipher_key

         cookies[:iv]  = @@cipher_iv

     end

+

+    def self.create_key_from_pass(pass)

+        Digest::SHA1.hexdigest(pass)

+    end

 end

\ No newline at end of file

@@ -7,8 +7,12 @@

 if Rails.env == 'development'

     Xmpp::Application.config.secret_token = '48c49768f9ec3134de5f76e352f13bf8fd66258941sa5d489g4fhj8k4uk8499075975aaaef1c32be9d596120302e8e3f7b6200c207835463ecdbb6c1610705c2'

+    Xmpp::Application.config.aes_iv = "L\x18nm\\@0Wz/\x1C\xDB.gl\xA5"

+

 elsif Rails.env == 'test'

     Xmpp::Application.config.secret_token = '48c49768f9ec3134de5f76e352f13bf8fd66252d67f6d285c1c6de8457f0499075975aaaesdjfdsaf84dasf4das89f47d44hgf7yuuy35463ecdbb6c1610705c2'

+    Xmpp::Application.config.aes_iv = "\e\x90\xC6b\x1D\x96TO:\xD8\r(\xCB>\x01m"

 else

     Xmpp::Application.config.secret_token = '8as5dg8fd4s5f76e352f13bf8fd66289dsa41s4tyijk8uy494j4e8457f0499075975aaaef89asd4302e8e3f7b6200c207835463ecdbb6cugsadbfy31610705c2'

+    Xmpp::Application.config.aes_iv = "\xDC\au\x80E\x04:\xA8\x10\xF4\x12.~o\x9F\a"

 end