jro_apps/redmine Commit - r7877:5d1388db02a2

Merged r7985 from trunk....

Jean-Philippe Lang -

r7877:5d1388db02a2

parent child

Context file:

r7877:5d1388db02a2

Collapse all files

lib/redmine/ciphering.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module Redmine
               module Ciphering
                 def self.included(base)
                   base.extend ClassMethods
                 end
                 class << self
                   def encrypt_text(text)
-                    if cipher_key.blank?
+                    if cipher_key.blank? || text.blank?
                       text
                     else
                       c = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
                       iv = c.random_iv
                       c.encrypt
                       c.key = cipher_key
                       c.iv = iv
                       e = c.update(text.to_s)
                       e << c.final
                       "aes-256-cbc:" + [e, iv].map {|v| Base64.encode64(v).strip}.join('--')
                     end
                   end
                   def decrypt_text(text)
                     if text && match = text.match(/\Aaes-256-cbc:(.+)\Z/)
                       text = match[1]
                       c = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
                       e, iv = text.split("--").map {|s| Base64.decode64(s)}
                       c.decrypt
                       c.key = cipher_key
                       c.iv = iv
                       d = c.update(e)
                       d << c.final
                     else
                       text
                     end
                   end
                   def cipher_key
                     key = Redmine::Configuration['database_cipher_key'].to_s
                     key.blank? ? nil : Digest::SHA256.hexdigest(key)
                   end
                 end
                 module ClassMethods
                   def encrypt_all(attribute)
                     transaction do
                       all.each do |object|
                         clear = object.send(attribute)
                         object.send "#{attribute}=", clear
                         raise(ActiveRecord::Rollback) unless object.save(false)
                       end
                     end ? true : false
                   end
                   def decrypt_all(attribute)
                     transaction do
                       all.each do |object|
                         clear = object.send(attribute)
                         object.write_attribute attribute, clear
                         raise(ActiveRecord::Rollback) unless object.save(false)
                       end
                     end
                   end ? true : false
                 end
                 private
                 # Returns the value of the given ciphered attribute
                 def read_ciphered_attribute(attribute)
                   Redmine::Ciphering.decrypt_text(read_attribute(attribute))
                 end
                 # Sets the value of the given ciphered attribute
                 def write_ciphered_attribute(attribute, value)
                   write_attribute(attribute, Redmine::Ciphering.encrypt_text(value))
                 end
               end
             end

test/unit/lib/redmine/ciphering_test.rb +8 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../../test_helper', __FILE__)
             class Redmine::CipheringTest < ActiveSupport::TestCase
               def test_password_should_be_encrypted
                 Redmine::Configuration.with 'database_cipher_key' => 'secret' do
                   r = Repository::Subversion.generate!(:password => 'foo')
                   assert_equal 'foo', r.password
                   assert r.read_attribute(:password).match(/\Aaes-256-cbc:.+\Z/)
                 end
               end
               def test_password_should_be_clear_with_blank_key
                 Redmine::Configuration.with 'database_cipher_key' => '' do
                   r = Repository::Subversion.generate!(:password => 'foo')
                   assert_equal 'foo', r.password
                   assert_equal 'foo', r.read_attribute(:password)
                 end
               end
               def test_password_should_be_clear_with_nil_key
                 Redmine::Configuration.with 'database_cipher_key' => nil do
                   r = Repository::Subversion.generate!(:password => 'foo')
                   assert_equal 'foo', r.password
                   assert_equal 'foo', r.read_attribute(:password)
                 end
               end
+              def test_blank_password_should_be_clear
+                Redmine::Configuration.with 'database_cipher_key' => 'secret' do
+                  r = Repository::Subversion.generate!(:password => '')
+                  assert_equal '', r.password
+                  assert_equal '', r.read_attribute(:password)
+                end
+              end
               def test_unciphered_password_should_be_readable
                 Redmine::Configuration.with 'database_cipher_key' => nil do
                   r = Repository::Subversion.generate!(:password => 'clear')
                 end
                 Redmine::Configuration.with 'database_cipher_key' => 'secret' do
                   r = Repository.first(:order => 'id DESC')
                   assert_equal 'clear', r.password
                 end
               end
               def test_encrypt_all
                 Repository.delete_all
                 Redmine::Configuration.with 'database_cipher_key' => nil do
                   Repository::Subversion.generate!(:password => 'foo')
                   Repository::Subversion.generate!(:password => 'bar')
                 end
                 Redmine::Configuration.with 'database_cipher_key' => 'secret' do
                   assert Repository.encrypt_all(:password)
                   r = Repository.first(:order => 'id DESC')
                   assert_equal 'bar', r.password
                   assert r.read_attribute(:password).match(/\Aaes-256-cbc:.+\Z/)
                 end
               end
               def test_decrypt_all
                 Repository.delete_all
                 Redmine::Configuration.with 'database_cipher_key' => 'secret' do
                   Repository::Subversion.generate!(:password => 'foo')
                   Repository::Subversion.generate!(:password => 'bar')
                   assert Repository.decrypt_all(:password)
                   r = Repository.first(:order => 'id DESC')
                   assert_equal 'bar', r.password
                   assert_equal 'bar', r.read_attribute(:password)
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages