laylo/trees
1
0
Fork 0
mirror of https://0xacab.org/liberate/trees.git synced 2024-11-22 10:10:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

worked on tests

Browse Source
This commit is contained in:
Philipp Brüll 2015-04-13 16:25:17 +02:00
parent ae592c6aef
commit a7b074a5ec
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dovecot/configuration/dovecot-sql.conf.ext.erb
View File

@ -112,7 +112,7 @@ password_query = \
1000 AS userdb_uid, \
1000 AS userdb_gid, \
'<%= with_base_directory 'home' %>/%n' AS userdb_home, \
'%w' AS userdb_scrambler_plain_password, \
REPLACE('%w', '%%', '%%%%') AS userdb_scrambler_plain_password, \
keys.enabled AS userdb_scrambler_enabled, \
keys.public_key AS userdb_scrambler_public_key, \
keys.private_key AS userdb_scrambler_private_key, \

BIN
dovecot/configuration/mailservice.sqlite
View File

Binary file not shown.

8
spec/integration/mail_encryption_enabled_spec.rb
View File

@ -5,15 +5,17 @@ require 'tempfile'
describe 'Mail encryption enabled' do
before :all do
password = 'testPassword'
@database = Database.new
@mailer = Mailer.new
@mailer = Mailer.new 'test.com', 'sender@test.com', 'test', password
@storage = Storage.new
@administrator = Administrator.new 'test'
@database.clear_users
@database.clear_keys
@database.insert_user 1, 'test', 'testPassword'
@database.insert_key 1, true
@database.insert_user 1, 'test', password
@database.insert_key 1, true, password
end
after :all do

8
spec/lib/database.rb
View File

@ -14,10 +14,10 @@ class Database
[ id, name, password ])
end
def insert_key(id, enabled)
def insert_key(id, enabled, password = nil)
@database.execute(
'INSERT INTO keys (id, enabled, public_key, private_key, private_key_salt, private_key_iterations) VALUES (?, ?, ?, ?, ?, ?)',
[ id, (enabled ? 1 : 0), default_public_key, default_private_key, default_private_key_salt, default_private_key_iterations ])
[ id, (enabled ? 1 : 0), default_public_key, default_private_key(password), default_private_key_salt, default_private_key_iterations ])
end
def update_key(id, enabled)
@ -86,9 +86,9 @@ class Database
escape_pem default_key_pair.public_key.to_pem
end
def default_private_key
def default_private_key(password = nil)
settings = '$2a$%02u$%22s' % [ default_private_key_iterations, default_private_key_salt ]
hashed_password = BCrypt::Engine.hash_secret default_private_key_password, settings
hashed_password = BCrypt::Engine.hash_secret (password || default_private_key_password), settings
escape_pem default_key_pair.to_pem(OpenSSL::Cipher.new('aes-256-cbc'), hashed_password)
end