From 5d31633eb5c22107158c6152cb0559cf5ca9689d Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Wed, 27 Nov 2013 11:28:12 +0100 Subject: [PATCH] Fix salt and password used in wrong position fixes #5227 --- etc/schema/accounts.mysql.sql | 6 +++--- etc/schema/accounts.pgsql.sql | 6 +++--- .../php/library/Icinga/Authentication/DbUserBackendTest.php | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/schema/accounts.mysql.sql b/etc/schema/accounts.mysql.sql index 0d0b5df7b..72eeee4fc 100644 --- a/etc/schema/accounts.mysql.sql +++ b/etc/schema/accounts.mysql.sql @@ -18,7 +18,7 @@ INSERT INTO account ( ) VALUES ( 'icingaadmin', - 'IepKgTTShC', - '52deddb5cc7a5769484fcb0fbc5981a7c62cd9f3ddbb8ff3ddb1b89ea324ad16', + '57cfd5746224be4f60c25d4e8514bec35ad2d01810723a138756b285898e71b2', + '43f8e0588eb39f1a41383b48def0b1fdc45e79b8f67194cccee4453eb3f4ea13', 1 - ); \ No newline at end of file + ); diff --git a/etc/schema/accounts.pgsql.sql b/etc/schema/accounts.pgsql.sql index 8ed599e73..84ecb54e8 100644 --- a/etc/schema/accounts.pgsql.sql +++ b/etc/schema/accounts.pgsql.sql @@ -22,7 +22,7 @@ INSERT INTO "account" ( ) VALUES ( 'icingaadmin', - 'IepKgTTShC', - '52deddb5cc7a5769484fcb0fbc5981a7c62cd9f3ddbb8ff3ddb1b89ea324ad16', + '57cfd5746224be4f60c25d4e8514bec35ad2d01810723a138756b285898e71b2', + '43f8e0588eb39f1a41383b48def0b1fdc45e79b8f67194cccee4453eb3f4ea13', true - ); \ No newline at end of file + ); diff --git a/test/php/library/Icinga/Authentication/DbUserBackendTest.php b/test/php/library/Icinga/Authentication/DbUserBackendTest.php index 581cf931e..899a621e2 100644 --- a/test/php/library/Icinga/Authentication/DbUserBackendTest.php +++ b/test/php/library/Icinga/Authentication/DbUserBackendTest.php @@ -169,8 +169,8 @@ class DbUserBackendTest extends BaseTestCase self::USER_NAME_COLUMN => $usr[self::USER_NAME_COLUMN], self::PASSWORD_COLUMN => hash_hmac( 'sha256', - $usr[self::SALT_COLUMN], - $usr[self::PASSWORD_COLUMN] + $usr[self::PASSWORD_COLUMN], + $usr[self::SALT_COLUMN] ), self::ACTIVE_COLUMN => $usr[self::ACTIVE_COLUMN], self::SALT_COLUMN => $usr[self::SALT_COLUMN]