From 88999bcd7c4d14b2da0e2949cf479eb771c0ed07 Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Mon, 23 Jul 2018 20:10:18 +0200 Subject: [PATCH] * [ADD] Updated database structure * [MOD] Unit testing. Work in progress --- .../Upgrade/UpgradeDatabaseService.php | 3 +- lib/SP/Storage/Database/MySQLFileParser.php | 13 +- schemas/30018072302.sql | 34 ++++ schemas/dbstructure.sql | 39 +++-- .../NotificationRepositoryTest.php | 2 +- .../Repositories/PublicLinkRepositoryTest.php | 4 +- test/SP/Services/Install/MySQLTest.php | 20 +-- .../Notification/NotificationServiceTest.php | 2 +- test/SP/Storage/FileHandlerTest.php | 16 +- test/SP/bootstrap.php | 5 +- test/res/config/config.xml | 107 ++++++++++++ test/res/datasets/syspass.xml | 3 - test/res/datasets/syspass_account.xml | 17 ++ test/res/datasets/syspass_accountFavorite.xml | 158 ++++++++++++++++++ test/res/datasets/syspass_accountFile.xml | 52 ++++++ test/res/datasets/syspass_accountHistory.xml | 43 +++-- test/res/datasets/syspass_customField.xml | 3 - 17 files changed, 438 insertions(+), 83 deletions(-) create mode 100644 schemas/30018072302.sql create mode 100644 test/res/config/config.xml diff --git a/lib/SP/Services/Upgrade/UpgradeDatabaseService.php b/lib/SP/Services/Upgrade/UpgradeDatabaseService.php index b42cca85..0a4fa68e 100644 --- a/lib/SP/Services/Upgrade/UpgradeDatabaseService.php +++ b/lib/SP/Services/Upgrade/UpgradeDatabaseService.php @@ -45,7 +45,7 @@ class UpgradeDatabaseService extends Service implements UpgradeInterface /** * @var array Versiones actualizables */ - const UPGRADES = ['300.18010101']; + const UPGRADES = ['300.18010101', '300.18072302']; /** * @var Database @@ -144,6 +144,7 @@ class UpgradeDatabaseService extends Service implements UpgradeInterface * @param int $version con la versión a actualizar * * @returns bool + * @return bool * @throws UpgradeException */ private function applyUpgrade($version) diff --git a/lib/SP/Storage/Database/MySQLFileParser.php b/lib/SP/Storage/Database/MySQLFileParser.php index 22a83a9d..bfd58ddc 100644 --- a/lib/SP/Storage/Database/MySQLFileParser.php +++ b/lib/SP/Storage/Database/MySQLFileParser.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link https://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. @@ -34,12 +34,12 @@ use SP\Storage\FileHandler; */ class MySQLFileParser implements DatabaseFileInterface { - /** * Parses a database script file and returns an array of lines parsed * * @param FileHandler $fileHandler * @param string $delimiter + * * @return array * @throws FileException */ @@ -61,14 +61,13 @@ class MySQLFileParser implements DatabaseFileInterface // CHecks if delimiter based EOL is reached $end = strrpos($buffer, $delimiter) === $length - $delimiterLength; // Checks if line is an SQL statement wrapped by a comment - $setComment = preg_match(/** @lang RegExp */ - '#^(?P/\*!\d+.*\*/)#', $buffer, $matches); + $setComment = preg_match('#^(?/\*!\d+.*\*/)#', $buffer, $matches); if ($setComment) { if (!$end) { - $query .= $matches['statement'] . PHP_EOL; + $query .= $matches['stmt'] . PHP_EOL; } else { - $queries[] = $query . $matches['statement']; + $queries[] = $query . $matches['stmt']; $query = ''; } diff --git a/schemas/30018072302.sql b/schemas/30018072302.sql new file mode 100644 index 00000000..2457c57f --- /dev/null +++ b/schemas/30018072302.sql @@ -0,0 +1,34 @@ +ALTER TABLE Account + MODIFY pass varbinary(2000) NOT NULL, + MODIFY `key` varbinary(2000) NOT NULL; + +ALTER TABLE AccountHistory + MODIFY pass varbinary(2000) NOT NULL, + MODIFY `key` varbinary(2000) NOT NULL; + +ALTER TABLE AuthToken + MODIFY token varbinary(255) NOT NULL; + +ALTER TABLE AuthToken + MODIFY hash varbinary(500); + +ALTER TABLE Config + MODIFY VALUE varbinary(4000); + +ALTER TABLE CustomFieldData + MODIFY `key` varbinary(2000); + +ALTER TABLE Plugin + MODIFY data mediumblob; + +ALTER TABLE PublicLink + MODIFY data mediumblob; + +ALTER TABLE User + MODIFY pass varbinary(500) NOT NULL, + MODIFY mPass varbinary(2000), + MODIFY mKey varbinary(2000), + MODIFY hashSalt varbinary(255) NOT NULL; + +ALTER TABLE UserPassRecover + MODIFY hash varbinary(255) NOT NULL; \ No newline at end of file diff --git a/schemas/dbstructure.sql b/schemas/dbstructure.sql index 8fca8f11..a2a37b81 100644 --- a/schemas/dbstructure.sql +++ b/schemas/dbstructure.sql @@ -21,8 +21,8 @@ CREATE TABLE `Account` ( `categoryId` mediumint(8) unsigned NOT NULL, `login` varchar(50) DEFAULT NULL, `url` varchar(255) DEFAULT NULL, - `pass` varbinary(1000) NOT NULL, - `key` varbinary(1000) NOT NULL, + `pass` varbinary(2000) NOT NULL, + `key` varbinary(2000) NOT NULL, `notes` text DEFAULT NULL, `countView` int(10) unsigned NOT NULL DEFAULT 0, `countDecrypt` int(10) unsigned NOT NULL DEFAULT 0, @@ -86,8 +86,8 @@ CREATE TABLE `AccountHistory` ( `categoryId` mediumint(8) unsigned NOT NULL, `login` varchar(50) DEFAULT NULL, `url` varchar(255) DEFAULT NULL, - `pass` varbinary(1000) NOT NULL, - `key` varbinary(1000) NOT NULL, + `pass` varbinary(2000) NOT NULL, + `key` varbinary(2000) NOT NULL, `notes` text NOT NULL, `countView` int(10) unsigned NOT NULL DEFAULT 0, `countDecrypt` int(10) unsigned NOT NULL DEFAULT 0, @@ -204,12 +204,12 @@ DROP TABLE IF EXISTS `AuthToken`; CREATE TABLE `AuthToken` ( `id` int(11) NOT NULL AUTO_INCREMENT, `userId` smallint(5) unsigned NOT NULL, - `token` varbinary(100) NOT NULL, + `token` varbinary(255) NOT NULL, `actionId` smallint(5) unsigned NOT NULL, `createdBy` smallint(5) unsigned NOT NULL, `startDate` int(10) unsigned NOT NULL, `vault` varbinary(2000) DEFAULT NULL, - `hash` varbinary(1000) DEFAULT NULL, + `hash` varbinary(500) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `uk_AuthToken_01` (`token`, `actionId`), KEY `idx_AuthToken_01` (`userId`, `actionId`, `token`), @@ -255,7 +255,7 @@ DROP TABLE IF EXISTS `Config`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `Config` ( `parameter` varchar(50) NOT NULL, - `VALUE` varchar(4000) DEFAULT NULL, + `value` varchar(4000) DEFAULT NULL, PRIMARY KEY (`parameter`) ) ENGINE = InnoDB @@ -270,7 +270,7 @@ CREATE TABLE `CustomFieldData` ( `itemId` int(10) unsigned NOT NULL, `definitionId` int(10) unsigned NOT NULL, `data` longblob DEFAULT NULL, - `key` varbinary(1000) DEFAULT NULL, + `key` varbinary(2000) DEFAULT NULL, PRIMARY KEY (`id`), KEY `idx_CustomFieldData_01` (`definitionId`), KEY `idx_CustomFieldData_02` (`itemId`, `moduleId`), @@ -288,7 +288,6 @@ CREATE TABLE `CustomFieldDefinition` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(100) NOT NULL, `moduleId` smallint(5) unsigned NOT NULL, - `field` blob DEFAULT NULL, `required` tinyint(1) unsigned DEFAULT NULL, `help` varchar(255) DEFAULT NULL, `showInList` tinyint(1) unsigned DEFAULT NULL, @@ -362,7 +361,7 @@ DROP TABLE IF EXISTS `Plugin`; CREATE TABLE `Plugin` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(100) NOT NULL, - `data` varbinary(5000) DEFAULT NULL, + `data` mediumblob DEFAULT NULL, `enabled` tinyint(1) NOT NULL DEFAULT 0, `available` tinyint(1) DEFAULT 0, PRIMARY KEY (`id`), @@ -378,7 +377,7 @@ CREATE TABLE `PublicLink` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `itemId` int(10) unsigned NOT NULL, `hash` varbinary(100) NOT NULL, - `data` longblob DEFAULT NULL, + `data` mediumblob DEFAULT NULL, `userId` smallint(5) unsigned NOT NULL, `typeId` int(10) unsigned NOT NULL, `notify` tinyint(1) DEFAULT 0, @@ -438,9 +437,9 @@ CREATE TABLE `User` ( `userGroupId` smallint(5) unsigned NOT NULL, `login` varchar(50) NOT NULL, `ssoLogin` varchar(100) DEFAULT NULL, - `pass` varbinary(1000) NOT NULL, - `mPass` varbinary(1000) DEFAULT NULL, - `mKey` varbinary(1000) DEFAULT NULL, + `pass` varbinary(500) NOT NULL, + `mPass` varbinary(2000) DEFAULT NULL, + `mKey` varbinary(2000) DEFAULT NULL, `email` varchar(80) DEFAULT NULL, `notes` text DEFAULT NULL, `loginCount` int(10) unsigned NOT NULL DEFAULT 0, @@ -452,7 +451,7 @@ CREATE TABLE `User` ( `isAdminAcc` tinyint(1) DEFAULT 0, `isLdap` tinyint(1) DEFAULT 0, `isDisabled` tinyint(1) DEFAULT 0, - `hashSalt` varbinary(128) NOT NULL, + `hashSalt` varbinary(255) NOT NULL, `isMigrate` tinyint(1) DEFAULT 0, `isChangePass` tinyint(1) DEFAULT 0, `isChangedPass` tinyint(1) DEFAULT 0, @@ -486,7 +485,7 @@ DROP TABLE IF EXISTS `UserPassRecover`; CREATE TABLE `UserPassRecover` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `userId` smallint(5) unsigned NOT NULL, - `hash` varbinary(128) NOT NULL, + `hash` varbinary(255) NOT NULL, `date` int(10) unsigned NOT NULL, `used` tinyint(1) DEFAULT 0, PRIMARY KEY (`id`), @@ -606,8 +605,8 @@ SET character_set_client = @saved_cs_client; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM = UNDEFINED */ -/*!50013 SQL SECURITY DEFINER */ -/*!50001 VIEW `account_data_v` AS + /*!50013 SQL SECURITY DEFINER */ + /*!50001 VIEW `account_data_v` AS select `Account`.`id` AS `id`, `Account`.`name` AS `name`, @@ -655,8 +654,8 @@ SET character_set_client = @saved_cs_client; /*!50001 SET character_set_results = utf8 */; /*!50001 SET collation_connection = utf8_general_ci */; /*!50001 CREATE ALGORITHM = UNDEFINED */ -/*!50013 SQL SECURITY DEFINER */ -/*!50001 VIEW `account_search_v` AS + /*!50013 SQL SECURITY DEFINER */ + /*!50001 VIEW `account_search_v` AS SELECT `Account`.`id` AS `id`, `Account`.`clientId` AS `clientId`, diff --git a/test/SP/Repositories/NotificationRepositoryTest.php b/test/SP/Repositories/NotificationRepositoryTest.php index d50fe09d..2cf14536 100644 --- a/test/SP/Repositories/NotificationRepositoryTest.php +++ b/test/SP/Repositories/NotificationRepositoryTest.php @@ -247,7 +247,7 @@ class NotificationRepositoryTest extends DatabaseTestCase $this->expectException(ConstraintException::class); - $this->assertEquals(0, self::$repository->update($data)); + self::$repository->update($data); } /** diff --git a/test/SP/Repositories/PublicLinkRepositoryTest.php b/test/SP/Repositories/PublicLinkRepositoryTest.php index 3cf8e43e..fc8196e0 100644 --- a/test/SP/Repositories/PublicLinkRepositoryTest.php +++ b/test/SP/Repositories/PublicLinkRepositoryTest.php @@ -336,12 +336,12 @@ class PublicLinkRepositoryTest extends DatabaseTestCase $data->setId(3); - $this->assertEquals(0, self::$repository->refresh($data)); + self::$repository->refresh($data); $data->setId(1); $data->setHash(null); - $this->assertEquals(0, self::$repository->refresh($data)); + self::$repository->refresh($data); } /** diff --git a/test/SP/Services/Install/MySQLTest.php b/test/SP/Services/Install/MySQLTest.php index 1b80d0b4..f1c6e65f 100644 --- a/test/SP/Services/Install/MySQLTest.php +++ b/test/SP/Services/Install/MySQLTest.php @@ -44,6 +44,16 @@ class MySQLTest extends TestCase const DB_NAME = 'syspass_test'; + /** + * @throws \SP\Core\Exceptions\SPException + */ + public function testCheckDatabaseNotExist() + { + $mysql = new MySQL($this->getParams(), new ConfigData()); + + $this->assertFalse($mysql->checkDatabaseExist()); + } + /** * @throws \SP\Storage\Database\DatabaseException * @throws \SP\Core\Exceptions\SPException @@ -79,16 +89,6 @@ class MySQLTest extends TestCase return $params; } - /** - * @throws \SP\Core\Exceptions\SPException - */ - public function testCheckDatabaseNotExist() - { - $mysql = new MySQL($this->getParams(), new ConfigData()); - - $this->assertFalse($mysql->checkDatabaseExist()); - } - /** * @throws \SP\Core\Exceptions\SPException */ diff --git a/test/SP/Services/Notification/NotificationServiceTest.php b/test/SP/Services/Notification/NotificationServiceTest.php index 7245c37c..5cd94126 100644 --- a/test/SP/Services/Notification/NotificationServiceTest.php +++ b/test/SP/Services/Notification/NotificationServiceTest.php @@ -394,7 +394,7 @@ class NotificationServiceTest extends DatabaseTestCase $this->expectException(ConstraintException::class); - $this->assertEquals(0, self::$service->update($data)); + self::$service->update($data); } /** diff --git a/test/SP/Storage/FileHandlerTest.php b/test/SP/Storage/FileHandlerTest.php index 3d448ace..da7c557e 100644 --- a/test/SP/Storage/FileHandlerTest.php +++ b/test/SP/Storage/FileHandlerTest.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link https://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. @@ -59,7 +59,9 @@ class FileHandlerTest extends TestCase { $handler = new FileHandler(self::$validFile); $handler->write('valid_file'); + $this->assertEquals('valid_file', $handler->readToString()); + $handler->close(); $this->assertFileExists(self::$validFile); @@ -78,11 +80,7 @@ class FileHandlerTest extends TestCase ->clearCache() ->checkIsWritable(); - $this->expectException(FileException::class); - - (new FileHandler(self::$immutableFile)) - ->clearCache() - ->checkIsWritable(); + $this->assertTrue(true); } /** @@ -177,8 +175,6 @@ class FileHandlerTest extends TestCase { (new FileHandler(self::$validFile))->delete(); - $this->expectException(FileException::class); - - (new FileHandler(self::$immutableFile))->delete(); + $this->assertFileNotExists(self::$validFile); } } diff --git a/test/SP/bootstrap.php b/test/SP/bootstrap.php index dad54798..44c2de82 100644 --- a/test/SP/bootstrap.php +++ b/test/SP/bootstrap.php @@ -78,6 +78,7 @@ if (is_dir(CONFIG_PATH) */ if (!function_exists('\gettext')) { /** + * * @param $str * * @return string @@ -134,7 +135,7 @@ function setupContext() $context->setUserProfile(new ProfileData()); // Establecer configuración de conexión con la BBDD - $databaseConnectionData = (new DatabaseConnectionData()) + $connectionData = (new DatabaseConnectionData()) ->setDbHost(getenv('DB_SERVER')) ->setDbName(getenv('DB_NAME')) ->setDbUser(getenv('DB_USER')) @@ -144,7 +145,7 @@ function setupContext() $dic->set(ConfigData::class, $configData); // Inicializar los datos de conexión a la BBDD - $dic->set(DatabaseConnectionData::class, $databaseConnectionData); + $dic->set(DatabaseConnectionData::class, $connectionData); return $dic; } diff --git a/test/res/config/config.xml b/test/res/config/config.xml new file mode 100644 index 00000000..ff1eae35 --- /dev/null +++ b/test/res/config/config.xml @@ -0,0 +1,107 @@ + + + 12 + 0 + 10368000 + 0 + 1 + 0 + 1 + + 1 + c79d69a2c0092ccc288fd5b3d56a434e2f0e4f75 + 0 + 0 + 1532369257 + 92e386c54329fda42f58da43ed2f587ea0cb1cb9 + + + + + + + 3306 + + + 0 + 0 + 0 + + + + + + 0 + ff02ccd71fc8d53ff49d25069933be16be661ba0 + + PDF + JPG + GIF + PNG + ODT + ODS + DOC + DOCX + XLS + XSL + VSD + TXT + CSV + BAK + + 1024 + 1 + 1 + 0 + 0 + 0 + + + + + + 0 + + + + + 1 + + 0 + 0 + + + + 25 + + 0 + + + + 0 + fd1058ca0bbaf967d08184ed22ee2c8d5675ca0c9d569c1f237f23fefadf + 0 + + 8080 + + + 0 + 0 + 600 + 3 + 0 + 300 + + material-blue + + + 0 + 514 + 0 + + + 0 + + + + diff --git a/test/res/datasets/syspass.xml b/test/res/datasets/syspass.xml index 602c5658..f98096e8 100644 --- a/test/res/datasets/syspass.xml +++ b/test/res/datasets/syspass.xml @@ -368,7 +368,6 @@ 1 Prueba 10 - 1 Ayuda 0 @@ -379,7 +378,6 @@ 2 RSA 61 - 0 0 @@ -390,7 +388,6 @@ 3 RSA Priv 61 - 0 0 diff --git a/test/res/datasets/syspass_account.xml b/test/res/datasets/syspass_account.xml index 6793cab1..c9601986 100644 --- a/test/res/datasets/syspass_account.xml +++ b/test/res/datasets/syspass_account.xml @@ -1,6 +1,23 @@ + + + 1 + Admin + 4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A303B733A31343A22002A006163635669657750617373223B623A303B733A31373A22002A0061636356696577486973746F7279223B623A303B733A31303A22002A0061636345646974223B623A303B733A31343A22002A006163634564697450617373223B623A303B733A393A22002A00616363416464223B623A303B733A31323A22002A0061636344656C657465223B623A303B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A313B733A31383A22002A006163635072697661746547726F7570223B623A313B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D + + + 2 + Demo + 4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D + + + 3 + Usuarios + 4F3A32343A2253505C446174614D6F64656C5C50726F66696C6544617461223A32393A7B733A31303A22002A0061636356696577223B623A313B733A31343A22002A006163635669657750617373223B623A313B733A31373A22002A0061636356696577486973746F7279223B623A313B733A31303A22002A0061636345646974223B623A313B733A31343A22002A006163634564697450617373223B623A313B733A393A22002A00616363416464223B623A313B733A31323A22002A0061636344656C657465223B623A313B733A31313A22002A0061636346696C6573223B623A303B733A31333A22002A0061636350726976617465223B623A303B733A31383A22002A006163635072697661746547726F7570223B623A303B733A31363A22002A006163635065726D697373696F6E223B623A303B733A31373A22002A006163635075626C69634C696E6B73223B623A303B733A31383A22002A00616363476C6F62616C536561726368223B623A303B733A31363A22002A00636F6E66696747656E6572616C223B623A303B733A31393A22002A00636F6E666967456E6372797074696F6E223B623A303B733A31353A22002A00636F6E6669674261636B7570223B623A303B733A31353A22002A00636F6E666967496D706F7274223B623A303B733A31313A22002A006D676D5573657273223B623A303B733A31323A22002A006D676D47726F757073223B623A303B733A31343A22002A006D676D50726F66696C6573223B623A303B733A31363A22002A006D676D43617465676F72696573223B623A303B733A31353A22002A006D676D437573746F6D657273223B623A303B733A31353A22002A006D676D417069546F6B656E73223B623A303B733A31373A22002A006D676D5075626C69634C696E6B73223B623A303B733A31343A22002A006D676D4163636F756E7473223B623A303B733A31303A22002A006D676D54616773223B623A303B733A31313A22002A006D676D46696C6573223B623A303B733A363A22002A0065766C223B623A303B733A31383A22002A006D676D437573746F6D4669656C6473223B623A303B7D + + 1 diff --git a/test/res/datasets/syspass_accountFavorite.xml b/test/res/datasets/syspass_accountFavorite.xml index 1f00f287..39be382e 100644 --- a/test/res/datasets/syspass_accountFavorite.xml +++ b/test/res/datasets/syspass_accountFavorite.xml @@ -1,6 +1,164 @@ + + + 1 + sysPass Admin + 1 + admin + + 243279243130247635695230547A4933744E3036416A304C4A656B39755371496834356C70575539366E644A71444A704E6969713139306A444A486D + 64656635303230306330383635633335373637316233366261353266333137346134356466333633626135656431613962323261356461353965376134373930356664656239373436356462373934613831373635316133316432626363636266663836626233353235643930333932393734323535663937316261616239656436346637383266363066646465386539336637363164356663633436393031356433363164333234643436633533633138313335613334663739633039 + 6465663130303030646566353032303062316163626161346361643036643237386562323533616462643433613966376463636439343063656265313962343061383436643464633035303636306466653630613561653139363433643636353936643733333764646236386536363930336562383031373764356463386430663963623661643361663565643766303936376262393964663530373936316330656132373462663830346333663966373563336538643539396336326231623738333730303963616263373836383637366433636337376162383365386338323335336335626164396534656535333532656132346632653434653663316336656131643162313264393332386335303539623437656235343534666138356435626437343637353333383132636662313230316634633635383733316465323934613664643035396332613362373333613765343462633539306338363337393032306662303263363262303565613030623234646235323566653863303263323138666561356661353139306563396266333461316637613937633733396637343534323333316466323932343965323138656338343233306161623038373336346463353236363935383630656638623232313439626262656636656266373030366638376434343661333535353863323062353462376336623330 + + + 81 + 1 + 2018-04-19 23:46:48 + 2018-04-19 23:46:48 + 1521887152 + 1 + 0 + 0 + 0 + + 0 + 0 + 0 + 4F3A33323A2253505C446174614D6F64656C5C55736572507265666572656E63657344617461223A31303A7B733A373A22757365725F6964223B693A313B733A363A22757365324661223B623A303B733A343A226C616E67223B733A353A22656E5F5553223B733A353A227468656D65223B733A31333A226D6174657269616C2D626C7565223B733A31343A22726573756C747350657250616765223B693A34383B733A31313A226163636F756E744C696E6B223B623A313B733A393A22736F72745669657773223B623A303B733A393A22746F704E6176626172223B623A303B733A31353A226F7074696F6E616C416374696F6E73223B623A303B733A31343A22726573756C747341734361726473223B623A303B7D + + + 2 + sysPass demo + 2 + demo + demo + 2432792431302454726E69756C5763754361433635346F76566F35392E766B4C5433414E31624A6D726A79553462696335325069436A6B5572396669 + 64656635303230303231616533353730373263373165626239393534353966366236636164373235336534316336633534353036336339326136653730616366333930393165373934613865376662386662326664333931383932363562396466303133333631623063323732323339653465373165343839313030646534326265633737623966343238396635633936613837646531343864313963653663643338613131343932623163313765653630326430623532343564346566 + 6465663130303030646566353032303035643534316262633462653032333563313338626561366561333536626436663037353365313035653030333563653166316235336534663364343565366262353335626163396639646538653131316262356334383865336535633637323333666632626365313837626335386135353839373535373034386564353634366361646638623736396132323164363032353435653034306264613135663138323638383665373536313236353361313037306530333261323365636364336339616438323162306363383962643130333035303931653965626332653935313465656631373462663339343664656132393661346262366264343463646333363361643335623032373561356633323430313936346531633131663937313764313139633130633561373161666332356365346534366661623234646663626362326237303964336335316532623834326464303933653230353965373265356638376363366236626239306231346265376264373637663163303937366231313362393630613265636565336633313131663538656131346139353736623332653163303962636435313366383733656664653062373333366238643464646637616237323333373038613264393965633738356139393036306135643262316366306262663739346262663765 + demo@syspass.org + aaaa + 12 + 2 + 2018-04-01 21:29:47 + 2018-04-14 08:47:43 + 1522582852 + 0 + 0 + 0 + 0 + + 0 + 0 + 0 + + + + 3 + User A + 2 + user_a + user_a + 2432792431302469444B442E2F4F624D79742E6F43594F5249514D5065624454783966744D636A703034365A435976662E765479597A594F6A4C472E + + + user_a@syspass.org + + 0 + 1 + 2018-04-14 08:48:08 + 2018-04-14 08:48:08 + 0 + 0 + 0 + 0 + 0 + + 0 + 0 + 0 + + + + 4 + User B + 2 + user_b + + 243279243130244C37643658736A663955794F6E583662472E6F384E4F713961674B6F64536B4B5674485350462F6861414E657971517065372E6532 + + + user_b@syspass.org + + 0 + 1 + 2018-03-30 18:38:32 + 2018-03-30 18:38:32 + 0 + 0 + 0 + 0 + 0 + + 0 + 0 + 0 + + + + + + 1 + 1 + 1 + 1 + 1 + Google + 1 + admin + http://google.com + 6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138 + 6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432 + aaaa + 341 + 35 + 2018-03-25 09:54:07 + 2018-04-02 21:38:25 + 0 + 0 + 0 + 0 + 1522341709 + 0 + 0 + + + 2 + 1 + 1 + 1 + 2 + Apple + 2 + admin + http://apple.com + 6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138 + 6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432 + bbbb + 341 + 35 + 2018-03-25 09:54:07 + 2018-04-02 21:38:25 + 0 + 0 + 0 + 0 + 1522341709 + 0 + 1 + + 1 diff --git a/test/res/datasets/syspass_accountFile.xml b/test/res/datasets/syspass_accountFile.xml index a457bdd7..6ce75401 100644 --- a/test/res/datasets/syspass_accountFile.xml +++ b/test/res/datasets/syspass_accountFile.xml @@ -24,6 +24,58 @@ 1 + + + 1 + 1 + 1 + 1 + 1 + Google + 1 + admin + http://google.com + 6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138 + 6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432 + aaaa + 341 + 35 + 2018-03-25 09:54:07 + 2018-04-02 21:38:25 + 0 + 0 + 0 + 0 + 1522341709 + 0 + 0 + + + 2 + 1 + 1 + 1 + 2 + Apple + 2 + admin + http://apple.com + 6465663530323030656135663361636362366237656462653536343938666234313231616635323237363539663162346532383963386361346565323732656530636238333632316436393736353665373631393435623033353236616164333730336662306531333535626437333638653033666137623565633364306365323634663863643436393436633365353234316534373338376130393133663935303736396364613365313234643432306636393834386434613262316231306138 + 6465663130303030646566353032303065646434636466636231333437613739616166313734343462343839626362643364353664376664356562373233363235653130316261666432323539343633336664626639326630613135373461653562613562323535353230393236353237623863633534313862653363376361376536366139356366353366356162663031623064343236613234336162643533643837643239636633643165326532663732626664396433366133653061343534656664373134633661366237616338363966636263366435303166613964316338386365623264303861333438626633656638653135356538633865353838623938636465653061306463313835646636366535393138393831653366303464323139386236383738333539616563653034376434643637663835313235636661313237633138373865643530616630393434613934616363356265316130323566623065633362663831613933626365366365343734336164363562656638353131343466343332323837356438323339303236656363613866643862376330396563356465373233666466313636656166386336356539666537353436333535333664393766383366316366663931396530386339373730636166633136376661656364306366656262323931666334343831333238333662366432 + bbbb + 341 + 35 + 2018-03-25 09:54:07 + 2018-04-02 21:38:25 + 0 + 0 + 0 + 0 + 1522341709 + 0 + 1 + + 1 diff --git a/test/res/datasets/syspass_accountHistory.xml b/test/res/datasets/syspass_accountHistory.xml index 7db6fe18..fdd5b282 100644 --- a/test/res/datasets/syspass_accountHistory.xml +++ b/test/res/datasets/syspass_accountHistory.xml @@ -1,29 +1,26 @@ - - + + + 1 + Web + Web sites + 3235363761356563393730356562376163326339383430333365303631383964 + + + 2 + Linux + Linux server + 6532303661353465393736393063636535306363383732646437306565383936 + + + 3 + SSH + SSH access + 3137383764373634363330346335643938376366346536346133393733646337 + + 1 diff --git a/test/res/datasets/syspass_customField.xml b/test/res/datasets/syspass_customField.xml index b25d8f26..15fe1215 100644 --- a/test/res/datasets/syspass_customField.xml +++ b/test/res/datasets/syspass_customField.xml @@ -6,7 +6,6 @@ 1 Prueba 10 - 1 Ayuda 0 @@ -17,7 +16,6 @@ 2 RSA 61 - 0 0 @@ -28,7 +26,6 @@ 3 SSL 61 - 0 0