From 936a831e5a2ce0fafc0c3fd190267c1c72d1f9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 28 Feb 2018 19:52:32 +0100 Subject: [PATCH 01/29] - code formatting (PSR-2) - removed all ownCloud references - removed update.php as its supported version was never published on the app store - updated info.xml --- ajax/settings.php | 276 +++++---- appinfo/app.php | 40 +- appinfo/info.xml | 49 +- appinfo/routes.php | 9 +- appinfo/update.php | 71 --- css/settings.css | 15 +- img/app-dark.svg | 3 +- screenshot.png => img/screenshot.png | Bin js/settings.js | 195 +++---- lib/PasswordHash.php | 395 +++++++------ lib/Settings/Admin.php | 123 ++-- lib/Settings/Section.php | 75 +-- lib/drupal.php | 651 +++++++++++---------- lib/group_sql.php | 80 ++- lib/helper.php | 226 ++++---- lib/user_sql.php | 838 ++++++++++++--------------- templates/admin.php | 342 +++++++---- 17 files changed, 1650 insertions(+), 1738 deletions(-) delete mode 100644 appinfo/update.php rename screenshot.png => img/screenshot.png (100%) diff --git a/ajax/settings.php b/ajax/settings.php index 77de46f..ed0f406 100644 --- a/ajax/settings.php +++ b/ajax/settings.php @@ -1,7 +1,7 @@ @@ -21,22 +21,22 @@ * */ - /** - * This is the AJAX portion of the settings page. - * - * It can: - * - Verify the connection settings - * - Load autocomplete values for tables - * - Load autocomplete values for columns - * - Save settings for a given domain - * - Load settings for a given domain - * - * It always returns JSON encoded responses - */ - +/** + * This is the AJAX portion of the settings page. + * + * It can: + * - Verify the connection settings + * - Load autocomplete values for tables + * - Load autocomplete values for columns + * - Save settings for a given domain + * - Load settings for a given domain + * + * It always returns JSON encoded responses + */ + namespace OCA\user_sql; -// Init owncloud +// Init Nextcloud // Check if we are a user \OCP\User::checkAdminUser(); @@ -50,53 +50,49 @@ $helper = new \OCA\user_sql\lib\Helper; $l = \OC::$server->getL10N('user_sql'); -$params = $helper -> getParameterArray(); +$params = $helper->getParameterArray(); $response = new \OCP\AppFramework\Http\JSONResponse(); // Check if the request is for us -if(isset($_POST['appname']) && ($_POST['appname'] === 'user_sql') && isset($_POST['function']) && isset($_POST['domain'])) -{ +if (isset($_POST['appname']) && ($_POST['appname'] === 'user_sql') && isset($_POST['function']) && isset($_POST['domain'])) { $domain = $_POST['domain']; - switch($_POST['function']) - { + switch ($_POST['function']) { // Save the settings for the given domain to the database case 'saveSettings': - $parameters = array('host' => $_POST['sql_hostname'], + $parameters = array( + 'host' => $_POST['sql_hostname'], 'password' => $_POST['sql_password'], 'user' => $_POST['sql_username'], 'dbname' => $_POST['sql_database'], 'tablePrefix' => '' ); - + // Check if the table exists - if(!$helper->verifyTable($parameters, $_POST['sql_driver'], $_POST['sql_table'])) - { - $response->setData(array('status' => 'error', - 'data' => array('message' => $l -> t('The selected SQL table '.$_POST['sql_table'].' does not exist!')))); + if (!$helper->verifyTable($parameters, $_POST['sql_driver'], $_POST['sql_table'])) { + $response->setData(array( + 'status' => 'error', + 'data' => array('message' => $l->t('The selected SQL table ' . $_POST['sql_table'] . ' does not exist!')) + )); break; } - if(!empty($_POST['sql_group_table']) && !$helper->verifyTable($parameters, $_POST['sql_driver'], $_POST['sql_group_table'])) - { - $response->setData(array('status' => 'error', - 'data' => array('message' => $l -> t('The selected SQL table '.$_POST['sql_group_table'].' does not exist!')))); + if (!empty($_POST['sql_group_table']) && !$helper->verifyTable($parameters, $_POST['sql_driver'], + $_POST['sql_group_table'])) { + $response->setData(array( + 'status' => 'error', + 'data' => array('message' => $l->t('The selected SQL table ' . $_POST['sql_group_table'] . ' does not exist!')) + )); break; } - + // Retrieve all column settings $columns = array(); $group_columns = array(); - foreach($params as $param) - { - if(strpos($param, 'col_') === 0) - { - if(isset($_POST[$param]) && $_POST[$param] !== '') - { - if(strpos($param, 'col_group_') === 0) - { + foreach ($params as $param) { + if (strpos($param, 'col_') === 0) { + if (isset($_POST[$param]) && $_POST[$param] !== '') { + if (strpos($param, 'col_group_') === 0) { $group_columns[] = $_POST[$param]; - } - else - { + } else { $columns[] = $_POST[$param]; } } @@ -105,97 +101,85 @@ if(isset($_POST['appname']) && ($_POST['appname'] === 'user_sql') && isset($_POS // Check if the columns exist $status = $helper->verifyColumns($parameters, $_POST['sql_driver'], $_POST['sql_table'], $columns); - if(!empty($_POST['sql_group_table']) && $status === true) - { - $status = $helper->verifyColumns($parameters, $_POST['sql_driver'], $_POST['sql_group_table'], $group_columns); + if (!empty($_POST['sql_group_table']) && $status === true) { + $status = $helper->verifyColumns($parameters, $_POST['sql_driver'], $_POST['sql_group_table'], + $group_columns); } - if($status !== true) - { - $response->setData(array('status' => 'error', - 'data' => array('message' => $l -> t('The selected SQL column(s) do(es) not exist: '.$status)))); + if ($status !== true) { + $response->setData(array( + 'status' => 'error', + 'data' => array('message' => $l->t('The selected SQL column(s) do(es) not exist: ' . $status)) + )); break; } // If we reach this point, all settings have been verified - foreach($params as $param) - { + foreach ($params as $param) { // Special handling for checkbox fields - if(isset($_POST[$param])) - { - if($param === 'set_strip_domain') - { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_strip_domain_'.$domain, 'true'); - } - elseif($param === 'set_allow_pwchange') - { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_allow_pwchange_'.$domain, 'true'); + if (isset($_POST[$param])) { + if ($param === 'set_strip_domain') { + \OC::$server->getConfig()->setAppValue('user_sql', 'set_strip_domain_' . $domain, 'true'); + } elseif ($param === 'set_allow_pwchange') { + \OC::$server->getConfig()->setAppValue('user_sql', 'set_allow_pwchange_' . $domain, 'true'); + } elseif ($param === 'set_active_invert') { + \OC::$server->getConfig()->setAppValue('user_sql', 'set_active_invert_' . $domain, 'true'); + } elseif ($param === 'set_enable_gethome') { + \OC::$server->getConfig()->setAppValue('user_sql', 'set_enable_gethome_' . $domain, 'true'); + } else { + \OC::$server->getConfig()->setAppValue('user_sql', $param . '_' . $domain, $_POST[$param]); } - elseif($param === 'set_active_invert') - { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_active_invert_'.$domain, 'true'); - } - elseif($param === 'set_enable_gethome') - { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_enable_gethome_'.$domain, 'true'); - } - else - { - \OC::$server->getConfig()->setAppValue('user_sql', $param.'_'.$domain, $_POST[$param]); - } - } else - { - if($param === 'set_strip_domain') - { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_strip_domain_'.$domain, 'false'); - } - elseif($param === 'set_allow_pwchange') - { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_allow_pwchange_'.$domain, 'false'); - } - elseif($param === 'set_active_invert') - { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_active_invert_'.$domain, 'false'); - } - elseif($param === 'set_enable_gethome') - { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_enable_gethome_'.$domain, 'false'); + } else { + if ($param === 'set_strip_domain') { + \OC::$server->getConfig()->setAppValue('user_sql', 'set_strip_domain_' . $domain, 'false'); + } elseif ($param === 'set_allow_pwchange') { + \OC::$server->getConfig()->setAppValue('user_sql', 'set_allow_pwchange_' . $domain, 'false'); + } elseif ($param === 'set_active_invert') { + \OC::$server->getConfig()->setAppValue('user_sql', 'set_active_invert_' . $domain, 'false'); + } elseif ($param === 'set_enable_gethome') { + \OC::$server->getConfig()->setAppValue('user_sql', 'set_enable_gethome_' . $domain, 'false'); } } } - $response->setData(array('status' => 'success', - 'data' => array('message' => $l -> t('Application settings successfully stored.')))); - break; + $response->setData(array( + 'status' => 'success', + 'data' => array('message' => $l->t('Application settings successfully stored.')) + )); + break; // Load the settings for a given domain case 'loadSettingsForDomain': $retArr = array(); - foreach($params as $param) - { - $retArr[$param] = \OC::$server->getConfig()->getAppValue('user_sql', $param.'_'.$domain, ''); + foreach ($params as $param) { + $retArr[$param] = \OC::$server->getConfig()->getAppValue('user_sql', $param . '_' . $domain, ''); } - $response->setData(array('status' => 'success', - 'settings' => $retArr)); - break; + $response->setData(array( + 'status' => 'success', + 'settings' => $retArr + )); + break; // Try to verify the database connection settings case 'verifySettings': $cm = new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig()); - if(!isset($_POST['sql_driver'])) - { - $response->setData(array('status' => 'error', - 'data' => array('message' => $l -> t('Error connecting to database: No driver specified.')))); + if (!isset($_POST['sql_driver'])) { + $response->setData(array( + 'status' => 'error', + 'data' => array('message' => $l->t('Error connecting to database: No driver specified.')) + )); break; } - if(($_POST['sql_hostname'] === '') || ($_POST['sql_database'] === '')) - { - $response->setData(array('status' => 'error', - 'data' => array('message' => $l -> t('Error connecting to database: You must specify at least host and database')))); + if (($_POST['sql_hostname'] === '') || ($_POST['sql_database'] === '')) { + $response->setData(array( + 'status' => 'error', + 'data' => array('message' => $l->t('Error connecting to database: You must specify at least host and database')) + )); break; } - $parameters = array('host' => $_POST['sql_hostname'], + $parameters = array( + 'host' => $_POST['sql_hostname'], 'password' => $_POST['sql_password'], 'user' => $_POST['sql_username'], 'dbname' => $_POST['sql_database'], @@ -203,22 +187,25 @@ if(isset($_POST['appname']) && ($_POST['appname'] === 'user_sql') && isset($_POS ); try { - $conn = $cm -> getConnection($_POST['sql_driver'], $parameters); - $response->setData(array('status' => 'success', - 'data' => array('message' => $l -> t('Successfully connected to database')))); + $conn = $cm->getConnection($_POST['sql_driver'], $parameters); + $response->setData(array( + 'status' => 'success', + 'data' => array('message' => $l->t('Successfully connected to database')) + )); + } catch (\Exception $e) { + $response->setData(array( + 'status' => 'error', + 'data' => array('message' => $l->t('Error connecting to database: ') . $e->getMessage()) + )); } - catch(\Exception $e) - { - $response->setData(array('status' => 'error', - 'data' => array('message' => $l -> t('Error connecting to database: ').$e->getMessage()))); - } - break; + break; // Get the autocompletion values for a column case 'getColumnAutocomplete': - - - $parameters = array('host' => $_POST['sql_hostname'], + + + $parameters = array( + 'host' => $_POST['sql_hostname'], 'password' => $_POST['sql_password'], 'user' => $_POST['sql_username'], 'dbname' => $_POST['sql_database'], @@ -231,28 +218,30 @@ if(isset($_POST['appname']) && ($_POST['appname'] === 'user_sql') && isset($_POS $sql_table = $_POST['sql_table']; } - if($helper->verifyTable($parameters, $_POST['sql_driver'], $_POST['sql_table'])) + if ($helper->verifyTable($parameters, $_POST['sql_driver'], $_POST['sql_table'])) { $columns = $helper->getColumns($parameters, $_POST['sql_driver'], $sql_table); - else + } else { $columns = array(); - + } + $search = $_POST['request']; $ret = array(); - foreach($columns as $name) - { - if(($search === '') || ($search === 'search') || (strpos($name, $search) === 0)) - { - $ret[] = array('label' => $name, - 'value' => $name); + foreach ($columns as $name) { + if (($search === '') || ($search === 'search') || (strpos($name, $search) === 0)) { + $ret[] = array( + 'label' => $name, + 'value' => $name + ); } } - $response -> setData($ret); - break; + $response->setData($ret); + break; // Get the autocompletion values for a table case 'getTableAutocomplete': - $parameters = array('host' => $_POST['sql_hostname'], + $parameters = array( + 'host' => $_POST['sql_hostname'], 'password' => $_POST['sql_password'], 'user' => $_POST['sql_username'], 'dbname' => $_POST['sql_database'], @@ -263,23 +252,24 @@ if(isset($_POST['appname']) && ($_POST['appname'] === 'user_sql') && isset($_POS $search = $_POST['request']; $ret = array(); - foreach($tables as $name) - { - if(($search === '') || ($search === 'search') || (strpos($name, $search) === 0)) - { - $ret[] = array('label' => $name, - 'value' => $name); + foreach ($tables as $name) { + if (($search === '') || ($search === 'search') || (strpos($name, $search) === 0)) { + $ret[] = array( + 'label' => $name, + 'value' => $name + ); } } - $response -> setData($ret); - break; + $response->setData($ret); + break; } -} else -{ +} else { // If the request was not for us, set an error message - $response->setData(array('status' => 'error', - 'data' => array('message' => $l -> t('Not submitted for us.')))); + $response->setData(array( + 'status' => 'error', + 'data' => array('message' => $l->t('Not submitted for us.')) + )); } // Return the JSON array diff --git a/appinfo/app.php b/appinfo/app.php index df34741..b984edd 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -1,31 +1,31 @@ -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library 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 AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see . -* -*/ + * Nextcloud - user_sql + * + * @author Andreas Böhler + * @copyright 2012-2015 Andreas Böhler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see . + * + */ require_once(__DIR__ . '/../lib/user_sql.php'); require_once __DIR__ . '/../lib/group_sql.php'; + $backend = new \OCA\user_sql\OC_USER_SQL; $group_backend = new \OCA\user_sql\OC_GROUP_SQL; \OC::$server->getUserManager()->registerBackend($backend); \OC::$server->getGroupManager()->addBackend($group_backend); -?> diff --git a/appinfo/info.xml b/appinfo/info.xml index 1c5d6bf..fa70152 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -1,27 +1,28 @@ - user_sql - SQL user backend - Authenticate Users by SQL - Authenticate Users by SQL - 3.1.0 - agpl - Andreas Boehler <dev (at) aboehler (dot) at > - user_sql - https://github.com/nextcloud/user_sql/issues - https://github.com/nextcloud/user_sql - https://raw.githubusercontent.com/nextcloud/user_sql/v2.4.0/screenshot.png - - - - auth - - - mysql - pgsql - - - \OCA\user_sql\Settings\Admin - OCA\user_sql\Settings\Section - + user_sql + SQL User Backend + Authenticate Users by SQL + Authenticate users and retrieve their groups from external database by native SQL queries. + 4.0.0-dev + agpl + Andreas Boehler <dev (at) aboehler (dot) at > + user_sql + https://github.com/nextcloud/user_sql/issues + https://github.com/nextcloud/user_sql + https://raw.githubusercontent.com/nextcloud/user_sql/v4.0.0/img/screenshot.png + + + + auth + + + + mysql + pgsql + + + \OCA\user_sql\Settings\Admin + OCA\user_sql\Settings\Section + diff --git a/appinfo/routes.php b/appinfo/routes.php index afb4fea..1617c63 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -1,8 +1,9 @@ -* This file is licensed under the Affero General Public License version 3 or later. -* See the COPYING-README file. -*/ + * Copyright (c) 2015, Andreas Böhler + * This file is licensed under the Affero General Public License version 3 or later. + * See the COPYING-README file. + */ + /** @var $this \OCP\Route\IRouter */ $this->create('user_sql_ajax_settings', 'ajax/settings.php')->actionInclude('user_sql/ajax/settings.php'); diff --git a/appinfo/update.php b/appinfo/update.php deleted file mode 100644 index 6312a16..0000000 --- a/appinfo/update.php +++ /dev/null @@ -1,71 +0,0 @@ - - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . - * - */ - -$installedVersion = \OC::$server->getConfig()->getAppValue('user_sql', 'installed_version'); - -$params = array('sql_host' => 'sql_hostname', - 'sql_user' => 'sql_username', - 'sql_database' => 'sql_database', - 'sql_password' => 'sql_password', - 'sql_table' => 'sql_table', - 'sql_column_username' => 'col_username', - 'sql_column_password' => 'col_password', - 'sql_type' => 'sql_driver', - 'sql_column_active' => 'col_active', - 'strip_domain' => 'set_strip_domain', - 'default_domain' => 'set_default_domain', - 'crypt_type' => 'set_crypt_type', - 'sql_column_displayname' => 'col_displayname', - 'allow_password_change' => 'set_allow_pwchange', - 'sql_column_active_invert' => 'set_active_invert', - 'sql_column_email' => 'col_email', - 'mail_sync_mode' => 'set_mail_sync_mode' - ); - -$delParams = array('domain_settings', - 'map_array', - 'domain_array' - ); - -if(version_compare($installedVersion, '1.99', '<')) -{ - foreach($params as $oldPar => $newPar) - { - $val = \OC::$server->getConfig()->getAppValue('user_sql', $oldPar); - if(($oldPar === 'strip_domain') || ($oldPar === 'allow_password_change') || ($oldPar === 'sql_column_active_invert')) - { - if($val) - $val = 'true'; - else - $val = 'false'; - } - if($val) - \OC::$server->getConfig()->setAppValue('user_sql', $newPar.'_default', $val); - \OC::$server->getConfig()->deleteAppValue('user_sql', $oldPar); - } - - foreach($delParams as $param) - { - \OC::$server->getConfig()->deleteAppValue('user_sql', $param); - } -} diff --git a/css/settings.css b/css/settings.css index 87f19b7..0f90ec3 100644 --- a/css/settings.css +++ b/css/settings.css @@ -1,15 +1,18 @@ .statusmessage { - background-color: #DDDDFF; + background-color: #DDDDFF; } + .errormessage { - background-color: #FFDDDD; + background-color: #FFDDDD; } + .successmessage { - background-color: #DDFFDD; + background-color: #DDFFDD; } -.statusmessage,.errormessage,.successmessage{ - display:none; - padding: 1px; + +.statusmessage, .errormessage, .successmessage { + display: none; + padding: 1px; } #sql-1 p label:first-child, diff --git a/img/app-dark.svg b/img/app-dark.svg index 54939fa..24168c8 100644 --- a/img/app-dark.svg +++ b/img/app-dark.svg @@ -1,4 +1,5 @@ - + diff --git a/screenshot.png b/img/screenshot.png similarity index 100% rename from screenshot.png rename to img/screenshot.png diff --git a/js/settings.js b/js/settings.js index f9f6b44..4b63b53 100644 --- a/js/settings.js +++ b/js/settings.js @@ -2,63 +2,57 @@ // declare namespace var user_sql = user_sql || -{ -}; + {}; /** * init admin settings view */ -user_sql.adminSettingsUI = function() -{ +user_sql.adminSettingsUI = function () { - if($('#sqlDiv').length > 0) - { + if ($('#sqlDiv').length > 0) { // enable tabs on settings page $('#sqlDiv').tabs(); - + // Attach auto-completion to all column fields $('#col_username, #col_password, #col_displayname, #col_active, #col_email, #col_gethome').autocomplete({ - source: function(request, response) - { + source: function (request, response) { var post = $('#sqlForm').serializeArray(); var domain = $('#sql_domain_chooser option:selected').val(); - + post.push({ name: 'function', value: 'getColumnAutocomplete' }); - + post.push({ name: 'domain', value: domain }); - + post.push({ name: 'request', value: request.term }); - + // Ajax foobar $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, response, 'json'); }, minLength: 0, - open: function() { + open: function () { $(this).attr('state', 'open'); }, - close: function() { + close: function () { $(this).attr('state', 'closed'); } - }).focus(function() { - if($(this).attr('state') != 'open') - { - $(this).autocomplete("search"); - } + }).focus(function () { + if ($(this).attr('state') != 'open') { + $(this).autocomplete("search"); + } }); // Attach auto-completion to all group column fields $('#col_group_name, #col_group_username').autocomplete({ - source: function(request, response) - { + source: function (request, response) { var post = $('#sqlForm').serializeArray(); var domain = $('#sql_domain_chooser option:selected').val(); @@ -86,71 +80,67 @@ user_sql.adminSettingsUI = function() $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, response, 'json'); }, minLength: 0, - open: function() { + open: function () { $(this).attr('state', 'open'); }, - close: function() { + close: function () { $(this).attr('state', 'closed'); } - }).focus(function() { - if($(this).attr('state') != 'open') - { - $(this).autocomplete("search"); - } + }).focus(function () { + if ($(this).attr('state') != 'open') { + $(this).autocomplete("search"); + } }); - + // Attach auto-completion to all table fields $('#sql_table, #sql_group_table').autocomplete({ - source: function(request, response) - { + source: function (request, response) { var post = $('#sqlForm').serializeArray(); var domain = $('#sql_domain_chooser option:selected').val(); - + post.push({ name: 'function', value: 'getTableAutocomplete' }); - + post.push({ name: 'domain', value: domain }); - + post.push({ name: 'request', value: request.term }); - + // Ajax foobar $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, response, 'json'); }, minLength: 0, - open: function() { + open: function () { $(this).attr('state', 'open'); }, - close: function() { + close: function () { $(this).attr('state', 'closed'); } - }).focus(function() { - if($(this).attr('state') != 'open') - { - $(this).autocomplete("search"); - } + }).focus(function () { + if ($(this).attr('state') != 'open') { + $(this).autocomplete("search"); + } }); - + // Verify the SQL database settings - $('#sqlVerify').click(function(event) - { + $('#sqlVerify').click(function (event) { event.preventDefault(); var post = $('#sqlForm').serializeArray(); var domain = $('#sql_domain_chooser option:selected').val(); - + post.push({ name: 'function', value: 'verifySettings' }); - + post.push({ name: 'domain', value: domain @@ -161,39 +151,34 @@ user_sql.adminSettingsUI = function() $('#sql_error_message').hide(); $('#sql_update_message').hide(); // Ajax foobar - $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, function(data) - { + $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, function (data) { $('#sql_verify_message').hide(); - if(data.status == 'success') - { + if (data.status == 'success') { $('#sql_success_message').html(data.data.message); $('#sql_success_message').show(); - window.setTimeout(function() - { + window.setTimeout(function () { $('#sql_success_message').hide(); }, 10000); - } else - { + } else { $('#sql_error_message').html(data.data.message); $('#sql_error_message').show(); } }, 'json'); return false; - }); + }); // Save the settings for a domain - $('#sqlSubmit').click(function(event) - { + $('#sqlSubmit').click(function (event) { event.preventDefault(); var post = $('#sqlForm').serializeArray(); var domain = $('#sql_domain_chooser option:selected').val(); - + post.push({ name: 'function', value: 'saveSettings' }); - + post.push({ name: 'domain', value: domain @@ -204,19 +189,15 @@ user_sql.adminSettingsUI = function() $('#sql_verify_message').hide(); $('#sql_error_message').hide(); // Ajax foobar - $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, function(data) - { + $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, function (data) { $('#sql_update_message').hide(); - if(data.status == 'success') - { + if (data.status == 'success') { $('#sql_success_message').html(data.data.message); $('#sql_success_message').show(); - window.setTimeout(function() - { + window.setTimeout(function () { $('#sql_success_message').hide(); }, 10000); - } else - { + } else { $('#sql_error_message').html(data.data.message); $('#sql_error_message').show(); } @@ -225,45 +206,39 @@ user_sql.adminSettingsUI = function() }); // Attach event handler to the domain chooser - $('#sql_domain_chooser').change(function() { - user_sql.loadDomainSettings($('#sql_domain_chooser option:selected').val()); + $('#sql_domain_chooser').change(function () { + user_sql.loadDomainSettings($('#sql_domain_chooser option:selected').val()); }); - - $('#set_gethome_mode').change(function() { - user_sql.setGethomeMode(); + + $('#set_gethome_mode').change(function () { + user_sql.setGethomeMode(); }); - - $('#set_enable_gethome').change(function() { + + $('#set_enable_gethome').change(function () { user_sql.setGethomeMode(); }); } }; -user_sql.setGethomeMode = function() -{ +user_sql.setGethomeMode = function () { var enabled = $('#set_enable_gethome').prop('checked'); - if(enabled) - { + if (enabled) { $('#set_gethome_mode').prop('disabled', false); var val = $('#set_gethome_mode option:selected').val(); - if(val === 'query') - { + if (val === 'query') { $('#set_gethome').prop('disabled', true); $('#col_gethome').prop('disabled', false); } - else if(val === 'static') - { + else if (val === 'static') { $('#set_gethome').prop('disabled', false); $('#col_gethome').prop('disabled', true); } - else - { + else { $('#set_gethome').prop('disabled', true); $('#col_gethome').prop('disabled', true); } } - else - { + else { $('#set_gethome_mode').prop('disabled', true); $('#set_gethome').prop('disabled', true); $('#col_gethome').prop('disabled', true); @@ -274,8 +249,7 @@ user_sql.setGethomeMode = function() * Load the settings for the selected domain * @param string domain The domain to load */ -user_sql.loadDomainSettings = function(domain) -{ +user_sql.loadDomainSettings = function (domain) { $('#sql_success_message').hide(); $('#sql_error_message').hide(); $('#sql_verify_message').hide(); @@ -294,49 +268,40 @@ user_sql.loadDomainSettings = function(domain) value: domain } ]; - $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, function(data) - { + $.post(OC.filePath('user_sql', 'ajax', 'settings.php'), post, function (data) { $('#sql_loading_message').hide(); - if(data.status == 'success') - { - for(key in data.settings) - { - if(key == 'set_strip_domain') - { - if(data.settings[key] == 'true') + if (data.status == 'success') { + for (key in data.settings) { + if (key == 'set_strip_domain') { + if (data.settings[key] == 'true') $('#' + key).prop('checked', true); else $('#' + key).prop('checked', false); } - else if(key == 'set_allow_pwchange') - { - if(data.settings[key] == 'true') + else if (key == 'set_allow_pwchange') { + if (data.settings[key] == 'true') $('#' + key).prop('checked', true); else $('#' + key).prop('checked', false); } - else if(key == 'set_active_invert') - { - if(data.settings[key] == 'true') + else if (key == 'set_active_invert') { + if (data.settings[key] == 'true') $('#' + key).prop('checked', true); else $('#' + key).prop('checked', false); } - else if(key == 'set_enable_gethome') - { - if(data.settings[key] == 'true') + else if (key == 'set_enable_gethome') { + if (data.settings[key] == 'true') $('#' + key).prop('checked', true); else $('#' + key).prop('checked', false); } - else - { + else { $('#' + key).val(data.settings[key]); } } } - else - { + else { $('#sql_error_message').html(data.data.message); $('#sql_error_message').show(); } @@ -346,10 +311,8 @@ user_sql.loadDomainSettings = function(domain) }; // Run our JS if the SQL settings are present -$(document).ready(function() -{ - if($('#sqlDiv')) - { +$(document).ready(function () { + if ($('#sqlDiv')) { user_sql.adminSettingsUI(); user_sql.loadDomainSettings($('#sql_domain_chooser option:selected').val()); user_sql.setGethomeMode(); diff --git a/lib/PasswordHash.php b/lib/PasswordHash.php index e363656..c414ad3 100644 --- a/lib/PasswordHash.php +++ b/lib/PasswordHash.php @@ -24,230 +24,245 @@ # Obviously, since this code is in the public domain, the above are not # requirements (there can be none), but merely suggestions. # -class PasswordHash { - var $itoa64; - var $iteration_count_log2; - var $portable_hashes; - var $random_state; +class PasswordHash +{ + var $itoa64; + var $iteration_count_log2; + var $portable_hashes; + var $random_state; - function __construct($iteration_count_log2, $portable_hashes) - { - $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; + function __construct($iteration_count_log2, $portable_hashes) + { + $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; - if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) - $iteration_count_log2 = 8; - $this->iteration_count_log2 = $iteration_count_log2; + if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) { + $iteration_count_log2 = 8; + } + $this->iteration_count_log2 = $iteration_count_log2; - $this->portable_hashes = $portable_hashes; + $this->portable_hashes = $portable_hashes; - $this->random_state = microtime(); - if (function_exists('getmypid')) - $this->random_state .= getmypid(); - } + $this->random_state = microtime(); + if (function_exists('getmypid')) { + $this->random_state .= getmypid(); + } + } - function get_random_bytes($count) - { - $output = ''; - if (is_readable('/dev/urandom') && - ($fh = @fopen('/dev/urandom', 'rb'))) { - $output = fread($fh, $count); - fclose($fh); - } + function get_random_bytes($count) + { + $output = ''; + if (is_readable('/dev/urandom') && + ($fh = @fopen('/dev/urandom', 'rb'))) { + $output = fread($fh, $count); + fclose($fh); + } - if (strlen($output) < $count) { - $output = ''; - for ($i = 0; $i < $count; $i += 16) { - $this->random_state = - md5(microtime() . $this->random_state); - $output .= - pack('H*', md5($this->random_state)); - } - $output = substr($output, 0, $count); - } + if (strlen($output) < $count) { + $output = ''; + for ($i = 0; $i < $count; $i += 16) { + $this->random_state = + md5(microtime() . $this->random_state); + $output .= + pack('H*', md5($this->random_state)); + } + $output = substr($output, 0, $count); + } - return $output; - } + return $output; + } - function encode64($input, $count) - { - $output = ''; - $i = 0; - do { - $value = ord($input[$i++]); - $output .= $this->itoa64[$value & 0x3f]; - if ($i < $count) - $value |= ord($input[$i]) << 8; - $output .= $this->itoa64[($value >> 6) & 0x3f]; - if ($i++ >= $count) - break; - if ($i < $count) - $value |= ord($input[$i]) << 16; - $output .= $this->itoa64[($value >> 12) & 0x3f]; - if ($i++ >= $count) - break; - $output .= $this->itoa64[($value >> 18) & 0x3f]; - } while ($i < $count); + function encode64($input, $count) + { + $output = ''; + $i = 0; + do { + $value = ord($input[$i++]); + $output .= $this->itoa64[$value & 0x3f]; + if ($i < $count) { + $value |= ord($input[$i]) << 8; + } + $output .= $this->itoa64[($value >> 6) & 0x3f]; + if ($i++ >= $count) { + break; + } + if ($i < $count) { + $value |= ord($input[$i]) << 16; + } + $output .= $this->itoa64[($value >> 12) & 0x3f]; + if ($i++ >= $count) { + break; + } + $output .= $this->itoa64[($value >> 18) & 0x3f]; + } while ($i < $count); - return $output; - } + return $output; + } - function gensalt_private($input) - { - $output = '$P$'; - $output .= $this->itoa64[min($this->iteration_count_log2 + - ((PHP_VERSION >= '5') ? 5 : 3), 30)]; - $output .= $this->encode64($input, 6); + function gensalt_private($input) + { + $output = '$P$'; + $output .= $this->itoa64[min($this->iteration_count_log2 + + ((PHP_VERSION >= '5') ? 5 : 3), 30)]; + $output .= $this->encode64($input, 6); - return $output; - } + return $output; + } - function crypt_private($password, $setting) - { - $output = '*0'; - if (substr($setting, 0, 2) === $output) - $output = '*1'; + function crypt_private($password, $setting) + { + $output = '*0'; + if (substr($setting, 0, 2) === $output) { + $output = '*1'; + } - $id = substr($setting, 0, 3); - # We use "$P$", phpBB3 uses "$H$" for the same thing - if ($id !== '$P$' && $id !== '$H$') - return $output; + $id = substr($setting, 0, 3); + # We use "$P$", phpBB3 uses "$H$" for the same thing + if ($id !== '$P$' && $id !== '$H$') { + return $output; + } - $count_log2 = strpos($this->itoa64, $setting[3]); - if ($count_log2 < 7 || $count_log2 > 30) - return $output; + $count_log2 = strpos($this->itoa64, $setting[3]); + if ($count_log2 < 7 || $count_log2 > 30) { + return $output; + } - $count = 1 << $count_log2; + $count = 1 << $count_log2; - $salt = substr($setting, 4, 8); - if (strlen($salt) !== 8) - return $output; + $salt = substr($setting, 4, 8); + if (strlen($salt) !== 8) { + return $output; + } - # We're kind of forced to use MD5 here since it's the only - # cryptographic primitive available in all versions of PHP - # currently in use. To implement our own low-level crypto - # in PHP would result in much worse performance and - # consequently in lower iteration counts and hashes that are - # quicker to crack (by non-PHP code). - if (PHP_VERSION >= '5') { - $hash = md5($salt . $password, TRUE); - do { - $hash = md5($hash . $password, TRUE); - } while (--$count); - } else { - $hash = pack('H*', md5($salt . $password)); - do { - $hash = pack('H*', md5($hash . $password)); - } while (--$count); - } + # We're kind of forced to use MD5 here since it's the only + # cryptographic primitive available in all versions of PHP + # currently in use. To implement our own low-level crypto + # in PHP would result in much worse performance and + # consequently in lower iteration counts and hashes that are + # quicker to crack (by non-PHP code). + if (PHP_VERSION >= '5') { + $hash = md5($salt . $password, true); + do { + $hash = md5($hash . $password, true); + } while (--$count); + } else { + $hash = pack('H*', md5($salt . $password)); + do { + $hash = pack('H*', md5($hash . $password)); + } while (--$count); + } - $output = substr($setting, 0, 12); - $output .= $this->encode64($hash, 16); + $output = substr($setting, 0, 12); + $output .= $this->encode64($hash, 16); - return $output; - } + return $output; + } - function gensalt_extended($input) - { - $count_log2 = min($this->iteration_count_log2 + 8, 24); - # This should be odd to not reveal weak DES keys, and the - # maximum valid value is (2**24 - 1) which is odd anyway. - $count = (1 << $count_log2) - 1; + function gensalt_extended($input) + { + $count_log2 = min($this->iteration_count_log2 + 8, 24); + # This should be odd to not reveal weak DES keys, and the + # maximum valid value is (2**24 - 1) which is odd anyway. + $count = (1 << $count_log2) - 1; - $output = '_'; - $output .= $this->itoa64[$count & 0x3f]; - $output .= $this->itoa64[($count >> 6) & 0x3f]; - $output .= $this->itoa64[($count >> 12) & 0x3f]; - $output .= $this->itoa64[($count >> 18) & 0x3f]; + $output = '_'; + $output .= $this->itoa64[$count & 0x3f]; + $output .= $this->itoa64[($count >> 6) & 0x3f]; + $output .= $this->itoa64[($count >> 12) & 0x3f]; + $output .= $this->itoa64[($count >> 18) & 0x3f]; - $output .= $this->encode64($input, 3); + $output .= $this->encode64($input, 3); - return $output; - } + return $output; + } - function gensalt_blowfish($input) - { - # This one needs to use a different order of characters and a - # different encoding scheme from the one in encode64() above. - # We care because the last character in our encoded string will - # only represent 2 bits. While two known implementations of - # bcrypt will happily accept and correct a salt string which - # has the 4 unused bits set to non-zero, we do not want to take - # chances and we also do not want to waste an additional byte - # of entropy. - $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + function gensalt_blowfish($input) + { + # This one needs to use a different order of characters and a + # different encoding scheme from the one in encode64() above. + # We care because the last character in our encoded string will + # only represent 2 bits. While two known implementations of + # bcrypt will happily accept and correct a salt string which + # has the 4 unused bits set to non-zero, we do not want to take + # chances and we also do not want to waste an additional byte + # of entropy. + $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - $output = '$2a$'; - $output .= chr(ord('0') + $this->iteration_count_log2 / 10); - $output .= chr(ord('0') + $this->iteration_count_log2 % 10); - $output .= '$'; + $output = '$2a$'; + $output .= chr(ord('0') + $this->iteration_count_log2 / 10); + $output .= chr(ord('0') + $this->iteration_count_log2 % 10); + $output .= '$'; - $i = 0; - do { - $c1 = ord($input[$i++]); - $output .= $itoa64[$c1 >> 2]; - $c1 = ($c1 & 0x03) << 4; - if ($i >= 16) { - $output .= $itoa64[$c1]; - break; - } + $i = 0; + do { + $c1 = ord($input[$i++]); + $output .= $itoa64[$c1 >> 2]; + $c1 = ($c1 & 0x03) << 4; + if ($i >= 16) { + $output .= $itoa64[$c1]; + break; + } - $c2 = ord($input[$i++]); - $c1 |= $c2 >> 4; - $output .= $itoa64[$c1]; - $c1 = ($c2 & 0x0f) << 2; + $c2 = ord($input[$i++]); + $c1 |= $c2 >> 4; + $output .= $itoa64[$c1]; + $c1 = ($c2 & 0x0f) << 2; - $c2 = ord($input[$i++]); - $c1 |= $c2 >> 6; - $output .= $itoa64[$c1]; - $output .= $itoa64[$c2 & 0x3f]; - } while (1); + $c2 = ord($input[$i++]); + $c1 |= $c2 >> 6; + $output .= $itoa64[$c1]; + $output .= $itoa64[$c2 & 0x3f]; + } while (1); - return $output; - } + return $output; + } - function HashPassword($password) - { - $random = ''; + function HashPassword($password) + { + $random = ''; - if (CRYPT_BLOWFISH === 1 && !$this->portable_hashes) { - $random = $this->get_random_bytes(16); - $hash = - crypt($password, $this->gensalt_blowfish($random)); - if (strlen($hash) === 60) - return $hash; - } + if (CRYPT_BLOWFISH === 1 && !$this->portable_hashes) { + $random = $this->get_random_bytes(16); + $hash = + crypt($password, $this->gensalt_blowfish($random)); + if (strlen($hash) === 60) { + return $hash; + } + } - if (CRYPT_EXT_DES === 1 && !$this->portable_hashes) { - if (strlen($random) < 3) - $random = $this->get_random_bytes(3); - $hash = - crypt($password, $this->gensalt_extended($random)); - if (strlen($hash) === 20) - return $hash; - } + if (CRYPT_EXT_DES === 1 && !$this->portable_hashes) { + if (strlen($random) < 3) { + $random = $this->get_random_bytes(3); + } + $hash = + crypt($password, $this->gensalt_extended($random)); + if (strlen($hash) === 20) { + return $hash; + } + } - if (strlen($random) < 6) - $random = $this->get_random_bytes(6); - $hash = - $this->crypt_private($password, - $this->gensalt_private($random)); - if (strlen($hash) === 34) - return $hash; + if (strlen($random) < 6) { + $random = $this->get_random_bytes(6); + } + $hash = + $this->crypt_private($password, + $this->gensalt_private($random)); + if (strlen($hash) === 34) { + return $hash; + } - # Returning '*' on error is safe here, but would _not_ be safe - # in a crypt(3)-like function used _both_ for generating new - # hashes and for validating passwords against existing hashes. - return '*'; - } + # Returning '*' on error is safe here, but would _not_ be safe + # in a crypt(3)-like function used _both_ for generating new + # hashes and for validating passwords against existing hashes. + return '*'; + } - function CheckPassword($password, $stored_hash) - { - $hash = $this->crypt_private($password, $stored_hash); - if ($hash[0] === '*') - $hash = crypt($password, $stored_hash); + function CheckPassword($password, $stored_hash) + { + $hash = $this->crypt_private($password, $stored_hash); + if ($hash[0] === '*') { + $hash = crypt($password, $stored_hash); + } - return $hash === $stored_hash; - } + return $hash === $stored_hash; + } } - -?> diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index cf11109..bf6f5b1 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -28,73 +28,76 @@ use OCP\Defaults; use OCP\IConfig; use OCP\IL10N; use OCP\Settings\ISettings; -use OCA\user_sql\lib\Helper; -class Admin implements ISettings { - /** @var IL10N */ - private $l10n; - /** @var Defaults */ - private $defaults; - /** @var IConfig */ - private $config; +class Admin implements ISettings +{ + /** @var IL10N */ + private $l10n; + /** @var Defaults */ + private $defaults; + /** @var IConfig */ + private $config; - /** - * @param IL10N $l10n - * @param Defaults $defaults - * @param IConfig $config - */ - public function __construct(IL10N $l10n, - Defaults $defaults, - IConfig $config) { - $this->l10n = $l10n; - $this->defaults = $defaults; - $this->config = $config; - $this->helper = new \OCA\user_sql\lib\Helper(); - $this->params = $this->helper->getParameterArray(); - $this->settings = $this->helper -> loadSettingsForDomain('default'); - } + /** + * @param IL10N $l10n + * @param Defaults $defaults + * @param IConfig $config + */ + public function __construct( + IL10N $l10n, + Defaults $defaults, + IConfig $config + ) { + $this->l10n = $l10n; + $this->defaults = $defaults; + $this->config = $config; + $this->helper = new \OCA\user_sql\lib\Helper(); + $this->params = $this->helper->getParameterArray(); + $this->settings = $this->helper->loadSettingsForDomain('default'); + } - /** - * @return TemplateResponse - */ - public function getForm() { + /** + * @return TemplateResponse + */ + public function getForm() + { - $type = $this->config->getAppValue('user_sql', 'type'); - $trusted_domains = \OC::$server->getConfig()->getSystemValue('trusted_domains'); - $inserted = array('default'); - array_splice($trusted_domains, 0, 0, $inserted); + $type = $this->config->getAppValue('user_sql', 'type'); + $trusted_domains = \OC::$server->getConfig()->getSystemValue('trusted_domains'); + $inserted = array('default'); + array_splice($trusted_domains, 0, 0, $inserted); - $params = [ - 'type' => $type, - ]; - $params['allowed_domains']= array_unique($trusted_domains); + $params = [ + 'type' => $type, + ]; + $params['allowed_domains'] = array_unique($trusted_domains); - foreach($this->params as $key) - { - $value = $this->settings[$key]; - $params[$key]=$value; - } + foreach ($this->params as $key) { + $value = $this->settings[$key]; + $params[$key] = $value; + } - $params["config"]=$this->config; - return new TemplateResponse('user_sql', 'admin', $params); - } + $params["config"] = $this->config; + return new TemplateResponse('user_sql', 'admin', $params); + } - /** - * @return string the section ID, e.g. 'sharing' - */ - public function getSection() { - return 'usersql'; - } - - /** - * @return int whether the form should be rather on the top or bottom of - * the admin section. The forms are arranged in ascending order of the - * priority values. It is required to return a value between 0 and 100. - * - * keep the server setting at the top, right after "server settings" - */ - public function getPriority() { - return 0; - } + /** + * @return string the section ID, e.g. 'sharing' + */ + public function getSection() + { + return 'user_sql'; + } + /** + * @return int whether the form should be rather on the top or bottom of + * the admin section. The forms are arranged in ascending order of the + * priority values. It is required to return a value between 0 and 100. + * + * keep the server setting at the top, right after "server settings" + */ + public function getPriority() + { + return 0; + } } diff --git a/lib/Settings/Section.php b/lib/Settings/Section.php index 091f8f2..9d6ba23 100644 --- a/lib/Settings/Section.php +++ b/lib/Settings/Section.php @@ -27,42 +27,49 @@ use OCP\IL10N; use OCP\Settings\IIconSection; use OCP\IURLGenerator; -class Section implements IIconSection { - /** @var IL10N */ - private $l; +class Section implements IIconSection +{ + /** @var IL10N */ + private $l; - /** - * @param IL10N $l - */ - public function __construct(IURLGenerator $url,IL10N $l) { - $this->l = $l; - $this->url = $url; - } + /** + * @param IL10N $l + */ + public function __construct(IURLGenerator $url, IL10N $l) + { + $this->l = $l; + $this->url = $url; + } - /** - * {@inheritdoc} - */ - public function getID() { - return 'usersql'; - } + /** + * {@inheritdoc} + */ + public function getID() + { + return 'user_sql'; + } - /** - * {@inheritdoc} - */ - public function getName() { - return $this->l->t('User SQL'); - } + /** + * {@inheritdoc} + */ + public function getName() + { + return $this->l->t('User SQL'); + } - /** - * {@inheritdoc} - */ - public function getPriority() { - return 75; - } - /** - * {@inheritdoc} - */ - public function getIcon() { - return $this->url->imagePath('user_sql', 'app-dark.svg'); - } + /** + * {@inheritdoc} + */ + public function getPriority() + { + return 75; + } + + /** + * {@inheritdoc} + */ + public function getIcon() + { + return $this->url->imagePath('user_sql', 'app-dark.svg'); + } } diff --git a/lib/drupal.php b/lib/drupal.php index 4c7e0a4..3b07cda 100644 --- a/lib/drupal.php +++ b/lib/drupal.php @@ -1,321 +1,330 @@ -> 6) & 0x3f]; - if ($i++ >= $count) { - break; - } - if ($i < $count) { - $value |= ord($input[$i]) << 16; - } - $output .= $itoa64[($value >> 12) & 0x3f]; - if ($i++ >= $count) { - break; - } - $output .= $itoa64[($value >> 18) & 0x3f]; - } while ($i < $count); - - return $output; -} -/** - * Returns a string of highly randomized bytes (over the full 8-bit range). - * - * This function is better than simply calling mt_rand() or any other built-in - * PHP function because it can return a long string of bytes (compared to < 4 - * bytes normally from mt_rand()) and uses the best available pseudo-random - * source. - * - * @param $count - * The number of characters (bytes) to return in the string. - */ - - function _random_bytes($count) { - // $random_state does not use static as it stores random bytes. - static $random_state, $bytes, $has_openssl; - - $missing_bytes = $count - strlen($bytes); - - if ($missing_bytes > 0) { - // PHP versions prior 5.3.4 experienced openssl_random_pseudo_bytes() - // locking on Windows and rendered it unusable. - if (!isset($has_openssl)) { - $has_openssl = version_compare(PHP_VERSION, '5.3.4', '>=') && function_exists('openssl_random_pseudo_bytes'); - } - - // openssl_random_pseudo_bytes() will find entropy in a system-dependent - // way. - if ($has_openssl) { - $bytes .= openssl_random_pseudo_bytes($missing_bytes); - } - - // Else, read directly from /dev/urandom, which is available on many *nix - // systems and is considered cryptographically secure. - elseif ($fh = @fopen('/dev/urandom', 'rb')) { - // PHP only performs buffered reads, so in reality it will always read - // at least 4096 bytes. Thus, it costs nothing extra to read and store - // that much so as to speed any additional invocations. - $bytes .= fread($fh, max(4096, $missing_bytes)); - fclose($fh); - } - - // If we couldn't get enough entropy, this simple hash-based PRNG will - // generate a good set of pseudo-random bytes on any system. - // Note that it may be important that our $random_state is passed - // through hash() prior to being rolled into $output, that the two hash() - // invocations are different, and that the extra input into the first one - - // the microtime() - is prepended rather than appended. This is to avoid - // directly leaking $random_state via the $output stream, which could - // allow for trivial prediction of further "random" numbers. - if (strlen($bytes) < $count) { - // Initialize on the first call. The contents of $_SERVER includes a mix of - // user-specific and system information that varies a little with each page. - if (!isset($random_state)) { - $random_state = print_r($_SERVER, TRUE); - if (function_exists('getmypid')) { - // Further initialize with the somewhat random PHP process ID. - $random_state .= getmypid(); - } - $bytes = ''; - } - - do { - $random_state = hash('sha256', microtime() . mt_rand() . $random_state); - $bytes .= hash('sha256', mt_rand() . $random_state, TRUE); - } - while (strlen($bytes) < $count); - } - } - $output = substr($bytes, 0, $count); - $bytes = substr($bytes, $count); - return $output; -} - -/** - * Generates a random base 64-encoded salt prefixed with settings for the hash. - * - * Proper use of salts may defeat a number of attacks, including: - * - The ability to try candidate passwords against multiple hashes at once. - * - The ability to use pre-hashed lists of candidate passwords. - * - The ability to determine whether two users have the same (or different) - * password without actually having to guess one of the passwords. - * - * @param $count_log2 - * Integer that determines the number of iterations used in the hashing - * process. A larger value is more secure, but takes more time to complete. - * - * @return - * A 12 character string containing the iteration count and a random salt. - */ -function _password_generate_salt($count_log2) { - $output = '$S$'; - // Ensure that $count_log2 is within set bounds. - $count_log2 = _password_enforce_log2_boundaries($count_log2); - // We encode the final log2 iteration count in base 64. - $itoa64 = _password_itoa64(); - $output .= $itoa64[$count_log2]; - // 6 bytes is the standard salt for a portable phpass hash. - $output .= _password_base64_encode(_random_bytes(6), 6); - return $output; -} - -/** - * Ensures that $count_log2 is within set bounds. - * - * @param $count_log2 - * Integer that determines the number of iterations used in the hashing - * process. A larger value is more secure, but takes more time to complete. - * - * @return - * Integer within set bounds that is closest to $count_log2. - */ -function _password_enforce_log2_boundaries($count_log2) { - if ($count_log2 < MIN_HASH_COUNT) { - return MIN_HASH_COUNT; - } - elseif ($count_log2 > MAX_HASH_COUNT) { - return MAX_HASH_COUNT; - } - - return (int) $count_log2; -} - -/** - * Hash a password using a secure stretched hash. - * - * By using a salt and repeated hashing the password is "stretched". Its - * security is increased because it becomes much more computationally costly - * for an attacker to try to break the hash by brute-force computation of the - * hashes of a large number of plain-text words or strings to find a match. - * - * @param $algo - * The string name of a hashing algorithm usable by hash(), like 'sha256'. - * @param $password - * Plain-text password up to 512 bytes (128 to 512 UTF-8 characters) to hash. - * @param $setting - * An existing hash or the output of _password_generate_salt(). Must be - * at least 12 characters (the settings and salt). - * - * @return - * A string containing the hashed password (and salt) or FALSE on failure. - * The return string will be truncated at DRUPAL_HASH_LENGTH characters max. - */ -function _password_crypt($algo, $password, $setting) { - // Prevent DoS attacks by refusing to hash large passwords. - if (strlen($password) > 512) { - return FALSE; - } - // The first 12 characters of an existing hash are its setting string. - $setting = substr($setting, 0, 12); - - if ($setting[0] != '$' || $setting[2] != '$') { - return FALSE; - } - $count_log2 = _password_get_count_log2($setting); - // Hashes may be imported from elsewhere, so we allow != DRUPAL_HASH_COUNT - if ($count_log2 < MIN_HASH_COUNT || $count_log2 > MAX_HASH_COUNT) { - return FALSE; - } - $salt = substr($setting, 4, 8); - // Hashes must have an 8 character salt. - if (strlen($salt) != 8) { - return FALSE; - } - - // Convert the base 2 logarithm into an integer. - $count = 1 << $count_log2; - - // We rely on the hash() function being available in PHP 5.2+. - $hash = hash($algo, $salt . $password, TRUE); - do { - $hash = hash($algo, $hash . $password, TRUE); - } while (--$count); - - $len = strlen($hash); - $output = $setting . _password_base64_encode($hash, $len); - // _password_base64_encode() of a 16 byte MD5 will always be 22 characters. - // _password_base64_encode() of a 64 byte sha512 will always be 86 characters. - $expected = 12 + ceil((8 * $len) / 6); - return (strlen($output) == $expected) ? substr($output, 0, HASH_LENGTH) : FALSE; -} - -/** - * Parse the log2 iteration count from a stored hash or setting string. - */ -function _password_get_count_log2($setting) { - $itoa64 = _password_itoa64(); - return strpos($itoa64, $setting[3]); -} - -/** - * Hash a password using a secure hash. - * - * @param $password - * A plain-text password. - * @param $count_log2 - * Optional integer to specify the iteration count. Generally used only during - * mass operations where a value less than the default is needed for speed. - * - * @return - * A string containing the hashed password (and a salt), or FALSE on failure. - */ -function user_hash_password($password, $count_log2 = 0) { - if (empty($count_log2)) { - // Use the standard iteration count. - $count_log2 = variable_get('password_count_log2', DRUPAL_HASH_COUNT); - } - return _password_crypt('sha512', $password, _password_generate_salt($count_log2)); -} - -/** - * Check whether a plain text password matches a stored hashed password. - * - * @param $password - * A plain-text password - * @param $hashpass - * - * @return - * TRUE or FALSE. - */ -function user_check_password($password, $hashpass) { - $stored_hash = $hashpass; - $type = substr($stored_hash, 0, 3); - switch ($type) { - case '$S$': - // A normal Drupal 7 password using sha512. - $hash = _password_crypt('sha512', $password, $stored_hash); - break; - case '$H$': - // phpBB3 uses "$H$" for the same thing as "$P$". - case '$P$': - // A phpass password generated using md5. This is an - // imported password or from an earlier Drupal version. - $hash = _password_crypt('md5', $password, $stored_hash); - break; - default: - return FALSE; - } - return ($hash && $stored_hash == $hash); -} \ No newline at end of file +> 6) & 0x3f]; + if ($i++ >= $count) { + break; + } + if ($i < $count) { + $value |= ord($input[$i]) << 16; + } + $output .= $itoa64[($value >> 12) & 0x3f]; + if ($i++ >= $count) { + break; + } + $output .= $itoa64[($value >> 18) & 0x3f]; + } while ($i < $count); + + return $output; +} + +/** + * Returns a string of highly randomized bytes (over the full 8-bit range). + * + * This function is better than simply calling mt_rand() or any other built-in + * PHP function because it can return a long string of bytes (compared to < 4 + * bytes normally from mt_rand()) and uses the best available pseudo-random + * source. + * + * @param $count + * The number of characters (bytes) to return in the string. + */ + +function _random_bytes($count) +{ + // $random_state does not use static as it stores random bytes. + static $random_state, $bytes, $has_openssl; + + $missing_bytes = $count - strlen($bytes); + + if ($missing_bytes > 0) { + // PHP versions prior 5.3.4 experienced openssl_random_pseudo_bytes() + // locking on Windows and rendered it unusable. + if (!isset($has_openssl)) { + $has_openssl = version_compare(PHP_VERSION, '5.3.4', + '>=') && function_exists('openssl_random_pseudo_bytes'); + } + + // openssl_random_pseudo_bytes() will find entropy in a system-dependent + // way. + if ($has_openssl) { + $bytes .= openssl_random_pseudo_bytes($missing_bytes); + } + + // Else, read directly from /dev/urandom, which is available on many *nix + // systems and is considered cryptographically secure. + elseif ($fh = @fopen('/dev/urandom', 'rb')) { + // PHP only performs buffered reads, so in reality it will always read + // at least 4096 bytes. Thus, it costs nothing extra to read and store + // that much so as to speed any additional invocations. + $bytes .= fread($fh, max(4096, $missing_bytes)); + fclose($fh); + } + + // If we couldn't get enough entropy, this simple hash-based PRNG will + // generate a good set of pseudo-random bytes on any system. + // Note that it may be important that our $random_state is passed + // through hash() prior to being rolled into $output, that the two hash() + // invocations are different, and that the extra input into the first one - + // the microtime() - is prepended rather than appended. This is to avoid + // directly leaking $random_state via the $output stream, which could + // allow for trivial prediction of further "random" numbers. + if (strlen($bytes) < $count) { + // Initialize on the first call. The contents of $_SERVER includes a mix of + // user-specific and system information that varies a little with each page. + if (!isset($random_state)) { + $random_state = print_r($_SERVER, true); + if (function_exists('getmypid')) { + // Further initialize with the somewhat random PHP process ID. + $random_state .= getmypid(); + } + $bytes = ''; + } + + do { + $random_state = hash('sha256', microtime() . mt_rand() . $random_state); + $bytes .= hash('sha256', mt_rand() . $random_state, true); + } while (strlen($bytes) < $count); + } + } + $output = substr($bytes, 0, $count); + $bytes = substr($bytes, $count); + return $output; +} + +/** + * Generates a random base 64-encoded salt prefixed with settings for the hash. + * + * Proper use of salts may defeat a number of attacks, including: + * - The ability to try candidate passwords against multiple hashes at once. + * - The ability to use pre-hashed lists of candidate passwords. + * - The ability to determine whether two users have the same (or different) + * password without actually having to guess one of the passwords. + * + * @param $count_log2 + * Integer that determines the number of iterations used in the hashing + * process. A larger value is more secure, but takes more time to complete. + * + * @return + * A 12 character string containing the iteration count and a random salt. + */ +function _password_generate_salt($count_log2) +{ + $output = '$S$'; + // Ensure that $count_log2 is within set bounds. + $count_log2 = _password_enforce_log2_boundaries($count_log2); + // We encode the final log2 iteration count in base 64. + $itoa64 = _password_itoa64(); + $output .= $itoa64[$count_log2]; + // 6 bytes is the standard salt for a portable phpass hash. + $output .= _password_base64_encode(_random_bytes(6), 6); + return $output; +} + +/** + * Ensures that $count_log2 is within set bounds. + * + * @param $count_log2 + * Integer that determines the number of iterations used in the hashing + * process. A larger value is more secure, but takes more time to complete. + * + * @return + * Integer within set bounds that is closest to $count_log2. + */ +function _password_enforce_log2_boundaries($count_log2) +{ + if ($count_log2 < MIN_HASH_COUNT) { + return MIN_HASH_COUNT; + } elseif ($count_log2 > MAX_HASH_COUNT) { + return MAX_HASH_COUNT; + } + + return (int)$count_log2; +} + +/** + * Hash a password using a secure stretched hash. + * + * By using a salt and repeated hashing the password is "stretched". Its + * security is increased because it becomes much more computationally costly + * for an attacker to try to break the hash by brute-force computation of the + * hashes of a large number of plain-text words or strings to find a match. + * + * @param $algo + * The string name of a hashing algorithm usable by hash(), like 'sha256'. + * @param $password + * Plain-text password up to 512 bytes (128 to 512 UTF-8 characters) to hash. + * @param $setting + * An existing hash or the output of _password_generate_salt(). Must be + * at least 12 characters (the settings and salt). + * + * @return + * A string containing the hashed password (and salt) or FALSE on failure. + * The return string will be truncated at DRUPAL_HASH_LENGTH characters max. + */ +function _password_crypt($algo, $password, $setting) +{ + // Prevent DoS attacks by refusing to hash large passwords. + if (strlen($password) > 512) { + return false; + } + // The first 12 characters of an existing hash are its setting string. + $setting = substr($setting, 0, 12); + + if ($setting[0] != '$' || $setting[2] != '$') { + return false; + } + $count_log2 = _password_get_count_log2($setting); + // Hashes may be imported from elsewhere, so we allow != DRUPAL_HASH_COUNT + if ($count_log2 < MIN_HASH_COUNT || $count_log2 > MAX_HASH_COUNT) { + return false; + } + $salt = substr($setting, 4, 8); + // Hashes must have an 8 character salt. + if (strlen($salt) != 8) { + return false; + } + + // Convert the base 2 logarithm into an integer. + $count = 1 << $count_log2; + + // We rely on the hash() function being available in PHP 5.2+. + $hash = hash($algo, $salt . $password, true); + do { + $hash = hash($algo, $hash . $password, true); + } while (--$count); + + $len = strlen($hash); + $output = $setting . _password_base64_encode($hash, $len); + // _password_base64_encode() of a 16 byte MD5 will always be 22 characters. + // _password_base64_encode() of a 64 byte sha512 will always be 86 characters. + $expected = 12 + ceil((8 * $len) / 6); + return (strlen($output) == $expected) ? substr($output, 0, HASH_LENGTH) : false; +} + +/** + * Parse the log2 iteration count from a stored hash or setting string. + */ +function _password_get_count_log2($setting) +{ + $itoa64 = _password_itoa64(); + return strpos($itoa64, $setting[3]); +} + +/** + * Hash a password using a secure hash. + * + * @param $password + * A plain-text password. + * @param $count_log2 + * Optional integer to specify the iteration count. Generally used only during + * mass operations where a value less than the default is needed for speed. + * + * @return + * A string containing the hashed password (and a salt), or FALSE on failure. + */ +function user_hash_password($password, $count_log2 = 0) +{ + if (empty($count_log2)) { + // Use the standard iteration count. + $count_log2 = variable_get('password_count_log2', DRUPAL_HASH_COUNT); + } + return _password_crypt('sha512', $password, _password_generate_salt($count_log2)); +} + +/** + * Check whether a plain text password matches a stored hashed password. + * + * @param $password + * A plain-text password + * @param $hashpass + * + * @return + * TRUE or FALSE. + */ +function user_check_password($password, $hashpass) +{ + $stored_hash = $hashpass; + $type = substr($stored_hash, 0, 3); + switch ($type) { + case '$S$': + // A normal Drupal 7 password using sha512. + $hash = _password_crypt('sha512', $password, $stored_hash); + break; + case '$H$': + // phpBB3 uses "$H$" for the same thing as "$P$". + case '$P$': + // A phpass password generated using md5. This is an + // imported password or from an earlier Drupal version. + $hash = _password_crypt('md5', $password, $stored_hash); + break; + default: + return false; + } + return ($hash && $stored_hash == $hash); +} diff --git a/lib/group_sql.php b/lib/group_sql.php index b0c1c06..8d06cd0 100644 --- a/lib/group_sql.php +++ b/lib/group_sql.php @@ -2,7 +2,6 @@ namespace OCA\user_sql; -use \OCA\user_sql\lib\Helper; use OCP\Util; class OC_GROUP_SQL extends \OC_Group_Backend implements \OCP\GroupInterface @@ -12,85 +11,78 @@ class OC_GROUP_SQL extends \OC_Group_Backend implements \OCP\GroupInterface public function __construct() { - $this -> helper = new \OCA\user_sql\lib\Helper(); + $this->helper = new \OCA\user_sql\lib\Helper(); $domain = \OC::$server->getRequest()->getServerHost(); - $this -> settings = $this -> helper -> loadSettingsForDomain($domain); - $this -> helper -> connectToDb($this -> settings); + $this->settings = $this->helper->loadSettingsForDomain($domain); + $this->helper->connectToDb($this->settings); return false; } - public function getUserGroups($uid) { - if(empty($this -> settings['sql_group_table'])) - { + public function getUserGroups($uid) + { + if (empty($this->settings['sql_group_table'])) { Util::writeLog('OC_USER_SQL', "Group table not configured", Util::DEBUG); return []; } - $rows = $this -> helper -> runQuery('getUserGroups', array('uid' => $uid), false, true); - if($rows === false) - { + $rows = $this->helper->runQuery('getUserGroups', array('uid' => $uid), false, true); + if ($rows === false) { Util::writeLog('OC_USER_SQL', "Found no group", Util::DEBUG); return []; } $groups = array(); - foreach($rows as $row) - { - $groups[] = $row[$this -> settings['col_group_name']]; - } + foreach ($rows as $row) { + $groups[] = $row[$this->settings['col_group_name']]; + } return $groups; } - public function getGroups($search = '', $limit = null, $offset = null) { - if(empty($this -> settings['sql_group_table'])) - { + public function getGroups($search = '', $limit = null, $offset = null) + { + if (empty($this->settings['sql_group_table'])) { return []; } - $search = "%".$search."%"; - $rows = $this -> helper -> runQuery('getGroups', array('search' => $search), false, true, array('limit' => $limit, 'offset' => $offset)); - if($rows === false) - { + $search = "%" . $search . "%"; + $rows = $this->helper->runQuery('getGroups', array('search' => $search), false, true, + array('limit' => $limit, 'offset' => $offset)); + if ($rows === false) { return []; - } + } $groups = array(); - foreach($rows as $row) - { - $groups[] = $row[$this -> settings['col_group_name']]; - } + foreach ($rows as $row) { + $groups[] = $row[$this->settings['col_group_name']]; + } return $groups; } - public function usersInGroup($gid, $search = '', $limit = null, $offset = null) { - if(empty($this -> settings['sql_group_table'])) - { + public function usersInGroup($gid, $search = '', $limit = null, $offset = null) + { + if (empty($this->settings['sql_group_table'])) { Util::writeLog('OC_USER_SQL', "Group table not configured", Util::DEBUG); return []; } - $rows = $this -> helper -> runQuery('getGroupUsers', array('gid' => $gid), false, true); - if($rows === false) - { + $rows = $this->helper->runQuery('getGroupUsers', array('gid' => $gid), false, true); + if ($rows === false) { Util::writeLog('OC_USER_SQL', "Found no users for group", Util::DEBUG); return []; } $users = array(); - foreach($rows as $row) - { - $users[] = $row[$this -> settings['col_group_username']]; - } + foreach ($rows as $row) { + $users[] = $row[$this->settings['col_group_username']]; + } return $users; } - public function countUsersInGroup($gid, $search = '') { - if(empty($this -> settings['sql_group_table'])) - { + public function countUsersInGroup($gid, $search = '') + { + if (empty($this->settings['sql_group_table'])) { return 0; } - $search = "%".$search."%"; - $count = $this -> helper -> runQuery('countUsersInGroup', array('gid' => $gid, 'search' => $search)); - if($count === false) - { + $search = "%" . $search . "%"; + $count = $this->helper->runQuery('countUsersInGroup', array('gid' => $gid, 'search' => $search)); + if ($count === false) { return 0; } else { return intval(reset($count)); } } } -?> diff --git a/lib/helper.php b/lib/helper.php index 0c0f782..b455e0a 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -1,7 +1,7 @@ @@ -22,10 +22,12 @@ */ namespace OCA\user_sql\lib; + use OCP\IConfig; use OCP\Util; -class Helper { +class Helper +{ protected $db; protected $db_conn; @@ -85,15 +87,13 @@ class Helper { { Util::writeLog('OC_USER_SQL', "Trying to load settings for domain: " . $domain, Util::DEBUG); $settings = array(); - $sql_host = \OC::$server->getConfig()->getAppValue('user_sql', 'sql_hostname_'.$domain, ''); - if($sql_host === '') - { + $sql_host = \OC::$server->getConfig()->getAppValue('user_sql', 'sql_hostname_' . $domain, ''); + if ($sql_host === '') { $domain = 'default'; } - $params = $this -> getParameterArray(); - foreach($params as $param) - { - $settings[$param] = \OC::$server->getConfig()->getAppValue('user_sql', $param.'_'.$domain, ''); + $params = $this->getParameterArray(); + foreach ($params as $param) { + $settings[$param] = \OC::$server->getConfig()->getAppValue('user_sql', $param . '_' . $domain, ''); } Util::writeLog('OC_USER_SQL', "Loaded settings for domain: " . $domain, Util::DEBUG); return $settings; @@ -111,159 +111,157 @@ class Helper { public function runQuery($type, $params, $execOnly = false, $fetchArray = false, $limits = array()) { Util::writeLog('OC_USER_SQL', "Entering runQuery for type: " . $type, Util::DEBUG); - if(!$this -> db_conn) + if (!$this->db_conn) { return false; + } - switch($type) - { + switch ($type) { case 'getHome': - $query = "SELECT ".$this->settings['col_gethome']." FROM ".$this->settings['sql_table']." WHERE ".$this->settings['col_username']." = :uid"; - break; + $query = "SELECT " . $this->settings['col_gethome'] . " FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid"; + break; case 'getMail': - $query = "SELECT ".$this->settings['col_email']." FROM ".$this->settings['sql_table']." WHERE ".$this->settings['col_username']." = :uid"; - break; + $query = "SELECT " . $this->settings['col_email'] . " FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid"; + break; case 'setMail': - $query = "UPDATE ".$this->settings['sql_table']." SET ".$this->settings['col_email']." = :currMail WHERE ".$this->settings['col_username']." = :uid"; - break; + $query = "UPDATE " . $this->settings['sql_table'] . " SET " . $this->settings['col_email'] . " = :currMail WHERE " . $this->settings['col_username'] . " = :uid"; + break; case 'getPass': - $query = "SELECT ".$this->settings['col_password']." FROM ".$this->settings['sql_table']." WHERE ".$this->settings['col_username']." = :uid"; - if($this -> settings['col_active'] !== '') - $query .= " AND " .($this -> settings['set_active_invert'] === 'true' ? "NOT " : "" ) . $this -> settings['col_active']; - break; + $query = "SELECT " . $this->settings['col_password'] . " FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid"; + if ($this->settings['col_active'] !== '') { + $query .= " AND " . ($this->settings['set_active_invert'] === 'true' ? "NOT " : "") . $this->settings['col_active']; + } + break; case 'setPass': - $query = "UPDATE ".$this->settings['sql_table']." SET ".$this->settings['col_password']." = :enc_password WHERE ".$this->settings['col_username'] ." = :uid"; - break; + $query = "UPDATE " . $this->settings['sql_table'] . " SET " . $this->settings['col_password'] . " = :enc_password WHERE " . $this->settings['col_username'] . " = :uid"; + break; case 'getRedmineSalt': - $query = "SELECT salt FROM ".$this->settings['sql_table']." WHERE ".$this->settings['col_username'] ." = :uid;"; - break; + $query = "SELECT salt FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid;"; + break; case 'countUsers': - $query = "SELECT COUNT(*) FROM ".$this->settings['sql_table']." WHERE ".$this->settings['col_username'] ." LIKE :search"; - if($this -> settings['col_active'] !== '') - $query .= " AND " .($this -> settings['set_active_invert'] === 'true' ? "NOT " : "" ) . $this -> settings['col_active']; - break; + $query = "SELECT COUNT(*) FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " LIKE :search"; + if ($this->settings['col_active'] !== '') { + $query .= " AND " . ($this->settings['set_active_invert'] === 'true' ? "NOT " : "") . $this->settings['col_active']; + } + break; case 'getUsers': - $query = "SELECT ".$this->settings['col_username']." FROM ".$this->settings['sql_table']; - $query .= " WHERE ".$this->settings['col_username']." LIKE :search"; - if($this -> settings['col_active'] !== '') - $query .= " AND " .($this -> settings['set_active_invert'] === 'true' ? "NOT " : "" ) . $this -> settings['col_active']; - $query .= " ORDER BY ".$this->settings['col_username']; - break; + $query = "SELECT " . $this->settings['col_username'] . " FROM " . $this->settings['sql_table']; + $query .= " WHERE " . $this->settings['col_username'] . " LIKE :search"; + if ($this->settings['col_active'] !== '') { + $query .= " AND " . ($this->settings['set_active_invert'] === 'true' ? "NOT " : "") . $this->settings['col_active']; + } + $query .= " ORDER BY " . $this->settings['col_username']; + break; case 'userExists': - $query = "SELECT ".$this->settings['col_username']." FROM ".$this->settings['sql_table']." WHERE ".$this->settings['col_username']." = :uid"; - if($this -> settings['col_active'] !== '') - $query .= " AND " .($this -> settings['set_active_invert'] === 'true' ? "NOT " : "" ) . $this -> settings['col_active']; - break; + $query = "SELECT " . $this->settings['col_username'] . " FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid"; + if ($this->settings['col_active'] !== '') { + $query .= " AND " . ($this->settings['set_active_invert'] === 'true' ? "NOT " : "") . $this->settings['col_active']; + } + break; case 'getDisplayName': - $query = "SELECT ".$this->settings['col_displayname']." FROM ".$this->settings['sql_table']." WHERE ".$this->settings['col_username']." = :uid"; - if($this -> settings['col_active'] !== '') - $query .= " AND " .($this -> settings['set_active_invert'] === 'true' ? "NOT " : "" ) . $this -> settings['col_active']; - break; + $query = "SELECT " . $this->settings['col_displayname'] . " FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid"; + if ($this->settings['col_active'] !== '') { + $query .= " AND " . ($this->settings['set_active_invert'] === 'true' ? "NOT " : "") . $this->settings['col_active']; + } + break; case 'mysqlEncryptSalt': $query = "SELECT ENCRYPT(:pw, :salt);"; - break; + break; case 'mysqlEncrypt': $query = "SELECT ENCRYPT(:pw);"; - break; + break; case 'mysqlPassword': $query = "SELECT PASSWORD(:pw);"; - break; + break; case 'getUserGroups': - $query = "SELECT ".$this->settings['col_group_name']." FROM ".$this->settings['sql_group_table']." WHERE ".$this->settings['col_group_username']." = :uid"; - break; + $query = "SELECT " . $this->settings['col_group_name'] . " FROM " . $this->settings['sql_group_table'] . " WHERE " . $this->settings['col_group_username'] . " = :uid"; + break; case 'getGroups': - $query = "SELECT distinct ".$this->settings['col_group_name']." FROM ".$this->settings['sql_group_table']." WHERE ".$this->settings['col_group_name']." LIKE :search"; - break; + $query = "SELECT distinct " . $this->settings['col_group_name'] . " FROM " . $this->settings['sql_group_table'] . " WHERE " . $this->settings['col_group_name'] . " LIKE :search"; + break; case 'getGroupUsers': - $query = "SELECT distinct ".$this->settings['col_group_username']." FROM ".$this->settings['sql_group_table']." WHERE ".$this->settings['col_group_name']." = :gid"; - break; + $query = "SELECT distinct " . $this->settings['col_group_username'] . " FROM " . $this->settings['sql_group_table'] . " WHERE " . $this->settings['col_group_name'] . " = :gid"; + break; case 'countUsersInGroup': - $query = "SELECT count(".$this->settings['col_group_username'].") FROM ".$this->settings['sql_group_table']." WHERE ".$this->settings['col_group_name']." = :gid AND ".$this->settings['col_group_username']." LIKE :search"; - break; + $query = "SELECT count(" . $this->settings['col_group_username'] . ") FROM " . $this->settings['sql_group_table'] . " WHERE " . $this->settings['col_group_name'] . " = :gid AND " . $this->settings['col_group_username'] . " LIKE :search"; + break; } - if(isset($limits['limit']) && $limits['limit'] !== null) - { + if (isset($limits['limit']) && $limits['limit'] !== null) { $limit = intval($limits['limit']); - $query .= " LIMIT ".$limit; + $query .= " LIMIT " . $limit; } - if(isset($limits['offset']) && $limits['offset'] !== null) - { + if (isset($limits['offset']) && $limits['offset'] !== null) { $offset = intval($limits['offset']); - $query .= " OFFSET ".$offset; + $query .= " OFFSET " . $offset; } Util::writeLog('OC_USER_SQL', "Preparing query: $query", Util::DEBUG); - $result = $this -> db -> prepare($query); - foreach($params as $param => $value) - { - $result -> bindValue(":".$param, $value); + $result = $this->db->prepare($query); + foreach ($params as $param => $value) { + $result->bindValue(":" . $param, $value); } Util::writeLog('OC_USER_SQL', "Executing query...", Util::DEBUG); - if(!$result -> execute()) - { - $err = $result -> errorInfo(); + if (!$result->execute()) { + $err = $result->errorInfo(); Util::writeLog('OC_USER_SQL', "Query failed: " . $err[2], Util::DEBUG); return false; } - if($execOnly === true) - { + if ($execOnly === true) { return true; } Util::writeLog('OC_USER_SQL', "Fetching result...", Util::DEBUG); - if($fetchArray === true) - $row = $result -> fetchAll(); - else - $row = $result -> fetch(); + if ($fetchArray === true) { + $row = $result->fetchAll(); + } else { + $row = $result->fetch(); + } - if(!$row) - { + if (!$row) { return false; } return $row; } /** - * Connect to the database using ownCloud's DBAL + * Connect to the database using Nextcloud's DBAL * @param array $settings The settings for the connection * @return bool */ public function connectToDb($settings) { - $this -> settings = $settings; + $this->settings = $settings; $cm = new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig()); - $parameters = array('host' => $this -> settings['sql_hostname'], - 'password' => $this -> settings['sql_password'], - 'user' => $this -> settings['sql_username'], - 'dbname' => $this -> settings['sql_database'], - 'tablePrefix' => '' - ); - try - { - $this -> db = $cm -> getConnection($this -> settings['sql_driver'], $parameters); - $this -> db -> query("SET NAMES 'UTF8'"); - $this -> db_conn = true; + $parameters = array( + 'host' => $this->settings['sql_hostname'], + 'password' => $this->settings['sql_password'], + 'user' => $this->settings['sql_username'], + 'dbname' => $this->settings['sql_database'], + 'tablePrefix' => '' + ); + try { + $this->db = $cm->getConnection($this->settings['sql_driver'], $parameters); + $this->db->query("SET NAMES 'UTF8'"); + $this->db_conn = true; return true; - } - catch (\Exception $e) - { - Util::writeLog('OC_USER_SQL', 'Failed to connect to the database: ' . $e -> getMessage(), Util::ERROR); - $this -> db_conn = false; + } catch (\Exception $e) { + Util::writeLog('OC_USER_SQL', 'Failed to connect to the database: ' . $e->getMessage(), Util::ERROR); + $this->db_conn = false; return false; } } @@ -275,24 +273,24 @@ class Helper { * @param string $table The table name to check * @param array $cols The columns to check * @param array True if found, otherwise false + * @return bool|string */ public function verifyColumns($parameters, $sql_driver, $table, $cols) { $columns = $this->getColumns($parameters, $sql_driver, $table); $res = true; $err = ''; - foreach($cols as $col) - { - if(!in_array($col, $columns, true)) - { + foreach ($cols as $col) { + if (!in_array($col, $columns, true)) { $res = false; - $err .= $col.' '; + $err .= $col . ' '; } } - if($res) + if ($res) { return true; - else + } else { return $err; + } } /** @@ -301,6 +299,7 @@ class Helper { * @param string $sql_driver The SQL driver to use * @param string $table The table name to check * @param array True if found, otherwise false + * @return bool */ public function verifyTable($parameters, $sql_driver, $table) { @@ -320,8 +319,8 @@ class Helper { { $cm = new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig()); try { - $conn = $cm -> getConnection($sql_driver, $parameters); - $platform = $conn -> getDatabasePlatform(); + $conn = $cm->getConnection($sql_driver, $parameters); + $platform = $conn->getDatabasePlatform(); $queryTables = $platform->getListTablesSQL(); $queryViews = $platform->getListViewsSQL($parameters['dbname']); @@ -339,9 +338,7 @@ class Helper { $ret[] = $name; } return $ret; - } - catch(\Exception $e) - { + } catch (\Exception $e) { return array(); } } @@ -404,13 +401,12 @@ class Helper { { $cm = new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig()); try { - $conn = $cm -> getConnection($sql_driver, $parameters); - $platform = $conn -> getDatabasePlatform(); - $query = $platform -> getListTableColumnsSQL($table); - $result = $conn -> executeQuery($query); + $conn = $cm->getConnection($sql_driver, $parameters); + $platform = $conn->getDatabasePlatform(); + $query = $platform->getListTableColumnsSQL($table); + $result = $conn->executeQuery($query); $ret = array(); - while($row = $result -> fetch()) - { + while ($row = $result->fetch()) { switch ($sql_driver) { case 'mysql': $name = $row['Field']; @@ -424,12 +420,8 @@ class Helper { $ret[] = $name; } return $ret; - } - catch(\Exception $e) - { + } catch (\Exception $e) { return array(); } } - - } diff --git a/lib/user_sql.php b/lib/user_sql.php index 936dfbb..b696027 100644 --- a/lib/user_sql.php +++ b/lib/user_sql.php @@ -1,7 +1,7 @@ @@ -28,30 +28,31 @@ */ namespace OCA\user_sql; + use OC\User\Backend; -use \OCA\user_sql\lib\Helper; use OCP\IConfig; use OCP\IUser; use OCP\IUserSession; -use OCP\Notification\IManager as INotificationManager; use OCP\Util; -abstract class BackendUtility { +abstract class BackendUtility +{ protected $access; /** * constructor, make sure the subclasses call this one! * @param Access $access an instance of Access for LDAP interaction */ - public function __construct(Access $access) { + public function __construct(Access $access) + { $this->access = $access; } } class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, - \OCP\UserInterface + \OCP\UserInterface { protected $cache; protected $settings; @@ -66,26 +67,25 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, public function __construct() { $memcache = \OC::$server->getMemCacheFactory(); - if ( $memcache -> isAvailable()) - { - $this -> cache = $memcache -> create(); + if ($memcache->isAvailable()) { + $this->cache = $memcache->create(); } - $this -> helper = new \OCA\user_sql\lib\Helper(); + $this->helper = new \OCA\user_sql\lib\Helper(); $domain = \OC::$server->getRequest()->getServerHost(); - $this -> settings = $this -> helper -> loadSettingsForDomain($domain); - $this -> ocConfig = \OC::$server->getConfig(); - $this -> helper -> connectToDb($this -> settings); - $this -> session_cache_name = 'USER_SQL_CACHE'; + $this->settings = $this->helper->loadSettingsForDomain($domain); + $this->ocConfig = \OC::$server->getConfig(); + $this->helper->connectToDb($this->settings); + $this->session_cache_name = 'USER_SQL_CACHE'; return false; } /** - * Sync the user's E-Mail address with the address stored by ownCloud. + * Sync the user's E-Mail address with the address stored by Nextcloud. * We have three (four) sync modes: * - none: Does nothing - * - initial: Do the sync only once from SQL -> ownCloud - * - forcesql: The SQL database always wins and sync to ownCloud - * - forceoc: ownCloud always wins and syncs to SQL + * - initial: Do the sync only once from SQL -> Nextcloud + * - forcesql: The SQL database always wins and sync to Nextcloud + * - forceoc: Nextcloud always wins and syncs to SQL * * @param string $uid The user's ID to sync * @return bool Success or Fail @@ -93,56 +93,57 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, private function doEmailSync($uid) { Util::writeLog('OC_USER_SQL', "Entering doEmailSync for UID: $uid", - Util::DEBUG); - if($this -> settings['col_email'] === '') - return false; - - if($this -> settings['set_mail_sync_mode'] === 'none') - return false; - - $ocUid = $uid; - $uid = $this -> doUserDomainMapping($uid); - - $row = $this -> helper -> runQuery('getMail', array('uid' => $uid)); - if($row === false) - { + Util::DEBUG); + if ($this->settings['col_email'] === '') { return false; } - $newMail = $row[$this -> settings['col_email']]; - $currMail = $this->ocConfig->getUserValue( $ocUid, - 'settings', - 'email', ''); + if ($this->settings['set_mail_sync_mode'] === 'none') { + return false; + } - switch($this -> settings['set_mail_sync_mode']) - { + $ocUid = $uid; + $uid = $this->doUserDomainMapping($uid); + + $row = $this->helper->runQuery('getMail', array('uid' => $uid)); + if ($row === false) { + return false; + } + $newMail = $row[$this->settings['col_email']]; + + $currMail = $this->ocConfig->getUserValue($ocUid, + 'settings', + 'email', ''); + + switch ($this->settings['set_mail_sync_mode']) { case 'initial': - if($currMail === '') - $this->ocConfig->setUserValue( $ocUid, - 'settings', - 'email', - $newMail); + if ($currMail === '') { + $this->ocConfig->setUserValue($ocUid, + 'settings', + 'email', + $newMail); + } break; case 'forcesql': //if($currMail !== $newMail) - $this->ocConfig->setUserValue( $ocUid, - 'settings', - 'email', - $newMail); + $this->ocConfig->setUserValue($ocUid, + 'settings', + 'email', + $newMail); break; case 'forceoc': - if(($currMail !== '') && ($currMail !== $newMail)) - { - $row = $this -> helper -> runQuery('setMail', - array('uid' => $uid, - 'currMail' => $currMail) - , true); + if (($currMail !== '') && ($currMail !== $newMail)) { + $row = $this->helper->runQuery('setMail', + array( + 'uid' => $uid, + 'currMail' => $currMail + ) + , true); - if($row === false) - { + if ($row === false) { Util::writeLog('OC_USER_SQL', - "Could not update E-Mail address in SQL database!", - Util::ERROR); + "Could not update E-Mail address in SQL database!", + Util::ERROR); } } break; @@ -162,19 +163,17 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, { $uid = trim($uid); - if($this -> settings['set_default_domain'] !== '') - { - Util::writeLog('OC_USER_SQL', "Append default domain: ". - $this -> settings['set_default_domain'], Util::DEBUG); - if(strpos($uid, '@') === false) - { - $uid .= "@" . $this -> settings['set_default_domain']; + if ($this->settings['set_default_domain'] !== '') { + Util::writeLog('OC_USER_SQL', "Append default domain: " . + $this->settings['set_default_domain'], Util::DEBUG); + if (strpos($uid, '@') === false) { + $uid .= "@" . $this->settings['set_default_domain']; } } $uid = strtolower($uid); Util::writeLog('OC_USER_SQL', 'Returning mapped UID: ' . $uid, - Util::DEBUG); + Util::DEBUG); return $uid; } @@ -186,12 +185,12 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, public function implementsActions($actions) { return (bool)((Backend::CHECK_PASSWORD - | Backend::GET_DISPLAYNAME - | Backend::COUNT_USERS - | ($this -> settings['set_allow_pwchange'] === 'true' ? - Backend::SET_PASSWORD : 0) - | ($this -> settings['set_enable_gethome'] === 'true' ? - Backend::GET_HOME : 0) + | Backend::GET_DISPLAYNAME + | Backend::COUNT_USERS + | ($this->settings['set_allow_pwchange'] === 'true' ? + Backend::SET_PASSWORD : 0) + | ($this->settings['set_enable_gethome'] === 'true' ? + Backend::GET_HOME : 0) ) & $actions); } @@ -212,47 +211,46 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, public function getHome($uid) { Util::writeLog('OC_USER_SQL', "Entering getHome for UID: $uid", - Util::DEBUG); + Util::DEBUG); - if($this -> settings['set_enable_gethome'] !== 'true') + if ($this->settings['set_enable_gethome'] !== 'true') { return false; + } - $uidMapped = $this -> doUserDomainMapping($uid); + $uidMapped = $this->doUserDomainMapping($uid); $home = false; - switch($this->settings['set_gethome_mode']) - { + switch ($this->settings['set_gethome_mode']) { case 'query': Util::writeLog('OC_USER_SQL', - "getHome with Query selected, running Query...", - Util::DEBUG); - $row = $this -> helper -> runQuery('getHome', - array('uid' => $uidMapped)); - if($row === false) - { + "getHome with Query selected, running Query...", + Util::DEBUG); + $row = $this->helper->runQuery('getHome', + array('uid' => $uidMapped)); + if ($row === false) { Util::writeLog('OC_USER_SQL', - "Got no row, return false", - Util::DEBUG); + "Got no row, return false", + Util::DEBUG); return false; } - $home = $row[$this -> settings['col_gethome']]; - break; + $home = $row[$this->settings['col_gethome']]; + break; case 'static': Util::writeLog('OC_USER_SQL', - "getHome with static selected", - Util::DEBUG); - $home = $this -> settings['set_gethome']; + "getHome with static selected", + Util::DEBUG); + $home = $this->settings['set_gethome']; $home = str_replace('%ud', $uidMapped, $home); $home = str_replace('%u', $uid, $home); $home = str_replace('%d', - $this -> settings['set_default_domain'], - $home); - break; + $this->settings['set_default_domain'], + $home); + break; } Util::writeLog('OC_USER_SQL', - "Returning getHome for UID: $uid with Home $home", - Util::DEBUG); + "Returning getHome for UID: $uid with Home $home", + Util::DEBUG); return $home; } @@ -264,8 +262,8 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, { // Can't create user Util::writeLog('OC_USER_SQL', - 'Not possible to create local users from web'. - ' frontend using SQL user backend', Util::ERROR); + 'Not possible to create local users from web' . + ' frontend using SQL user backend', Util::ERROR); return false; } @@ -277,7 +275,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, public function deleteUser($uid) { // Can't delete user - Util::writeLog('OC_USER_SQL', 'Not possible to delete local users'. + Util::writeLog('OC_USER_SQL', 'Not possible to delete local users' . ' from web frontend using SQL user backend', Util::ERROR); return false; } @@ -286,7 +284,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, * Set (change) a user password * This can be enabled/disabled in the settings (set_allow_pwchange) * - * @param string $uid The user ID + * @param string $uid The user ID * @param string $password The user's new password * @return bool The return status */ @@ -295,109 +293,87 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, // Update the user's password - this might affect other services, that // use the same database, as well Util::writeLog('OC_USER_SQL', "Entering setPassword for UID: $uid", - Util::DEBUG); + Util::DEBUG); - if($this -> settings['set_allow_pwchange'] !== 'true') - return false; - - $uid = $this -> doUserDomainMapping($uid); - - $row = $this -> helper -> runQuery('getPass', array('uid' => $uid)); - if($row === false) - { + if ($this->settings['set_allow_pwchange'] !== 'true') { return false; } - $old_password = $row[$this -> settings['col_password']]; + + $uid = $this->doUserDomainMapping($uid); + + $row = $this->helper->runQuery('getPass', array('uid' => $uid)); + if ($row === false) { + return false; + } + $old_password = $row[$this->settings['col_password']]; // Added and disabled updating passwords for Drupal 7 WD 2018-01-04 - if($this -> settings['set_crypt_type'] === 'drupal') - { + if ($this->settings['set_crypt_type'] === 'drupal') { return false; - } - elseif($this -> settings['set_crypt_type'] === 'joomla2') - { - if(!class_exists('\PasswordHash')) + } elseif ($this->settings['set_crypt_type'] === 'joomla2') { + if (!class_exists('\PasswordHash')) { require_once('PasswordHash.php'); + } $hasher = new \PasswordHash(10, true); - $enc_password = $hasher -> HashPassword($password); + $enc_password = $hasher->HashPassword($password); } // Redmine stores the salt separatedly, this doesn't play nice with // the way we check passwords - elseif($this -> settings['set_crypt_type'] === 'redmine') - { - $salt = $this -> helper -> runQuery('getRedmineSalt', - array('uid' => $uid)); - if(!$salt) + elseif ($this->settings['set_crypt_type'] === 'redmine') { + $salt = $this->helper->runQuery('getRedmineSalt', + array('uid' => $uid)); + if (!$salt) { return false; - $enc_password = sha1($salt['salt'].sha1($password)); + } + $enc_password = sha1($salt['salt'] . sha1($password)); - } - elseif($this -> settings['set_crypt_type'] === 'sha1') - { + } elseif ($this->settings['set_crypt_type'] === 'sha1') { $enc_password = sha1($password); - } - elseif($this -> settings['set_crypt_type'] === 'system') - { - $prefix=substr($old_password,0,2); - if ($prefix==="$2") + } elseif ($this->settings['set_crypt_type'] === 'system') { + $prefix = substr($old_password, 0, 2); + if ($prefix === "$2") { + $enc_password = $this->pw_hash($password); + } else { + if (($prefix === "$1") or ($prefix[0] != "$")) //old md5 or DES { - $enc_password = $this->pw_hash($password); + //Update encryption algorithm + $prefix = "$6"; //change to sha512 } - else - { - if (($prefix==="$1") or ($prefix[0] != "$")) //old md5 or DES - { - //Update encryption algorithm - $prefix="$6"; //change to sha512 - } - $newsalt=$this->create_systemsalt(); - $enc_password=crypt($password,$prefix ."$" . $newsalt); + $newsalt = $this->create_systemsalt(); + $enc_password = crypt($password, $prefix . "$" . $newsalt); } + } elseif ($this->settings['set_crypt_type'] === 'password_hash') { + $enc_password = $this->pw_hash($password); + } elseif ($this->settings['set_crypt_type'] === 'courier_md5') { + $enc_password = '{MD5}' . OC_USER_SQL::hex_to_base64(md5($password)); + } elseif ($this->settings['set_crypt_type'] === 'courier_md5raw') { + $enc_password = '{MD5RAW}' . md5($password); + } elseif ($this->settings['set_crypt_type'] === 'courier_sha1') { + $enc_password = '{SHA}' . OC_USER_SQL::hex_to_base64(sha1($password)); + } elseif ($this->settings['set_crypt_type'] === 'courier_sha256') { + $enc_password = '{SHA256}' . OC_USER_SQL::hex_to_base64(hash('sha256', $password, false)); + } else { + $enc_password = $this->pacrypt($password, $old_password); } - elseif($this -> settings['set_crypt_type'] === 'password_hash') - { - $enc_password = $this->pw_hash($password); - } - elseif($this -> settings['set_crypt_type'] === 'courier_md5') - { - $enc_password = '{MD5}'.OC_USER_SQL::hex_to_base64(md5($password)); - } - elseif($this -> settings['set_crypt_type'] === 'courier_md5raw') - { - $enc_password = '{MD5RAW}'.md5($password); - } - elseif($this -> settings['set_crypt_type'] === 'courier_sha1') - { - $enc_password = '{SHA}'.OC_USER_SQL::hex_to_base64(sha1($password)); - } - elseif($this -> settings['set_crypt_type'] === 'courier_sha256') - { - $enc_password = '{SHA256}'.OC_USER_SQL::hex_to_base64(hash('sha256', $password, false)); - } - else - { - $enc_password = $this -> pacrypt($password, $old_password); - } - $res = $this -> helper -> runQuery('setPass', - array('uid' => $uid, 'enc_password' => $enc_password), - true); - if($res === false) - { + $res = $this->helper->runQuery('setPass', + array('uid' => $uid, 'enc_password' => $enc_password), + true); + if ($res === false) { Util::writeLog('OC_USER_SQL', "Could not update password!", - Util::ERROR); + Util::ERROR); return false; } Util::writeLog('OC_USER_SQL', - "Updated password successfully, return true", - Util::DEBUG); + "Updated password successfully, return true", + Util::DEBUG); return true; } /** * Check if the password is correct - * @param string $uid The username + * @param string $uid The username * @param string $password The password * @return bool true/false * @@ -406,94 +382,75 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, public function checkPassword($uid, $password) { Util::writeLog('OC_USER_SQL', - "Entering checkPassword() for UID: $uid", - Util::DEBUG); + "Entering checkPassword() for UID: $uid", + Util::DEBUG); - $uid = $this -> doUserDomainMapping($uid); + $uid = $this->doUserDomainMapping($uid); - $row = $this -> helper -> runQuery('getPass', array('uid' => $uid)); - if($row === false) - { - Util::writeLog('OC_USER_SQL', "Got no row, return false", Util::DEBUG); - return false; - } - $db_pass = $row[$this -> settings['col_password']]; + $row = $this->helper->runQuery('getPass', array('uid' => $uid)); + if ($row === false) { + Util::writeLog('OC_USER_SQL', "Got no row, return false", Util::DEBUG); + return false; + } + $db_pass = $row[$this->settings['col_password']]; Util::writeLog('OC_USER_SQL', "Encrypting and checking password", - Util::DEBUG); + Util::DEBUG); // Added handling for Drupal 7 passwords WD 2018-01-04 - if($this -> settings['set_crypt_type'] === 'drupal') - { - if(!function_exists('user_check_password')) + if ($this->settings['set_crypt_type'] === 'drupal') { + if (!function_exists('user_check_password')) { require_once('drupal.php'); + } $ret = user_check_password($password, $db_pass); } // Joomla 2.5.18 switched to phPass, which doesn't play nice with the // way we check passwords - elseif($this -> settings['set_crypt_type'] === 'joomla2') - { - if(!class_exists('\PasswordHash')) + elseif ($this->settings['set_crypt_type'] === 'joomla2') { + if (!class_exists('\PasswordHash')) { require_once('PasswordHash.php'); + } $hasher = new \PasswordHash(10, true); - $ret = $hasher -> CheckPassword($password, $db_pass); - } - elseif($this -> settings['set_crypt_type'] === 'password_hash') - { - $ret = password_verify($password,$db_pass); + $ret = $hasher->CheckPassword($password, $db_pass); + } elseif ($this->settings['set_crypt_type'] === 'password_hash') { + $ret = password_verify($password, $db_pass); } // Redmine stores the salt separatedly, this doesn't play nice with the // way we check passwords - elseif($this -> settings['set_crypt_type'] === 'redmine') - { - $salt = $this -> helper -> runQuery('getRedmineSalt', - array('uid' => $uid)); - if(!$salt) + elseif ($this->settings['set_crypt_type'] === 'redmine') { + $salt = $this->helper->runQuery('getRedmineSalt', + array('uid' => $uid)); + if (!$salt) { return false; - $ret = sha1($salt['salt'].sha1($password)) === $db_pass; + } + $ret = sha1($salt['salt'] . sha1($password)) === $db_pass; + } elseif ($this->settings['set_crypt_type'] == 'sha1') { + $ret = $this->hash_equals(sha1($password), $db_pass); + } elseif ($this->settings['set_crypt_type'] === 'courier_md5') { + $ret = '{MD5}' . OC_USER_SQL::hex_to_base64(md5($password)) === $db_pass; + } elseif ($this->settings['set_crypt_type'] === 'courier_md5raw') { + $ret = '{MD5RAW}' . md5($password) === $db_pass; + } elseif ($this->settings['set_crypt_type'] === 'courier_sha1') { + $ret = '{SHA}' . OC_USER_SQL::hex_to_base64(sha1($password)) === $db_pass; + } elseif ($this->settings['set_crypt_type'] === 'courier_sha256') { + $ret = '{SHA256}' . OC_USER_SQL::hex_to_base64(hash('sha256', $password, false)) === $db_pass; + } else { + // $ret = $this -> pacrypt($password, $db_pass) === $db_pass; + $ret = $this->hash_equals($this->pacrypt($password, $db_pass), + $db_pass); } - - elseif($this -> settings['set_crypt_type'] == 'sha1') - { - $ret = $this->hash_equals(sha1($password) , $db_pass); - } - elseif($this -> settings['set_crypt_type'] === 'courier_md5') - { - $ret = '{MD5}'.OC_USER_SQL::hex_to_base64(md5($password)) === $db_pass; - } - elseif($this -> settings['set_crypt_type'] === 'courier_md5raw') - { - $ret = '{MD5RAW}'.md5($password) === $db_pass; - } - elseif($this -> settings['set_crypt_type'] === 'courier_sha1') - { - $ret = '{SHA}'.OC_USER_SQL::hex_to_base64(sha1($password)) === $db_pass; - } - elseif($this -> settings['set_crypt_type'] === 'courier_sha256') - { - $ret = '{SHA256}'.OC_USER_SQL::hex_to_base64(hash('sha256', $password, false)) === $db_pass; - } else - - { - // $ret = $this -> pacrypt($password, $db_pass) === $db_pass; - $ret = $this->hash_equals($this -> pacrypt($password, $db_pass), - $db_pass); - } - if($ret) - { + if ($ret) { Util::writeLog('OC_USER_SQL', - "Passwords matching, return true", - Util::DEBUG); - if($this -> settings['set_strip_domain'] === 'true') - { + "Passwords matching, return true", + Util::DEBUG); + if ($this->settings['set_strip_domain'] === 'true') { $uid = explode("@", $uid); $uid = $uid[0]; } return $uid; - } else - { + } else { Util::writeLog('OC_USER_SQL', - "Passwords do not match, return false", - Util::DEBUG); + "Passwords do not match, return false", + Util::DEBUG); return false; } } @@ -505,68 +462,64 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, public function countUsers() { Util::writeLog('OC_USER_SQL', "Entering countUsers()", - Util::DEBUG); + Util::DEBUG); - $search = "%".$this -> doUserDomainMapping(""); - $userCount = $this -> helper -> runQuery('countUsers', - array('search' => $search)); - if($userCount === false) - { + $search = "%" . $this->doUserDomainMapping(""); + $userCount = $this->helper->runQuery('countUsers', + array('search' => $search)); + if ($userCount === false) { $userCount = 0; - } - else { + } else { $userCount = reset($userCount); } - Util::writeLog('OC_USER_SQL', "Return usercount: ".$userCount, - Util::DEBUG); + Util::writeLog('OC_USER_SQL', "Return usercount: " . $userCount, + Util::DEBUG); return $userCount; } /** * Get a list of all users * @param string $search The search term (can be empty) - * @param int $limit The search limit (can be null) - * @param int $offset The search offset (can be null) + * @param int $limit The search limit (can be null) + * @param int $offset The search offset (can be null) * @return array with all uids */ public function getUsers($search = '', $limit = null, $offset = null) { Util::writeLog('OC_USER_SQL', - "Entering getUsers() with Search: $search, ". - "Limit: $limit, Offset: $offset", Util::DEBUG); + "Entering getUsers() with Search: $search, " . + "Limit: $limit, Offset: $offset", Util::DEBUG); $users = array(); - if($search !== '') - { - $search = "%".$this -> doUserDomainMapping($search."%")."%"; - } - else - { - $search = "%".$this -> doUserDomainMapping("")."%"; + if ($search !== '') { + $search = "%" . $this->doUserDomainMapping($search . "%") . "%"; + } else { + $search = "%" . $this->doUserDomainMapping("") . "%"; } - $rows = $this -> helper -> runQuery('getUsers', - array('search' => $search), - false, - true, - array('limit' => $limit, - 'offset' => $offset)); - if($rows === false) + $rows = $this->helper->runQuery('getUsers', + array('search' => $search), + false, + true, + array( + 'limit' => $limit, + 'offset' => $offset + )); + if ($rows === false) { return array(); + } - foreach($rows as $row) - { - $uid = $row[$this -> settings['col_username']]; - if($this -> settings['set_strip_domain'] === 'true') - { + foreach ($rows as $row) { + $uid = $row[$this->settings['col_username']]; + if ($this->settings['set_strip_domain'] === 'true') { $uid = explode("@", $uid); $uid = $uid[0]; } $users[] = strtolower($uid); } Util::writeLog('OC_USER_SQL', "Return list of results", - Util::DEBUG); + Util::DEBUG); return $users; } @@ -579,36 +532,34 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, { $cacheKey = 'sql_user_exists_' . $uid; - $cacheVal = $this -> getCache ($cacheKey); + $cacheVal = $this->getCache($cacheKey); Util::writeLog('OC_USER_SQL', - "userExists() for UID: $uid cacheVal: $cacheVal", - Util::DEBUG); - if(!is_null($cacheVal)) + "userExists() for UID: $uid cacheVal: $cacheVal", + Util::DEBUG); + if (!is_null($cacheVal)) { return (bool)$cacheVal; + } Util::writeLog('OC_USER_SQL', - "Entering userExists() for UID: $uid", - Util::DEBUG); + "Entering userExists() for UID: $uid", + Util::DEBUG); // Only if the domain is removed for internal user handling, // we should add the domain back when checking existance - if($this -> settings['set_strip_domain'] === 'true') - { - $uid = $this -> doUserDomainMapping($uid); + if ($this->settings['set_strip_domain'] === 'true') { + $uid = $this->doUserDomainMapping($uid); } - $exists = (bool)$this -> helper -> runQuery('userExists', - array('uid' => $uid));; - $this -> setCache ($cacheKey, $exists, 60); + $exists = (bool)$this->helper->runQuery('userExists', + array('uid' => $uid));; + $this->setCache($cacheKey, $exists, 60); - if(!$exists) - { + if (!$exists) { Util::writeLog('OC_USER_SQL', - "Empty row, user does not exists, return false", - Util::DEBUG); + "Empty row, user does not exists, return false", + Util::DEBUG); return false; - } else - { + } else { Util::writeLog('OC_USER_SQL', "User exists, return true", Util::DEBUG); return true; @@ -624,45 +575,41 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, public function getDisplayName($uid) { Util::writeLog('OC_USER_SQL', - "Entering getDisplayName() for UID: $uid", - Util::DEBUG); + "Entering getDisplayName() for UID: $uid", + Util::DEBUG); - $this -> doEmailSync($uid); - $uid = $this -> doUserDomainMapping($uid); + $this->doEmailSync($uid); + $uid = $this->doUserDomainMapping($uid); - if(!$this -> userExists($uid)) - { + if (!$this->userExists($uid)) { return false; } - $row = $this -> helper -> runQuery('getDisplayName', - array('uid' => $uid)); + $row = $this->helper->runQuery('getDisplayName', + array('uid' => $uid)); - if(!$row) - { + if (!$row) { Util::writeLog('OC_USER_SQL', - "Empty row, user has no display name or ". - "does not exist, return false", - Util::DEBUG); + "Empty row, user has no display name or " . + "does not exist, return false", + Util::DEBUG); return false; - } else - { + } else { Util::writeLog('OC_USER_SQL', - "User exists, return true", - Util::DEBUG); - $displayName = $row[$this -> settings['col_displayname']]; - return $displayName; ; + "User exists, return true", + Util::DEBUG); + $displayName = $row[$this->settings['col_displayname']]; + return $displayName;; } return false; } public function getDisplayNames($search = '', $limit = null, $offset = null) { - $uids = $this -> getUsers($search, $limit, $offset); + $uids = $this->getUsers($search, $limit, $offset); $displayNames = array(); - foreach($uids as $uid) - { - $displayNames[$uid] = $this -> getDisplayName($uid); + foreach ($uids as $uid) { + $displayNames[$uid] = $this->getDisplayName($uid); } return $displayNames; } @@ -686,109 +633,90 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, * salt used - hence * the second parameter ($pw_db), which is the existing hash from the DB. * - * @param string $pw cleartext password - * @param string $pw_db encrypted password from database + * @param string $pw cleartext password + * @param string $pw_db encrypted password from database * @return string encrypted password. */ private function pacrypt($pw, $pw_db = "") { Util::writeLog('OC_USER_SQL', "Entering private pacrypt()", - Util::DEBUG); + Util::DEBUG); $pw = stripslashes($pw); $password = ""; $salt = ""; - if($this -> settings['set_crypt_type'] === 'md5crypt') - { + if ($this->settings['set_crypt_type'] === 'md5crypt') { $split_salt = preg_split('/\$/', $pw_db); - if(isset($split_salt[2])) - { + if (isset($split_salt[2])) { $salt = $split_salt[2]; } - $password = $this -> md5crypt($pw, $salt); - } elseif($this -> settings['set_crypt_type'] === 'md5') - { + $password = $this->md5crypt($pw, $salt); + } elseif ($this->settings['set_crypt_type'] === 'md5') { $password = md5($pw); - } elseif($this -> settings['set_crypt_type'] === 'system') - { + } elseif ($this->settings['set_crypt_type'] === 'system') { // We never generate salts, as user creation is not allowed here $password = crypt($pw, $pw_db); - } elseif($this -> settings['set_crypt_type'] === 'cleartext') - { + } elseif ($this->settings['set_crypt_type'] === 'cleartext') { $password = $pw; } // See // https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1793352&group_id=191583 // this is apparently useful for pam_mysql etc. - elseif($this -> settings['set_crypt_type'] === 'mysql_encrypt') - { - if($pw_db !== "") - { + elseif ($this->settings['set_crypt_type'] === 'mysql_encrypt') { + if ($pw_db !== "") { $salt = substr($pw_db, 0, 2); - $row = $this -> helper -> runQuery('mysqlEncryptSalt', - array('pw' => $pw, 'salt' => $salt)); - } else - { - $row = $this -> helper -> runQuery('mysqlEncrypt', - array('pw' => $pw)); + $row = $this->helper->runQuery('mysqlEncryptSalt', + array('pw' => $pw, 'salt' => $salt)); + } else { + $row = $this->helper->runQuery('mysqlEncrypt', + array('pw' => $pw)); } - if($row === false) - { + if ($row === false) { return false; } $password = $row[0]; - } elseif($this -> settings['set_crypt_type'] === 'mysql_password') - { - $row = $this -> helper -> runQuery('mysqlPassword', - array('pw' => $pw)); + } elseif ($this->settings['set_crypt_type'] === 'mysql_password') { + $row = $this->helper->runQuery('mysqlPassword', + array('pw' => $pw)); - if($row === false) - { + if ($row === false) { return false; } $password = $row[0]; - } - - // The following is by Frédéric France - elseif($this -> settings['set_crypt_type'] === 'joomla') - { + } // The following is by Frédéric France + elseif ($this->settings['set_crypt_type'] === 'joomla') { $split_salt = preg_split('/:/', $pw_db); - if(isset($split_salt[1])) - { + if (isset($split_salt[1])) { $salt = $split_salt[1]; } $password = ($salt) ? md5($pw . $salt) : md5($pw); $password .= ':' . $salt; - } - - elseif($this-> settings['set_crypt_type'] === 'ssha256') - { + } elseif ($this->settings['set_crypt_type'] === 'ssha256') { $salted_password = base64_decode( - preg_replace('/{SSHA256}/i','',$pw_db)); - $salt = substr($salted_password,-(strlen($salted_password)-32)); - $password = $this->ssha256($pw,$salt); - } else - { + preg_replace('/{SSHA256}/i', '', $pw_db)); + $salt = substr($salted_password, -(strlen($salted_password) - 32)); + $password = $this->ssha256($pw, $salt); + } else { Util::writeLog('OC_USER_SQL', - "unknown/invalid crypt_type settings: ". - $this->settings['set_crypt_type'], - Util::ERROR); + "unknown/invalid crypt_type settings: " . + $this->settings['set_crypt_type'], + Util::ERROR); die('unknown/invalid Encryption type setting: ' . - $this -> settings['set_crypt_type']); + $this->settings['set_crypt_type']); } Util::writeLog('OC_USER_SQL', "pacrypt() done, return", - Util::DEBUG); + Util::DEBUG); return $password; } /** * md5crypt * Creates MD5 encrypted password - * @param string $pw The password to encrypt - * @param string $salt The salt to use + * @param string $pw The password to encrypt + * @param string $salt The salt to use * @param string $magic ? * @return string The encrypted password */ @@ -797,75 +725,72 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, { $MAGIC = "$1$"; - if($magic === "") + if ($magic === "") { $magic = $MAGIC; - if($salt === "") - $salt = $this -> create_md5salt(); + } + if ($salt === "") { + $salt = $this->create_md5salt(); + } $slist = explode("$", $salt); - if($slist[0] === "1") + if ($slist[0] === "1") { $salt = $slist[1]; + } $salt = substr($salt, 0, 8); $ctx = $pw . $magic . $salt; - $final = $this -> pahex2bin(md5($pw . $salt . $pw)); + $final = $this->pahex2bin(md5($pw . $salt . $pw)); - for($i = strlen($pw); $i > 0; $i -= 16) - { - if($i > 16) - { + for ($i = strlen($pw); $i > 0; $i -= 16) { + if ($i > 16) { $ctx .= substr($final, 0, 16); - } else - { + } else { $ctx .= substr($final, 0, $i); } } $i = strlen($pw); - while($i > 0) - { - if($i & 1) + while ($i > 0) { + if ($i & 1) { $ctx .= chr(0); - else + } else { $ctx .= $pw[0]; - $i = $i>>1; + } + $i = $i >> 1; } - $final = $this -> pahex2bin(md5($ctx)); + $final = $this->pahex2bin(md5($ctx)); - for($i = 0; $i < 1000; $i++) - { + for ($i = 0; $i < 1000; $i++) { $ctx1 = ""; - if($i & 1) - { + if ($i & 1) { $ctx1 .= $pw; - } else - { + } else { $ctx1 .= substr($final, 0, 16); } - if($i % 3) + if ($i % 3) { $ctx1 .= $salt; - if($i % 7) - $ctx1 .= $pw; - if($i & 1) - { - $ctx1 .= substr($final, 0, 16); - } else - { + } + if ($i % 7) { $ctx1 .= $pw; } - $final = $this -> pahex2bin(md5($ctx1)); + if ($i & 1) { + $ctx1 .= substr($final, 0, 16); + } else { + $ctx1 .= $pw; + } + $final = $this->pahex2bin(md5($ctx1)); } $passwd = ""; - $passwd .= $this -> to64(((ord($final[0])<<16) | - (ord($final[6])<<8) | (ord($final[12]))), 4); - $passwd .= $this -> to64(((ord($final[1])<<16) | - (ord($final[7])<<8) | (ord($final[13]))), 4); - $passwd .= $this -> to64(((ord($final[2])<<16) | - (ord($final[8])<<8) | (ord($final[14]))), 4); - $passwd .= $this -> to64(((ord($final[3])<<16) | - (ord($final[9])<<8) | (ord($final[15]))), 4); - $passwd .= $this -> to64(((ord($final[4])<<16) | - (ord($final[10])<<8) | (ord($final[5]))), 4); - $passwd .= $this -> to64(ord($final[11]), 2); + $passwd .= $this->to64(((ord($final[0]) << 16) | + (ord($final[6]) << 8) | (ord($final[12]))), 4); + $passwd .= $this->to64(((ord($final[1]) << 16) | + (ord($final[7]) << 8) | (ord($final[13]))), 4); + $passwd .= $this->to64(((ord($final[2]) << 16) | + (ord($final[8]) << 8) | (ord($final[14]))), 4); + $passwd .= $this->to64(((ord($final[3]) << 16) | + (ord($final[9]) << 8) | (ord($final[15]))), 4); + $passwd .= $this->to64(((ord($final[4]) << 16) | + (ord($final[10]) << 8) | (ord($final[5]))), 4); + $passwd .= $this->to64(ord($final[11]), 2); return "$magic$salt\$$passwd"; } @@ -875,20 +800,20 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, */ private function create_md5salt() { - srand((double) microtime() * 1000000); + srand((double)microtime() * 1000000); $salt = substr(md5(rand(0, 9999999)), 0, 8); return $salt; } /** * Encrypt using SSHA256 algorithm - * @param string $pw The password + * @param string $pw The password * @param string $salt The salt to use * @return string The hashed password, prefixed by {SSHA256} */ private function ssha256($pw, $salt) { - return '{SSHA256}'.base64_encode(hash('sha256',$pw.$salt,true).$salt); + return '{SSHA256}' . base64_encode(hash('sha256', $pw . $salt, true) . $salt); } /** @@ -898,15 +823,12 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, */ private function pahex2bin($str) { - if(function_exists('hex2bin')) - { + if (function_exists('hex2bin')) { return hex2bin($str); - } else - { + } else { $len = strlen($str); $nstr = ""; - for($i = 0; $i < $len; $i += 2) - { + for ($i = 0; $i < $len; $i += 2) { $num = sscanf(substr($str, $i, 2), "%x"); $nstr .= chr($num[0]); } @@ -919,36 +841,33 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, */ private function to64($v, $n) { - $ITOA64 = - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + $ITOA64 = + "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; $ret = ""; - while(($n - 1) >= 0) - { + while (($n - 1) >= 0) { $n--; $ret .= $ITOA64[$v & 0x3f]; - $v = $v>>6; + $v = $v >> 6; } return $ret; } /** * Store a value in memcache or the session, if no memcache is available - * @param string $key The key + * @param string $key The key * @param mixed $value The value to store * @param int $ttl (optional) defaults to 3600 seconds. */ - private function setCache($key, $value, $ttl=3600) + private function setCache($key, $value, $ttl = 3600) { - if ($this -> cache === NULL) - { - $_SESSION[$this -> session_cache_name][$key] = array( + if ($this->cache === null) { + $_SESSION[$this->session_cache_name][$key] = array( 'value' => $value, 'time' => time(), 'ttl' => $ttl, ); - } else - { - $this -> cache -> set($key,$value,$ttl); + } else { + $this->cache->set($key, $value, $ttl); } } @@ -960,26 +879,22 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, */ private function getCache($key) { - $retVal = NULL; - if ($this -> cache === NULL) - { - if (isset($_SESSION[$this -> session_cache_name], - $_SESSION[$this -> session_cache_name][$key])) - { - $value = $_SESSION[$this -> session_cache_name][$key]; - if (time() < $value['time'] + $value['ttl']) - { + $retVal = null; + if ($this->cache === null) { + if (isset($_SESSION[$this->session_cache_name], + $_SESSION[$this->session_cache_name][$key])) { + $value = $_SESSION[$this->session_cache_name][$key]; + if (time() < $value['time'] + $value['ttl']) { $retVal = $value['value']; } } - } else - { - $retVal = $this -> cache -> get ($key); + } else { + $retVal = $this->cache->get($key); } return $retVal; } - private function create_systemsalt($length=20) + private function create_systemsalt($length = 20) { $fp = fopen('/dev/urandom', 'r'); $randomString = fread($fp, $length); @@ -991,31 +906,32 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, private function pw_hash($password) { $options = [ - 'cost' => 10, - ]; + 'cost' => 10, + ]; return password_hash($password, PASSWORD_BCRYPT, $options); } - function hash_equals( $a, $b ) { - $a_length = strlen( $a ); + function hash_equals($a, $b) + { + $a_length = strlen($a); - if ( $a_length !== strlen( $b ) ) { + if ($a_length !== strlen($b)) { return false; - } - $result = 0; + } + $result = 0; // Do not attempt to "optimize" this. - for ( $i = 0; $i < $a_length; $i++ ) { - $result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] ); + for ($i = 0; $i < $a_length; $i++) { + $result |= ord($a[$i]) ^ ord($b[$i]); } - //Hide the length of the string - $additional_length=200-($a_length % 200); - $tmp=0; - $c="abCD"; - for ( $i = 0; $i < $additional_length; $i++ ) { - $tmp |= ord( $c[ 0 ] ) ^ ord( $c[ 0 ] ); + //Hide the length of the string + $additional_length = 200 - ($a_length % 200); + $tmp = 0; + $c = "abCD"; + for ($i = 0; $i < $additional_length; $i++) { + $tmp |= ord($c[0]) ^ ord($c[0]); } return $result === 0; @@ -1024,11 +940,9 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, private static function hex_to_base64($hex) { $hex_chr = ''; - foreach(str_split($hex, 2) as $hexpair) - { + foreach (str_split($hex, 2) as $hexpair) { $hex_chr .= chr(hexdec($hexpair)); } return base64_encode($hex_chr); } - } diff --git a/templates/admin.php b/templates/admin.php index 4820559..5ff8a8e 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -1,181 +1,273 @@

t('SQL User Backend')); ?>

-
+ -
- - - +
+ + + -
-

- 'MySQL', 'pgsql' => 'PostgreSQL'); ?> - + $name): //echo $_['sql_driver']; - if($_['sql_driver'] === $driver): ?> + if ($_['sql_driver'] === $driver): ?> - -

+ ?> + +

-

+

+

-

+

+

-

+

+

-

+

+

-

+

-
-
-

+
+
+

+

-

+

+

-

+

+

-

>
- t('Allow changing passwords. Imposes a security risk if password salts are not recreated.')); ?>

- t('Only the encryption types "System","password_hash" and "Joomla2" are safe.')); ?>

+

+ >
+ t('Allow changing passwords. Imposes a security risk if password salts are not recreated.')); ?> +

+ t('Only the encryption types "System","password_hash" and "Joomla2" are safe.')); ?>

-

+

+

-

- 'Drupal 7', 'md5' => 'MD5', 'md5crypt' => 'MD5 Crypt', 'cleartext' => 'Cleartext', 'mysql_encrypt' => 'mySQL ENCRYPT()', 'system' => 'System (crypt)', 'password_hash' => 'password_hash','mysql_password' => 'mySQL PASSWORD()', 'joomla' => 'Joomla MD5 Encryption', 'joomla2' => 'Joomla > 2.5.18 phpass', 'ssha256' => 'Salted SSHA256', 'redmine' => 'Redmine', 'sha1' => 'SHA1', 'courier_md5' => 'Courier base64-encoded MD5', 'courier_md5raw' => 'Courier hexadecimal MD5', 'courier_sha1' => 'Courier base64-encoded SHA1', 'courier_sha256' => 'Courier base64-encoded SHA256'); ?> - + $name): //echo $_['set_crypt_type']; - if($_['set_crypt_type'] === $driver): ?> + if ($_['set_crypt_type'] === $driver): ?> - -

+ ?> + +

-

+

+

-

/>
- t("Invert the logic of the active column (for blocked users in the SQL DB)")); ?>

+

/>
+ t("Invert the logic of the active column (for blocked users in the SQL DB)")); ?> +

-
+ -
+
-

+

+

-

- 'No Synchronisation', 'initial' => 'Synchronise only once', 'forceoc' => 'Nextcloud always wins', 'forcesql' => 'SQL always wins'); ?> - -

+

+ 'No Synchronisation', + 'initial' => 'Synchronise only once', + 'forceoc' => 'Nextcloud always wins', + 'forcesql' => 'SQL always wins' + ); ?> + +

-
+
-
+
-


- t('Append this string, e.g. a domain name, to each user name. The @-sign is automatically inserted.')); ?> -

+


+ t('Append this string, e.g. a domain name, to each user name. The @-sign is automatically inserted.')); ?> +

-

/>
- t("Strip Domain Part including @-sign from Username when logging in and retrieving username lists")); ?>

+

/>
+ t("Strip Domain Part including @-sign from Username when logging in and retrieving username lists")); ?> +

-
+
-
-

/>

+
+

/>

-

- 'SQL Column', 'static' => 'Static (with Variables)'); ?> - -

+

+ 'SQL Column', 'static' => 'Static (with Variables)'); ?> + +

-

+

+

-


- t('You can use the placeholders %%u to specify the user ID (before appending the default domain), %%ud to specify the user ID (after appending the default domain) and %%d to specify the default domain')); ?>

+


+ t('You can use the placeholders %%u to specify the user ID (before appending the default domain), %%ud to specify the user ID (after appending the default domain) and %%d to specify the default domain')); ?> +

-
-
-

+
+
+

+

-

+

+

-

+

+

-
+
- - - -
t('Saving...')); ?>
-
t('Loading...')); ?>
-
t('Verifying...')); ?>
-
-
-
- + + + +
t('Saving...')); ?>
+
t('Loading...')); ?>
+
t('Verifying...')); ?>
+
+
+
+
From 7672c66c75848fb0e1139e672b682b9280e8ddec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 28 Feb 2018 20:18:50 +0100 Subject: [PATCH 02/29] New interface. This interface must be implemented by all supported hash algorithms. --- lib/HashAlgorithm/HashAlgorithm.php | 57 +++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 lib/HashAlgorithm/HashAlgorithm.php diff --git a/lib/HashAlgorithm/HashAlgorithm.php b/lib/HashAlgorithm/HashAlgorithm.php new file mode 100644 index 0000000..5c074ef --- /dev/null +++ b/lib/HashAlgorithm/HashAlgorithm.php @@ -0,0 +1,57 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\user_sql\HashAlgorithm; + +/** + * Interface which defines all function required by a hash algorithm. + * Please note that this interface must be implemented by every hash function supported in this app. + * @author Marcin Łojewski + */ +interface HashAlgorithm +{ + /** + * Used by reflection to get the class instance. + * @return HashAlgorithm + */ + public static function getInstance(); + + /** + * Get the hash algorithm name. + * This name is visible in the admin panel. + * @return string + */ + public function getVisibleName(); + + /** + * Hash given password. + * This value is stored in the database, when the password is changed. + * @param String $password The new password. + * @return boolean True if the password was hashed successfully, false otherwise. + */ + public function getPasswordHash($password); + + /** + * Check password given by the user against hash stored in the database. + * @param String $password Password given by the user. + * @param String $dbHash Password hash stored in the database. + * @return boolean True if the password is correct, false otherwise. + */ + public function checkPassword($password, $dbHash); +} From 3251067b38c6ccdb87e1731ce6a3c59f3082feab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 28 Feb 2018 21:31:42 +0100 Subject: [PATCH 03/29] Set to default new logic. Add cleartext password hash implementation. TODO: - add new implementation of the rest of currently supported hashes - create update.php changing hash names in the config --- lib/HashAlgorithm/Cleartext.php | 75 +++++++++++++++++++++++++++++ lib/user_sql.php | 85 +++++++++++++++++++++++---------- templates/admin.php | 2 +- 3 files changed, 135 insertions(+), 27 deletions(-) create mode 100644 lib/HashAlgorithm/Cleartext.php diff --git a/lib/HashAlgorithm/Cleartext.php b/lib/HashAlgorithm/Cleartext.php new file mode 100644 index 0000000..17526b1 --- /dev/null +++ b/lib/HashAlgorithm/Cleartext.php @@ -0,0 +1,75 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\user_sql\HashAlgorithm; + +/** + * Cleartext password hash implementation. + * @author Marcin Łojewski + */ +class Cleartext implements HashAlgorithm +{ + /** + * @var Cleartext + */ + private static $instance; + + private function __construct() + { + } + + /** + * @return Cleartext + */ + public static function getInstance() + { + if (self::$instance === null) { + self::$instance = new Cleartext(); + } + return self::$instance; + } + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Cleartext"; + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return $password; + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return $password === $dbHash; + } + + private function __clone() + { + } +} diff --git a/lib/user_sql.php b/lib/user_sql.php index b696027..cb6f2a5 100644 --- a/lib/user_sql.php +++ b/lib/user_sql.php @@ -30,7 +30,7 @@ namespace OCA\user_sql; use OC\User\Backend; - +use OCA\user_sql\HashAlgorithm\HashAlgorithm; use OCP\IConfig; use OCP\IUser; use OCP\IUserSession; @@ -280,6 +280,15 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, return false; } + /** + * @return HashAlgorithm|bool + */ + private function getHashAlgorithmInstance() { + $cryptoType = $this->settings['set_crypt_type']; + require_once('HashAlgorithm/'. $cryptoType . '.php'); + return call_user_func('OCA\\user_sql\\HashAlgorithm\\' . $cryptoType . "::getInstance"); + } + /** * Set (change) a user password * This can be enabled/disabled in the settings (set_allow_pwchange) @@ -305,7 +314,20 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, if ($row === false) { return false; } - $old_password = $row[$this->settings['col_password']]; + + $hashAlgorithm = $this->getHashAlgorithmInstance(); + + if ($hashAlgorithm === false) { + return false; + } + + $enc_password = $hashAlgorithm->getPasswordHash($password); + + if ($enc_password === false) { + return false; + } + + /*$old_password = $row[$this->settings['col_password']]; // Added and disabled updating passwords for Drupal 7 WD 2018-01-04 if ($this->settings['set_crypt_type'] === 'drupal') { @@ -356,7 +378,8 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, $enc_password = '{SHA256}' . OC_USER_SQL::hex_to_base64(hash('sha256', $password, false)); } else { $enc_password = $this->pacrypt($password, $old_password); - } + }*/ + $res = $this->helper->runQuery('setPass', array('uid' => $uid, 'enc_password' => $enc_password), true); @@ -396,7 +419,16 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, Util::writeLog('OC_USER_SQL', "Encrypting and checking password", Util::DEBUG); - // Added handling for Drupal 7 passwords WD 2018-01-04 + + $hashAlgorithm = $this->getHashAlgorithmInstance(); + + if ($hashAlgorithm === false) { + return false; + } + + $ret = $hashAlgorithm->checkPassword($password, $db_pass); + + /*// Added handling for Drupal 7 passwords WD 2018-01-04 if ($this->settings['set_crypt_type'] === 'drupal') { if (!function_exists('user_check_password')) { require_once('drupal.php'); @@ -437,7 +469,8 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, // $ret = $this -> pacrypt($password, $db_pass) === $db_pass; $ret = $this->hash_equals($this->pacrypt($password, $db_pass), $db_pass); - } + }*/ + if ($ret) { Util::writeLog('OC_USER_SQL', "Passwords matching, return true", @@ -620,7 +653,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, */ public function getBackendName() { - return 'SQL'; + return 'user_sql'; } /** @@ -637,7 +670,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, * @param string $pw_db encrypted password from database * @return string encrypted password. */ - private function pacrypt($pw, $pw_db = "") + /*private function pacrypt($pw, $pw_db = "") { Util::writeLog('OC_USER_SQL', "Entering private pacrypt()", Util::DEBUG); @@ -710,7 +743,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, Util::writeLog('OC_USER_SQL', "pacrypt() done, return", Util::DEBUG); return $password; - } + }*/ /** * md5crypt @@ -721,7 +754,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, * @return string The encrypted password */ - private function md5crypt($pw, $salt = "", $magic = "") + /*private function md5crypt($pw, $salt = "", $magic = "") { $MAGIC = "$1$"; @@ -792,18 +825,18 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, (ord($final[10]) << 8) | (ord($final[5]))), 4); $passwd .= $this->to64(ord($final[11]), 2); return "$magic$salt\$$passwd"; - } + }*/ /** * Create a new salte * @return string The salt */ - private function create_md5salt() + /*private function create_md5salt() { srand((double)microtime() * 1000000); $salt = substr(md5(rand(0, 9999999)), 0, 8); return $salt; - } + }*/ /** * Encrypt using SSHA256 algorithm @@ -811,17 +844,17 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, * @param string $salt The salt to use * @return string The hashed password, prefixed by {SSHA256} */ - private function ssha256($pw, $salt) + /*private function ssha256($pw, $salt) { return '{SSHA256}' . base64_encode(hash('sha256', $pw . $salt, true) . $salt); - } + }*/ /** * PostfixAdmin's hex2bin function * @param string $str The string to convert * @return string The converted string */ - private function pahex2bin($str) + /*private function pahex2bin($str) { if (function_exists('hex2bin')) { return hex2bin($str); @@ -834,12 +867,12 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, } return $nstr; } - } + }*/ /** * Convert to 64? */ - private function to64($v, $n) + /*private function to64($v, $n) { $ITOA64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; @@ -850,7 +883,7 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, $v = $v >> 6; } return $ret; - } + }*/ /** * Store a value in memcache or the session, if no memcache is available @@ -894,25 +927,25 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, return $retVal; } - private function create_systemsalt($length = 20) + /*private function create_systemsalt($length = 20) { $fp = fopen('/dev/urandom', 'r'); $randomString = fread($fp, $length); fclose($fp); $salt = base64_encode($randomString); return $salt; - } + }*/ - private function pw_hash($password) + /*private function pw_hash($password) { $options = [ 'cost' => 10, ]; return password_hash($password, PASSWORD_BCRYPT, $options); - } + }*/ - function hash_equals($a, $b) + /*function hash_equals($a, $b) { $a_length = strlen($a); @@ -935,14 +968,14 @@ class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, } return $result === 0; - } + }*/ - private static function hex_to_base64($hex) + /*private static function hex_to_base64($hex) { $hex_chr = ''; foreach (str_split($hex, 2) as $hexpair) { $hex_chr .= chr(hexdec($hexpair)); } return base64_encode($hex_chr); - } + }*/ } diff --git a/templates/admin.php b/templates/admin.php index 5ff8a8e..fbc35d8 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -106,7 +106,7 @@ $cfgClass = 'section'; 'drupal' => 'Drupal 7', 'md5' => 'MD5', 'md5crypt' => 'MD5 Crypt', - 'cleartext' => 'Cleartext', + 'Cleartext' => 'Cleartext', 'mysql_encrypt' => 'mySQL ENCRYPT()', 'system' => 'System (crypt)', 'password_hash' => 'password_hash', From 7872d98dd63a377b8ebf1dc486cff05e26252b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 28 Feb 2018 21:37:51 +0100 Subject: [PATCH 04/29] SHA1 and MD5 hash implementation. --- lib/HashAlgorithm/MD5.php | 75 ++++++++++++++++++++++++++++++++++++++ lib/HashAlgorithm/SHA1.php | 75 ++++++++++++++++++++++++++++++++++++++ templates/admin.php | 4 +- 3 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 lib/HashAlgorithm/MD5.php create mode 100644 lib/HashAlgorithm/SHA1.php diff --git a/lib/HashAlgorithm/MD5.php b/lib/HashAlgorithm/MD5.php new file mode 100644 index 0000000..5d7548d --- /dev/null +++ b/lib/HashAlgorithm/MD5.php @@ -0,0 +1,75 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\user_sql\HashAlgorithm; + +/** + * MD5 password hash implementation. + * @author Marcin Łojewski + */ +class MD5 implements HashAlgorithm +{ + /** + * @var MD5 + */ + private static $instance; + + private function __construct() + { + } + + /** + * @return MD5 + */ + public static function getInstance() + { + if (self::$instance === null) { + self::$instance = new MD5(); + } + return self::$instance; + } + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "MD5"; + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return md5($password); + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return md5($password) === $dbHash; + } + + private function __clone() + { + } +} diff --git a/lib/HashAlgorithm/SHA1.php b/lib/HashAlgorithm/SHA1.php new file mode 100644 index 0000000..6913adb --- /dev/null +++ b/lib/HashAlgorithm/SHA1.php @@ -0,0 +1,75 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\user_sql\HashAlgorithm; + +/** + * SHA1 password hash implementation. + * @author Marcin Łojewski + */ +class SHA1 implements HashAlgorithm +{ + /** + * @var SHA1 + */ + private static $instance; + + private function __construct() + { + } + + /** + * @return SHA1 + */ + public static function getInstance() + { + if (self::$instance === null) { + self::$instance = new SHA1(); + } + return self::$instance; + } + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "SHA1"; + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return sha1($password); + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return sha1($password) === $dbHash; + } + + private function __clone() + { + } +} diff --git a/templates/admin.php b/templates/admin.php index fbc35d8..a181c11 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -104,7 +104,7 @@ $cfgClass = 'section';

'Drupal 7', - 'md5' => 'MD5', + 'MD5' => 'MD5', 'md5crypt' => 'MD5 Crypt', 'Cleartext' => 'Cleartext', 'mysql_encrypt' => 'mySQL ENCRYPT()', @@ -115,7 +115,7 @@ $cfgClass = 'section'; 'joomla2' => 'Joomla > 2.5.18 phpass', 'ssha256' => 'Salted SSHA256', 'redmine' => 'Redmine', - 'sha1' => 'SHA1', + 'SHA1' => 'SHA1', 'courier_md5' => 'Courier base64-encoded MD5', 'courier_md5raw' => 'Courier hexadecimal MD5', 'courier_sha1' => 'Courier base64-encoded SHA1', From 9c13804638abdab2122ac973efa0ff2d641656a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 28 Feb 2018 23:07:35 +0100 Subject: [PATCH 05/29] Singleton pattern trait. --- lib/HashAlgorithm/Cleartext.php | 24 +--------------- lib/HashAlgorithm/MD5.php | 24 +--------------- lib/HashAlgorithm/SHA1.php | 24 +--------------- lib/HashAlgorithm/Singleton.php | 49 +++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 69 deletions(-) create mode 100644 lib/HashAlgorithm/Singleton.php diff --git a/lib/HashAlgorithm/Cleartext.php b/lib/HashAlgorithm/Cleartext.php index 17526b1..179d1ba 100644 --- a/lib/HashAlgorithm/Cleartext.php +++ b/lib/HashAlgorithm/Cleartext.php @@ -25,25 +25,7 @@ namespace OCA\user_sql\HashAlgorithm; */ class Cleartext implements HashAlgorithm { - /** - * @var Cleartext - */ - private static $instance; - - private function __construct() - { - } - - /** - * @return Cleartext - */ - public static function getInstance() - { - if (self::$instance === null) { - self::$instance = new Cleartext(); - } - return self::$instance; - } + use Singleton; /** * @inheritdoc @@ -68,8 +50,4 @@ class Cleartext implements HashAlgorithm { return $password === $dbHash; } - - private function __clone() - { - } } diff --git a/lib/HashAlgorithm/MD5.php b/lib/HashAlgorithm/MD5.php index 5d7548d..acf3370 100644 --- a/lib/HashAlgorithm/MD5.php +++ b/lib/HashAlgorithm/MD5.php @@ -25,25 +25,7 @@ namespace OCA\user_sql\HashAlgorithm; */ class MD5 implements HashAlgorithm { - /** - * @var MD5 - */ - private static $instance; - - private function __construct() - { - } - - /** - * @return MD5 - */ - public static function getInstance() - { - if (self::$instance === null) { - self::$instance = new MD5(); - } - return self::$instance; - } + use Singleton; /** * @inheritdoc @@ -68,8 +50,4 @@ class MD5 implements HashAlgorithm { return md5($password) === $dbHash; } - - private function __clone() - { - } } diff --git a/lib/HashAlgorithm/SHA1.php b/lib/HashAlgorithm/SHA1.php index 6913adb..e9f7a1e 100644 --- a/lib/HashAlgorithm/SHA1.php +++ b/lib/HashAlgorithm/SHA1.php @@ -25,25 +25,7 @@ namespace OCA\user_sql\HashAlgorithm; */ class SHA1 implements HashAlgorithm { - /** - * @var SHA1 - */ - private static $instance; - - private function __construct() - { - } - - /** - * @return SHA1 - */ - public static function getInstance() - { - if (self::$instance === null) { - self::$instance = new SHA1(); - } - return self::$instance; - } + use Singleton; /** * @inheritdoc @@ -68,8 +50,4 @@ class SHA1 implements HashAlgorithm { return sha1($password) === $dbHash; } - - private function __clone() - { - } } diff --git a/lib/HashAlgorithm/Singleton.php b/lib/HashAlgorithm/Singleton.php new file mode 100644 index 0000000..b54c550 --- /dev/null +++ b/lib/HashAlgorithm/Singleton.php @@ -0,0 +1,49 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\user_sql\HashAlgorithm; + +/** + * Singleton pattern trait. + * @author Marcin Łojewski + */ +trait Singleton +{ + private static $instance; + + final private function __construct() + { + $this->init(); + } + + protected function init() + { + } + + final public static function getInstance() + { + return isset(static::$instance) + ? static::$instance + : static::$instance = new static; + } + + final private function __clone() + { + } +} From a6a502fe7cb538f1249088b31cf05b13aa2471df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 28 Feb 2018 23:20:19 +0100 Subject: [PATCH 06/29] Courier hashes. New traits. --- lib/HashAlgorithm/Base/Base64.php | 41 ++++++++++++++++ lib/HashAlgorithm/{ => Base}/Singleton.php | 2 +- lib/HashAlgorithm/Cleartext.php | 2 + lib/HashAlgorithm/CourierMD5.php | 57 ++++++++++++++++++++++ lib/HashAlgorithm/CourierMD5Raw.php | 55 +++++++++++++++++++++ lib/HashAlgorithm/CourierSHA1.php | 57 ++++++++++++++++++++++ lib/HashAlgorithm/CourierSHA256.php | 57 ++++++++++++++++++++++ lib/HashAlgorithm/MD5.php | 10 ++-- lib/HashAlgorithm/SHA1.php | 10 ++-- 9 files changed, 282 insertions(+), 9 deletions(-) create mode 100644 lib/HashAlgorithm/Base/Base64.php rename lib/HashAlgorithm/{ => Base}/Singleton.php (96%) create mode 100644 lib/HashAlgorithm/CourierMD5.php create mode 100644 lib/HashAlgorithm/CourierMD5Raw.php create mode 100644 lib/HashAlgorithm/CourierSHA1.php create mode 100644 lib/HashAlgorithm/CourierSHA256.php diff --git a/lib/HashAlgorithm/Base/Base64.php b/lib/HashAlgorithm/Base/Base64.php new file mode 100644 index 0000000..ca9fb05 --- /dev/null +++ b/lib/HashAlgorithm/Base/Base64.php @@ -0,0 +1,41 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\user_sql\HashAlgorithm\Base; + +/** + * Base64 utilities trait. + * @author Marcin Łojewski + */ +trait Base64 +{ + /** + * Convert hexadecimal message to its base64 form. + * @param $hex string Hexadecimal encoded message. + * @return string Same message encoded in base64. + */ + private static function hexToBase64($hex) + { + $hexChr = ''; + foreach (str_split($hex, 2) as $hexPair) { + $hexChr .= chr(hexdec($hexPair)); + } + return base64_encode($hexChr); + } +} diff --git a/lib/HashAlgorithm/Singleton.php b/lib/HashAlgorithm/Base/Singleton.php similarity index 96% rename from lib/HashAlgorithm/Singleton.php rename to lib/HashAlgorithm/Base/Singleton.php index b54c550..39dadc4 100644 --- a/lib/HashAlgorithm/Singleton.php +++ b/lib/HashAlgorithm/Base/Singleton.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm; +namespace OCA\user_sql\HashAlgorithm\Base; /** * Singleton pattern trait. diff --git a/lib/HashAlgorithm/Cleartext.php b/lib/HashAlgorithm/Cleartext.php index 179d1ba..428ea83 100644 --- a/lib/HashAlgorithm/Cleartext.php +++ b/lib/HashAlgorithm/Cleartext.php @@ -19,6 +19,8 @@ namespace OCA\user_sql\HashAlgorithm; +use OCA\user_sql\HashAlgorithm\Base\Singleton; + /** * Cleartext password hash implementation. * @author Marcin Łojewski diff --git a/lib/HashAlgorithm/CourierMD5.php b/lib/HashAlgorithm/CourierMD5.php new file mode 100644 index 0000000..42d6e7b --- /dev/null +++ b/lib/HashAlgorithm/CourierMD5.php @@ -0,0 +1,57 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\user_sql\HashAlgorithm; + +use OCA\user_sql\HashAlgorithm\Base\Base64; +use OCA\user_sql\HashAlgorithm\Base\Singleton; + +/** + * Courier MD5 password hash implementation. + * @author Marcin Łojewski + */ +class CourierMD5 implements HashAlgorithm +{ + use Base64; + use Singleton; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Courier base64-encoded MD5"; + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return $this->getPasswordHash($password) === $dbHash; + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return '{MD5}' . self::hexToBase64(md5($password)); + } +} diff --git a/lib/HashAlgorithm/CourierMD5Raw.php b/lib/HashAlgorithm/CourierMD5Raw.php new file mode 100644 index 0000000..3d31819 --- /dev/null +++ b/lib/HashAlgorithm/CourierMD5Raw.php @@ -0,0 +1,55 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\user_sql\HashAlgorithm; + +use OCA\user_sql\HashAlgorithm\Base\Singleton; + +/** + * Courier MD5 RAW password hash implementation. + * @author Marcin Łojewski + */ +class CourierMD5Raw implements HashAlgorithm +{ + use Singleton; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Courier hexadecimal MD5"; + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return $this->getPasswordHash($password) === $dbHash; + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return '{MD5RAW}' . md5($password); + } +} diff --git a/lib/HashAlgorithm/CourierSHA1.php b/lib/HashAlgorithm/CourierSHA1.php new file mode 100644 index 0000000..2553c61 --- /dev/null +++ b/lib/HashAlgorithm/CourierSHA1.php @@ -0,0 +1,57 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\user_sql\HashAlgorithm; + +use OCA\user_sql\HashAlgorithm\Base\Base64; +use OCA\user_sql\HashAlgorithm\Base\Singleton; + +/** + * Courier SHA1 password hash implementation. + * @author Marcin Łojewski + */ +class CourierSHA1 implements HashAlgorithm +{ + use Base64; + use Singleton; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Courier base64-encoded SHA1"; + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return $this->getPasswordHash($password) === $dbHash; + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return '{SHA}' . self::hexToBase64(sha1($password)); + } +} diff --git a/lib/HashAlgorithm/CourierSHA256.php b/lib/HashAlgorithm/CourierSHA256.php new file mode 100644 index 0000000..c7e4c94 --- /dev/null +++ b/lib/HashAlgorithm/CourierSHA256.php @@ -0,0 +1,57 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\user_sql\HashAlgorithm; + +use OCA\user_sql\HashAlgorithm\Base\Base64; +use OCA\user_sql\HashAlgorithm\Base\Singleton; + +/** + * Courier SHA256 password hash implementation. + * @author Marcin Łojewski + */ +class CourierSHA256 implements HashAlgorithm +{ + use Base64; + use Singleton; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Courier base64-encoded SHA256"; + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return $this->getPasswordHash($password) === $dbHash; + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return '{SHA256}' . self::hexToBase64(hash('sha256', $password)); + } +} diff --git a/lib/HashAlgorithm/MD5.php b/lib/HashAlgorithm/MD5.php index acf3370..f87db67 100644 --- a/lib/HashAlgorithm/MD5.php +++ b/lib/HashAlgorithm/MD5.php @@ -19,6 +19,8 @@ namespace OCA\user_sql\HashAlgorithm; +use OCA\user_sql\HashAlgorithm\Base\Singleton; + /** * MD5 password hash implementation. * @author Marcin Łojewski @@ -38,16 +40,16 @@ class MD5 implements HashAlgorithm /** * @inheritdoc */ - public function getPasswordHash($password) + public function checkPassword($password, $dbHash) { - return md5($password); + return $this->getPasswordHash($password) === $dbHash; } /** * @inheritdoc */ - public function checkPassword($password, $dbHash) + public function getPasswordHash($password) { - return md5($password) === $dbHash; + return md5($password); } } diff --git a/lib/HashAlgorithm/SHA1.php b/lib/HashAlgorithm/SHA1.php index e9f7a1e..086a527 100644 --- a/lib/HashAlgorithm/SHA1.php +++ b/lib/HashAlgorithm/SHA1.php @@ -19,6 +19,8 @@ namespace OCA\user_sql\HashAlgorithm; +use OCA\user_sql\HashAlgorithm\Base\Singleton; + /** * SHA1 password hash implementation. * @author Marcin Łojewski @@ -38,16 +40,16 @@ class SHA1 implements HashAlgorithm /** * @inheritdoc */ - public function getPasswordHash($password) + public function checkPassword($password, $dbHash) { - return sha1($password); + return $this->getPasswordHash($password) === $dbHash; } /** * @inheritdoc */ - public function checkPassword($password, $dbHash) + public function getPasswordHash($password) { - return sha1($password) === $dbHash; + return sha1($password); } } From 3d901e3fc2ce1b0eb0136dd20f307181a01c75c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 28 Feb 2018 23:53:33 +0100 Subject: [PATCH 07/29] Use hash_equals method to compare the hashes. --- lib/HashAlgorithm/Cleartext.php | 2 +- lib/HashAlgorithm/CourierMD5.php | 2 +- lib/HashAlgorithm/CourierMD5Raw.php | 2 +- lib/HashAlgorithm/CourierSHA1.php | 2 +- lib/HashAlgorithm/CourierSHA256.php | 2 +- lib/HashAlgorithm/MD5.php | 2 +- lib/HashAlgorithm/SHA1.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/HashAlgorithm/Cleartext.php b/lib/HashAlgorithm/Cleartext.php index 428ea83..e5a60bd 100644 --- a/lib/HashAlgorithm/Cleartext.php +++ b/lib/HashAlgorithm/Cleartext.php @@ -50,6 +50,6 @@ class Cleartext implements HashAlgorithm */ public function checkPassword($password, $dbHash) { - return $password === $dbHash; + return hash_equals($dbHash, $password); } } diff --git a/lib/HashAlgorithm/CourierMD5.php b/lib/HashAlgorithm/CourierMD5.php index 42d6e7b..25476eb 100644 --- a/lib/HashAlgorithm/CourierMD5.php +++ b/lib/HashAlgorithm/CourierMD5.php @@ -44,7 +44,7 @@ class CourierMD5 implements HashAlgorithm */ public function checkPassword($password, $dbHash) { - return $this->getPasswordHash($password) === $dbHash; + return hash_equals($dbHash, $this->getPasswordHash($password)); } /** diff --git a/lib/HashAlgorithm/CourierMD5Raw.php b/lib/HashAlgorithm/CourierMD5Raw.php index 3d31819..dbdfc04 100644 --- a/lib/HashAlgorithm/CourierMD5Raw.php +++ b/lib/HashAlgorithm/CourierMD5Raw.php @@ -42,7 +42,7 @@ class CourierMD5Raw implements HashAlgorithm */ public function checkPassword($password, $dbHash) { - return $this->getPasswordHash($password) === $dbHash; + return hash_equals($dbHash, $this->getPasswordHash($password)); } /** diff --git a/lib/HashAlgorithm/CourierSHA1.php b/lib/HashAlgorithm/CourierSHA1.php index 2553c61..21f3a44 100644 --- a/lib/HashAlgorithm/CourierSHA1.php +++ b/lib/HashAlgorithm/CourierSHA1.php @@ -44,7 +44,7 @@ class CourierSHA1 implements HashAlgorithm */ public function checkPassword($password, $dbHash) { - return $this->getPasswordHash($password) === $dbHash; + return hash_equals($dbHash, $this->getPasswordHash($password)); } /** diff --git a/lib/HashAlgorithm/CourierSHA256.php b/lib/HashAlgorithm/CourierSHA256.php index c7e4c94..0951d59 100644 --- a/lib/HashAlgorithm/CourierSHA256.php +++ b/lib/HashAlgorithm/CourierSHA256.php @@ -44,7 +44,7 @@ class CourierSHA256 implements HashAlgorithm */ public function checkPassword($password, $dbHash) { - return $this->getPasswordHash($password) === $dbHash; + return hash_equals($dbHash, $this->getPasswordHash($password)); } /** diff --git a/lib/HashAlgorithm/MD5.php b/lib/HashAlgorithm/MD5.php index f87db67..8b43bb2 100644 --- a/lib/HashAlgorithm/MD5.php +++ b/lib/HashAlgorithm/MD5.php @@ -42,7 +42,7 @@ class MD5 implements HashAlgorithm */ public function checkPassword($password, $dbHash) { - return $this->getPasswordHash($password) === $dbHash; + return hash_equals($dbHash, $this->getPasswordHash($password)); } /** diff --git a/lib/HashAlgorithm/SHA1.php b/lib/HashAlgorithm/SHA1.php index 086a527..b59b9c2 100644 --- a/lib/HashAlgorithm/SHA1.php +++ b/lib/HashAlgorithm/SHA1.php @@ -42,7 +42,7 @@ class SHA1 implements HashAlgorithm */ public function checkPassword($password, $dbHash) { - return $this->getPasswordHash($password) === $dbHash; + return hash_equals($dbHash, $this->getPasswordHash($password)); } /** From ed5ec8247957df5ced15dc5ff1fde2394dce1d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Fri, 2 Mar 2018 09:09:09 +0100 Subject: [PATCH 08/29] New hashing algorithms. --- lib/HashAlgorithm/Base/BaseCrypt.php | 60 +++++++++++++++ .../{ => Base}/HashAlgorithm.php | 4 +- lib/HashAlgorithm/Base/SSHA.php | 75 +++++++++++++++++++ lib/HashAlgorithm/Base/Singleton.php | 4 +- .../Base/{Base64.php => Utils.php} | 23 +++++- lib/HashAlgorithm/Cleartext.php | 9 ++- lib/HashAlgorithm/CourierMD5.php | 13 ++-- lib/HashAlgorithm/CourierMD5Raw.php | 9 ++- lib/HashAlgorithm/CourierSHA1.php | 13 ++-- lib/HashAlgorithm/CourierSHA256.php | 13 ++-- lib/HashAlgorithm/Crypt.php | 59 +++++++++++++++ lib/HashAlgorithm/CryptArgon2.php | 57 ++++++++++++++ lib/HashAlgorithm/CryptBlowfish.php | 57 ++++++++++++++ lib/HashAlgorithm/CryptExtendedDES.php | 63 ++++++++++++++++ lib/HashAlgorithm/CryptMD5.php | 48 ++++++++++++ lib/HashAlgorithm/CryptSHA256.php | 49 ++++++++++++ lib/HashAlgorithm/CryptSHA512.php | 49 ++++++++++++ lib/HashAlgorithm/CryptStandardDES.php | 48 ++++++++++++ lib/HashAlgorithm/Joomla.php | 71 ++++++++++++++++++ lib/HashAlgorithm/MD5.php | 9 ++- lib/HashAlgorithm/SHA1.php | 9 ++- lib/HashAlgorithm/SSHA256.php | 53 +++++++++++++ lib/HashAlgorithm/SSHA512.php | 53 +++++++++++++ 23 files changed, 806 insertions(+), 42 deletions(-) create mode 100644 lib/HashAlgorithm/Base/BaseCrypt.php rename lib/HashAlgorithm/{ => Base}/HashAlgorithm.php (94%) create mode 100644 lib/HashAlgorithm/Base/SSHA.php rename lib/HashAlgorithm/Base/{Base64.php => Utils.php} (65%) create mode 100644 lib/HashAlgorithm/Crypt.php create mode 100644 lib/HashAlgorithm/CryptArgon2.php create mode 100644 lib/HashAlgorithm/CryptBlowfish.php create mode 100644 lib/HashAlgorithm/CryptExtendedDES.php create mode 100644 lib/HashAlgorithm/CryptMD5.php create mode 100644 lib/HashAlgorithm/CryptSHA256.php create mode 100644 lib/HashAlgorithm/CryptSHA512.php create mode 100644 lib/HashAlgorithm/CryptStandardDES.php create mode 100644 lib/HashAlgorithm/Joomla.php create mode 100644 lib/HashAlgorithm/SSHA256.php create mode 100644 lib/HashAlgorithm/SSHA512.php diff --git a/lib/HashAlgorithm/Base/BaseCrypt.php b/lib/HashAlgorithm/Base/BaseCrypt.php new file mode 100644 index 0000000..620cbea --- /dev/null +++ b/lib/HashAlgorithm/Base/BaseCrypt.php @@ -0,0 +1,60 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm\Base; + +/** + * Implements standard Unix DES-based algorithm or + * alternative algorithms that may be available on the system. + * @see crypt() + * @author Marcin Łojewski + */ +abstract class BaseCrypt implements HashAlgorithm +{ + use Singleton; + + const SALT_ALPHABET = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + + /** + * @inheritdoc + */ + abstract public function getVisibleName(); + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return hash_equals($dbHash, crypt($password, $dbHash)); + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return crypt($password, self::getSalt()); + } + + /** + * Generate salt for hashing algorithm. + * @return string + */ + protected abstract function getSalt(); +} diff --git a/lib/HashAlgorithm/HashAlgorithm.php b/lib/HashAlgorithm/Base/HashAlgorithm.php similarity index 94% rename from lib/HashAlgorithm/HashAlgorithm.php rename to lib/HashAlgorithm/Base/HashAlgorithm.php index 5c074ef..0f378a4 100644 --- a/lib/HashAlgorithm/HashAlgorithm.php +++ b/lib/HashAlgorithm/Base/HashAlgorithm.php @@ -1,7 +1,7 @@ + * Copyright (C) 2018 Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm; +namespace OCA\UserSQL\HashAlgorithm\Base; /** * Interface which defines all function required by a hash algorithm. diff --git a/lib/HashAlgorithm/Base/SSHA.php b/lib/HashAlgorithm/Base/SSHA.php new file mode 100644 index 0000000..baac624 --- /dev/null +++ b/lib/HashAlgorithm/Base/SSHA.php @@ -0,0 +1,75 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm\Base; + +/** + * SSHA* hashing implementation. + * @author Marcin Łojewski + */ +abstract class SSHA implements HashAlgorithm +{ + use Singleton; + use Utils; + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + $saltedPassword = base64_decode(preg_replace("/" . $this->getPrefix() . "/i", "", $dbHash)); + $salt = substr($saltedPassword, -(strlen($saltedPassword) - 32)); + $hash = self::ssha($password, $salt); + + return hash_equals($dbHash, $hash); + } + + /** + * Get hash prefix eg. {SSHA256}. + * @return string + */ + public abstract function getPrefix(); + + /** + * Encrypt using SSHA256 algorithm + * @param string $password The password. + * @param string $salt The salt to use. + * @return string The hashed password, prefixed by {SSHA256}. + */ + private function ssha($password, $salt) + { + return $this->getPrefix() . base64_encode(hash($this->getAlgorithm(), $password . $salt, true) . $salt); + } + + /** + * Get algorithm used by the hash() function. + * @see hash() + * @return string + */ + public abstract function getAlgorithm(); + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return self::ssha($password, + self::randomString(32, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); + } +} diff --git a/lib/HashAlgorithm/Base/Singleton.php b/lib/HashAlgorithm/Base/Singleton.php index 39dadc4..3dc4440 100644 --- a/lib/HashAlgorithm/Base/Singleton.php +++ b/lib/HashAlgorithm/Base/Singleton.php @@ -1,7 +1,7 @@ + * Copyright (C) 2018 Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm\Base; +namespace OCA\UserSQL\HashAlgorithm\Base; /** * Singleton pattern trait. diff --git a/lib/HashAlgorithm/Base/Base64.php b/lib/HashAlgorithm/Base/Utils.php similarity index 65% rename from lib/HashAlgorithm/Base/Base64.php rename to lib/HashAlgorithm/Base/Utils.php index ca9fb05..956c3b6 100644 --- a/lib/HashAlgorithm/Base/Base64.php +++ b/lib/HashAlgorithm/Base/Utils.php @@ -1,7 +1,7 @@ + * Copyright (C) 2018 Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm\Base; +namespace OCA\UserSQL\HashAlgorithm\Base; /** - * Base64 utilities trait. + * Cryptographic utilities trait. * @author Marcin Łojewski */ -trait Base64 +trait Utils { /** * Convert hexadecimal message to its base64 form. @@ -38,4 +38,19 @@ trait Base64 } return base64_encode($hexChr); } + + /** + * Generate random string from given alphabet. + * @param $length int Output string length. + * @param $alphabet string Output string alphabet. + * @return string Random string from given alphabet. + */ + private static function randomString($length, $alphabet) + { + $string = ""; + for ($i = 0; $i != $length; ++$i) { + $string .= $alphabet[mt_rand(0, strlen($alphabet) - 1)]; + } + return $string; + } } diff --git a/lib/HashAlgorithm/Cleartext.php b/lib/HashAlgorithm/Cleartext.php index e5a60bd..c15b11b 100644 --- a/lib/HashAlgorithm/Cleartext.php +++ b/lib/HashAlgorithm/Cleartext.php @@ -1,7 +1,7 @@ + * Copyright (C) 2018 Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,12 +17,13 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm; +namespace OCA\UserSQL\HashAlgorithm; -use OCA\user_sql\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; /** - * Cleartext password hash implementation. + * Cleartext password implementation. * @author Marcin Łojewski */ class Cleartext implements HashAlgorithm diff --git a/lib/HashAlgorithm/CourierMD5.php b/lib/HashAlgorithm/CourierMD5.php index 25476eb..00cd67a 100644 --- a/lib/HashAlgorithm/CourierMD5.php +++ b/lib/HashAlgorithm/CourierMD5.php @@ -1,7 +1,7 @@ + * Copyright (C) 2018 Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,19 +17,20 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm; +namespace OCA\UserSQL\HashAlgorithm; -use OCA\user_sql\HashAlgorithm\Base\Base64; -use OCA\user_sql\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\Utils; /** - * Courier MD5 password hash implementation. + * Courier MD5 hashing implementation. * @author Marcin Łojewski */ class CourierMD5 implements HashAlgorithm { - use Base64; use Singleton; + use Utils; /** * @inheritdoc diff --git a/lib/HashAlgorithm/CourierMD5Raw.php b/lib/HashAlgorithm/CourierMD5Raw.php index dbdfc04..d0cc952 100644 --- a/lib/HashAlgorithm/CourierMD5Raw.php +++ b/lib/HashAlgorithm/CourierMD5Raw.php @@ -1,7 +1,7 @@ + * Copyright (C) 2018 Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,12 +17,13 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm; +namespace OCA\UserSQL\HashAlgorithm; -use OCA\user_sql\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; /** - * Courier MD5 RAW password hash implementation. + * Courier MD5 RAW hashing implementation. * @author Marcin Łojewski */ class CourierMD5Raw implements HashAlgorithm diff --git a/lib/HashAlgorithm/CourierSHA1.php b/lib/HashAlgorithm/CourierSHA1.php index 21f3a44..5c2a82b 100644 --- a/lib/HashAlgorithm/CourierSHA1.php +++ b/lib/HashAlgorithm/CourierSHA1.php @@ -1,7 +1,7 @@ + * Copyright (C) 2018 Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,19 +17,20 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm; +namespace OCA\UserSQL\HashAlgorithm; -use OCA\user_sql\HashAlgorithm\Base\Base64; -use OCA\user_sql\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\Utils; /** - * Courier SHA1 password hash implementation. + * Courier SHA1 hashing implementation. * @author Marcin Łojewski */ class CourierSHA1 implements HashAlgorithm { - use Base64; use Singleton; + use Utils; /** * @inheritdoc diff --git a/lib/HashAlgorithm/CourierSHA256.php b/lib/HashAlgorithm/CourierSHA256.php index 0951d59..f275bbe 100644 --- a/lib/HashAlgorithm/CourierSHA256.php +++ b/lib/HashAlgorithm/CourierSHA256.php @@ -1,7 +1,7 @@ + * Copyright (C) 2018 Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,19 +17,20 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm; +namespace OCA\UserSQL\HashAlgorithm; -use OCA\user_sql\HashAlgorithm\Base\Base64; -use OCA\user_sql\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\Utils; /** - * Courier SHA256 password hash implementation. + * Courier SHA256 hashing implementation. * @author Marcin Łojewski */ class CourierSHA256 implements HashAlgorithm { - use Base64; use Singleton; + use Utils; /** * @inheritdoc diff --git a/lib/HashAlgorithm/Crypt.php b/lib/HashAlgorithm/Crypt.php new file mode 100644 index 0000000..348dbf2 --- /dev/null +++ b/lib/HashAlgorithm/Crypt.php @@ -0,0 +1,59 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; + +/** + * Implements standard Unix DES-based algorithm or + * alternative algorithms that may be available on the system. + * This implementation does not support password changing. + * @see crypt() + * @author Marcin Łojewski + */ +class Crypt implements HashAlgorithm +{ + use Singleton; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Crypt (Unix)"; + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return hash_equals($dbHash, crypt($password, $dbHash)); + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return password_hash($password, PASSWORD_DEFAULT); + } +} diff --git a/lib/HashAlgorithm/CryptArgon2.php b/lib/HashAlgorithm/CryptArgon2.php new file mode 100644 index 0000000..d628723 --- /dev/null +++ b/lib/HashAlgorithm/CryptArgon2.php @@ -0,0 +1,57 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; + +/** + * Argon2 Crypt hashing implementation. + * @author Marcin Łojewski + */ +class CryptArgon2 implements HashAlgorithm +{ + use Singleton; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Argon2 (Crypt)"; + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return password_verify($password, $dbHash); + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + // TODO - add support for options: memory_cost, time_cost, threads. + return password_hash($password, PASSWORD_ARGON2I); + } +} diff --git a/lib/HashAlgorithm/CryptBlowfish.php b/lib/HashAlgorithm/CryptBlowfish.php new file mode 100644 index 0000000..2a2f1c0 --- /dev/null +++ b/lib/HashAlgorithm/CryptBlowfish.php @@ -0,0 +1,57 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; + +/** + * Blowfish Crypt hashing implementation. + * @author Marcin Łojewski + */ +class CryptBlowfish implements HashAlgorithm +{ + use Singleton; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Blowfish (Crypt)"; + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return password_verify($password, $dbHash); + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + // TODO - add support for options: cost. + return password_hash($password, PASSWORD_BCRYPT); + } +} diff --git a/lib/HashAlgorithm/CryptExtendedDES.php b/lib/HashAlgorithm/CryptExtendedDES.php new file mode 100644 index 0000000..c49563f --- /dev/null +++ b/lib/HashAlgorithm/CryptExtendedDES.php @@ -0,0 +1,63 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\BaseCrypt; +use OCA\UserSQL\HashAlgorithm\Base\Utils; + +/** + * Extended DES Crypt hashing implementation. + * @author Marcin Łojewski + */ +class CryptExtendedDES extends BaseCrypt +{ + use Utils; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Extended DES (Crypt)"; + } + + /** + * @inheritdoc + */ + protected function getSalt() + { + // TODO - add support for options: iteration_count. + return self::base64IntEncode(1000) . self::randomString(4, self::SALT_ALPHABET); + } + + private static function base64IntEncode($number) + { + $alphabet = str_split(self::SALT_ALPHABET); + $chars = array(); + $base = sizeof($alphabet); + while ($number) { + $rem = $number % $base; + $number = (int)($number / $base); + $arr[] = $alphabet[$rem]; + } + $string = implode($chars); + return str_pad($string, 4, '.', STR_PAD_RIGHT); + } +} diff --git a/lib/HashAlgorithm/CryptMD5.php b/lib/HashAlgorithm/CryptMD5.php new file mode 100644 index 0000000..2cc096e --- /dev/null +++ b/lib/HashAlgorithm/CryptMD5.php @@ -0,0 +1,48 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\BaseCrypt; +use OCA\UserSQL\HashAlgorithm\Base\Utils; + +/** + * MD5 Crypt hashing implementation. + * @author Marcin Łojewski + */ +class CryptMD5 extends BaseCrypt +{ + use Utils; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "MD5 (Crypt)"; + } + + /** + * @inheritdoc + */ + protected function getSalt() + { + return "$1$" . self::randomString(8, self::SALT_ALPHABET) . "$"; + } +} diff --git a/lib/HashAlgorithm/CryptSHA256.php b/lib/HashAlgorithm/CryptSHA256.php new file mode 100644 index 0000000..ca466f9 --- /dev/null +++ b/lib/HashAlgorithm/CryptSHA256.php @@ -0,0 +1,49 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\BaseCrypt; +use OCA\UserSQL\HashAlgorithm\Base\Utils; + +/** + * SHA256 Crypt hashing implementation. + * @author Marcin Łojewski + */ +class CryptSHA256 extends BaseCrypt +{ + use Utils; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "SHA256 (Crypt)"; + } + + /** + * @inheritdoc + */ + protected function getSalt() + { + // TODO - add support for options: rounds. + return "$5\$rounds=5000$" . self::randomString(16, self::SALT_ALPHABET) . "$"; + } +} diff --git a/lib/HashAlgorithm/CryptSHA512.php b/lib/HashAlgorithm/CryptSHA512.php new file mode 100644 index 0000000..f117606 --- /dev/null +++ b/lib/HashAlgorithm/CryptSHA512.php @@ -0,0 +1,49 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\BaseCrypt; +use OCA\UserSQL\HashAlgorithm\Base\Utils; + +/** + * SHA512 Crypt hashing implementation. + * @author Marcin Łojewski + */ +class CryptSHA512 extends BaseCrypt +{ + use Utils; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "SHA512 (Crypt)"; + } + + /** + * @inheritdoc + */ + protected function getSalt() + { + // TODO - add support for options: rounds. + return "$5\$rounds=5000$" . self::randomString(16, self::SALT_ALPHABET) . "$"; + } +} diff --git a/lib/HashAlgorithm/CryptStandardDES.php b/lib/HashAlgorithm/CryptStandardDES.php new file mode 100644 index 0000000..44e4a23 --- /dev/null +++ b/lib/HashAlgorithm/CryptStandardDES.php @@ -0,0 +1,48 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\BaseCrypt; +use OCA\UserSQL\HashAlgorithm\Base\Utils; + +/** + * Standard DES Crypt hashing implementation. + * @author Marcin Łojewski + */ +class CryptStandardDES extends BaseCrypt +{ + use Utils; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Standard DES (Crypt)"; + } + + /** + * @inheritdoc + */ + protected function getSalt() + { + return self::randomString(2, self::SALT_ALPHABET); + } +} diff --git a/lib/HashAlgorithm/Joomla.php b/lib/HashAlgorithm/Joomla.php new file mode 100644 index 0000000..abc92af --- /dev/null +++ b/lib/HashAlgorithm/Joomla.php @@ -0,0 +1,71 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\Utils; + +/** + * Joomla hashing implementation. + * @author Marcin Łojewski + */ +class Joomla implements HashAlgorithm +{ + use Singleton; + use Utils; + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "Joomla MD5 Encryption"; + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return md5($password . ":" . self::randomString(32, + "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return hash_equals($dbHash, self::generateHash($password, $dbHash)); + } + + private static function generateHash($password, $dbHash) + { + $split_salt = preg_split("/:/", $dbHash); + $salt = false; + if (isset($split_salt[1])) { + $salt = $split_salt[1]; + } + $pwHash = ($salt) ? md5($password . $salt) : md5($password); + $pwHash .= ":" . $salt; + return $pwHash; + } +} diff --git a/lib/HashAlgorithm/MD5.php b/lib/HashAlgorithm/MD5.php index 8b43bb2..ad39f59 100644 --- a/lib/HashAlgorithm/MD5.php +++ b/lib/HashAlgorithm/MD5.php @@ -1,7 +1,7 @@ + * Copyright (C) 2018 Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,12 +17,13 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm; +namespace OCA\UserSQL\HashAlgorithm; -use OCA\user_sql\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; /** - * MD5 password hash implementation. + * MD5 hashing implementation. * @author Marcin Łojewski */ class MD5 implements HashAlgorithm diff --git a/lib/HashAlgorithm/SHA1.php b/lib/HashAlgorithm/SHA1.php index b59b9c2..dfd8d7c 100644 --- a/lib/HashAlgorithm/SHA1.php +++ b/lib/HashAlgorithm/SHA1.php @@ -1,7 +1,7 @@ + * Copyright (C) 2018 Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,12 +17,13 @@ * along with this program. If not, see . */ -namespace OCA\user_sql\HashAlgorithm; +namespace OCA\UserSQL\HashAlgorithm; -use OCA\user_sql\HashAlgorithm\Base\Singleton; +use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; +use OCA\UserSQL\HashAlgorithm\Base\Singleton; /** - * SHA1 password hash implementation. + * SHA1 hashing implementation. * @author Marcin Łojewski */ class SHA1 implements HashAlgorithm diff --git a/lib/HashAlgorithm/SSHA256.php b/lib/HashAlgorithm/SSHA256.php new file mode 100644 index 0000000..516e0bf --- /dev/null +++ b/lib/HashAlgorithm/SSHA256.php @@ -0,0 +1,53 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\SSHA; + +/** + * SSHA256 hashing implementation. + * @author Marcin Łojewski + */ +class SSHA256 extends SSHA +{ + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "SSHA256"; + } + + /** + * @inheritdoc + */ + public function getPrefix() + { + return "{SSHA256}"; + } + + /** + * @inheritdoc + */ + public function getAlgorithm() + { + return "sha256"; + } +} diff --git a/lib/HashAlgorithm/SSHA512.php b/lib/HashAlgorithm/SSHA512.php new file mode 100644 index 0000000..948a28d --- /dev/null +++ b/lib/HashAlgorithm/SSHA512.php @@ -0,0 +1,53 @@ + + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\HashAlgorithm; + +use OCA\UserSQL\HashAlgorithm\Base\SSHA; + +/** + * SSHA512 hashing implementation. + * @author Marcin Łojewski + */ +class SSHA512 extends SSHA +{ + /** + * @inheritdoc + */ + public function getVisibleName() + { + return "SSHA512"; + } + + /** + * @inheritdoc + */ + public function getPrefix() + { + return "{SSHA512}"; + } + + /** + * @inheritdoc + */ + public function getAlgorithm() + { + return "sha512"; + } +} From c1cc89f456231ecb853fc7d3a4d47ec6dcaa41f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Fri, 2 Mar 2018 22:56:13 +0100 Subject: [PATCH 09/29] 'lib' rewritten. --- LICENCE.md | 614 +++++++++++ ajax/settings.php | 276 ----- appinfo/app.php | 36 +- appinfo/info.xml | 27 +- appinfo/routes.php | 67 +- img/app-dark.svg | 6 +- lib/Action/EmailSync.php | 136 +++ lib/Action/IUserAction.php | 41 + lib/AppInfo/Application.php | 67 ++ lib/Backend/GroupBackend.php | 457 ++++++++ lib/Backend/UserBackend.php | 566 ++++++++++ lib/Cache.php | 107 ++ .../Base/Singleton.php => Constant/App.php} | 37 +- lib/Constant/DB.php | 54 + lib/Constant/Opt.php | 38 + lib/Constant/Query.php | 47 + lib/Controller/SettingsController.php | 350 +++++++ lib/Crypto/AbstractAlgorithm.php | 77 ++ .../AbstractCrypt.php} | 33 +- lib/{HashAlgorithm => Crypto}/Cleartext.php | 26 +- lib/{HashAlgorithm => Crypto}/CourierMD5.php | 42 +- .../CourierMD5Raw.php | 38 +- lib/{HashAlgorithm => Crypto}/CourierSHA1.php | 42 +- .../CourierSHA256.php | 42 +- lib/Crypto/Crypt.php | 59 ++ lib/Crypto/CryptArgon2.php | 97 ++ .../CryptBlowfish.php | 44 +- lib/Crypto/CryptExtendedDES.php | 92 ++ lib/{HashAlgorithm => Crypto}/CryptMD5.php | 33 +- lib/{HashAlgorithm => Crypto}/CryptSHA256.php | 42 +- lib/{HashAlgorithm => Crypto}/CryptSHA512.php | 42 +- .../CryptStandardDES.php | 32 +- .../IPasswordAlgorithm.php} | 22 +- lib/{HashAlgorithm => Crypto}/Joomla.php | 40 +- lib/{HashAlgorithm => Crypto}/MD5.php | 38 +- lib/{HashAlgorithm => Crypto}/SHA1.php | 38 +- lib/{HashAlgorithm/Base => Crypto}/SSHA.php | 49 +- lib/{HashAlgorithm => Crypto}/SSHA256.php | 25 +- lib/{HashAlgorithm => Crypto}/SSHA512.php | 25 +- lib/{HashAlgorithm/Base => Crypto}/Utils.php | 31 +- lib/HashAlgorithm/Crypt.php | 59 -- lib/HashAlgorithm/CryptArgon2.php | 57 - lib/HashAlgorithm/CryptExtendedDES.php | 63 -- lib/Model/Group.php | 43 + lib/Model/User.php | 55 + lib/PasswordHash.php | 268 ----- lib/Platform/AbstractPlatform.php | 135 +++ lib/Platform/MySQLPlatform.php | 66 ++ lib/Platform/PlatformFactory.php | 54 + lib/Platform/PostgreSQLPlatform.php | 68 ++ lib/Properties.php | 211 ++++ lib/Query/DataQuery.php | 267 +++++ lib/Query/QueryProvider.php | 195 ++++ lib/Repository/GroupRepository.php | 150 +++ lib/Repository/UserRepository.php | 114 ++ lib/Settings/Admin.php | 90 +- lib/Settings/Section.php | 65 +- lib/drupal.php | 330 ------ lib/group_sql.php | 88 -- lib/helper.php | 427 -------- lib/user_sql.php | 981 ------------------ templates/admin.php | 38 +- 62 files changed, 4788 insertions(+), 2971 deletions(-) create mode 100644 LICENCE.md delete mode 100644 ajax/settings.php create mode 100644 lib/Action/EmailSync.php create mode 100644 lib/Action/IUserAction.php create mode 100644 lib/AppInfo/Application.php create mode 100644 lib/Backend/GroupBackend.php create mode 100644 lib/Backend/UserBackend.php create mode 100644 lib/Cache.php rename lib/{HashAlgorithm/Base/Singleton.php => Constant/App.php} (59%) create mode 100644 lib/Constant/DB.php create mode 100644 lib/Constant/Opt.php create mode 100644 lib/Constant/Query.php create mode 100644 lib/Controller/SettingsController.php create mode 100644 lib/Crypto/AbstractAlgorithm.php rename lib/{HashAlgorithm/Base/BaseCrypt.php => Crypto/AbstractCrypt.php} (70%) rename lib/{HashAlgorithm => Crypto}/Cleartext.php (70%) rename lib/{HashAlgorithm => Crypto}/CourierMD5.php (65%) rename lib/{HashAlgorithm => Crypto}/CourierMD5Raw.php (70%) rename lib/{HashAlgorithm => Crypto}/CourierSHA1.php (64%) rename lib/{HashAlgorithm => Crypto}/CourierSHA256.php (64%) create mode 100644 lib/Crypto/Crypt.php create mode 100644 lib/Crypto/CryptArgon2.php rename lib/{HashAlgorithm => Crypto}/CryptBlowfish.php (54%) create mode 100644 lib/Crypto/CryptExtendedDES.php rename lib/{HashAlgorithm => Crypto}/CryptMD5.php (63%) rename lib/{HashAlgorithm => Crypto}/CryptSHA256.php (52%) rename lib/{HashAlgorithm => Crypto}/CryptSHA512.php (52%) rename lib/{HashAlgorithm => Crypto}/CryptStandardDES.php (65%) rename lib/{HashAlgorithm/Base/HashAlgorithm.php => Crypto/IPasswordAlgorithm.php} (83%) rename lib/{HashAlgorithm => Crypto}/Joomla.php (72%) rename lib/{HashAlgorithm => Crypto}/MD5.php (70%) rename lib/{HashAlgorithm => Crypto}/SHA1.php (70%) rename lib/{HashAlgorithm/Base => Crypto}/SSHA.php (58%) rename lib/{HashAlgorithm => Crypto}/SSHA256.php (72%) rename lib/{HashAlgorithm => Crypto}/SSHA512.php (72%) rename lib/{HashAlgorithm/Base => Crypto}/Utils.php (66%) delete mode 100644 lib/HashAlgorithm/Crypt.php delete mode 100644 lib/HashAlgorithm/CryptArgon2.php delete mode 100644 lib/HashAlgorithm/CryptExtendedDES.php create mode 100644 lib/Model/Group.php create mode 100644 lib/Model/User.php delete mode 100644 lib/PasswordHash.php create mode 100644 lib/Platform/AbstractPlatform.php create mode 100644 lib/Platform/MySQLPlatform.php create mode 100644 lib/Platform/PlatformFactory.php create mode 100644 lib/Platform/PostgreSQLPlatform.php create mode 100644 lib/Properties.php create mode 100644 lib/Query/DataQuery.php create mode 100644 lib/Query/QueryProvider.php create mode 100644 lib/Repository/GroupRepository.php create mode 100644 lib/Repository/UserRepository.php delete mode 100644 lib/drupal.php delete mode 100644 lib/group_sql.php delete mode 100644 lib/helper.php delete mode 100644 lib/user_sql.php diff --git a/LICENCE.md b/LICENCE.md new file mode 100644 index 0000000..c7f159a --- /dev/null +++ b/LICENCE.md @@ -0,0 +1,614 @@ +### GNU AFFERO GENERAL PUBLIC LICENSE + +Version 3, 19 November 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +### Preamble + +The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains +free software for all its users. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + +Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + +A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + +The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + +An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing +under this license. + +The precise terms and conditions for copying, distribution and +modification follow. + +### TERMS AND CONDITIONS + +#### 0. Definitions. + +"This License" refers to version 3 of the GNU Affero General Public +License. + +"Copyright" also means copyright-like laws that apply to other kinds +of works, such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + +To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of +an exact copy. The resulting work is called a "modified version" of +the earlier work or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based +on the Program. + +To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user +through a computer network, with no transfer of a copy, is not +conveying. + +An interactive user interface displays "Appropriate Legal Notices" to +the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + +#### 1. Source Code. + +The "source code" for a work means the preferred form of the work for +making modifications to it. "Object code" means any non-source form of +a work. + +A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + +The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can +regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same +work. + +#### 2. Basic Permissions. + +All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, +without conditions so long as your license otherwise remains in force. +You may convey covered works to others for the sole purpose of having +them make modifications exclusively for you, or provide you with +facilities for running those works, provided that you comply with the +terms of this License in conveying all material for which you do not +control copyright. Those thus making or running the covered works for +you must do so exclusively on your behalf, under your direction and +control, on terms that prohibit them from making any copies of your +copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the +conditions stated below. Sublicensing is not allowed; section 10 makes +it unnecessary. + +#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + +When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such +circumvention is effected by exercising rights under this License with +respect to the covered work, and you disclaim any intention to limit +operation or modification of the work as a means of enforcing, against +the work's users, your or third parties' legal rights to forbid +circumvention of technological measures. + +#### 4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + +#### 5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these +conditions: + +- a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. +- b) The work must carry prominent notices stating that it is + released under this License and any conditions added under + section 7. This requirement modifies the requirement in section 4 + to "keep intact all notices". +- c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. +- d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + +A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + +#### 6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of +sections 4 and 5, provided that you also convey the machine-readable +Corresponding Source under the terms of this License, in one of these +ways: + +- a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. +- b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the Corresponding + Source from a network server at no charge. +- c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. +- d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. +- e) Convey the object code using peer-to-peer transmission, + provided you inform other peers where the object code and + Corresponding Source of the work are being offered to the general + public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + +A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, +family, or household purposes, or (2) anything designed or sold for +incorporation into a dwelling. In determining whether a product is a +consumer product, doubtful cases shall be resolved in favor of +coverage. For a particular product received by a particular user, +"normally used" refers to a typical or common use of that class of +product, regardless of the status of the particular user or of the way +in which the particular user actually uses, or expects or is expected +to use, the product. A product is a consumer product regardless of +whether the product has substantial commercial, industrial or +non-consumer uses, unless such uses represent the only significant +mode of use of the product. + +"Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to +install and execute modified versions of a covered work in that User +Product from a modified version of its Corresponding Source. The +information must suffice to ensure that the continued functioning of +the modified object code is in no case prevented or interfered with +solely because modification has been made. + +If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + +The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or +updates for a work that has been modified or installed by the +recipient, or for the User Product in which it has been modified or +installed. Access to a network may be denied when the modification +itself materially and adversely affects the operation of the network +or violates the rules and protocols for communication across the +network. + +Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + +#### 7. Additional Terms. + +"Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders +of that material) supplement the terms of this License with terms: + +- a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or +- b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or +- c) Prohibiting misrepresentation of the origin of that material, + or requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or +- d) Limiting the use for publicity purposes of names of licensors + or authors of the material; or +- e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or +- f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions + of it) with contractual assumptions of liability to the recipient, + for any liability that these contractual assumptions directly + impose on those licensors and authors. + +All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; the +above requirements apply either way. + +#### 8. Termination. + +You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + +#### 9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run +a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + +#### 10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + +An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + +#### 11. Patents. + +A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned +or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + +In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + +If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + +A patent license is "discriminatory" if it does not include within the +scope of its coverage, prohibits the exercise of, or is conditioned on +the non-exercise of one or more of the rights that are specifically +granted under this License. You may not convey a covered work if you +are a party to an arrangement with a third party that is in the +business of distributing software, under which you make payment to the +third party based on the extent of your activity of conveying the +work, and under which the third party grants, to any of the parties +who would receive the covered work from you, a discriminatory patent +license (a) in connection with copies of the covered work conveyed by +you (or copies made from those copies), or (b) primarily for and in +connection with specific products or compilations that contain the +covered work, unless you entered into that arrangement, or that patent +license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + +#### 12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under +this License and any other pertinent obligations, then as a +consequence you may not convey it at all. For example, if you agree to +terms that obligate you to collect a royalty for further conveying +from those to whom you convey the Program, the only way you could +satisfy both those terms and this License would be to refrain entirely +from conveying the Program. + +#### 13. Remote Network Interaction; Use with the GNU General Public License. + +Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your +version supports such interaction) an opportunity to receive the +Corresponding Source of your version by providing access to the +Corresponding Source from a network server at no charge, through some +standard or customary means of facilitating copying of software. This +Corresponding Source shall include the Corresponding Source for any +work covered by version 3 of the GNU General Public License that is +incorporated pursuant to the following paragraph. + +Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + +#### 14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU Affero General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever +published by the Free Software Foundation. + +If the Program specifies that a proxy can decide which future versions +of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + +#### 15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +#### 16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR +CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT +NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM +TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +#### 17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. diff --git a/ajax/settings.php b/ajax/settings.php deleted file mode 100644 index ed0f406..0000000 --- a/ajax/settings.php +++ /dev/null @@ -1,276 +0,0 @@ - - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . - * - */ - -/** - * This is the AJAX portion of the settings page. - * - * It can: - * - Verify the connection settings - * - Load autocomplete values for tables - * - Load autocomplete values for columns - * - Save settings for a given domain - * - Load settings for a given domain - * - * It always returns JSON encoded responses - */ - -namespace OCA\user_sql; - -// Init Nextcloud - -// Check if we are a user -\OCP\User::checkAdminUser(); -\OCP\JSON::checkAppEnabled('user_sql'); - -// CSRF checks -\OCP\JSON::callCheck(); - - -$helper = new \OCA\user_sql\lib\Helper; - -$l = \OC::$server->getL10N('user_sql'); - -$params = $helper->getParameterArray(); -$response = new \OCP\AppFramework\Http\JSONResponse(); - -// Check if the request is for us -if (isset($_POST['appname']) && ($_POST['appname'] === 'user_sql') && isset($_POST['function']) && isset($_POST['domain'])) { - $domain = $_POST['domain']; - switch ($_POST['function']) { - // Save the settings for the given domain to the database - case 'saveSettings': - $parameters = array( - 'host' => $_POST['sql_hostname'], - 'password' => $_POST['sql_password'], - 'user' => $_POST['sql_username'], - 'dbname' => $_POST['sql_database'], - 'tablePrefix' => '' - ); - - // Check if the table exists - if (!$helper->verifyTable($parameters, $_POST['sql_driver'], $_POST['sql_table'])) { - $response->setData(array( - 'status' => 'error', - 'data' => array('message' => $l->t('The selected SQL table ' . $_POST['sql_table'] . ' does not exist!')) - )); - break; - } - if (!empty($_POST['sql_group_table']) && !$helper->verifyTable($parameters, $_POST['sql_driver'], - $_POST['sql_group_table'])) { - $response->setData(array( - 'status' => 'error', - 'data' => array('message' => $l->t('The selected SQL table ' . $_POST['sql_group_table'] . ' does not exist!')) - )); - break; - } - - // Retrieve all column settings - $columns = array(); - $group_columns = array(); - foreach ($params as $param) { - if (strpos($param, 'col_') === 0) { - if (isset($_POST[$param]) && $_POST[$param] !== '') { - if (strpos($param, 'col_group_') === 0) { - $group_columns[] = $_POST[$param]; - } else { - $columns[] = $_POST[$param]; - } - } - } - } - - // Check if the columns exist - $status = $helper->verifyColumns($parameters, $_POST['sql_driver'], $_POST['sql_table'], $columns); - if (!empty($_POST['sql_group_table']) && $status === true) { - $status = $helper->verifyColumns($parameters, $_POST['sql_driver'], $_POST['sql_group_table'], - $group_columns); - } - if ($status !== true) { - $response->setData(array( - 'status' => 'error', - 'data' => array('message' => $l->t('The selected SQL column(s) do(es) not exist: ' . $status)) - )); - break; - } - - // If we reach this point, all settings have been verified - foreach ($params as $param) { - // Special handling for checkbox fields - if (isset($_POST[$param])) { - if ($param === 'set_strip_domain') { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_strip_domain_' . $domain, 'true'); - } elseif ($param === 'set_allow_pwchange') { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_allow_pwchange_' . $domain, 'true'); - } elseif ($param === 'set_active_invert') { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_active_invert_' . $domain, 'true'); - } elseif ($param === 'set_enable_gethome') { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_enable_gethome_' . $domain, 'true'); - } else { - \OC::$server->getConfig()->setAppValue('user_sql', $param . '_' . $domain, $_POST[$param]); - } - } else { - if ($param === 'set_strip_domain') { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_strip_domain_' . $domain, 'false'); - } elseif ($param === 'set_allow_pwchange') { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_allow_pwchange_' . $domain, 'false'); - } elseif ($param === 'set_active_invert') { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_active_invert_' . $domain, 'false'); - } elseif ($param === 'set_enable_gethome') { - \OC::$server->getConfig()->setAppValue('user_sql', 'set_enable_gethome_' . $domain, 'false'); - } - } - } - $response->setData(array( - 'status' => 'success', - 'data' => array('message' => $l->t('Application settings successfully stored.')) - )); - break; - - // Load the settings for a given domain - case 'loadSettingsForDomain': - $retArr = array(); - foreach ($params as $param) { - $retArr[$param] = \OC::$server->getConfig()->getAppValue('user_sql', $param . '_' . $domain, ''); - } - $response->setData(array( - 'status' => 'success', - 'settings' => $retArr - )); - break; - - // Try to verify the database connection settings - case 'verifySettings': - $cm = new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig()); - - if (!isset($_POST['sql_driver'])) { - $response->setData(array( - 'status' => 'error', - 'data' => array('message' => $l->t('Error connecting to database: No driver specified.')) - )); - break; - } - - if (($_POST['sql_hostname'] === '') || ($_POST['sql_database'] === '')) { - $response->setData(array( - 'status' => 'error', - 'data' => array('message' => $l->t('Error connecting to database: You must specify at least host and database')) - )); - break; - } - - $parameters = array( - 'host' => $_POST['sql_hostname'], - 'password' => $_POST['sql_password'], - 'user' => $_POST['sql_username'], - 'dbname' => $_POST['sql_database'], - 'tablePrefix' => '' - ); - - try { - $conn = $cm->getConnection($_POST['sql_driver'], $parameters); - $response->setData(array( - 'status' => 'success', - 'data' => array('message' => $l->t('Successfully connected to database')) - )); - } catch (\Exception $e) { - $response->setData(array( - 'status' => 'error', - 'data' => array('message' => $l->t('Error connecting to database: ') . $e->getMessage()) - )); - } - break; - - // Get the autocompletion values for a column - case 'getColumnAutocomplete': - - - $parameters = array( - 'host' => $_POST['sql_hostname'], - 'password' => $_POST['sql_password'], - 'user' => $_POST['sql_username'], - 'dbname' => $_POST['sql_database'], - 'tablePrefix' => '' - ); - - if ($_POST['groupTable'] === 'true') { - $sql_table = $_POST['sql_group_table']; - } else { - $sql_table = $_POST['sql_table']; - } - - if ($helper->verifyTable($parameters, $_POST['sql_driver'], $_POST['sql_table'])) { - $columns = $helper->getColumns($parameters, $_POST['sql_driver'], $sql_table); - } else { - $columns = array(); - } - - $search = $_POST['request']; - $ret = array(); - - foreach ($columns as $name) { - if (($search === '') || ($search === 'search') || (strpos($name, $search) === 0)) { - $ret[] = array( - 'label' => $name, - 'value' => $name - ); - } - } - $response->setData($ret); - break; - - // Get the autocompletion values for a table - case 'getTableAutocomplete': - $parameters = array( - 'host' => $_POST['sql_hostname'], - 'password' => $_POST['sql_password'], - 'user' => $_POST['sql_username'], - 'dbname' => $_POST['sql_database'], - 'tablePrefix' => '' - ); - - $tables = $helper->getTables($parameters, $_POST['sql_driver']); - - $search = $_POST['request']; - $ret = array(); - foreach ($tables as $name) { - if (($search === '') || ($search === 'search') || (strpos($name, $search) === 0)) { - $ret[] = array( - 'label' => $name, - 'value' => $name - ); - } - } - $response->setData($ret); - break; - } - -} else { - // If the request was not for us, set an error message - $response->setData(array( - 'status' => 'error', - 'data' => array('message' => $l->t('Not submitted for us.')) - )); -} - -// Return the JSON array -echo $response->render(); diff --git a/appinfo/app.php b/appinfo/app.php index b984edd..716393f 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -1,31 +1,31 @@ + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * 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 AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . + * GNU Affero General Public License for more details. * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ -require_once(__DIR__ . '/../lib/user_sql.php'); -require_once __DIR__ . '/../lib/group_sql.php'; +use OCA\UserSQL\AppInfo\Application; +use OCP\AppFramework\QueryException; -$backend = new \OCA\user_sql\OC_USER_SQL; -$group_backend = new \OCA\user_sql\OC_GROUP_SQL; - -\OC::$server->getUserManager()->registerBackend($backend); -\OC::$server->getGroupManager()->addBackend($group_backend); +try { + $app = new Application(); + $app->registerBackends(); +} catch (QueryException $queryException) { + OC::$server->getLogger()->logException($queryException); +} diff --git a/appinfo/info.xml b/appinfo/info.xml index fa70152..67aa41e 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -1,28 +1,31 @@ user_sql - SQL User Backend -

Authenticate Users by SQL - Authenticate users and retrieve their groups from external database by native SQL queries. + User and Group SQL Backends + Control users and groups by SQL queries + + Use external database as a source for Nextcloud users and groups. + Retrieve the users and groups info. Allow the users to change their passwords. + Sync the users' email addresses with the addresses stored by Nextcloud. + 4.0.0-dev agpl - Andreas Boehler <dev (at) aboehler (dot) at > - user_sql + Andreas Böhler <dev (at) aboehler (dot) at> + Marcin Łojewski <dev (at) mlojewski (dot) me> + UserSQL https://github.com/nextcloud/user_sql/issues https://github.com/nextcloud/user_sql - https://raw.githubusercontent.com/nextcloud/user_sql/v4.0.0/img/screenshot.png + https://raw.githubusercontent.com/nextcloud/user_sql/master/img/screenshot.png auth - - - mysql - pgsql + + - \OCA\user_sql\Settings\Admin - OCA\user_sql\Settings\Section + \OCA\UserSQL\Settings\Admin + OCA\UserSQL\Settings\Section diff --git a/appinfo/routes.php b/appinfo/routes.php index 1617c63..8224fa4 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -1,9 +1,66 @@ - * This file is licensed under the Affero General Public License version 3 or later. - * See the COPYING-README file. + * Nextcloud - user_sql + * + * @copyright 2012-2015 Andreas Böhler + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ -/** @var $this \OCP\Route\IRouter */ -$this->create('user_sql_ajax_settings', 'ajax/settings.php')->actionInclude('user_sql/ajax/settings.php'); +use OCA\UserSQL\AppInfo\Application; + +$application = new Application(); +$application->registerRoutes( + $this, [ + "routes" => [ + [ + "name" => "settings#verifyDbConnection", + "url" => "/settings/db/verify", + "verb" => "POST" + ], + [ + "name" => "settings#saveProperties", + "url" => "/settings/properties", + "verb" => "POST" + ], + [ + "name" => "settings#clearCache", + "url" => "/settings/cache/clear", + "verb" => "POST" + ], + [ + "name" => "settings#tableAutocomplete", + "url" => "/settings/autocomplete/table", + "verb" => "POST" + ], + [ + "name" => "settings#userTableAutocomplete", + "url" => "/settings/autocomplete/table/user", + "verb" => "POST" + ], + [ + "name" => "settings#userGroupTableAutocomplete", + "url" => "/settings/autocomplete/table/user_group", + "verb" => "POST" + ], + [ + "name" => "settings#groupTableAutocomplete", + "url" => "/settings/autocomplete/table/group", + "verb" => "POST" + ], + ] + ] +); diff --git a/img/app-dark.svg b/img/app-dark.svg index 24168c8..f6c7cf3 100644 --- a/img/app-dark.svg +++ b/img/app-dark.svg @@ -1,5 +1 @@ - - - - + \ No newline at end of file diff --git a/lib/Action/EmailSync.php b/lib/Action/EmailSync.php new file mode 100644 index 0000000..c027faf --- /dev/null +++ b/lib/Action/EmailSync.php @@ -0,0 +1,136 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Action; + +use OCA\UserSQL\Constant\App; +use OCA\UserSQL\Constant\Opt; +use OCA\UserSQL\Model\User; +use OCA\UserSQL\Properties; +use OCA\UserSQL\Repository\UserRepository; +use OCP\IConfig; +use OCP\ILogger; + +/** + * Synchronizes the user email address. + * + * @author Marcin Łojewski + */ +class EmailSync implements IUserAction +{ + /** + * @var string The application name. + */ + private $appName; + /** + * @var ILogger The logger instance. + */ + private $logger; + /** + * @var Properties The properties array. + */ + private $properties; + /** + * @var IConfig The config instance. + */ + private $config; + /** + * @var UserRepository The user repository. + */ + private $userRepository; + + /** + * The default constructor. + * + * @param string $appName The application name. + * @param ILogger $logger The logger instance. + * @param Properties $properties The properties array. + * @param IConfig $config The config instance. + * @param UserRepository $userRepository The user repository. + */ + public function __construct( + $appName, ILogger $logger, Properties $properties, IConfig $config, + UserRepository $userRepository + ) { + $this->appName = $appName; + $this->logger = $logger; + $this->properties = $properties; + $this->config = $config; + $this->userRepository = $userRepository; + } + + /** + * @inheritdoc + */ + public function doAction(User $user) + { + $this->logger->debug( + "Entering EmailSync#doAction($user->uid)", ["app" => $this->appName] + ); + + $ncMail = $this->config->getUserValue( + $user->uid, "settings", "email", "" + ); + + $result = false; + + switch ($this->properties[Opt::EMAIL_SYNC]) { + case App::EMAIL_INITIAL: + if (empty($ncMail) && !empty($user->email)) { + $this->config->setUserValue( + $user->uid, "settings", "email", $user->email + ); + } + + $result = true; + break; + case App::EMAIL_FORCE_NC: + if (!empty($ncMail) && $user->email !== $ncMail) { + $user = $this->userRepository->findByUid($user->uid); + if (!($user instanceof User)) { + break; + } + + $user->email = $ncMail; + $result = $this->userRepository->save($user); + } + + break; + case App::EMAIL_FORCE_SQL: + if (!empty($user->email) && $user->email !== $ncMail) { + $this->config->setUserValue( + $user->uid, "settings", "email", $user->email + ); + } + + $result = true; + break; + } + + $this->logger->debug( + "Returning EmailSync#doAction($user->uid): " . ($result ? "true" + : "false"), + ["app" => $this->appName] + ); + + return $result; + } +} diff --git a/lib/Action/IUserAction.php b/lib/Action/IUserAction.php new file mode 100644 index 0000000..46df9fe --- /dev/null +++ b/lib/Action/IUserAction.php @@ -0,0 +1,41 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Action; + +use OCA\UserSQL\Model\User; + +/** + * Action to execute every time an user account is queried. + * + * @author Marcin Łojewski + */ +interface IUserAction +{ + /** + * Execute an action. + * + * @param User $user The user entity. + * + * @return bool The action status. + */ + public function doAction(User $user); +} diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php new file mode 100644 index 0000000..3cec6bb --- /dev/null +++ b/lib/AppInfo/Application.php @@ -0,0 +1,67 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\AppInfo; + +use OCP\AppFramework\App; +use OCP\AppFramework\QueryException; + +/** + * The application bootstrap class. + * + * @author Marcin Łojewski + */ +class Application extends App +{ + /** + * The class constructor. + * + * @param array $urlParams An array with variables extracted + * from the routes. + */ + public function __construct(array $urlParams = array()) + { + parent::__construct('user_sql', $urlParams); + } + + /** + * Register the application backends + * if all necessary configuration is provided. + * + * @throws QueryException If the query container's could not be resolved + */ + public function registerBackends() + { + $userBackend = $this->getContainer()->query( + '\OCA\UserSQL\Backend\UserBackend' + ); + $groupBackend = $this->getContainer()->query( + '\OCA\UserSQL\Backend\GroupBackend' + ); + + if ($userBackend->isConfigured()) { + \OC::$server->getUserManager()->registerBackend($userBackend); + } + if ($groupBackend->isConfigured()) { + \OC::$server->getGroupManager()->addBackend($groupBackend); + } + } +} diff --git a/lib/Backend/GroupBackend.php b/lib/Backend/GroupBackend.php new file mode 100644 index 0000000..2ef5cd0 --- /dev/null +++ b/lib/Backend/GroupBackend.php @@ -0,0 +1,457 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Backend; + +use OC\Group\Backend; +use OCA\UserSQL\Cache; +use OCA\UserSQL\Constant\DB; +use OCA\UserSQL\Model\Group; +use OCA\UserSQL\Properties; +use OCA\UserSQL\Repository\GroupRepository; +use OCP\ILogger; + +/** + * The SQL group backend manager. + * + * @author Marcin Łojewski + */ +final class GroupBackend extends Backend +{ + /** + * @var string The application name. + */ + private $appName; + /** + * @var ILogger The logger instance. + */ + private $logger; + /** + * @var Cache The cache instance. + */ + private $cache; + /** + * @var GroupRepository The group repository. + */ + private $groupRepository; + /** + * @var Properties The properties array. + */ + private $properties; + + /** + * The default constructor. + * + * @param string $AppName The application name. + * @param Cache $cache The cache instance. + * @param ILogger $logger The logger instance. + * @param Properties $properties The properties array. + * @param GroupRepository $groupRepository The group repository. + */ + public function __construct( + $AppName, Cache $cache, ILogger $logger, Properties $properties, + GroupRepository $groupRepository + ) { + $this->appName = $AppName; + $this->cache = $cache; + $this->logger = $logger; + $this->properties = $properties; + $this->groupRepository = $groupRepository; + } + + /** + * @inheritdoc + */ + public function getGroups($search = "", $limit = null, $offset = null) + { + $this->logger->debug( + "Entering getGroups($search, $limit, $offset)", + ["app" => $this->appName] + ); + + $cacheKey = self::class . "groups_" . $search . "_" . $limit . "_" + . $offset; + $groups = $this->cache->get($cacheKey); + + if (!is_null($groups)) { + $this->logger->debug( + "Returning from cache getGroups($search, $limit, $offset): count(" + . count($groups) . ")", ["app" => $this->appName] + ); + return $groups; + } + + $groups = $this->groupRepository->findAllBySearchTerm( + "%" . $search . "%", $limit, $offset + ); + + if ($groups === false) { + return []; + } + + foreach ($groups as $group) { + $this->cache->set("group_" . $group->gid, $group); + } + + $groups = array_map( + function ($group) { + return $group->gid; + }, $groups + ); + + $this->cache->set($cacheKey, $groups); + $this->logger->debug( + "Returning getGroups($search, $limit, $offset): count(" . count( + $groups + ) . ")", ["app" => $this->appName] + ); + + return $groups; + } + + /** + * Returns the number of users in given group matching the search term. + * + * @param string $gid The group ID. + * @param string $search The search term. + * + * @return int The number of users in given group matching the search term. + */ + public function countUsersInGroup($gid, $search = "") + { + $this->logger->debug( + "Entering countUsersInGroup($gid, $search)", + ["app" => $this->appName] + ); + + $cacheKey = self::class . "users#_" . $gid . "_" . $search; + $count = $this->cache->get($cacheKey); + + if (!is_null($count)) { + $this->logger->debug( + "Returning from cache countUsersInGroup($gid, $search): $count", + ["app" => $this->appName] + ); + return $count; + } + + $count = $this->groupRepository->countAll($gid, "%" . $search . "%"); + + if ($count === false) { + return 0; + } + + $this->cache->set($cacheKey, $count); + $this->logger->debug( + "Returning countUsersInGroup($gid, $search): $count", + ["app" => $this->appName] + ); + + return $count; + } + + /** + * @inheritdoc + */ + public function inGroup($uid, $gid) + { + $this->logger->debug( + "Entering inGroup($uid, $gid)", ["app" => $this->appName] + ); + + $cacheKey = self::class . "user_group_" . $uid . "_" . $gid; + $inGroup = $this->cache->get($cacheKey); + + if (!is_null($inGroup)) { + $this->logger->debug( + "Returning from cache inGroup($uid, $gid): " . ($inGroup + ? "true" : "false"), ["app" => $this->appName] + ); + return $inGroup; + } + + $inGroup = in_array($gid, $this->getUserGroups($uid)); + + $this->cache->set($cacheKey, $inGroup); + $this->logger->debug( + "Returning inGroup($uid, $gid): " . ($inGroup ? "true" : "false"), + ["app" => $this->appName] + ); + + return $inGroup; + } + + /** + * @inheritdoc + */ + public function getUserGroups($uid) + { + $this->logger->debug( + "Entering getUserGroups($uid)", ["app" => $this->appName] + ); + + $cacheKey = self::class . "user_groups_" . $uid; + $groups = $this->cache->get($cacheKey); + + if (!is_null($groups)) { + $this->logger->debug( + "Returning from cache getUserGroups($uid): count(" . count( + $groups + ) . ")", ["app" => $this->appName] + ); + return $groups; + } + + $groups = $this->groupRepository->findAllByUid($uid); + + if ($groups === false) { + return []; + } + + foreach ($groups as $group) { + $this->cache->set("group_" . $group->gid, $group); + } + + $groups = array_map( + function ($group) { + return $group->gid; + }, $groups + ); + + $this->cache->set($cacheKey, $groups); + $this->logger->debug( + "Returning getUserGroups($uid): count(" . count( + $groups + ) . ")", ["app" => $this->appName] + ); + + return $groups; + } + + /** + * @inheritdoc + */ + public function groupExists($gid) + { + $this->logger->debug( + "Entering groupExists($gid)", ["app" => $this->appName] + ); + + $group = $this->getGroup($gid); + + if ($group === false) { + return false; + } + + $exists = !is_null($group); + $this->logger->debug( + "Returning groupExists($gid): " . ($exists ? "true" : "false"), + ["app" => $this->appName] + ); + + return $exists; + } + + /** + * Get a group entity object. If it's found value from cache is used. + * + * @param $gid $uid The group ID. + * + * @return Group The group entity, NULL if it does not exists or + * FALSE on failure. + */ + private function getGroup($gid) + { + $cacheKey = self::class . "group_" . $gid; + $cachedGroup = $this->cache->get($cacheKey); + + if (!is_null($cachedGroup)) { + if ($cachedGroup === false) { + $this->logger->debug( + "Found null group in cache: $gid", ["app" => $this->appName] + ); + return null; + } + + $group = new Group(); + foreach ($cachedGroup as $key => $value) { + $group->{$key} = $value; + } + + $this->logger->debug( + "Found group in cache: " . $group->gid, + ["app" => $this->appName] + ); + + return $group; + } + + $group = $this->groupRepository->findByGid($gid); + + if ($group instanceof Group) { + $this->cache->set($cacheKey, $group); + } elseif (is_null($group)) { + $this->cache->set($cacheKey, false); + } + + return $group; + } + + /** + * @inheritdoc + */ + public function usersInGroup($gid, $search = "", $limit = -1, $offset = 0) + { + $this->logger->debug( + "Entering usersInGroup($gid, $search, $limit, $offset)", + ["app" => $this->appName] + ); + + $cacheKey = self::class . "group_users_" . $gid . "_" . $search . "_" + . $limit . "_" . $offset; + $users = $this->cache->get($cacheKey); + + if (!is_null($users)) { + $this->logger->debug( + "Returning from cache usersInGroup($gid, $search, $limit, $offset): count(" + . count($users) . ")", ["app" => $this->appName] + ); + return $users; + } + + $uids = $this->groupRepository->findAllUidsBySearchTerm( + $gid, "%" . $search . "%", $limit, $offset + ); + + if ($uids === false) { + return []; + } + + $this->cache->set($cacheKey, $uids); + $this->logger->debug( + "Returning usersInGroup($gid, $search, $limit, $offset): count(" + . count($uids) . ")", ["app" => $this->appName] + ); + + return $uids; + } + + /** + * Checks if a user is in the admin group. + * + * @param string $uid User ID. + * + * @return bool TRUE if a user is in the admin group, FALSE otherwise. + */ + public function isAdmin($uid) + { + $this->logger->debug( + "Entering isAdmin($uid)", ["app" => $this->appName] + ); + + $cacheKey = self::class . "admin_" . $uid; + $admin = $this->cache->get($cacheKey); + + if (!is_null($admin)) { + $this->logger->debug( + "Returning from cache isAdmin($uid): " . ($admin ? "true" + : "false"), ["app" => $this->appName] + ); + return $admin; + } + + $admin = $this->groupRepository->belongsToAdmin($uid); + + if (is_null($admin)) { + return false; + } + + $this->cache->set($cacheKey, $admin); + $this->logger->debug( + "Returning isAdmin($uid): " . ($admin ? "true" : "false"), + ["app" => $this->appName] + ); + + return $admin; + } + + /** + * Get associative array of the group details. + * + * @param string $gid The group ID. + * + * @return array Associative array of the group details. + */ + public function getGroupDetails($gid) + { + $this->logger->debug( + "Entering getGroupDetails($gid)", ["app" => $this->appName] + ); + + $group = $this->getGroup($gid); + + if (!($group instanceof Group)) { + return []; + } + + $details = ["displayName" => $group->name]; + $this->logger->debug( + "Returning getGroupDetails($gid): " . implode(", ", $details), + ["app" => $this->appName] + ); + + return $details; + } + + /** + * @inheritdoc + */ + public function getSupportedActions() + { + $actions = parent::getSupportedActions(); + + $actions &= empty($this->properties[DB::GROUP_ADMIN_COLUMN]) + ? ~Backend::IS_ADMIN : ~0; + $actions &= empty($this->properties[DB::GROUP_NAME_COLUMN]) + ? ~Backend::GROUP_DETAILS : ~0; + + return $actions; + } + + /** + * Check if this backend is correctly set and can be enabled. + * + * @return bool TRUE if all necessary options for this backend + * are configured, FALSE otherwise. + */ + public function isConfigured() + { + return !empty($this->properties[DB::DATABASE]) + && !empty($this->properties[DB::DRIVER]) + && !empty($this->properties[DB::HOSTNAME]) + && !empty($this->properties[DB::USERNAME]) + && !empty($this->properties[DB::GROUP_TABLE]) + && !empty($this->properties[DB::USER_GROUP_TABLE]) + && !empty($this->properties[DB::GROUP_GID_COLUMN]) + && !empty($this->properties[DB::USER_GROUP_GID_COLUMN]) + && !empty($this->properties[DB::USER_GROUP_UID_COLUMN]); + } +} diff --git a/lib/Backend/UserBackend.php b/lib/Backend/UserBackend.php new file mode 100644 index 0000000..0552b04 --- /dev/null +++ b/lib/Backend/UserBackend.php @@ -0,0 +1,566 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Backend; + +use OC\User\Backend; +use OCA\UserSQL\Action\EmailSync; +use OCA\UserSQL\Action\IUserAction; +use OCA\UserSQL\Cache; +use OCA\UserSQL\Constant\App; +use OCA\UserSQL\Constant\DB; +use OCA\UserSQL\Constant\Opt; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCA\UserSQL\Model\User; +use OCA\UserSQL\Properties; +use OCA\UserSQL\Repository\UserRepository; +use OCP\IConfig; +use OCP\IL10N; +use OCP\ILogger; + +/** + * The SQL user backend manager. + * + * @author Marcin Łojewski + */ +final class UserBackend extends Backend +{ + /** + * @var string The application name. + */ + private $appName; + /** + * @var ILogger The logger instance. + */ + private $logger; + /** + * @var Cache The cache instance. + */ + private $cache; + /** + * @var UserRepository The user repository. + */ + private $userRepository; + /** + * @var Properties The properties array. + */ + private $properties; + /** + * @var IL10N The localization service. + */ + private $localization; + /** + * @var IConfig The config instance. + */ + private $config; + /** + * @var IUserAction[] The actions to execute. + */ + private $actions; + + /** + * The default constructor. + * + * @param string $AppName The application name. + * @param Cache $cache The cache instance. + * @param ILogger $logger The logger instance. + * @param Properties $properties The properties array. + * @param UserRepository $userRepository The user repository. + * @param IL10N $localization The localization service. + * @param IConfig $config The config instance. + */ + public function __construct( + $AppName, Cache $cache, ILogger $logger, Properties $properties, + UserRepository $userRepository, IL10N $localization, IConfig $config + ) { + $this->appName = $AppName; + $this->cache = $cache; + $this->logger = $logger; + $this->properties = $properties; + $this->userRepository = $userRepository; + $this->localization = $localization; + $this->config = $config; + $this->actions = []; + + $this->initActions(); + } + + /** + * Initiate the actions array. + */ + private function initActions() + { + if (!empty($this->properties[Opt::EMAIL_SYNC]) + && !empty($this->properties[DB::USER_EMAIL_COLUMN]) + ) { + $this->actions[] = new EmailSync( + $this->appName, $this->logger, $this->properties, $this->config, + $this->userRepository + ); + } + } + + /** + * @inheritdoc + */ + public function hasUserListings() + { + return true; + } + + /** + * Count users in the database. + * + * @return int The number of users. + */ + public function countUsers() + { + $this->logger->debug( + "Entering countUsers()", ["app" => $this->appName] + ); + + $cacheKey = self::class . "users#"; + $count = $this->cache->get($cacheKey); + + if (!is_null($count)) { + $this->logger->debug( + "Returning from cache countUsers(): $count", + ["app" => $this->appName] + ); + return $count; + } + + $count = $this->userRepository->countAll("%"); + + if ($count === false) { + return 0; + } + + $this->cache->set($cacheKey, $count); + $this->logger->debug( + "Returning countUsers(): $count", ["app" => $this->appName] + ); + + return $count; + } + + /** + * @inheritdoc + */ + public function userExists($uid) + { + $this->logger->debug( + "Entering userExists($uid)", ["app" => $this->appName] + ); + + $user = $this->getUser($uid); + + if ($user === false) { + return false; + } + + $exists = !is_null($user); + $this->logger->debug( + "Returning userExists($uid): " . ($exists ? "true" : "false"), + ["app" => $this->appName] + ); + + return $exists; + } + + /** + * Get a user entity object. If it's found value from cache is used. + * + * @param string $uid The user ID. + * + * @return User The user entity, NULL if it does not exists or + * FALSE on failure. + */ + private function getUser($uid) + { + $cacheKey = self::class . "user_" . $uid; + $cachedUser = $this->cache->get($cacheKey); + + if (!is_null($cachedUser)) { + $user = new User(); + foreach ($cachedUser as $key => $value) { + $user->{$key} = $value; + } + + $this->logger->debug( + "Found user in cache: " . $user->uid, ["app" => $this->appName] + ); + + return $user; + } + + $user = $this->userRepository->findByUid($uid); + + if ($user instanceof User) { + $this->cache->set($cacheKey, $user); + + foreach ($this->actions as $action) { + $action->doAction($user); + } + } + + return $user; + } + + /** + * @inheritdoc + */ + public function getDisplayName($uid) + { + $this->logger->debug( + "Entering getDisplayName($uid)", ["app" => $this->appName] + ); + + $user = $this->getUser($uid); + + if (!($user instanceof User)) { + return false; + } + + $name = $user->name; + $this->logger->debug( + "Returning getDisplayName($uid): $name", + ["app" => $this->appName] + ); + + return $name; + } + + /** + * Check if the user's password is correct then return its ID or + * FALSE on failure. + * + * @param string $uid The user ID. + * @param string $password The password. + * + * @return string|bool The user ID on success, false otherwise. + */ + public function checkPassword($uid, $password) + { + $this->logger->debug( + "Entering checkPassword($uid, *)", ["app" => $this->appName] + ); + + $passwordAlgorithm = $this->getPasswordAlgorithm(); + if ($passwordAlgorithm === null) { + return false; + } + + $user = $this->userRepository->findByUid($uid); + if (!($user instanceof User)) { + return false; + } + + $isCorrect = $passwordAlgorithm->checkPassword( + $password, $user->password + ); + + if ($isCorrect !== true) { + $this->logger->info( + "Invalid password attempt for user: $uid", + ["app" => $this->appName] + ); + return false; + } + + $this->logger->info( + "Successful password attempt for user: $uid", + ["app" => $this->appName] + ); + + return $uid; + } + + /** + * Get a password algorithm implementation instance. + * + * @return IPasswordAlgorithm The password algorithm instance or FALSE + * on failure. + */ + private function getPasswordAlgorithm() + { + $cryptoType = $this->properties[Opt::CRYPTO_CLASS]; + $passwordAlgorithm = new $cryptoType($this->localization); + + if ($passwordAlgorithm === null) { + $this->logger->error( + "Cannot get password algorithm instance: " . $cryptoType, + ["app" => $this->appName] + ); + } + + return $passwordAlgorithm; + } + + /** + * @inheritdoc + */ + public function getDisplayNames($search = "", $limit = null, $offset = null) + { + $this->logger->debug( + "Entering getDisplayNames($search, $limit, $offset)", + ["app" => $this->appName] + ); + + $users = $this->getUsers($search, $limit, $offset); + + $names = []; + foreach ($users as $user) { + $names[$user->uid] = $user->name; + } + + $this->logger->debug( + "Returning getDisplayNames($search, $limit, $offset): count(" + . count($users) . ")", ["app" => $this->appName] + ); + + return $names; + } + + /** + * @inheritdoc + */ + public function getUsers($search = "", $limit = null, $offset = null) + { + $this->logger->debug( + "Entering getUsers($search, $limit, $offset)", + ["app" => $this->appName] + ); + + $cacheKey = self::class . "users_" . $search . "_" . $limit . "_" + . $offset; + $users = $this->cache->get($cacheKey); + + if (!is_null($users)) { + $this->logger->debug( + "Returning from cache getUsers($search, $limit, $offset): count(" + . count($users) . ")", ["app" => $this->appName] + ); + return $users; + } + + $users = $this->userRepository->findAllBySearchTerm( + "%" . $search . "%", $limit, $offset + ); + + if ($users === false) { + return []; + } + + foreach ($users as $user) { + $this->cache->set("user_" . $user->uid, $user); + } + + $users = array_map( + function ($user) { + return $user->uid; + }, $users + ); + + $this->cache->set($cacheKey, $users); + $this->logger->debug( + "Returning getUsers($search, $limit, $offset): count(" . count( + $users + ) . ")", ["app" => $this->appName] + ); + + return $users; + } + + /** + * Set a user password. + * + * @param string $uid The user ID. + * @param string $password The password to set. + * + * @return bool TRUE if the password has been set, FALSE otherwise. + */ + public function setPassword($uid, $password) + { + $this->logger->debug( + "Entering setPassword($uid, *)", ["app" => "user_sql"] + ); + + $passwordAlgorithm = $this->getPasswordAlgorithm(); + if ($passwordAlgorithm === false) { + return false; + } + + $passwordHash = $passwordAlgorithm->getPasswordHash($password); + if ($passwordHash === false) { + return false; + } + + $user = $this->userRepository->findByUid($uid); + if (!($user instanceof User)) { + return false; + } + + $user->password = $passwordHash; + $result = $this->userRepository->save($user); + + if ($result === true) { + $this->logger->info( + "Password has been set successfully for user: $uid", + ["app" => $this->appName] + ); + return true; + } + + return false; + } + + /** + * @inheritdoc + */ + public function getHome($uid) + { + $this->logger->debug( + "Entering getHome($uid)", ["app" => $this->appName] + ); + + $home = false; + switch ($this->properties[Opt::HOME_MODE]) { + case App::HOME_STATIC: + $home = $this->properties[Opt::HOME_LOCATION]; + $home = str_replace("%u", $uid, $home); + break; + case App::HOME_QUERY: + $user = $this->getUser($uid); + if (!($user instanceof User)) { + return false; + } + $home = $user->home; + break; + } + + $this->logger->debug( + "Returning getHome($uid): " . $home, ["app" => $this->appName] + ); + + return $home; + } + + /** + * Can user change its avatar. + * + * @param string $uid The user ID. + * + * @return bool TRUE if the user can change its avatar, FALSE otherwise. + */ + public function canChangeAvatar($uid) + { + $this->logger->debug( + "Entering canChangeAvatar($uid)", ["app" => $this->appName] + ); + + $user = $this->userRepository->findByUid($uid); + if (!($user instanceof User)) { + return false; + } + + $avatar = $user->avatar; + $this->logger->debug( + "Returning canChangeAvatar($uid): " . ($avatar ? "true" + : "false"), ["app" => $this->appName] + ); + + return $avatar; + } + + /** + * Set a user display name. + * + * @param string $uid The user ID. + * @param string $displayName The display name to set. + * + * @return bool TRUE if the password has been set, FALSE otherwise. + */ + public function setDisplayName($uid, $displayName) + { + $this->logger->debug( + "Entering setDisplayName($uid, $displayName)", + ["app" => $this->appName] + ); + + $user = $this->userRepository->findByUid($uid); + if (!($user instanceof User)) { + return false; + } + + $user->name = $displayName; + $result = $this->userRepository->save($user); + + if ($result === true) { + $this->logger->info( + "Display name has been set successfully for user: $uid", + ["app" => $this->appName] + ); + return true; + } + + return false; + } + + /** + * @inheritdoc + */ + public function getSupportedActions() + { + $actions = parent::getSupportedActions(); + + $actions &= empty($this->properties[DB::USER_NAME_COLUMN]) + ? ~Backend::GET_DISPLAYNAME : ~0; + $actions &= empty($this->properties[Opt::HOME_MODE]) + ? ~Backend::GET_HOME : ~0; + $actions &= empty($this->properties[DB::USER_AVATAR_COLUMN]) + ? ~Backend::PROVIDE_AVATAR : ~0; + $actions &= (!empty($this->properties[DB::USER_NAME_COLUMN]) + && $this->properties[Opt::NAME_CHANGE]) ? ~0 + : ~Backend::SET_DISPLAYNAME; + $actions &= $this->properties[Opt::PASSWORD_CHANGE] ? ~0 + : ~Backend::SET_PASSWORD; + + return $actions; + } + + /** + * Check if this backend is correctly set and can be enabled. + * + * @return bool TRUE if all necessary options for this backend + * are configured, FALSE otherwise. + */ + public function isConfigured() + { + return !empty($this->properties[DB::DATABASE]) + && !empty($this->properties[DB::DRIVER]) + && !empty($this->properties[DB::HOSTNAME]) + && !empty($this->properties[DB::USERNAME]) + && !empty($this->properties[DB::USER_TABLE]) + && !empty($this->properties[DB::USER_PASSWORD_COLUMN]) + && !empty($this->properties[Opt::CRYPTO_CLASS]); + } +} diff --git a/lib/Cache.php b/lib/Cache.php new file mode 100644 index 0000000..622deb7 --- /dev/null +++ b/lib/Cache.php @@ -0,0 +1,107 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL; + +use OC\Memcache\NullCache; +use OCA\UserSQL\Constant\App; +use OCA\UserSQL\Constant\Opt; +use OCP\ICache; +use OCP\IConfig; +use OCP\ILogger; + +/** + * Used to store key-value pairs in the cache memory. + * If there's no distributed cache available NULL cache is used. + * + * @author Marcin Łojewski + */ +class Cache +{ + /** + * @var ICache The cache instance. + */ + private $cache; + + /** + * The default constructor. Initiates the cache memory. + * + * @param string $AppName The application name. + * @param IConfig $config The config instance. + * @param ILogger $logger The logger instance. + */ + public function __construct($AppName, IConfig $config, ILogger $logger) + { + $factory = \OC::$server->getMemCacheFactory(); + $useCache = $config->getAppValue( + $AppName, Opt::USE_CACHE, App::FALSE_VALUE + ); + + if ($useCache === App::FALSE_VALUE) { + $this->cache = new NullCache(); + } elseif ($factory->isAvailable()) { + $this->cache = $factory->createDistributed(); + $logger->debug("Distributed cache initiated.", ["app" => $AppName]); + } else { + $logger->warning( + "There's no distributed cache available, fallback to null cache.", + ["app" => $AppName] + ); + $this->cache = new NullCache(); + } + } + + /** + * Fetch a value from the cache memory. + * + * @param string $key The cache value key. + * + * @return mixed|NULL Cached value or NULL if there's no value stored. + */ + public function get($key) + { + return $this->cache->get($key); + } + + /** + * Store a value in the cache memory. + * + * @param string $key The cache value key. + * @param mixed $value The value to store. + * @param int $ttl (optional) TTL in seconds. Defaults to 1 hour. + * + * @return bool TRUE on success, FALSE otherwise. + */ + public function set($key, $value, $ttl = 3600) + { + return $this->cache->set($key, $value, $ttl); + } + + /** + * Clear the cache of all entries. + * + * @return bool TRUE on success, FALSE otherwise. + */ + public function clear() + { + return $this->cache->clear(); + } +} diff --git a/lib/HashAlgorithm/Base/Singleton.php b/lib/Constant/App.php similarity index 59% rename from lib/HashAlgorithm/Base/Singleton.php rename to lib/Constant/App.php index 3dc4440..a2973ce 100644 --- a/lib/HashAlgorithm/Base/Singleton.php +++ b/lib/Constant/App.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,33 +19,22 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm\Base; +namespace OCA\UserSQL\Constant; /** - * Singleton pattern trait. + * The application constants. + * * @author Marcin Łojewski */ -trait Singleton +final class App { - private static $instance; + const FALSE_VALUE = "0"; + const TRUE_VALUE = "1"; - final private function __construct() - { - $this->init(); - } + const HOME_QUERY = "query"; + const HOME_STATIC = "static"; - protected function init() - { - } - - final public static function getInstance() - { - return isset(static::$instance) - ? static::$instance - : static::$instance = new static; - } - - final private function __clone() - { - } + const EMAIL_FORCE_NC = "force_nc"; + const EMAIL_FORCE_SQL = "force_sql"; + const EMAIL_INITIAL = "initial"; } diff --git a/lib/Constant/DB.php b/lib/Constant/DB.php new file mode 100644 index 0000000..51f50f0 --- /dev/null +++ b/lib/Constant/DB.php @@ -0,0 +1,54 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Constant; + +/** + * The database properties. + * + * @author Marcin Łojewski + */ +final class DB +{ + const DATABASE = "db.database"; + const DRIVER = "db.driver"; + const HOSTNAME = "db.hostname"; + const PASSWORD = "db.password"; + const USERNAME = "db.username"; + + const GROUP_TABLE = "db.table.group"; + const USER_GROUP_TABLE = "db.table.user_group"; + const USER_TABLE = "db.table.user"; + + const GROUP_ADMIN_COLUMN = "db.table.group.column.admin"; + const GROUP_GID_COLUMN = "db.table.group.column.gid"; + const GROUP_NAME_COLUMN = "db.table.group.column.name"; + + const USER_GROUP_GID_COLUMN = "db.table.user_group.column.gid"; + const USER_GROUP_UID_COLUMN = "db.table.user_group.column.uid"; + + const USER_AVATAR_COLUMN = "db.table.user.column.avatar"; + const USER_EMAIL_COLUMN = "db.table.user.column.email"; + const USER_HOME_COLUMN = "db.table.user.column.home"; + const USER_NAME_COLUMN = "db.table.user.column.name"; + const USER_PASSWORD_COLUMN = "db.table.user.column.password"; + const USER_UID_COLUMN = "db.table.user.column.uid"; +} diff --git a/lib/Constant/Opt.php b/lib/Constant/Opt.php new file mode 100644 index 0000000..56ce8b2 --- /dev/null +++ b/lib/Constant/Opt.php @@ -0,0 +1,38 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Constant; + +/** + * The option properties names. + * + * @author Marcin Łojewski + */ +final class Opt +{ + const CRYPTO_CLASS = "opt.crypto_class"; + const EMAIL_SYNC = "opt.email_sync"; + const HOME_LOCATION = "opt.home_location"; + const HOME_MODE = "opt.home_mode"; + const NAME_CHANGE = "opt.name_change"; + const PASSWORD_CHANGE = "opt.password_change"; + const USE_CACHE = "opt.use_cache"; +} diff --git a/lib/Constant/Query.php b/lib/Constant/Query.php new file mode 100644 index 0000000..f67183c --- /dev/null +++ b/lib/Constant/Query.php @@ -0,0 +1,47 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Constant; + +/** + * The database query constants. + * + * @author Marcin Łojewski + */ +final class Query +{ + const BELONGS_TO_ADMIN = "belongs_to_admin"; + const COUNT_GROUPS = "count_groups"; + const COUNT_USERS = "count_users"; + const FIND_GROUP = "find_group"; + const FIND_GROUP_USERS = "find_group_users"; + const FIND_GROUPS = "find_groups"; + const FIND_USER = "find_user"; + const FIND_USER_GROUPS = "find_user_groups"; + const FIND_USERS = "find_users"; + const SAVE_USER = "save_user"; + + const GID_PARAM = "gid"; + const NAME_PARAM = "name"; + const PASSWORD_PARAM = "password"; + const SEARCH_PARAM = "search"; + const UID_PARAM = "uid"; +} diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php new file mode 100644 index 0000000..c8bf37f --- /dev/null +++ b/lib/Controller/SettingsController.php @@ -0,0 +1,350 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Controller; + +use Doctrine\DBAL\DBALException; +use Exception; +use OC\DatabaseException; +use OC\DB\Connection; +use OC\DB\ConnectionFactory; +use OCA\UserSQL\Cache; +use OCA\UserSQL\Constant\App; +use OCA\UserSQL\Platform\PlatformFactory; +use OCA\UserSQL\Properties; +use OCP\AppFramework\Controller; +use OCP\IL10N; +use OCP\ILogger; +use OCP\IRequest; + +/** + * The settings controller. + * + * @author Marcin Łojewski + */ +class SettingsController extends Controller +{ + /** + * @var ILogger The logger instance. + */ + private $logger; + /** + * @var IL10N The localization service. + */ + private $localization; + /** + * @var Properties The properties array. + */ + private $properties; + /** + * @var Cache The cache instance. + */ + private $cache; + + /** + * The default constructor. + * + * @param string $appName The application name. + * @param IRequest $request An instance of the request. + * @param ILogger $logger The logger instance. + * @param IL10N $localization The localization service. + * @param Properties $properties The properties array. + * @param Cache $cache The cache instance. + */ + public function __construct( + $appName, IRequest $request, ILogger $logger, IL10N $localization, + Properties $properties, Cache $cache + ) { + parent::__construct($appName, $request); + $this->appName = $appName; + $this->logger = $logger; + $this->localization = $localization; + $this->properties = $properties; + $this->cache = $cache; + } + + /** + * Verify the database connection parameters. + * + * @return array The request status. + */ + public function verifyDbConnection() + { + $this->logger->debug( + "Entering verifyDbConnection()", ["app" => $this->appName] + ); + + try { + $this->getConnection(); + + $this->logger->debug( + "Returning verifyDbConnection(): success", + ["app" => $this->appName] + ); + + return [ + "status" => "success", + "data" => [ + "message" => $this->localization->t( + "Successfully connected to the database." + ) + ] + ]; + } catch (Exception $exception) { + $this->logger->debug( + "Returning verifyDbConnection(): error", + ["app" => $this->appName] + ); + + return [ + "status" => "error", + "data" => [ + "message" => $this->localization->t( + "Error connecting to the database: " + ) . $exception->getMessage() + ] + ]; + } + } + + /** + * Get the database connection instance. + * + * @return Connection The database connection instance. + * @throws DBALException On database connection problems. + * @throws DatabaseException Whenever no database driver is specified. + */ + private function getConnection() + { + $dbDriver = $this->request->getParam("db-driver"); + $dbHostname = $this->request->getParam("db-hostname"); + $dbDatabase = $this->request->getParam("db-database"); + $dbUsername = $this->request->getParam("db-username"); + $dbPassword = $this->request->getParam("db-password"); + + if (empty($dbDriver)) { + throw new DatabaseException("No database driver specified."); + } + + $connectionFactory = new ConnectionFactory( + \OC::$server->getSystemConfig() + ); + + $parameters = [ + "host" => $dbHostname, + "password" => $dbPassword, + "user" => $dbUsername, + "dbname" => $dbDatabase, + "tablePrefix" => "" + ]; + + $connection = $connectionFactory->getConnection($dbDriver, $parameters); + $connection->executeQuery("SELECT 'user_sql'"); + + return $connection; + } + + /** + * Save application properties. + * + * @return array The request status. + */ + public function saveProperties() + { + $this->logger->debug( + "Entering saveProperties()", ["app" => $this->appName] + ); + + $properties = $this->properties->getArray(); + + foreach ($properties as $key => $value) { + $reqValue = $this->request->getParam(str_replace(".", "-", $key)); + $appValue = $this->properties[$key]; + + if ((!is_bool($appValue) && isset($reqValue) + && $reqValue !== $appValue) + || (is_bool($appValue) && isset($reqValue) !== $appValue) + ) { + $value = isset($reqValue) ? $reqValue : App::FALSE_VALUE; + $this->properties[$key] = $value; + + $this->logger->info( + "Property '$key' has been set to: " . $value, + ["app" => $this->appName] + ); + } + } + + $this->logger->debug( + "Returning saveProperties(): success", ["app" => $this->appName] + ); + + return [ + "status" => "success", + "data" => [ + "message" => $this->localization->t( + "Properties has been saved." + ) + ] + ]; + } + + /** + * Clear the application cache memory. + * + * @return array The request status. + */ + public function clearCache() + { + $this->logger->debug( + "Entering clearCache()", ["app" => $this->appName] + ); + + $this->cache->clear(); + + $this->logger->info( + "Cache memory has been cleared.", ["app" => $this->appName] + ); + + return [ + "status" => "success", + "data" => [ + "message" => $this->localization->t( + "Cache memory has been cleared." + ) + ] + ]; + } + + /** + * Autocomplete for table select options. + * + * @return array The database table list. + */ + public function tableAutocomplete() + { + $this->logger->debug( + "Entering tableAutocomplete()", ["app" => $this->appName] + ); + + try { + $connection = $this->getConnection(); + $platform = PlatformFactory::getPlatform($connection); + $tables = $platform->getTables(); + + $this->logger->debug( + "Returning tableAutocomplete(): count(" . count($tables) . ")", + ["app" => $this->appName] + ); + + return $tables; + } catch (Exception $e) { + $this->logger->logException($e); + return []; + } + } + + /** + * Autocomplete for column select options - user table. + * + * @return array The database table's column list. + */ + public function userTableAutocomplete() + { + $this->logger->debug( + "Entering userTableAutocomplete()", ["app" => $this->appName] + ); + + $columns = $this->columnAutocomplete("db-table-user"); + + $this->logger->debug( + "Returning userTableAutocomplete(): count(" . count($columns) . ")", + ["app" => $this->appName] + ); + + return $columns; + } + + /** + * Autocomplete for column select options. + * + * @param string $table The table's form ID. + * + * @return array The table's column list. + */ + private function columnAutocomplete($table) + { + try { + $connection = $this->getConnection(); + $platform = PlatformFactory::getPlatform($connection); + $columns = $platform->getColumns( + $this->request->getParam($table) + ); + + return $columns; + } catch (Exception $e) { + $this->logger->logException($e); + return []; + } + } + + /** + * Autocomplete for column select options - user_group table. + * + * @return array The database table's column list. + */ + public function userGroupTableAutocomplete() + { + $this->logger->debug( + "Entering userGroupTableAutocomplete()", ["app" => $this->appName] + ); + + $columns = $this->columnAutocomplete("db-table-user_group"); + + $this->logger->debug( + "Returning userGroupTableAutocomplete(): count(" . count($columns) + . ")", ["app" => $this->appName] + ); + + return $columns; + } + + /** + * Autocomplete for column select options - group table. + * + * @return array The database table's column list. + */ + public function groupTableAutocomplete() + { + $this->logger->debug( + "Entering groupTableAutocomplete()", ["app" => $this->appName] + ); + + $columns = $this->columnAutocomplete("db-table-group"); + + $this->logger->debug( + "Returning groupTableAutocomplete(): count(" . count($columns) + . ")", ["app" => $this->appName] + ); + + return $columns; + } +} diff --git a/lib/Crypto/AbstractAlgorithm.php b/lib/Crypto/AbstractAlgorithm.php new file mode 100644 index 0000000..9556d78 --- /dev/null +++ b/lib/Crypto/AbstractAlgorithm.php @@ -0,0 +1,77 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Crypto; + +use OCP\IL10N; + +/** + * The abstract password algorithm class. + * Each algorithm should extend this class, as it provides very base + * functionality which seems to be necessary for every implementation. + * + * @author Marcin Łojewski + */ +abstract class AbstractAlgorithm implements IPasswordAlgorithm +{ + /** + * @var IL10N The localization service. + */ + private $localization; + + /** + * The class constructor. + * + * @param IL10N $localization The localization service. + */ + public function __construct(IL10N $localization) + { + $this->localization = $localization; + } + + /** + * @inheritdoc + */ + public function getVisibleName() + { + return $this->localization->t($this->getAlgorithmName()); + } + + /** + * Get the algorithm name. + * + * @return string The algorithm name. + */ + protected abstract function getAlgorithmName(); + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return hash_equals($dbHash, $this->getPasswordHash($password)); + } + + /** + * @inheritdoc + */ + public abstract function getPasswordHash($password); +} diff --git a/lib/HashAlgorithm/Base/BaseCrypt.php b/lib/Crypto/AbstractCrypt.php similarity index 70% rename from lib/HashAlgorithm/Base/BaseCrypt.php rename to lib/Crypto/AbstractCrypt.php index 620cbea..9d053ec 100644 --- a/lib/HashAlgorithm/Base/BaseCrypt.php +++ b/lib/Crypto/AbstractCrypt.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,24 +19,21 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm\Base; +namespace OCA\UserSQL\Crypto; /** - * Implements standard Unix DES-based algorithm or - * alternative algorithms that may be available on the system. - * @see crypt() + * Abstract Unix Crypt hashing implementation. + * The hashing algorithm depends on the chosen salt. + * + * @see crypt() * @author Marcin Łojewski */ -abstract class BaseCrypt implements HashAlgorithm +abstract class AbstractCrypt extends AbstractAlgorithm { - use Singleton; - - const SALT_ALPHABET = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - /** - * @inheritdoc + * The chars used in the salt. */ - abstract public function getVisibleName(); + const SALT_ALPHABET = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; /** * @inheritdoc @@ -53,8 +52,12 @@ abstract class BaseCrypt implements HashAlgorithm } /** - * Generate salt for hashing algorithm. - * @return string + * Generate a salt string for the hashing algorithm. + * + * @return string The salt string. */ - protected abstract function getSalt(); + protected function getSalt() + { + return ""; + } } diff --git a/lib/HashAlgorithm/Cleartext.php b/lib/Crypto/Cleartext.php similarity index 70% rename from lib/HashAlgorithm/Cleartext.php rename to lib/Crypto/Cleartext.php index c15b11b..e33d919 100644 --- a/lib/HashAlgorithm/Cleartext.php +++ b/lib/Crypto/Cleartext.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,25 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; +use OCP\IL10N; /** * Cleartext password implementation. + * * @author Marcin Łojewski */ -class Cleartext implements HashAlgorithm +class Cleartext extends AbstractAlgorithm { - use Singleton; - /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "Cleartext"; + parent::__construct($localization); } /** @@ -49,8 +51,8 @@ class Cleartext implements HashAlgorithm /** * @inheritdoc */ - public function checkPassword($password, $dbHash) + protected function getAlgorithmName() { - return hash_equals($dbHash, $password); + return "Cleartext"; } } diff --git a/lib/HashAlgorithm/CourierMD5.php b/lib/Crypto/CourierMD5.php similarity index 65% rename from lib/HashAlgorithm/CourierMD5.php rename to lib/Crypto/CourierMD5.php index 00cd67a..6e8e71f 100644 --- a/lib/HashAlgorithm/CourierMD5.php +++ b/lib/Crypto/CourierMD5.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,35 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; -use OCA\UserSQL\HashAlgorithm\Base\Utils; +use OCP\IL10N; /** * Courier MD5 hashing implementation. + * * @author Marcin Łojewski */ -class CourierMD5 implements HashAlgorithm +class CourierMD5 extends AbstractAlgorithm { - use Singleton; - use Utils; - /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "Courier base64-encoded MD5"; - } - - /** - * @inheritdoc - */ - public function checkPassword($password, $dbHash) - { - return hash_equals($dbHash, $this->getPasswordHash($password)); + parent::__construct($localization); } /** @@ -53,6 +45,14 @@ class CourierMD5 implements HashAlgorithm */ public function getPasswordHash($password) { - return '{MD5}' . self::hexToBase64(md5($password)); + return '{MD5}' . Utils::hexToBase64(md5($password)); + } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "Courier base64-encoded MD5"; } } diff --git a/lib/HashAlgorithm/CourierMD5Raw.php b/lib/Crypto/CourierMD5Raw.php similarity index 70% rename from lib/HashAlgorithm/CourierMD5Raw.php rename to lib/Crypto/CourierMD5Raw.php index d0cc952..39fd3db 100644 --- a/lib/HashAlgorithm/CourierMD5Raw.php +++ b/lib/Crypto/CourierMD5Raw.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,33 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; +use OCP\IL10N; /** * Courier MD5 RAW hashing implementation. + * * @author Marcin Łojewski */ -class CourierMD5Raw implements HashAlgorithm +class CourierMD5Raw extends AbstractAlgorithm { - use Singleton; - /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "Courier hexadecimal MD5"; - } - - /** - * @inheritdoc - */ - public function checkPassword($password, $dbHash) - { - return hash_equals($dbHash, $this->getPasswordHash($password)); + parent::__construct($localization); } /** @@ -53,4 +47,12 @@ class CourierMD5Raw implements HashAlgorithm { return '{MD5RAW}' . md5($password); } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "Courier hexadecimal MD5"; + } } diff --git a/lib/HashAlgorithm/CourierSHA1.php b/lib/Crypto/CourierSHA1.php similarity index 64% rename from lib/HashAlgorithm/CourierSHA1.php rename to lib/Crypto/CourierSHA1.php index 5c2a82b..15d2ef3 100644 --- a/lib/HashAlgorithm/CourierSHA1.php +++ b/lib/Crypto/CourierSHA1.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,35 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; -use OCA\UserSQL\HashAlgorithm\Base\Utils; +use OCP\IL10N; /** * Courier SHA1 hashing implementation. + * * @author Marcin Łojewski */ -class CourierSHA1 implements HashAlgorithm +class CourierSHA1 extends AbstractAlgorithm { - use Singleton; - use Utils; - /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "Courier base64-encoded SHA1"; - } - - /** - * @inheritdoc - */ - public function checkPassword($password, $dbHash) - { - return hash_equals($dbHash, $this->getPasswordHash($password)); + parent::__construct($localization); } /** @@ -53,6 +45,14 @@ class CourierSHA1 implements HashAlgorithm */ public function getPasswordHash($password) { - return '{SHA}' . self::hexToBase64(sha1($password)); + return '{SHA}' . Utils::hexToBase64(sha1($password)); + } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "Courier base64-encoded SHA1"; } } diff --git a/lib/HashAlgorithm/CourierSHA256.php b/lib/Crypto/CourierSHA256.php similarity index 64% rename from lib/HashAlgorithm/CourierSHA256.php rename to lib/Crypto/CourierSHA256.php index f275bbe..3bf0ed6 100644 --- a/lib/HashAlgorithm/CourierSHA256.php +++ b/lib/Crypto/CourierSHA256.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,35 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; -use OCA\UserSQL\HashAlgorithm\Base\Utils; +use OCP\IL10N; /** * Courier SHA256 hashing implementation. + * * @author Marcin Łojewski */ -class CourierSHA256 implements HashAlgorithm +class CourierSHA256 extends AbstractAlgorithm { - use Singleton; - use Utils; - /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "Courier base64-encoded SHA256"; - } - - /** - * @inheritdoc - */ - public function checkPassword($password, $dbHash) - { - return hash_equals($dbHash, $this->getPasswordHash($password)); + parent::__construct($localization); } /** @@ -53,6 +45,14 @@ class CourierSHA256 implements HashAlgorithm */ public function getPasswordHash($password) { - return '{SHA256}' . self::hexToBase64(hash('sha256', $password)); + return '{SHA256}' . Utils::hexToBase64(hash('sha256', $password)); + } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "Courier base64-encoded SHA256"; } } diff --git a/lib/Crypto/Crypt.php b/lib/Crypto/Crypt.php new file mode 100644 index 0000000..c52be8d --- /dev/null +++ b/lib/Crypto/Crypt.php @@ -0,0 +1,59 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Crypto; + +use OCP\IL10N; + +/** + * Unix Crypt hashing implementation. + * + * @see crypt() + * @author Marcin Łojewski + */ +class Crypt extends AbstractCrypt +{ + /** + * The class constructor. + * + * @param IL10N $localization The localization service. + */ + public function __construct(IL10N $localization) + { + parent::__construct($localization); + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return password_hash($password, PASSWORD_DEFAULT); + } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "Unix (Crypt)"; + } +} diff --git a/lib/Crypto/CryptArgon2.php b/lib/Crypto/CryptArgon2.php new file mode 100644 index 0000000..736b68d --- /dev/null +++ b/lib/Crypto/CryptArgon2.php @@ -0,0 +1,97 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Crypto; + +use OCP\IL10N; + +/** + * Argon2 Crypt hashing implementation. + * + * @see crypt() + * @author Marcin Łojewski + */ +class CryptArgon2 extends AbstractAlgorithm +{ + /** + * @var int Maximum memory (in bytes) that may be used to compute. + */ + private $memoryCost; + /** + * @var int Maximum amount of time it may take to compute. + */ + private $timeCost; + /** + * @var int Number of threads to use for computing. + */ + private $threads; + + /** + * The class constructor. + * + * @param IL10N $localization The localization service. + * @param int $memoryCost Maximum memory (in bytes) that may be used + * to compute. + * @param int $timeCost Maximum amount of time it may take to compute. + * @param int $threads Number of threads to use for computing. + */ + public function __construct( + IL10N $localization, + $memoryCost = PASSWORD_ARGON2_DEFAULT_MEMORY_COST, + $timeCost = PASSWORD_ARGON2_DEFAULT_TIME_COST, + $threads = PASSWORD_ARGON2_DEFAULT_THREADS + ) { + parent::__construct($localization); + $this->memoryCost = $memoryCost; + $this->timeCost = $timeCost; + $this->threads = $threads; + } + + /** + * @inheritdoc + */ + public function checkPassword($password, $dbHash) + { + return password_verify($password, $dbHash); + } + + /** + * @inheritdoc + */ + public function getPasswordHash($password) + { + return password_hash( + $password, PASSWORD_ARGON2I, [ + "memory_cost" => $this->memoryCost, + "time_cost" => $this->timeCost, + "threads" => $this->threads + ] + ); + } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "Argon2 (Crypt)"; + } +} diff --git a/lib/HashAlgorithm/CryptBlowfish.php b/lib/Crypto/CryptBlowfish.php similarity index 54% rename from lib/HashAlgorithm/CryptBlowfish.php rename to lib/Crypto/CryptBlowfish.php index 2a2f1c0..8e4a35e 100644 --- a/lib/HashAlgorithm/CryptBlowfish.php +++ b/lib/Crypto/CryptBlowfish.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,25 +19,34 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; +use OCP\IL10N; /** * Blowfish Crypt hashing implementation. + * + * @see crypt() * @author Marcin Łojewski */ -class CryptBlowfish implements HashAlgorithm +class CryptBlowfish extends AbstractAlgorithm { - use Singleton; + /** + * @var int Denotes the algorithmic cost that should be used. + */ + private $cost; /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. + * @param int $cost Denotes the algorithmic cost that should + * be used. */ - public function getVisibleName() + public function __construct(IL10N $localization, $cost = 10) { - return "Blowfish (Crypt)"; + parent::__construct($localization); + $this->cost = $cost; } /** @@ -51,7 +62,18 @@ class CryptBlowfish implements HashAlgorithm */ public function getPasswordHash($password) { - // TODO - add support for options: cost. - return password_hash($password, PASSWORD_BCRYPT); + return password_hash( + $password, PASSWORD_BCRYPT, ["cost" => $this->cost] + ); + } + + /** + * Get the algorithm name. + * + * @return string The algorithm name. + */ + protected function getAlgorithmName() + { + return "Blowfish (Crypt)"; } } diff --git a/lib/Crypto/CryptExtendedDES.php b/lib/Crypto/CryptExtendedDES.php new file mode 100644 index 0000000..b09baab --- /dev/null +++ b/lib/Crypto/CryptExtendedDES.php @@ -0,0 +1,92 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Crypto; + +use OCP\IL10N; + +/** + * Extended DES Crypt hashing implementation. + * + * @see crypt() + * @author Marcin Łojewski + */ +class CryptExtendedDES extends AbstractCrypt +{ + /** + * @var int The number of iterations. + */ + private $iterationCount; + + /** + * The class constructor. + * + * @param IL10N $localization The localization service. + * @param int $iterationCount The number of iterations. + */ + public function __construct(IL10N $localization, $iterationCount = 1000) + { + parent::__construct($localization); + $this->iterationCount = $iterationCount; + } + + /** + * @inheritdoc + */ + protected function getSalt() + { + return self::encodeIterationCount($this->iterationCount) + . Utils::randomString(4, self::SALT_ALPHABET); + } + + /** + * Get the number of iterations as describe below. + * The 4 bytes of iteration count are encoded as printable characters, + * 6 bits per character, least significant character first. + * The values 0 to 63 are encoded as "./0-9A-Za-z". + * + * @param int $number The number of iterations. + * + * @return string + */ + private static function encodeIterationCount($number) + { + $alphabet = str_split(self::SALT_ALPHABET); + $chars = array(); + $base = sizeof($alphabet); + + while ($number) { + $rem = $number % $base; + $number = (int)($number / $base); + $arr[] = $alphabet[$rem]; + } + + return str_pad(implode($chars), 4, ".", STR_PAD_RIGHT); + } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "Extended DES (Crypt)"; + } +} diff --git a/lib/HashAlgorithm/CryptMD5.php b/lib/Crypto/CryptMD5.php similarity index 63% rename from lib/HashAlgorithm/CryptMD5.php rename to lib/Crypto/CryptMD5.php index 2cc096e..6ca2e3b 100644 --- a/lib/HashAlgorithm/CryptMD5.php +++ b/lib/Crypto/CryptMD5.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,25 +19,26 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\BaseCrypt; -use OCA\UserSQL\HashAlgorithm\Base\Utils; +use OCP\IL10N; /** * MD5 Crypt hashing implementation. + * + * @see crypt() * @author Marcin Łojewski */ -class CryptMD5 extends BaseCrypt +class CryptMD5 extends AbstractCrypt { - use Utils; - /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "MD5 (Crypt)"; + parent::__construct($localization); } /** @@ -43,6 +46,14 @@ class CryptMD5 extends BaseCrypt */ protected function getSalt() { - return "$1$" . self::randomString(8, self::SALT_ALPHABET) . "$"; + return "$1$" . Utils::randomString(8, self::SALT_ALPHABET) . "$"; + } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "MD5 (Crypt)"; } } diff --git a/lib/HashAlgorithm/CryptSHA256.php b/lib/Crypto/CryptSHA256.php similarity index 52% rename from lib/HashAlgorithm/CryptSHA256.php rename to lib/Crypto/CryptSHA256.php index ca466f9..fad91b3 100644 --- a/lib/HashAlgorithm/CryptSHA256.php +++ b/lib/Crypto/CryptSHA256.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,25 +19,34 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\BaseCrypt; -use OCA\UserSQL\HashAlgorithm\Base\Utils; +use OCP\IL10N; /** * SHA256 Crypt hashing implementation. + * + * @see crypt() * @author Marcin Łojewski */ -class CryptSHA256 extends BaseCrypt +class CryptSHA256 extends AbstractCrypt { - use Utils; + /** + * @var int The number of rounds. + */ + private $rounds; /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. + * @param int $rounds The number of rounds. + * This value must be between 1000 and 999999999. */ - public function getVisibleName() + public function __construct(IL10N $localization, $rounds = 5000) { - return "SHA256 (Crypt)"; + parent::__construct($localization); + $this->rounds = $rounds; } /** @@ -43,7 +54,16 @@ class CryptSHA256 extends BaseCrypt */ protected function getSalt() { - // TODO - add support for options: rounds. - return "$5\$rounds=5000$" . self::randomString(16, self::SALT_ALPHABET) . "$"; + return "$5\$rounds=" . $this->rounds . "$" . Utils::randomString( + 16, self::SALT_ALPHABET + ) . "$"; + } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "SHA256 (Crypt)"; } } diff --git a/lib/HashAlgorithm/CryptSHA512.php b/lib/Crypto/CryptSHA512.php similarity index 52% rename from lib/HashAlgorithm/CryptSHA512.php rename to lib/Crypto/CryptSHA512.php index f117606..11f3b8f 100644 --- a/lib/HashAlgorithm/CryptSHA512.php +++ b/lib/Crypto/CryptSHA512.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,25 +19,34 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\BaseCrypt; -use OCA\UserSQL\HashAlgorithm\Base\Utils; +use OCP\IL10N; /** * SHA512 Crypt hashing implementation. + * + * @see crypt() * @author Marcin Łojewski */ -class CryptSHA512 extends BaseCrypt +class CryptSHA512 extends AbstractCrypt { - use Utils; + /** + * @var int The number of rounds. + */ + private $rounds; /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. + * @param int $rounds The number of rounds. + * This value must be between 1000 and 999999999. */ - public function getVisibleName() + public function __construct(IL10N $localization, $rounds = 5000) { - return "SHA512 (Crypt)"; + parent::__construct($localization); + $this->rounds = $rounds; } /** @@ -43,7 +54,16 @@ class CryptSHA512 extends BaseCrypt */ protected function getSalt() { - // TODO - add support for options: rounds. - return "$5\$rounds=5000$" . self::randomString(16, self::SALT_ALPHABET) . "$"; + return "$6\$rounds=" . $this->rounds . "$" . Utils::randomString( + 16, self::SALT_ALPHABET + ) . "$"; + } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "SHA512 (Crypt)"; } } diff --git a/lib/HashAlgorithm/CryptStandardDES.php b/lib/Crypto/CryptStandardDES.php similarity index 65% rename from lib/HashAlgorithm/CryptStandardDES.php rename to lib/Crypto/CryptStandardDES.php index 44e4a23..7d8fa7d 100644 --- a/lib/HashAlgorithm/CryptStandardDES.php +++ b/lib/Crypto/CryptStandardDES.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,25 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\BaseCrypt; -use OCA\UserSQL\HashAlgorithm\Base\Utils; +use OCP\IL10N; /** * Standard DES Crypt hashing implementation. + * * @author Marcin Łojewski */ -class CryptStandardDES extends BaseCrypt +class CryptStandardDES extends AbstractCrypt { - use Utils; - /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "Standard DES (Crypt)"; + parent::__construct($localization); } /** @@ -43,6 +45,14 @@ class CryptStandardDES extends BaseCrypt */ protected function getSalt() { - return self::randomString(2, self::SALT_ALPHABET); + return Utils::randomString(2, self::SALT_ALPHABET); + } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "Standard DES (Crypt)"; } } diff --git a/lib/HashAlgorithm/Base/HashAlgorithm.php b/lib/Crypto/IPasswordAlgorithm.php similarity index 83% rename from lib/HashAlgorithm/Base/HashAlgorithm.php rename to lib/Crypto/IPasswordAlgorithm.php index 0f378a4..47ba961 100644 --- a/lib/HashAlgorithm/Base/HashAlgorithm.php +++ b/lib/Crypto/IPasswordAlgorithm.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,24 +19,20 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm\Base; +namespace OCA\UserSQL\Crypto; /** * Interface which defines all function required by a hash algorithm. * Please note that this interface must be implemented by every hash function supported in this app. + * * @author Marcin Łojewski */ -interface HashAlgorithm +interface IPasswordAlgorithm { - /** - * Used by reflection to get the class instance. - * @return HashAlgorithm - */ - public static function getInstance(); - /** * Get the hash algorithm name. * This name is visible in the admin panel. + * * @return string */ public function getVisibleName(); @@ -42,15 +40,19 @@ interface HashAlgorithm /** * Hash given password. * This value is stored in the database, when the password is changed. + * * @param String $password The new password. + * * @return boolean True if the password was hashed successfully, false otherwise. */ public function getPasswordHash($password); /** * Check password given by the user against hash stored in the database. + * * @param String $password Password given by the user. - * @param String $dbHash Password hash stored in the database. + * @param String $dbHash Password hash stored in the database. + * * @return boolean True if the password is correct, false otherwise. */ public function checkPassword($password, $dbHash); diff --git a/lib/HashAlgorithm/Joomla.php b/lib/Crypto/Joomla.php similarity index 72% rename from lib/HashAlgorithm/Joomla.php rename to lib/Crypto/Joomla.php index abc92af..abc9a72 100644 --- a/lib/HashAlgorithm/Joomla.php +++ b/lib/Crypto/Joomla.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,27 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; -use OCA\UserSQL\HashAlgorithm\Base\Utils; +use OCP\IL10N; /** * Joomla hashing implementation. + * * @author Marcin Łojewski */ -class Joomla implements HashAlgorithm +class Joomla extends AbstractAlgorithm { - use Singleton; - use Utils; - /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "Joomla MD5 Encryption"; + parent::__construct($localization); } /** @@ -45,8 +45,12 @@ class Joomla implements HashAlgorithm */ public function getPasswordHash($password) { - return md5($password . ":" . self::randomString(32, - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); + return md5( + $password . ":" . Utils::randomString( + 32, + "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + ) + ); } /** @@ -68,4 +72,12 @@ class Joomla implements HashAlgorithm $pwHash .= ":" . $salt; return $pwHash; } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "Joomla MD5 Encryption"; + } } diff --git a/lib/HashAlgorithm/MD5.php b/lib/Crypto/MD5.php similarity index 70% rename from lib/HashAlgorithm/MD5.php rename to lib/Crypto/MD5.php index ad39f59..a4ba435 100644 --- a/lib/HashAlgorithm/MD5.php +++ b/lib/Crypto/MD5.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,33 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; +use OCP\IL10N; /** * MD5 hashing implementation. + * * @author Marcin Łojewski */ -class MD5 implements HashAlgorithm +class MD5 extends AbstractAlgorithm { - use Singleton; - /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "MD5"; - } - - /** - * @inheritdoc - */ - public function checkPassword($password, $dbHash) - { - return hash_equals($dbHash, $this->getPasswordHash($password)); + parent::__construct($localization); } /** @@ -53,4 +47,12 @@ class MD5 implements HashAlgorithm { return md5($password); } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "MD5"; + } } diff --git a/lib/HashAlgorithm/SHA1.php b/lib/Crypto/SHA1.php similarity index 70% rename from lib/HashAlgorithm/SHA1.php rename to lib/Crypto/SHA1.php index dfd8d7c..a534212 100644 --- a/lib/HashAlgorithm/SHA1.php +++ b/lib/Crypto/SHA1.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,33 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; +use OCP\IL10N; /** * SHA1 hashing implementation. + * * @author Marcin Łojewski */ -class SHA1 implements HashAlgorithm +class SHA1 extends AbstractAlgorithm { - use Singleton; - /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "SHA1"; - } - - /** - * @inheritdoc - */ - public function checkPassword($password, $dbHash) - { - return hash_equals($dbHash, $this->getPasswordHash($password)); + parent::__construct($localization); } /** @@ -53,4 +47,12 @@ class SHA1 implements HashAlgorithm { return sha1($password); } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "SHA1"; + } } diff --git a/lib/HashAlgorithm/Base/SSHA.php b/lib/Crypto/SSHA.php similarity index 58% rename from lib/HashAlgorithm/Base/SSHA.php rename to lib/Crypto/SSHA.php index baac624..cfe7119 100644 --- a/lib/HashAlgorithm/Base/SSHA.php +++ b/lib/Crypto/SSHA.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,23 +19,35 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm\Base; +namespace OCA\UserSQL\Crypto; + +use OCP\IL10N; /** * SSHA* hashing implementation. + * * @author Marcin Łojewski */ -abstract class SSHA implements HashAlgorithm +abstract class SSHA extends AbstractAlgorithm { - use Singleton; - use Utils; + /** + * The class constructor. + * + * @param IL10N $localization The localization service. + */ + public function __construct(IL10N $localization) + { + parent::__construct($localization); + } /** * @inheritdoc */ public function checkPassword($password, $dbHash) { - $saltedPassword = base64_decode(preg_replace("/" . $this->getPrefix() . "/i", "", $dbHash)); + $saltedPassword = base64_decode( + preg_replace("/" . $this->getPrefix() . "/i", "", $dbHash) + ); $salt = substr($saltedPassword, -(strlen($saltedPassword) - 32)); $hash = self::ssha($password, $salt); @@ -42,23 +56,29 @@ abstract class SSHA implements HashAlgorithm /** * Get hash prefix eg. {SSHA256}. - * @return string + * + * @return string The hash prefix. */ public abstract function getPrefix(); /** - * Encrypt using SSHA256 algorithm + * Encrypt using SSHA* algorithm. + * * @param string $password The password. - * @param string $salt The salt to use. - * @return string The hashed password, prefixed by {SSHA256}. + * @param string $salt The salt to use. + * + * @return string The hashed password, prefixed by {SSHA*}. */ private function ssha($password, $salt) { - return $this->getPrefix() . base64_encode(hash($this->getAlgorithm(), $password . $salt, true) . $salt); + return $this->getPrefix() . base64_encode( + hash($this->getAlgorithm(), $password . $salt, true) . $salt + ); } /** * Get algorithm used by the hash() function. + * * @see hash() * @return string */ @@ -69,7 +89,10 @@ abstract class SSHA implements HashAlgorithm */ public function getPasswordHash($password) { - return self::ssha($password, - self::randomString(32, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")); + return self::ssha( + $password, Utils::randomString( + 32, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + ) + ); } } diff --git a/lib/HashAlgorithm/SSHA256.php b/lib/Crypto/SSHA256.php similarity index 72% rename from lib/HashAlgorithm/SSHA256.php rename to lib/Crypto/SSHA256.php index 516e0bf..a1c9d38 100644 --- a/lib/HashAlgorithm/SSHA256.php +++ b/lib/Crypto/SSHA256.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,22 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\SSHA; +use OCP\IL10N; /** * SSHA256 hashing implementation. + * * @author Marcin Łojewski */ class SSHA256 extends SSHA { /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "SSHA256"; + parent::__construct($localization); } /** @@ -50,4 +55,12 @@ class SSHA256 extends SSHA { return "sha256"; } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "SSHA256"; + } } diff --git a/lib/HashAlgorithm/SSHA512.php b/lib/Crypto/SSHA512.php similarity index 72% rename from lib/HashAlgorithm/SSHA512.php rename to lib/Crypto/SSHA512.php index 948a28d..b2e15d8 100644 --- a/lib/HashAlgorithm/SSHA512.php +++ b/lib/Crypto/SSHA512.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,22 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm; +namespace OCA\UserSQL\Crypto; -use OCA\UserSQL\HashAlgorithm\Base\SSHA; +use OCP\IL10N; /** * SSHA512 hashing implementation. + * * @author Marcin Łojewski */ class SSHA512 extends SSHA { /** - * @inheritdoc + * The class constructor. + * + * @param IL10N $localization The localization service. */ - public function getVisibleName() + public function __construct(IL10N $localization) { - return "SSHA512"; + parent::__construct($localization); } /** @@ -50,4 +55,12 @@ class SSHA512 extends SSHA { return "sha512"; } + + /** + * @inheritdoc + */ + protected function getAlgorithmName() + { + return "SSHA512"; + } } diff --git a/lib/HashAlgorithm/Base/Utils.php b/lib/Crypto/Utils.php similarity index 66% rename from lib/HashAlgorithm/Base/Utils.php rename to lib/Crypto/Utils.php index 956c3b6..4bd0651 100644 --- a/lib/HashAlgorithm/Base/Utils.php +++ b/lib/Crypto/Utils.php @@ -1,7 +1,9 @@ + * + * @copyright 2018 Marcin Łojewski + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,22 +19,25 @@ * along with this program. If not, see . */ -namespace OCA\UserSQL\HashAlgorithm\Base; +namespace OCA\UserSQL\Crypto; /** - * Cryptographic utilities trait. + * Cryptographic utilities. + * * @author Marcin Łojewski */ -trait Utils +final class Utils { /** * Convert hexadecimal message to its base64 form. - * @param $hex string Hexadecimal encoded message. - * @return string Same message encoded in base64. + * + * @param $hex string The hexadecimal encoded message. + * + * @return string The same message encoded in base64. */ - private static function hexToBase64($hex) + public static function hexToBase64($hex) { - $hexChr = ''; + $hexChr = ""; foreach (str_split($hex, 2) as $hexPair) { $hexChr .= chr(hexdec($hexPair)); } @@ -41,14 +46,16 @@ trait Utils /** * Generate random string from given alphabet. - * @param $length int Output string length. - * @param $alphabet string Output string alphabet. + * + * @param $length int The output string length. + * @param $alphabet string The output string alphabet. + * * @return string Random string from given alphabet. */ - private static function randomString($length, $alphabet) + public static function randomString($length, $alphabet) { $string = ""; - for ($i = 0; $i != $length; ++$i) { + for ($idx = 0; $idx != $length; ++$idx) { $string .= $alphabet[mt_rand(0, strlen($alphabet) - 1)]; } return $string; diff --git a/lib/HashAlgorithm/Crypt.php b/lib/HashAlgorithm/Crypt.php deleted file mode 100644 index 348dbf2..0000000 --- a/lib/HashAlgorithm/Crypt.php +++ /dev/null @@ -1,59 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -namespace OCA\UserSQL\HashAlgorithm; - -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; - -/** - * Implements standard Unix DES-based algorithm or - * alternative algorithms that may be available on the system. - * This implementation does not support password changing. - * @see crypt() - * @author Marcin Łojewski - */ -class Crypt implements HashAlgorithm -{ - use Singleton; - - /** - * @inheritdoc - */ - public function getVisibleName() - { - return "Crypt (Unix)"; - } - - /** - * @inheritdoc - */ - public function checkPassword($password, $dbHash) - { - return hash_equals($dbHash, crypt($password, $dbHash)); - } - - /** - * @inheritdoc - */ - public function getPasswordHash($password) - { - return password_hash($password, PASSWORD_DEFAULT); - } -} diff --git a/lib/HashAlgorithm/CryptArgon2.php b/lib/HashAlgorithm/CryptArgon2.php deleted file mode 100644 index d628723..0000000 --- a/lib/HashAlgorithm/CryptArgon2.php +++ /dev/null @@ -1,57 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -namespace OCA\UserSQL\HashAlgorithm; - -use OCA\UserSQL\HashAlgorithm\Base\HashAlgorithm; -use OCA\UserSQL\HashAlgorithm\Base\Singleton; - -/** - * Argon2 Crypt hashing implementation. - * @author Marcin Łojewski - */ -class CryptArgon2 implements HashAlgorithm -{ - use Singleton; - - /** - * @inheritdoc - */ - public function getVisibleName() - { - return "Argon2 (Crypt)"; - } - - /** - * @inheritdoc - */ - public function checkPassword($password, $dbHash) - { - return password_verify($password, $dbHash); - } - - /** - * @inheritdoc - */ - public function getPasswordHash($password) - { - // TODO - add support for options: memory_cost, time_cost, threads. - return password_hash($password, PASSWORD_ARGON2I); - } -} diff --git a/lib/HashAlgorithm/CryptExtendedDES.php b/lib/HashAlgorithm/CryptExtendedDES.php deleted file mode 100644 index c49563f..0000000 --- a/lib/HashAlgorithm/CryptExtendedDES.php +++ /dev/null @@ -1,63 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -namespace OCA\UserSQL\HashAlgorithm; - -use OCA\UserSQL\HashAlgorithm\Base\BaseCrypt; -use OCA\UserSQL\HashAlgorithm\Base\Utils; - -/** - * Extended DES Crypt hashing implementation. - * @author Marcin Łojewski - */ -class CryptExtendedDES extends BaseCrypt -{ - use Utils; - - /** - * @inheritdoc - */ - public function getVisibleName() - { - return "Extended DES (Crypt)"; - } - - /** - * @inheritdoc - */ - protected function getSalt() - { - // TODO - add support for options: iteration_count. - return self::base64IntEncode(1000) . self::randomString(4, self::SALT_ALPHABET); - } - - private static function base64IntEncode($number) - { - $alphabet = str_split(self::SALT_ALPHABET); - $chars = array(); - $base = sizeof($alphabet); - while ($number) { - $rem = $number % $base; - $number = (int)($number / $base); - $arr[] = $alphabet[$rem]; - } - $string = implode($chars); - return str_pad($string, 4, '.', STR_PAD_RIGHT); - } -} diff --git a/lib/Model/Group.php b/lib/Model/Group.php new file mode 100644 index 0000000..a839754 --- /dev/null +++ b/lib/Model/Group.php @@ -0,0 +1,43 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Model; + +/** + * The group entity. + * + * @author Marcin Łojewski + */ +class Group +{ + /** + * @var string The GID (group name). + */ + public $gid; + /** + * @var string The group's display name. + */ + public $name; + /** + * @var bool Whether it is an admin group. + */ + public $admin; +} diff --git a/lib/Model/User.php b/lib/Model/User.php new file mode 100644 index 0000000..65aed5b --- /dev/null +++ b/lib/Model/User.php @@ -0,0 +1,55 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Model; + +/** + * The user entity. + * + * @author Marcin Łojewski + */ +class User +{ + /** + * @var string The UID (username). + */ + public $uid; + /** + * @var string The user's email address. + */ + public $email; + /** + * @var string The user's display name. + */ + public $name; + /** + * @var string The user's password (hash). + */ + public $password; + /** + * @var string The user's home location. + */ + public $home; + /** + * @var bool Can user change its avatar. + */ + public $avatar; +} diff --git a/lib/PasswordHash.php b/lib/PasswordHash.php deleted file mode 100644 index c414ad3..0000000 --- a/lib/PasswordHash.php +++ /dev/null @@ -1,268 +0,0 @@ - in 2004-2006 and placed in -# the public domain. Revised in subsequent years, still public domain. -# -# There's absolutely no warranty. -# -# The homepage URL for this framework is: -# -# http://www.openwall.com/phpass/ -# -# Please be sure to update the Version line if you edit this file in any way. -# It is suggested that you leave the main version number intact, but indicate -# your project name (after the slash) and add your own revision information. -# -# Please do not change the "private" password hashing method implemented in -# here, thereby making your hashes incompatible. However, if you must, please -# change the hash type identifier (the "$P$") to something different. -# -# Obviously, since this code is in the public domain, the above are not -# requirements (there can be none), but merely suggestions. -# -class PasswordHash -{ - var $itoa64; - var $iteration_count_log2; - var $portable_hashes; - var $random_state; - - function __construct($iteration_count_log2, $portable_hashes) - { - $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; - - if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) { - $iteration_count_log2 = 8; - } - $this->iteration_count_log2 = $iteration_count_log2; - - $this->portable_hashes = $portable_hashes; - - $this->random_state = microtime(); - if (function_exists('getmypid')) { - $this->random_state .= getmypid(); - } - } - - function get_random_bytes($count) - { - $output = ''; - if (is_readable('/dev/urandom') && - ($fh = @fopen('/dev/urandom', 'rb'))) { - $output = fread($fh, $count); - fclose($fh); - } - - if (strlen($output) < $count) { - $output = ''; - for ($i = 0; $i < $count; $i += 16) { - $this->random_state = - md5(microtime() . $this->random_state); - $output .= - pack('H*', md5($this->random_state)); - } - $output = substr($output, 0, $count); - } - - return $output; - } - - function encode64($input, $count) - { - $output = ''; - $i = 0; - do { - $value = ord($input[$i++]); - $output .= $this->itoa64[$value & 0x3f]; - if ($i < $count) { - $value |= ord($input[$i]) << 8; - } - $output .= $this->itoa64[($value >> 6) & 0x3f]; - if ($i++ >= $count) { - break; - } - if ($i < $count) { - $value |= ord($input[$i]) << 16; - } - $output .= $this->itoa64[($value >> 12) & 0x3f]; - if ($i++ >= $count) { - break; - } - $output .= $this->itoa64[($value >> 18) & 0x3f]; - } while ($i < $count); - - return $output; - } - - function gensalt_private($input) - { - $output = '$P$'; - $output .= $this->itoa64[min($this->iteration_count_log2 + - ((PHP_VERSION >= '5') ? 5 : 3), 30)]; - $output .= $this->encode64($input, 6); - - return $output; - } - - function crypt_private($password, $setting) - { - $output = '*0'; - if (substr($setting, 0, 2) === $output) { - $output = '*1'; - } - - $id = substr($setting, 0, 3); - # We use "$P$", phpBB3 uses "$H$" for the same thing - if ($id !== '$P$' && $id !== '$H$') { - return $output; - } - - $count_log2 = strpos($this->itoa64, $setting[3]); - if ($count_log2 < 7 || $count_log2 > 30) { - return $output; - } - - $count = 1 << $count_log2; - - $salt = substr($setting, 4, 8); - if (strlen($salt) !== 8) { - return $output; - } - - # We're kind of forced to use MD5 here since it's the only - # cryptographic primitive available in all versions of PHP - # currently in use. To implement our own low-level crypto - # in PHP would result in much worse performance and - # consequently in lower iteration counts and hashes that are - # quicker to crack (by non-PHP code). - if (PHP_VERSION >= '5') { - $hash = md5($salt . $password, true); - do { - $hash = md5($hash . $password, true); - } while (--$count); - } else { - $hash = pack('H*', md5($salt . $password)); - do { - $hash = pack('H*', md5($hash . $password)); - } while (--$count); - } - - $output = substr($setting, 0, 12); - $output .= $this->encode64($hash, 16); - - return $output; - } - - function gensalt_extended($input) - { - $count_log2 = min($this->iteration_count_log2 + 8, 24); - # This should be odd to not reveal weak DES keys, and the - # maximum valid value is (2**24 - 1) which is odd anyway. - $count = (1 << $count_log2) - 1; - - $output = '_'; - $output .= $this->itoa64[$count & 0x3f]; - $output .= $this->itoa64[($count >> 6) & 0x3f]; - $output .= $this->itoa64[($count >> 12) & 0x3f]; - $output .= $this->itoa64[($count >> 18) & 0x3f]; - - $output .= $this->encode64($input, 3); - - return $output; - } - - function gensalt_blowfish($input) - { - # This one needs to use a different order of characters and a - # different encoding scheme from the one in encode64() above. - # We care because the last character in our encoded string will - # only represent 2 bits. While two known implementations of - # bcrypt will happily accept and correct a salt string which - # has the 4 unused bits set to non-zero, we do not want to take - # chances and we also do not want to waste an additional byte - # of entropy. - $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - - $output = '$2a$'; - $output .= chr(ord('0') + $this->iteration_count_log2 / 10); - $output .= chr(ord('0') + $this->iteration_count_log2 % 10); - $output .= '$'; - - $i = 0; - do { - $c1 = ord($input[$i++]); - $output .= $itoa64[$c1 >> 2]; - $c1 = ($c1 & 0x03) << 4; - if ($i >= 16) { - $output .= $itoa64[$c1]; - break; - } - - $c2 = ord($input[$i++]); - $c1 |= $c2 >> 4; - $output .= $itoa64[$c1]; - $c1 = ($c2 & 0x0f) << 2; - - $c2 = ord($input[$i++]); - $c1 |= $c2 >> 6; - $output .= $itoa64[$c1]; - $output .= $itoa64[$c2 & 0x3f]; - } while (1); - - return $output; - } - - function HashPassword($password) - { - $random = ''; - - if (CRYPT_BLOWFISH === 1 && !$this->portable_hashes) { - $random = $this->get_random_bytes(16); - $hash = - crypt($password, $this->gensalt_blowfish($random)); - if (strlen($hash) === 60) { - return $hash; - } - } - - if (CRYPT_EXT_DES === 1 && !$this->portable_hashes) { - if (strlen($random) < 3) { - $random = $this->get_random_bytes(3); - } - $hash = - crypt($password, $this->gensalt_extended($random)); - if (strlen($hash) === 20) { - return $hash; - } - } - - if (strlen($random) < 6) { - $random = $this->get_random_bytes(6); - } - $hash = - $this->crypt_private($password, - $this->gensalt_private($random)); - if (strlen($hash) === 34) { - return $hash; - } - - # Returning '*' on error is safe here, but would _not_ be safe - # in a crypt(3)-like function used _both_ for generating new - # hashes and for validating passwords against existing hashes. - return '*'; - } - - function CheckPassword($password, $stored_hash) - { - $hash = $this->crypt_private($password, $stored_hash); - if ($hash[0] === '*') { - $hash = crypt($password, $stored_hash); - } - - return $hash === $stored_hash; - } -} diff --git a/lib/Platform/AbstractPlatform.php b/lib/Platform/AbstractPlatform.php new file mode 100644 index 0000000..63156ff --- /dev/null +++ b/lib/Platform/AbstractPlatform.php @@ -0,0 +1,135 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Platform; + +use Doctrine\DBAL\DBALException; +use OC\DB\Connection; + +/** + * Database platform tools. + * + * @author Marcin Łojewski + */ +abstract class AbstractPlatform +{ + /** + * @var Connection The database connection. + */ + protected $connection; + + /** + * The class constructor. + * + * @param Connection $connection The database connection. + */ + public function __construct(Connection $connection) + { + $this->connection = $connection; + } + + /** + * Get all the tables defined in the database. + * + * @param bool $schemaPrefix Show schema name in the results. + * + * @return array Array with table names. + * @throws DBALException On a database exception. + */ + public function getTables($schemaPrefix = false) + { + $platform = $this->connection->getDatabasePlatform(); + + $queryTables = $platform->getListTablesSQL(); + $queryViews = $platform->getListViewsSQL( + $this->connection->getDatabase() + ); + + $tables = array(); + + $result = $this->connection->executeQuery($queryTables); + while ($row = $result->fetch()) { + $name = $this->getTableName($row, $schemaPrefix); + $tables[] = $name; + } + + $result = $this->connection->executeQuery($queryViews); + while ($row = $result->fetch()) { + $name = $this->getViewName($row, $schemaPrefix); + $tables[] = $name; + } + + return $tables; + } + + /** + * Get a table name from a query result row. + * + * @param array $row The query result row. + * @param string $schema Put schema name in the result. + * + * @return string The table name retrieved from the row. + */ + protected abstract function getTableName($row, $schema); + + /** + * Get a view name from a query result row. + * + * @param array $row The query result row. + * @param string $schema Put schema name in the result. + * + * @return string The view name retrieved from the row. + */ + protected abstract function getViewName($row, $schema); + + /** + * Get all the columns defined in the table. + * + * @param string $table The table name. + * + * @return array Array with column names. + * @throws DBALException On a database exception. + */ + public function getColumns($table) + { + $platform = $this->connection->getDatabasePlatform(); + $query = $platform->getListTableColumnsSQL($table); + $result = $this->connection->executeQuery($query); + + $columns = array(); + + while ($row = $result->fetch()) { + $name = $this->getColumnName($row); + $columns[] = $name; + } + + return $columns; + } + + /** + * Get a column name from a query result row. + * + * @param array $row The query result row. + * + * @return string The column name retrieved from the row. + */ + protected abstract function getColumnName($row); +} diff --git a/lib/Platform/MySQLPlatform.php b/lib/Platform/MySQLPlatform.php new file mode 100644 index 0000000..4e47c09 --- /dev/null +++ b/lib/Platform/MySQLPlatform.php @@ -0,0 +1,66 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Platform; + +use OC\DB\Connection; + +/** + * MySQL database platform. + * + * @author Marcin Łojewski + */ +class MySQLPlatform extends AbstractPlatform +{ + /** + * The class constructor. + * + * @param Connection $connection The database connection. + */ + public function __construct(Connection $connection) + { + parent::__construct($connection); + } + + /** + * @inheritdoc + */ + protected function getViewName($row, $schema) + { + return $row["TABLE_NAME"]; + } + + /** + * @inheritdoc + */ + protected function getTableName($row, $schema) + { + return $row["Tables_in_" . $this->connection->getDatabase()]; + } + + /** + * @inheritdoc + */ + protected function getColumnName($row) + { + return $row["Field"]; + } +} diff --git a/lib/Platform/PlatformFactory.php b/lib/Platform/PlatformFactory.php new file mode 100644 index 0000000..328e591 --- /dev/null +++ b/lib/Platform/PlatformFactory.php @@ -0,0 +1,54 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Platform; + +use OC\DB\Connection; + +/** + * Factory for the database platform class instance. + * + * @author Marcin Łojewski + */ +class PlatformFactory +{ + /** + * Get the database platform. + * + * @param Connection $connection The database connection. + * + * @return AbstractPlatform The database platform. + */ + public static function getPlatform(Connection $connection) + { + switch ($connection->getDriver()->getName()) { + case "pdo_mysql": + return new MySQLPlatform($connection); + case "pdo_pgsql": + return new PostgreSQLPlatform($connection); + default: + throw new \InvalidArgumentException( + "Unknown database driver: " . $connection->getDriver()->getName( + ) + ); + } + } +} diff --git a/lib/Platform/PostgreSQLPlatform.php b/lib/Platform/PostgreSQLPlatform.php new file mode 100644 index 0000000..d9611c0 --- /dev/null +++ b/lib/Platform/PostgreSQLPlatform.php @@ -0,0 +1,68 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Platform; + +use OC\DB\Connection; + +/** + * PostgreSQL database platform. + * + * @author Marcin Łojewski + */ +class PostgreSQLPlatform extends AbstractPlatform +{ + /** + * The class constructor. + * + * @param Connection $connection The database connection. + */ + public function __construct(Connection $connection) + { + parent::__construct($connection); + } + + /** + * @inheritdoc + */ + protected function getViewName($row, $schema) + { + $schema ? ($row["schemaname"] . "." . $row["viewname"]) + : $row["viewname"]; + } + + /** + * @inheritdoc + */ + protected function getTableName($row, $schema) + { + $schema ? ($row["schema_name"] . "." . $row["table_name"]) + : $row["table_name"]; + } + + /** + * @inheritdoc + */ + protected function getColumnName($row) + { + return $row["field"]; + } +} diff --git a/lib/Properties.php b/lib/Properties.php new file mode 100644 index 0000000..b030b82 --- /dev/null +++ b/lib/Properties.php @@ -0,0 +1,211 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL; + +use OCA\UserSQL\Constant\App; +use OCA\UserSQL\Constant\DB; +use OCA\UserSQL\Constant\Opt; +use OCP\IConfig; +use OCP\ILogger; + +/** + * Store and retrieve application properties. + * + * @author Marcin Łojewski + */ +class Properties implements \ArrayAccess +{ + /** + * @var string The cache key name. + */ + const CACHE_KEY = "Properties_data"; + + /** + * @var string The application name. + */ + private $appName; + /** + * @var IConfig The config instance. + */ + private $config; + /** + * @var ILogger The logger instance. + */ + private $logger; + /** + * @var Cache The cache instance. + */ + private $cache; + /** + * @var array The properties array. + */ + private $data; + + /** + * The default constructor. + * + * @param string $AppName The application name. + * @param IConfig $config The config instance. + * @param ILogger $logger The logger instance. + * @param Cache $cache The cache instance. + */ + public function __construct( + $AppName, IConfig $config, ILogger $logger, Cache $cache + ) { + $this->appName = $AppName; + $this->config = $config; + $this->logger = $logger; + $this->cache = $cache; + + $this->loadProperties(); + } + + /** + * Load the application properties. + * + * First the values are fetched from the cache memory. + * If these are not available, the database values are fetched. + */ + private function loadProperties() + { + $this->data = $this->cache->get(self::CACHE_KEY); + + if (!is_null($this->data)) { + return; + } + + $params = $this->getParameterArray(); + $this->data = []; + + foreach ($params as $param) { + $value = $this->config->getAppValue($this->appName, $param, null); + + if ($value === App::FALSE_VALUE) { + $value = false; + } elseif ($value === App::TRUE_VALUE) { + $value = true; + } + + $this->data[$param] = $value; + } + + $this->store(); + + $this->logger->debug( + "The application properties has been loaded.", + ["app" => $this->appName] + ); + } + + /** + * Return an array with all supported parameters. + * + * @return array Array containing strings of the parameters. + */ + private function getParameterArray() + { + $params = []; + + foreach ([DB::class, Opt::class] as $class) { + try { + $reflection = new \ReflectionClass($class); + $params = array_merge( + $params, array_values($reflection->getConstants()) + ); + } catch (\ReflectionException $exception) { + $this->logger->logException( + $exception, ["app" => $this->appName] + ); + } + } + + return $params; + } + + /** + * Store properties in the cache memory. + */ + private function store() + { + $this->cache->set(self::CACHE_KEY, $this->data); + } + + /** + * Get properties array. + * + * @return array The properties array. + */ + public function getArray() + { + return $this->data; + } + + /** + * @inheritdoc + */ + public function offsetExists($offset) + { + return isset($this->data[$offset]); + } + + /** + * @inheritdoc + */ + public function offsetGet($offset) + { + if (isset($this->data[$offset])) { + return $this->data[$offset]; + } else { + return null; + } + } + + /** + * @inheritdoc + */ + public function offsetSet($offset, $value) + { + $this->config->setAppValue($this->appName, $offset, $value); + + if ($value === App::FALSE_VALUE) { + $value = false; + } elseif ($value === App::TRUE_VALUE) { + $value = true; + } + + $this->data[$offset] = $value; + + if ($offset === Opt::USE_CACHE && $value === false) { + $this->cache->clear(); + } else { + $this->store(); + } + } + + /** + * @inheritdoc + */ + public function offsetUnset($offset) + { + unset($this->data[$offset]); + } +} diff --git a/lib/Query/DataQuery.php b/lib/Query/DataQuery.php new file mode 100644 index 0000000..8f7f990 --- /dev/null +++ b/lib/Query/DataQuery.php @@ -0,0 +1,267 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Query; + +use Doctrine\DBAL\Driver\Statement; +use OC\DB\Connection; +use OC\DB\ConnectionFactory; +use OCA\UserSQL\Constant\DB; +use OCA\UserSQL\Constant\Query; +use OCA\UserSQL\Properties; +use OCP\ILogger; + +/** + * Used to query a database. + * + * @author Marcin Łojewski + */ +class DataQuery +{ + /** + * @var string The application name. + */ + private $appName; + /** + * @var ILogger The logger instance. + */ + private $logger; + /** + * @var Properties The properties array. + */ + private $properties; + /** + * @var QueryProvider The query provider. + */ + private $queryProvider; + /** + * @var Connection The database connection. + */ + private $connection; + + /** + * The class constructor. + * + * @param string $AppName The application name. + * @param ILogger $logger The logger instance. + * @param Properties $properties The properties array. + * @param QueryProvider $queryProvider The query provider. + */ + public function __construct( + $AppName, ILogger $logger, Properties $properties, + QueryProvider $queryProvider + ) { + $this->appName = $AppName; + $this->logger = $logger; + $this->properties = $properties; + $this->queryProvider = $queryProvider; + $this->connection = false; + } + + /** + * Execute an update query. + * + * @param string $queryName The query name. + * @param array $params The query parameters. + * + * @see Query + * @return bool TRUE on success, FALSE otherwise. + */ + public function update($queryName, $params = []) + { + return $this->execQuery($queryName, $params) !== false; + } + + /** + * Run a given query and return the result. + * + * @param string $queryName The query to execute. + * @param array $params The query parameters to bind. + * @param int $limit Results limit. Defaults to -1 (no limit). + * @param int $offset Results offset. Defaults to 0. + * + * @return Statement|bool Result of query or FALSE on failure. + */ + private function execQuery( + $queryName, $params = [], $limit = -1, $offset = 0 + ) { + if ($this->connection === false) { + $this->connectToDatabase(); + } + + $query = $this->queryProvider[$queryName]; + $result = $this->connection->prepare($query, $limit, $offset); + + foreach ($params as $param => $value) { + $result->bindValue(":" . $param, $value); + } + + $this->logger->debug( + "Executing query:" . $query . ", " . implode(",", $params), + ["app" => $this->appName] + ); + + if ($result->execute() !== true) { + $error = $result->errorInfo(); + $this->logger->error( + "Could not execute the query: " . implode(", ", $error), + ["app" => $this->appName] + ); + return false; + } + + return $result; + } + + /** + * Connect to the database using Nextcloud's DBAL. + */ + private function connectToDatabase() + { + $connectionFactory = new ConnectionFactory( + \OC::$server->getSystemConfig() + ); + + $parameters = array( + "host" => $this->properties[DB::HOSTNAME], + "password" => $this->properties[DB::PASSWORD], + "user" => $this->properties[DB::USERNAME], + "dbname" => $this->properties[DB::DATABASE], + "tablePrefix" => "" + ); + + $this->connection = $connectionFactory->getConnection( + $this->properties[DB::DRIVER], $parameters + ); + + $this->logger->debug( + "Database connection established.", ["app" => $this->appName] + ); + } + + /** + * Fetch a value from the first row and the first column which + * the given query returns. Empty result set is consider to be a failure. + * + * @param string $queryName The query to execute. + * @param array $params The query parameters to bind. + * @param bool $failure Value returned on database query failure. + * Defaults to FALSE. + * + * @return array|bool Queried value or $failure value on failure. + */ + public function queryValue($queryName, $params = [], $failure = false) + { + $result = $this->execQuery($queryName, $params); + if ($result === false) { + return false; + } + + $row = $result->fetch(\PDO::FETCH_COLUMN); + if ($row === false) { + return $failure; + } + + return $row; + } + + /** + * Fetch values from the first column which the given query returns. + * + * @param string $queryName The query to execute. + * @param array $params The query parameters to bind. + * @param int $limit Results limit. Defaults to -1 (no limit). + * @param int $offset Results offset. Defaults to 0. + * + * @return array|bool Queried column or FALSE on failure. + */ + public function queryColumn( + $queryName, $params = [], $limit = -1, $offset = 0 + ) { + $result = $this->execQuery($queryName, $params, $limit, $offset); + if ($result === false) { + return false; + } + + $column = $result->fetchAll(\PDO::FETCH_COLUMN); + return $column; + } + + /** + * Fetch entity returned by the given query. + * + * @param string $queryName The query to execute. + * @param string $entityClass The entity class name. + * @param array $params The query parameters to bind. + * + * @return mixed|null The queried entity, NULL if it does not exists or + * FALSE on failure. + */ + public function queryEntity($queryName, $entityClass, $params = []) + { + $result = $this->execQuery($queryName, $params); + if ($result === false) { + return false; + } + + $result->setFetchMode(\PDO::FETCH_CLASS, $entityClass); + $entity = $result->fetch(); + + if ($entity === false) { + return null; + } + + if (empty($entity) === true) { + $this->logger->debug( + "Empty result for query: " . $queryName, + ["app" => $this->appName] + ); + return null; + } + + return $entity; + } + + /** + * Fetch entities returned by the given query. + * + * @param string $queryName The query to execute. + * @param string $entityClass The entity class name. + * @param array $params The query parameters to bind. + * @param int $limit Results limit. Defaults to -1 (no limit). + * @param int $offset Results offset. Defaults to 0. + * + * @return mixed|null The queried entities or FALSE on failure. + */ + public function queryEntities( + $queryName, $entityClass, $params = [], $limit = -1, $offset = 0 + ) { + $result = $this->execQuery($queryName, $params, $limit, $offset); + if ($result === false) { + return false; + } + + $result->setFetchMode(\PDO::FETCH_CLASS, $entityClass); + $entities = $result->fetchAll(); + + return $entities; + } +} diff --git a/lib/Query/QueryProvider.php b/lib/Query/QueryProvider.php new file mode 100644 index 0000000..4de8084 --- /dev/null +++ b/lib/Query/QueryProvider.php @@ -0,0 +1,195 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Query; + +use OCA\UserSQL\Constant\DB; +use OCA\UserSQL\Constant\Query; +use OCA\UserSQL\Properties; + +/** + * Provides queries array. + * + * @author Marcin Łojewski + */ +class QueryProvider implements \ArrayAccess +{ + /** + * @var Properties The properties array. + */ + private $properties; + /** + * @var array The queries array. + */ + private $queries; + + /** + * The class constructor. + * + * @param Properties $properties The properties array. + */ + public function __construct(Properties $properties) + { + $this->properties = $properties; + $this->loadQueries(); + } + + /** + * Load queries to the array. + */ + private function loadQueries() + { + $group = $this->properties[DB::GROUP_TABLE]; + $userGroup = $this->properties[DB::USER_GROUP_TABLE]; + $user = $this->properties[DB::USER_TABLE]; + + $gAdmin = $this->properties[DB::GROUP_ADMIN_COLUMN]; + $gGID = $this->properties[DB::GROUP_GID_COLUMN]; + $gName = $this->properties[DB::GROUP_NAME_COLUMN]; + + $uAvatar = $this->properties[DB::USER_AVATAR_COLUMN]; + $uEmail = $this->properties[DB::USER_EMAIL_COLUMN]; + $uHome = $this->properties[DB::USER_HOME_COLUMN]; + $uName = $this->properties[DB::USER_NAME_COLUMN]; + $uPassword = $this->properties[DB::USER_PASSWORD_COLUMN]; + $uUID = $this->properties[DB::USER_UID_COLUMN]; + + $ugGID = $this->properties[DB::USER_GROUP_GID_COLUMN]; + $ugUID = $this->properties[DB::USER_GROUP_UID_COLUMN]; + + $gidParam = Query::GID_PARAM; + $nameParam = Query::NAME_PARAM; + $passwordParam = Query::PASSWORD_PARAM; + $searchParam = Query::SEARCH_PARAM; + $uidParam = Query::UID_PARAM; + + $groupColumns + = "$gGID AS gid, " . + "$gName AS name, " . + "$gAdmin AS admin"; + $userColumns + = "$uUID AS uid, " . + "$uName AS name, " . + "$uEmail AS email, " . + "$uHome AS home, " . + "$uAvatar AS avatar"; + + $this->queries = [ + Query::BELONGS_TO_ADMIN => + "SELECT COUNT($gGID) > 0 AS admin " . + "FROM $group, $userGroup " . + "WHERE $ugGID = $gGID " . + "AND $ugUID = :$uidParam " . + "AND $gAdmin", + + Query::COUNT_GROUPS => + "SELECT COUNT($ugGID) " . + "FROM $userGroup " . + "WHERE $ugGID = :$gidParam " . + "AND $ugUID " . + "LIKE :$searchParam", + + Query::COUNT_USERS => + "SELECT COUNT($uUID) AS count " . + "FROM $user " . + "WHERE $uUID LIKE :$searchParam", + + Query::FIND_GROUP => + "SELECT $groupColumns " . + "FROM $group " . + "WHERE $gGID = :$gidParam", + + Query::FIND_GROUP_USERS => + "SELECT $ugUID AS uid " . + "FROM $userGroup " . + "WHERE $ugGID = :$gidParam " . + "AND $ugUID " . + "LIKE :$searchParam " . + "ORDER BY $ugUID", + + Query::FIND_GROUPS => + "SELECT $groupColumns " . + "FROM $group " . + "WHERE $gGID LIKE :$searchParam " . + "ORDER BY $gGID", + + Query::FIND_USER => + "SELECT $userColumns, $uPassword AS password " . + "FROM $user " . + "WHERE $uUID = :$uidParam", + + Query::FIND_USER_GROUPS => + "SELECT $groupColumns " . + "FROM $group, $userGroup " . + "WHERE $ugGID = $gGID " . + "AND $ugUID = :$uidParam " . + "ORDER BY $gGID", + + Query::FIND_USERS => + "SELECT $userColumns " . + "FROM $user " . + "WHERE $uUID LIKE :$searchParam " . + "ORDER BY $uUID", + + Query::SAVE_USER => + "UPDATE $user " . + "SET $uPassword = :$passwordParam, " . + "$uName = :$nameParam " . + "WHERE $uUID = :$uidParam", + ]; + } + + /** + * @inheritdoc + */ + public function offsetExists($offset) + { + return isset($this->queries[$offset]); + } + + /** + * @inheritdoc + */ + public function offsetGet($offset) + { + if (isset($this->queries[$offset])) { + return $this->queries[$offset]; + } else { + return null; + } + } + + /** + * @inheritdoc + */ + public function offsetSet($offset, $value) + { + $this->queries[$offset] = $value; + } + + /** + * @inheritdoc + */ + public function offsetUnset($offset) + { + unset($this->queries[$offset]); + } +} diff --git a/lib/Repository/GroupRepository.php b/lib/Repository/GroupRepository.php new file mode 100644 index 0000000..f0203c3 --- /dev/null +++ b/lib/Repository/GroupRepository.php @@ -0,0 +1,150 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Repository; + +use OCA\UserSQL\Constant\Query; +use OCA\UserSQL\Model\Group; +use OCA\UserSQL\Query\DataQuery; + +/** + * The group repository. + * + * @author Marcin Łojewski + */ +class GroupRepository +{ + /** + * @var DataQuery The data query object. + */ + private $dataQuery; + + /** + * The class constructor. + * + * @param DataQuery $dataQuery The data query object. + */ + public function __construct(DataQuery $dataQuery) + { + $this->dataQuery = $dataQuery; + } + + /** + * Get a group entity object. + * + * @param string $gid The group ID. + * + * @return Group The group entity, NULL if it does not exists or + * FALSE on failure. + */ + public function findByGid($gid) + { + return $this->dataQuery->queryEntity( + Query::FIND_GROUP, Group::class, [Query::GID_PARAM => $gid] + ); + } + + /** + * Get all groups a user belongs to. + * + * @param string $uid The user ID. + * + * @return Group[] Array of group entity objects or FALSE on failure. + */ + public function findAllByUid($uid) + { + return $this->dataQuery->queryEntities( + Query::FIND_USER_GROUPS, Group::class, [Query::UID_PARAM => $uid] + ); + } + + /** + * Get a list of all user IDs belonging to the group. + * + * @param string $gid The group ID. + * @param string $search The UID search term. Defaults to "" (empty string). + * @param int $limit (optional) Results limit. + * Defaults to -1 (no limit). + * @param int $offset (optional) Results offset. Defaults to 0. + * + * @return string[] Array of UIDs belonging to the group + * or FALSE on failure. + */ + public function findAllUidsBySearchTerm( + $gid, $search = "", $limit = -1, $offset = 0 + ) { + return $this->dataQuery->queryColumn( + Query::FIND_GROUP_USERS, + [Query::GID_PARAM => $gid, Query::SEARCH_PARAM => $search], $limit, + $offset + ); + } + + /** + * Get an array of group entity objects. + * + * @param string $search The search term. Defaults to "" (empty string). + * @param int $limit (optional) Results limit. + * Defaults to -1 (no limit). + * @param int $offset (optional) Results offset. Defaults to 0. + * + * @return Group[] Array of group entity objects or FALSE on failure. + */ + public function findAllBySearchTerm($search = "", $limit = -1, $offset = 0) + { + return $this->dataQuery->queryEntities( + Query::FIND_GROUPS, Group::class, [Query::SEARCH_PARAM => $search], + $limit, $offset + ); + } + + /** + * Get the number of users in given group matching the search term. + * + * @param string $gid The group ID. + * @param string $search The UID search term. Defaults to "" (empty string). + * + * @return int The number of users in given group matching the search term + * or FALSE on failure. + */ + public function countAll($gid, $search = "") + { + return $this->dataQuery->queryValue( + Query::COUNT_GROUPS, + [Query::GID_PARAM => $gid, Query::SEARCH_PARAM => $search] + ); + } + + /** + * Find out if the user belongs to any admin group. + * + * @param string $uid The user ID. + * + * @return bool|null TRUE if the user belongs to any admin group, + * FALSE if not, NULL on failure. + */ + public function belongsToAdmin($uid) + { + return $this->dataQuery->queryValue( + Query::BELONGS_TO_ADMIN, [Query::UID_PARAM => $uid], null + ); + } +} diff --git a/lib/Repository/UserRepository.php b/lib/Repository/UserRepository.php new file mode 100644 index 0000000..8f284b6 --- /dev/null +++ b/lib/Repository/UserRepository.php @@ -0,0 +1,114 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace OCA\UserSQL\Repository; + +use OCA\UserSQL\Constant\Query; +use OCA\UserSQL\Model\User; +use OCA\UserSQL\Query\DataQuery; + +/** + * The user repository. + * + * @author Marcin Łojewski + */ +class UserRepository +{ + /** + * @var DataQuery The data query object. + */ + private $dataQuery; + + /** + * The class constructor. + * + * @param DataQuery $dataQuery The data query object. + */ + public function __construct(DataQuery $dataQuery) + { + $this->dataQuery = $dataQuery; + } + + /** + * Get a user entity object. + * + * @param string $uid The user ID. + * + * @return User The user entity, NULL if it does not exists or + * FALSE on failure. + */ + public function findByUid($uid) + { + return $this->dataQuery->queryEntity( + Query::FIND_USER, User::class, [Query::UID_PARAM => $uid] + ); + } + + /** + * Get an array of user entity objects. + * + * @param string $search The search term. Defaults to "" (empty string). + * @param int $limit (optional) Results limit. + * Defaults to -1 (no limit). + * @param int $offset (optional) Results offset. Defaults to 0. + * + * @return User[] Array of user entity objects or FALSE on failure. + */ + public function findAllBySearchTerm($search = "", $limit = -1, $offset = 0) + { + return $this->dataQuery->queryEntities( + Query::FIND_USERS, User::class, [Query::SEARCH_PARAM => $search], + $limit, $offset + ); + } + + /** + * Get the number of users. + * + * @param string $search The search term. Defaults to "" (empty string). + * + * @return int The number of users or FALSE on failure. + */ + public function countAll($search = "") + { + return $this->dataQuery->queryValue( + Query::COUNT_USERS, [Query::SEARCH_PARAM => $search] + ); + } + + /** + * Save an user entity object. + * + * @param User $user The user entity. + * + * @return bool TRUE on success, FALSE otherwise. + */ + public function save($user) + { + return $this->dataQuery->update( + Query::SAVE_USER, [ + Query::NAME_PARAM => $user->name, + Query::PASSWORD_PARAM => $user->password, + Query::UID_PARAM => $user->uid + ] + ); + } +} diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php index bf6f5b1..e578dc3 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -1,10 +1,9 @@ + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,87 +16,64 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * + * along with this program. If not, see . */ -namespace OCA\user_sql\Settings; +namespace OCA\UserSQL\Settings; +use OCA\UserSQL\Properties; use OCP\AppFramework\Http\TemplateResponse; -use OCP\Defaults; -use OCP\IConfig; -use OCP\IL10N; use OCP\Settings\ISettings; +/** + * The administrator's settings page. + * + * @author Marcin Łojewski + */ class Admin implements ISettings { - /** @var IL10N */ - private $l10n; - /** @var Defaults */ - private $defaults; - /** @var IConfig */ - private $config; + /** + * @var string The application name. + */ + private $appName; + /** + * @var Properties The properties array. + */ + private $properties; /** - * @param IL10N $l10n - * @param Defaults $defaults - * @param IConfig $config + * The class constructor, + * + * @param string $AppName The application name. + * @param Properties $properties The properties array. */ - public function __construct( - IL10N $l10n, - Defaults $defaults, - IConfig $config - ) { - $this->l10n = $l10n; - $this->defaults = $defaults; - $this->config = $config; - $this->helper = new \OCA\user_sql\lib\Helper(); - $this->params = $this->helper->getParameterArray(); - $this->settings = $this->helper->loadSettingsForDomain('default'); + public function __construct($AppName, Properties $properties) + { + $this->appName = $AppName; + $this->properties = $properties; } /** - * @return TemplateResponse + * @inheritdoc */ public function getForm() { - - $type = $this->config->getAppValue('user_sql', 'type'); - $trusted_domains = \OC::$server->getConfig()->getSystemValue('trusted_domains'); - $inserted = array('default'); - array_splice($trusted_domains, 0, 0, $inserted); - - $params = [ - 'type' => $type, - ]; - $params['allowed_domains'] = array_unique($trusted_domains); - - foreach ($this->params as $key) { - $value = $this->settings[$key]; - $params[$key] = $value; - } - - $params["config"] = $this->config; - return new TemplateResponse('user_sql', 'admin', $params); + return new TemplateResponse($this->appName, "admin", $this->properties->getArray()); } /** - * @return string the section ID, e.g. 'sharing' + * @inheritdoc */ public function getSection() { - return 'user_sql'; + return $this->appName; } /** - * @return int whether the form should be rather on the top or bottom of - * the admin section. The forms are arranged in ascending order of the - * priority values. It is required to return a value between 0 and 100. - * - * keep the server setting at the top, right after "server settings" + * @inheritdoc */ public function getPriority() { - return 0; + return 25; } } diff --git a/lib/Settings/Section.php b/lib/Settings/Section.php index 9d6ba23..a3dfc3a 100644 --- a/lib/Settings/Section.php +++ b/lib/Settings/Section.php @@ -1,10 +1,9 @@ + * @author Marcin Łojewski * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -17,59 +16,79 @@ * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * + * along with this program. If not, see . */ -namespace OCA\user_sql\Settings; +namespace OCA\UserSQL\Settings; use OCP\IL10N; -use OCP\Settings\IIconSection; use OCP\IURLGenerator; +use OCP\Settings\IIconSection; +/** + * The section item. + * + * @author Marcin Łojewski + */ class Section implements IIconSection { - /** @var IL10N */ - private $l; + /** + * @var string The application name. + */ + private $appName; + /** + * @var IURLGenerator The URL generator. + */ + private $urlGenerator; + /** + * @var IL10N The localization service. + */ + private $localization; /** - * @param IL10N $l + * The class constructor. + * + * @param string $AppName The application name. + * @param IURLGenerator $urlGenerator The URL generator. + * @param IL10N $localization The localization service. */ - public function __construct(IURLGenerator $url, IL10N $l) - { - $this->l = $l; - $this->url = $url; + public function __construct( + $AppName, IURLGenerator $urlGenerator, IL10N $localization + ) { + $this->appName = $AppName; + $this->urlGenerator = $urlGenerator; + $this->localization = $localization; } /** - * {@inheritdoc} + * @inheritdoc */ public function getID() { - return 'user_sql'; + return $this->appName; } /** - * {@inheritdoc} + * @inheritdoc */ public function getName() { - return $this->l->t('User SQL'); + return $this->localization->t("SQL Backends"); } /** - * {@inheritdoc} + * @inheritdoc */ public function getPriority() { - return 75; + return 25; } /** - * {@inheritdoc} + * @inheritdoc */ public function getIcon() { - return $this->url->imagePath('user_sql', 'app-dark.svg'); + return $this->urlGenerator->imagePath($this->appName, "app-dark.svg"); } } diff --git a/lib/drupal.php b/lib/drupal.php deleted file mode 100644 index 3b07cda..0000000 --- a/lib/drupal.php +++ /dev/null @@ -1,330 +0,0 @@ -> 6) & 0x3f]; - if ($i++ >= $count) { - break; - } - if ($i < $count) { - $value |= ord($input[$i]) << 16; - } - $output .= $itoa64[($value >> 12) & 0x3f]; - if ($i++ >= $count) { - break; - } - $output .= $itoa64[($value >> 18) & 0x3f]; - } while ($i < $count); - - return $output; -} - -/** - * Returns a string of highly randomized bytes (over the full 8-bit range). - * - * This function is better than simply calling mt_rand() or any other built-in - * PHP function because it can return a long string of bytes (compared to < 4 - * bytes normally from mt_rand()) and uses the best available pseudo-random - * source. - * - * @param $count - * The number of characters (bytes) to return in the string. - */ - -function _random_bytes($count) -{ - // $random_state does not use static as it stores random bytes. - static $random_state, $bytes, $has_openssl; - - $missing_bytes = $count - strlen($bytes); - - if ($missing_bytes > 0) { - // PHP versions prior 5.3.4 experienced openssl_random_pseudo_bytes() - // locking on Windows and rendered it unusable. - if (!isset($has_openssl)) { - $has_openssl = version_compare(PHP_VERSION, '5.3.4', - '>=') && function_exists('openssl_random_pseudo_bytes'); - } - - // openssl_random_pseudo_bytes() will find entropy in a system-dependent - // way. - if ($has_openssl) { - $bytes .= openssl_random_pseudo_bytes($missing_bytes); - } - - // Else, read directly from /dev/urandom, which is available on many *nix - // systems and is considered cryptographically secure. - elseif ($fh = @fopen('/dev/urandom', 'rb')) { - // PHP only performs buffered reads, so in reality it will always read - // at least 4096 bytes. Thus, it costs nothing extra to read and store - // that much so as to speed any additional invocations. - $bytes .= fread($fh, max(4096, $missing_bytes)); - fclose($fh); - } - - // If we couldn't get enough entropy, this simple hash-based PRNG will - // generate a good set of pseudo-random bytes on any system. - // Note that it may be important that our $random_state is passed - // through hash() prior to being rolled into $output, that the two hash() - // invocations are different, and that the extra input into the first one - - // the microtime() - is prepended rather than appended. This is to avoid - // directly leaking $random_state via the $output stream, which could - // allow for trivial prediction of further "random" numbers. - if (strlen($bytes) < $count) { - // Initialize on the first call. The contents of $_SERVER includes a mix of - // user-specific and system information that varies a little with each page. - if (!isset($random_state)) { - $random_state = print_r($_SERVER, true); - if (function_exists('getmypid')) { - // Further initialize with the somewhat random PHP process ID. - $random_state .= getmypid(); - } - $bytes = ''; - } - - do { - $random_state = hash('sha256', microtime() . mt_rand() . $random_state); - $bytes .= hash('sha256', mt_rand() . $random_state, true); - } while (strlen($bytes) < $count); - } - } - $output = substr($bytes, 0, $count); - $bytes = substr($bytes, $count); - return $output; -} - -/** - * Generates a random base 64-encoded salt prefixed with settings for the hash. - * - * Proper use of salts may defeat a number of attacks, including: - * - The ability to try candidate passwords against multiple hashes at once. - * - The ability to use pre-hashed lists of candidate passwords. - * - The ability to determine whether two users have the same (or different) - * password without actually having to guess one of the passwords. - * - * @param $count_log2 - * Integer that determines the number of iterations used in the hashing - * process. A larger value is more secure, but takes more time to complete. - * - * @return - * A 12 character string containing the iteration count and a random salt. - */ -function _password_generate_salt($count_log2) -{ - $output = '$S$'; - // Ensure that $count_log2 is within set bounds. - $count_log2 = _password_enforce_log2_boundaries($count_log2); - // We encode the final log2 iteration count in base 64. - $itoa64 = _password_itoa64(); - $output .= $itoa64[$count_log2]; - // 6 bytes is the standard salt for a portable phpass hash. - $output .= _password_base64_encode(_random_bytes(6), 6); - return $output; -} - -/** - * Ensures that $count_log2 is within set bounds. - * - * @param $count_log2 - * Integer that determines the number of iterations used in the hashing - * process. A larger value is more secure, but takes more time to complete. - * - * @return - * Integer within set bounds that is closest to $count_log2. - */ -function _password_enforce_log2_boundaries($count_log2) -{ - if ($count_log2 < MIN_HASH_COUNT) { - return MIN_HASH_COUNT; - } elseif ($count_log2 > MAX_HASH_COUNT) { - return MAX_HASH_COUNT; - } - - return (int)$count_log2; -} - -/** - * Hash a password using a secure stretched hash. - * - * By using a salt and repeated hashing the password is "stretched". Its - * security is increased because it becomes much more computationally costly - * for an attacker to try to break the hash by brute-force computation of the - * hashes of a large number of plain-text words or strings to find a match. - * - * @param $algo - * The string name of a hashing algorithm usable by hash(), like 'sha256'. - * @param $password - * Plain-text password up to 512 bytes (128 to 512 UTF-8 characters) to hash. - * @param $setting - * An existing hash or the output of _password_generate_salt(). Must be - * at least 12 characters (the settings and salt). - * - * @return - * A string containing the hashed password (and salt) or FALSE on failure. - * The return string will be truncated at DRUPAL_HASH_LENGTH characters max. - */ -function _password_crypt($algo, $password, $setting) -{ - // Prevent DoS attacks by refusing to hash large passwords. - if (strlen($password) > 512) { - return false; - } - // The first 12 characters of an existing hash are its setting string. - $setting = substr($setting, 0, 12); - - if ($setting[0] != '$' || $setting[2] != '$') { - return false; - } - $count_log2 = _password_get_count_log2($setting); - // Hashes may be imported from elsewhere, so we allow != DRUPAL_HASH_COUNT - if ($count_log2 < MIN_HASH_COUNT || $count_log2 > MAX_HASH_COUNT) { - return false; - } - $salt = substr($setting, 4, 8); - // Hashes must have an 8 character salt. - if (strlen($salt) != 8) { - return false; - } - - // Convert the base 2 logarithm into an integer. - $count = 1 << $count_log2; - - // We rely on the hash() function being available in PHP 5.2+. - $hash = hash($algo, $salt . $password, true); - do { - $hash = hash($algo, $hash . $password, true); - } while (--$count); - - $len = strlen($hash); - $output = $setting . _password_base64_encode($hash, $len); - // _password_base64_encode() of a 16 byte MD5 will always be 22 characters. - // _password_base64_encode() of a 64 byte sha512 will always be 86 characters. - $expected = 12 + ceil((8 * $len) / 6); - return (strlen($output) == $expected) ? substr($output, 0, HASH_LENGTH) : false; -} - -/** - * Parse the log2 iteration count from a stored hash or setting string. - */ -function _password_get_count_log2($setting) -{ - $itoa64 = _password_itoa64(); - return strpos($itoa64, $setting[3]); -} - -/** - * Hash a password using a secure hash. - * - * @param $password - * A plain-text password. - * @param $count_log2 - * Optional integer to specify the iteration count. Generally used only during - * mass operations where a value less than the default is needed for speed. - * - * @return - * A string containing the hashed password (and a salt), or FALSE on failure. - */ -function user_hash_password($password, $count_log2 = 0) -{ - if (empty($count_log2)) { - // Use the standard iteration count. - $count_log2 = variable_get('password_count_log2', DRUPAL_HASH_COUNT); - } - return _password_crypt('sha512', $password, _password_generate_salt($count_log2)); -} - -/** - * Check whether a plain text password matches a stored hashed password. - * - * @param $password - * A plain-text password - * @param $hashpass - * - * @return - * TRUE or FALSE. - */ -function user_check_password($password, $hashpass) -{ - $stored_hash = $hashpass; - $type = substr($stored_hash, 0, 3); - switch ($type) { - case '$S$': - // A normal Drupal 7 password using sha512. - $hash = _password_crypt('sha512', $password, $stored_hash); - break; - case '$H$': - // phpBB3 uses "$H$" for the same thing as "$P$". - case '$P$': - // A phpass password generated using md5. This is an - // imported password or from an earlier Drupal version. - $hash = _password_crypt('md5', $password, $stored_hash); - break; - default: - return false; - } - return ($hash && $stored_hash == $hash); -} diff --git a/lib/group_sql.php b/lib/group_sql.php deleted file mode 100644 index 8d06cd0..0000000 --- a/lib/group_sql.php +++ /dev/null @@ -1,88 +0,0 @@ -helper = new \OCA\user_sql\lib\Helper(); - $domain = \OC::$server->getRequest()->getServerHost(); - $this->settings = $this->helper->loadSettingsForDomain($domain); - $this->helper->connectToDb($this->settings); - return false; - } - - public function getUserGroups($uid) - { - if (empty($this->settings['sql_group_table'])) { - Util::writeLog('OC_USER_SQL', "Group table not configured", Util::DEBUG); - return []; - } - $rows = $this->helper->runQuery('getUserGroups', array('uid' => $uid), false, true); - if ($rows === false) { - Util::writeLog('OC_USER_SQL', "Found no group", Util::DEBUG); - return []; - } - $groups = array(); - foreach ($rows as $row) { - $groups[] = $row[$this->settings['col_group_name']]; - } - return $groups; - } - - public function getGroups($search = '', $limit = null, $offset = null) - { - if (empty($this->settings['sql_group_table'])) { - return []; - } - $search = "%" . $search . "%"; - $rows = $this->helper->runQuery('getGroups', array('search' => $search), false, true, - array('limit' => $limit, 'offset' => $offset)); - if ($rows === false) { - return []; - } - $groups = array(); - foreach ($rows as $row) { - $groups[] = $row[$this->settings['col_group_name']]; - } - return $groups; - } - - public function usersInGroup($gid, $search = '', $limit = null, $offset = null) - { - if (empty($this->settings['sql_group_table'])) { - Util::writeLog('OC_USER_SQL', "Group table not configured", Util::DEBUG); - return []; - } - $rows = $this->helper->runQuery('getGroupUsers', array('gid' => $gid), false, true); - if ($rows === false) { - Util::writeLog('OC_USER_SQL', "Found no users for group", Util::DEBUG); - return []; - } - $users = array(); - foreach ($rows as $row) { - $users[] = $row[$this->settings['col_group_username']]; - } - return $users; - } - - public function countUsersInGroup($gid, $search = '') - { - if (empty($this->settings['sql_group_table'])) { - return 0; - } - $search = "%" . $search . "%"; - $count = $this->helper->runQuery('countUsersInGroup', array('gid' => $gid, 'search' => $search)); - if ($count === false) { - return 0; - } else { - return intval(reset($count)); - } - } -} diff --git a/lib/helper.php b/lib/helper.php deleted file mode 100644 index b455e0a..0000000 --- a/lib/helper.php +++ /dev/null @@ -1,427 +0,0 @@ - - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . - * - */ - -namespace OCA\user_sql\lib; - -use OCP\IConfig; -use OCP\Util; - -class Helper -{ - - protected $db; - protected $db_conn; - protected $settings; - - /** - * The default constructor initializes some parameters - */ - public function __construct() - { - $this->db_conn = false; - } - - /** - * Return an array with all supported parameters - * @return array Containing strings of the parameters - */ - public function getParameterArray() - { - $params = array( - 'sql_hostname', - 'sql_username', - 'sql_password', - 'sql_database', - 'sql_table', - 'sql_driver', - 'col_username', - 'col_password', - 'col_active', - 'col_displayname', - 'col_email', - 'col_gethome', - 'set_active_invert', - 'set_allow_pwchange', - 'set_default_domain', - 'set_strip_domain', - 'set_crypt_type', - 'set_mail_sync_mode', - 'set_enable_gethome', - 'set_gethome_mode', - 'set_gethome', - 'sql_group_table', - 'col_group_username', - 'col_group_name' - ); - - return $params; - } - - /** - * Load the settings for a given domain. If the domain is not found, - * the settings for 'default' are returned instead. - * @param string $domain The domain name - * @return array of settings - */ - public function loadSettingsForDomain($domain) - { - Util::writeLog('OC_USER_SQL', "Trying to load settings for domain: " . $domain, Util::DEBUG); - $settings = array(); - $sql_host = \OC::$server->getConfig()->getAppValue('user_sql', 'sql_hostname_' . $domain, ''); - if ($sql_host === '') { - $domain = 'default'; - } - $params = $this->getParameterArray(); - foreach ($params as $param) { - $settings[$param] = \OC::$server->getConfig()->getAppValue('user_sql', $param . '_' . $domain, ''); - } - Util::writeLog('OC_USER_SQL', "Loaded settings for domain: " . $domain, Util::DEBUG); - return $settings; - } - - /** - * Run a given query type and return the results - * @param string $type The type of query to run - * @param array $params The parameter array of the query (i.e. the values to bind as key-value pairs) - * @param bool $execOnly Only execute the query, but don't fetch the results (optional, default = false) - * @param bool $fetchArray Fetch an array instead of a single row (optional, default=false) - * @param array $limits use the given limits for the query (optional, default = empty) - * @return mixed - */ - public function runQuery($type, $params, $execOnly = false, $fetchArray = false, $limits = array()) - { - Util::writeLog('OC_USER_SQL', "Entering runQuery for type: " . $type, Util::DEBUG); - if (!$this->db_conn) { - return false; - } - - switch ($type) { - case 'getHome': - $query = "SELECT " . $this->settings['col_gethome'] . " FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid"; - break; - case 'getMail': - $query = "SELECT " . $this->settings['col_email'] . " FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid"; - break; - - case 'setMail': - $query = "UPDATE " . $this->settings['sql_table'] . " SET " . $this->settings['col_email'] . " = :currMail WHERE " . $this->settings['col_username'] . " = :uid"; - break; - - case 'getPass': - $query = "SELECT " . $this->settings['col_password'] . " FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid"; - if ($this->settings['col_active'] !== '') { - $query .= " AND " . ($this->settings['set_active_invert'] === 'true' ? "NOT " : "") . $this->settings['col_active']; - } - break; - - case 'setPass': - $query = "UPDATE " . $this->settings['sql_table'] . " SET " . $this->settings['col_password'] . " = :enc_password WHERE " . $this->settings['col_username'] . " = :uid"; - break; - - case 'getRedmineSalt': - $query = "SELECT salt FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid;"; - break; - - case 'countUsers': - $query = "SELECT COUNT(*) FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " LIKE :search"; - if ($this->settings['col_active'] !== '') { - $query .= " AND " . ($this->settings['set_active_invert'] === 'true' ? "NOT " : "") . $this->settings['col_active']; - } - break; - - case 'getUsers': - $query = "SELECT " . $this->settings['col_username'] . " FROM " . $this->settings['sql_table']; - $query .= " WHERE " . $this->settings['col_username'] . " LIKE :search"; - if ($this->settings['col_active'] !== '') { - $query .= " AND " . ($this->settings['set_active_invert'] === 'true' ? "NOT " : "") . $this->settings['col_active']; - } - $query .= " ORDER BY " . $this->settings['col_username']; - break; - - case 'userExists': - $query = "SELECT " . $this->settings['col_username'] . " FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid"; - if ($this->settings['col_active'] !== '') { - $query .= " AND " . ($this->settings['set_active_invert'] === 'true' ? "NOT " : "") . $this->settings['col_active']; - } - break; - - case 'getDisplayName': - $query = "SELECT " . $this->settings['col_displayname'] . " FROM " . $this->settings['sql_table'] . " WHERE " . $this->settings['col_username'] . " = :uid"; - if ($this->settings['col_active'] !== '') { - $query .= " AND " . ($this->settings['set_active_invert'] === 'true' ? "NOT " : "") . $this->settings['col_active']; - } - break; - - case 'mysqlEncryptSalt': - $query = "SELECT ENCRYPT(:pw, :salt);"; - break; - - case 'mysqlEncrypt': - $query = "SELECT ENCRYPT(:pw);"; - break; - - case 'mysqlPassword': - $query = "SELECT PASSWORD(:pw);"; - break; - - case 'getUserGroups': - $query = "SELECT " . $this->settings['col_group_name'] . " FROM " . $this->settings['sql_group_table'] . " WHERE " . $this->settings['col_group_username'] . " = :uid"; - break; - - case 'getGroups': - $query = "SELECT distinct " . $this->settings['col_group_name'] . " FROM " . $this->settings['sql_group_table'] . " WHERE " . $this->settings['col_group_name'] . " LIKE :search"; - break; - - case 'getGroupUsers': - $query = "SELECT distinct " . $this->settings['col_group_username'] . " FROM " . $this->settings['sql_group_table'] . " WHERE " . $this->settings['col_group_name'] . " = :gid"; - break; - - case 'countUsersInGroup': - $query = "SELECT count(" . $this->settings['col_group_username'] . ") FROM " . $this->settings['sql_group_table'] . " WHERE " . $this->settings['col_group_name'] . " = :gid AND " . $this->settings['col_group_username'] . " LIKE :search"; - break; - } - - if (isset($limits['limit']) && $limits['limit'] !== null) { - $limit = intval($limits['limit']); - $query .= " LIMIT " . $limit; - } - - if (isset($limits['offset']) && $limits['offset'] !== null) { - $offset = intval($limits['offset']); - $query .= " OFFSET " . $offset; - } - - Util::writeLog('OC_USER_SQL', "Preparing query: $query", Util::DEBUG); - $result = $this->db->prepare($query); - foreach ($params as $param => $value) { - $result->bindValue(":" . $param, $value); - } - Util::writeLog('OC_USER_SQL', "Executing query...", Util::DEBUG); - if (!$result->execute()) { - $err = $result->errorInfo(); - Util::writeLog('OC_USER_SQL', "Query failed: " . $err[2], Util::DEBUG); - return false; - } - if ($execOnly === true) { - return true; - } - Util::writeLog('OC_USER_SQL', "Fetching result...", Util::DEBUG); - if ($fetchArray === true) { - $row = $result->fetchAll(); - } else { - $row = $result->fetch(); - } - - if (!$row) { - return false; - } - return $row; - } - - /** - * Connect to the database using Nextcloud's DBAL - * @param array $settings The settings for the connection - * @return bool - */ - public function connectToDb($settings) - { - $this->settings = $settings; - $cm = new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig()); - $parameters = array( - 'host' => $this->settings['sql_hostname'], - 'password' => $this->settings['sql_password'], - 'user' => $this->settings['sql_username'], - 'dbname' => $this->settings['sql_database'], - 'tablePrefix' => '' - ); - try { - $this->db = $cm->getConnection($this->settings['sql_driver'], $parameters); - $this->db->query("SET NAMES 'UTF8'"); - $this->db_conn = true; - return true; - } catch (\Exception $e) { - Util::writeLog('OC_USER_SQL', 'Failed to connect to the database: ' . $e->getMessage(), Util::ERROR); - $this->db_conn = false; - return false; - } - } - - /** - * Check if all of the given columns exist - * @param array $parameters The connection parameters - * @param string $sql_driver The SQL driver to use - * @param string $table The table name to check - * @param array $cols The columns to check - * @param array True if found, otherwise false - * @return bool|string - */ - public function verifyColumns($parameters, $sql_driver, $table, $cols) - { - $columns = $this->getColumns($parameters, $sql_driver, $table); - $res = true; - $err = ''; - foreach ($cols as $col) { - if (!in_array($col, $columns, true)) { - $res = false; - $err .= $col . ' '; - } - } - if ($res) { - return true; - } else { - return $err; - } - } - - /** - * Check if a given table exists - * @param array $parameters The connection parameters - * @param string $sql_driver The SQL driver to use - * @param string $table The table name to check - * @param array True if found, otherwise false - * @return bool - */ - public function verifyTable($parameters, $sql_driver, $table) - { - $tablesWithSchema = $this->getTables($parameters, $sql_driver, true); - $tablesWithoutSchema = $this->getTables($parameters, $sql_driver, false); - return in_array($table, $tablesWithSchema, true) || in_array($table, $tablesWithoutSchema, true); - } - - /** - * Retrieve a list of tables for the given connection parameters - * @param array $parameters The connection parameters - * @param string $sql_driver The SQL driver to use - * @param boolean $schema Return table name with schema - * @return array The found tables, empty if an error occurred - */ - public function getTables($parameters, $sql_driver, $schema = true) - { - $cm = new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig()); - try { - $conn = $cm->getConnection($sql_driver, $parameters); - $platform = $conn->getDatabasePlatform(); - - $queryTables = $platform->getListTablesSQL(); - $queryViews = $platform->getListViewsSQL($parameters['dbname']); - $ret = array(); - - $result = $conn->executeQuery($queryTables); - while ($row = $result->fetch()) { - $name = $this->getTableNameFromRow($sql_driver, $parameters['dbname'], $row, $schema); - $ret[] = $name; - } - - $result = $conn->executeQuery($queryViews); - while ($row = $result->fetch()) { - $name = $this->getViewNameFromRow($sql_driver, $row, $schema); - $ret[] = $name; - } - return $ret; - } catch (\Exception $e) { - return array(); - } - } - - /** - * Retrieve table name from database list table SQL - * @param string $sql_driver The SQL driver to use - * @param string $dbname The database name - * @param array $row Query result row - * @param boolean $schema Return table name with schema - * @return string Table name - */ - public function getTableNameFromRow($sql_driver, $dbname, $row, $schema) - { - switch ($sql_driver) { - case 'mysql': - return $row['Tables_in_' . $dbname]; - case 'pgsql': - if ($schema) { - return $row['schema_name'] . '.' . $row['table_name']; - } else { - return $row['table_name']; - } - default: - return null; - } - } - - /** - * Retrieve view name from database list table SQL - * @param string $sql_driver The SQL driver to use - * @param array $row Query result row - * @param boolean $schema Return table name with schema - * @return string Table name - */ - public function getViewNameFromRow($sql_driver, $row, $schema) - { - switch ($sql_driver) { - case 'mysql': - return $row['TABLE_NAME']; - case 'pgsql': - if ($schema) { - return $row['schemaname'] . '.' . $row['viewname']; - } else { - return $row['viewname']; - } - default: - return null; - } - } - - /** - * Retrieve a list of columns for the given connection parameters - * @param array $parameters The connection parameters - * @param string $sql_driver The SQL driver to use - * @param string $table The SQL table to work with - * @return array The found column, empty if an error occured - */ - public function getColumns($parameters, $sql_driver, $table) - { - $cm = new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig()); - try { - $conn = $cm->getConnection($sql_driver, $parameters); - $platform = $conn->getDatabasePlatform(); - $query = $platform->getListTableColumnsSQL($table); - $result = $conn->executeQuery($query); - $ret = array(); - while ($row = $result->fetch()) { - switch ($sql_driver) { - case 'mysql': - $name = $row['Field']; - break; - case 'pgsql': - $name = $row['field']; - break; - default: - return $ret; - } - $ret[] = $name; - } - return $ret; - } catch (\Exception $e) { - return array(); - } - } -} diff --git a/lib/user_sql.php b/lib/user_sql.php deleted file mode 100644 index cb6f2a5..0000000 --- a/lib/user_sql.php +++ /dev/null @@ -1,981 +0,0 @@ - - * - * credits go to Ed W for several SQL injection fixes and caching support - * credits go to Frédéric France for providing Joomla support - * credits go to Mark Jansenn for providing Joomla 2.5.18+ / 3.2.1+ support - * credits go to Dominik Grothaus for providing SSHA256 support and fixing a few bugs - * credits go to Sören Eberhardt-Biermann for providing multi-host support - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE - * License as published by the Free Software Foundation; either - * version 3 of the License, or any later version. - * - * This library 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 AFFERO GENERAL PUBLIC LICENSE for more details. - * - * You should have received a copy of the GNU Affero General Public - * License along with this library. If not, see . - * - */ - -namespace OCA\user_sql; - -use OC\User\Backend; -use OCA\user_sql\HashAlgorithm\HashAlgorithm; -use OCP\IConfig; -use OCP\IUser; -use OCP\IUserSession; -use OCP\Util; - -abstract class BackendUtility -{ - protected $access; - - /** - * constructor, make sure the subclasses call this one! - * @param Access $access an instance of Access for LDAP interaction - */ - public function __construct(Access $access) - { - $this->access = $access; - } -} - - -class OC_USER_SQL extends BackendUtility implements \OCP\IUserBackend, - \OCP\UserInterface -{ - protected $cache; - protected $settings; - protected $helper; - protected $session_cache_name; - protected $ocConfig; - - /** - * The default constructor. It loads the settings for the given domain - * and tries to connect to the database. - */ - public function __construct() - { - $memcache = \OC::$server->getMemCacheFactory(); - if ($memcache->isAvailable()) { - $this->cache = $memcache->create(); - } - $this->helper = new \OCA\user_sql\lib\Helper(); - $domain = \OC::$server->getRequest()->getServerHost(); - $this->settings = $this->helper->loadSettingsForDomain($domain); - $this->ocConfig = \OC::$server->getConfig(); - $this->helper->connectToDb($this->settings); - $this->session_cache_name = 'USER_SQL_CACHE'; - return false; - } - - /** - * Sync the user's E-Mail address with the address stored by Nextcloud. - * We have three (four) sync modes: - * - none: Does nothing - * - initial: Do the sync only once from SQL -> Nextcloud - * - forcesql: The SQL database always wins and sync to Nextcloud - * - forceoc: Nextcloud always wins and syncs to SQL - * - * @param string $uid The user's ID to sync - * @return bool Success or Fail - */ - private function doEmailSync($uid) - { - Util::writeLog('OC_USER_SQL', "Entering doEmailSync for UID: $uid", - Util::DEBUG); - if ($this->settings['col_email'] === '') { - return false; - } - - if ($this->settings['set_mail_sync_mode'] === 'none') { - return false; - } - - $ocUid = $uid; - $uid = $this->doUserDomainMapping($uid); - - $row = $this->helper->runQuery('getMail', array('uid' => $uid)); - if ($row === false) { - return false; - } - $newMail = $row[$this->settings['col_email']]; - - $currMail = $this->ocConfig->getUserValue($ocUid, - 'settings', - 'email', ''); - - switch ($this->settings['set_mail_sync_mode']) { - case 'initial': - if ($currMail === '') { - $this->ocConfig->setUserValue($ocUid, - 'settings', - 'email', - $newMail); - } - break; - case 'forcesql': - //if($currMail !== $newMail) - $this->ocConfig->setUserValue($ocUid, - 'settings', - 'email', - $newMail); - break; - case 'forceoc': - if (($currMail !== '') && ($currMail !== $newMail)) { - $row = $this->helper->runQuery('setMail', - array( - 'uid' => $uid, - 'currMail' => $currMail - ) - , true); - - if ($row === false) { - Util::writeLog('OC_USER_SQL', - "Could not update E-Mail address in SQL database!", - Util::ERROR); - } - } - break; - } - - return true; - } - - /** - * This maps the username to the specified domain name. - * It can only append a default domain name. - * - * @param string $uid The UID to work with - * @return string The mapped UID - */ - private function doUserDomainMapping($uid) - { - $uid = trim($uid); - - if ($this->settings['set_default_domain'] !== '') { - Util::writeLog('OC_USER_SQL', "Append default domain: " . - $this->settings['set_default_domain'], Util::DEBUG); - if (strpos($uid, '@') === false) { - $uid .= "@" . $this->settings['set_default_domain']; - } - } - - $uid = strtolower($uid); - Util::writeLog('OC_USER_SQL', 'Returning mapped UID: ' . $uid, - Util::DEBUG); - return $uid; - } - - /** - * Return the actions implemented by this backend - * @param $actions - * @return bool - */ - public function implementsActions($actions) - { - return (bool)((Backend::CHECK_PASSWORD - | Backend::GET_DISPLAYNAME - | Backend::COUNT_USERS - | ($this->settings['set_allow_pwchange'] === 'true' ? - Backend::SET_PASSWORD : 0) - | ($this->settings['set_enable_gethome'] === 'true' ? - Backend::GET_HOME : 0) - ) & $actions); - } - - /** - * Checks if this backend has user listing support - * @return bool - */ - public function hasUserListings() - { - return true; - } - - /** - * Return the user's home directory, if enabled - * @param string $uid The user's ID to retrieve - * @return mixed The user's home directory or false - */ - public function getHome($uid) - { - Util::writeLog('OC_USER_SQL', "Entering getHome for UID: $uid", - Util::DEBUG); - - if ($this->settings['set_enable_gethome'] !== 'true') { - return false; - } - - $uidMapped = $this->doUserDomainMapping($uid); - $home = false; - - switch ($this->settings['set_gethome_mode']) { - case 'query': - Util::writeLog('OC_USER_SQL', - "getHome with Query selected, running Query...", - Util::DEBUG); - $row = $this->helper->runQuery('getHome', - array('uid' => $uidMapped)); - if ($row === false) { - Util::writeLog('OC_USER_SQL', - "Got no row, return false", - Util::DEBUG); - return false; - } - $home = $row[$this->settings['col_gethome']]; - break; - - case 'static': - Util::writeLog('OC_USER_SQL', - "getHome with static selected", - Util::DEBUG); - $home = $this->settings['set_gethome']; - $home = str_replace('%ud', $uidMapped, $home); - $home = str_replace('%u', $uid, $home); - $home = str_replace('%d', - $this->settings['set_default_domain'], - $home); - break; - } - Util::writeLog('OC_USER_SQL', - "Returning getHome for UID: $uid with Home $home", - Util::DEBUG); - return $home; - } - - /** - * Create a new user account using this backend - * @return bool always false, as we can't create users - */ - public function createUser() - { - // Can't create user - Util::writeLog('OC_USER_SQL', - 'Not possible to create local users from web' . - ' frontend using SQL user backend', Util::ERROR); - return false; - } - - /** - * Delete a user account using this backend - * @param string $uid The user's ID to delete - * @return bool always false, as we can't delete users - */ - public function deleteUser($uid) - { - // Can't delete user - Util::writeLog('OC_USER_SQL', 'Not possible to delete local users' . - ' from web frontend using SQL user backend', Util::ERROR); - return false; - } - - /** - * @return HashAlgorithm|bool - */ - private function getHashAlgorithmInstance() { - $cryptoType = $this->settings['set_crypt_type']; - require_once('HashAlgorithm/'. $cryptoType . '.php'); - return call_user_func('OCA\\user_sql\\HashAlgorithm\\' . $cryptoType . "::getInstance"); - } - - /** - * Set (change) a user password - * This can be enabled/disabled in the settings (set_allow_pwchange) - * - * @param string $uid The user ID - * @param string $password The user's new password - * @return bool The return status - */ - public function setPassword($uid, $password) - { - // Update the user's password - this might affect other services, that - // use the same database, as well - Util::writeLog('OC_USER_SQL', "Entering setPassword for UID: $uid", - Util::DEBUG); - - if ($this->settings['set_allow_pwchange'] !== 'true') { - return false; - } - - $uid = $this->doUserDomainMapping($uid); - - $row = $this->helper->runQuery('getPass', array('uid' => $uid)); - if ($row === false) { - return false; - } - - $hashAlgorithm = $this->getHashAlgorithmInstance(); - - if ($hashAlgorithm === false) { - return false; - } - - $enc_password = $hashAlgorithm->getPasswordHash($password); - - if ($enc_password === false) { - return false; - } - - /*$old_password = $row[$this->settings['col_password']]; - - // Added and disabled updating passwords for Drupal 7 WD 2018-01-04 - if ($this->settings['set_crypt_type'] === 'drupal') { - return false; - } elseif ($this->settings['set_crypt_type'] === 'joomla2') { - if (!class_exists('\PasswordHash')) { - require_once('PasswordHash.php'); - } - $hasher = new \PasswordHash(10, true); - $enc_password = $hasher->HashPassword($password); - } - // Redmine stores the salt separatedly, this doesn't play nice with - // the way we check passwords - elseif ($this->settings['set_crypt_type'] === 'redmine') { - $salt = $this->helper->runQuery('getRedmineSalt', - array('uid' => $uid)); - if (!$salt) { - return false; - } - $enc_password = sha1($salt['salt'] . sha1($password)); - - } elseif ($this->settings['set_crypt_type'] === 'sha1') { - $enc_password = sha1($password); - } elseif ($this->settings['set_crypt_type'] === 'system') { - $prefix = substr($old_password, 0, 2); - if ($prefix === "$2") { - $enc_password = $this->pw_hash($password); - } else { - if (($prefix === "$1") or ($prefix[0] != "$")) //old md5 or DES - { - //Update encryption algorithm - $prefix = "$6"; //change to sha512 - } - - $newsalt = $this->create_systemsalt(); - $enc_password = crypt($password, $prefix . "$" . $newsalt); - } - - } elseif ($this->settings['set_crypt_type'] === 'password_hash') { - $enc_password = $this->pw_hash($password); - } elseif ($this->settings['set_crypt_type'] === 'courier_md5') { - $enc_password = '{MD5}' . OC_USER_SQL::hex_to_base64(md5($password)); - } elseif ($this->settings['set_crypt_type'] === 'courier_md5raw') { - $enc_password = '{MD5RAW}' . md5($password); - } elseif ($this->settings['set_crypt_type'] === 'courier_sha1') { - $enc_password = '{SHA}' . OC_USER_SQL::hex_to_base64(sha1($password)); - } elseif ($this->settings['set_crypt_type'] === 'courier_sha256') { - $enc_password = '{SHA256}' . OC_USER_SQL::hex_to_base64(hash('sha256', $password, false)); - } else { - $enc_password = $this->pacrypt($password, $old_password); - }*/ - - $res = $this->helper->runQuery('setPass', - array('uid' => $uid, 'enc_password' => $enc_password), - true); - if ($res === false) { - Util::writeLog('OC_USER_SQL', "Could not update password!", - Util::ERROR); - return false; - } - Util::writeLog('OC_USER_SQL', - "Updated password successfully, return true", - Util::DEBUG); - return true; - } - - /** - * Check if the password is correct - * @param string $uid The username - * @param string $password The password - * @return bool true/false - * - * Check if the password is correct without logging in the user - */ - public function checkPassword($uid, $password) - { - Util::writeLog('OC_USER_SQL', - "Entering checkPassword() for UID: $uid", - Util::DEBUG); - - $uid = $this->doUserDomainMapping($uid); - - $row = $this->helper->runQuery('getPass', array('uid' => $uid)); - if ($row === false) { - Util::writeLog('OC_USER_SQL', "Got no row, return false", Util::DEBUG); - return false; - } - $db_pass = $row[$this->settings['col_password']]; - - Util::writeLog('OC_USER_SQL', "Encrypting and checking password", - Util::DEBUG); - - $hashAlgorithm = $this->getHashAlgorithmInstance(); - - if ($hashAlgorithm === false) { - return false; - } - - $ret = $hashAlgorithm->checkPassword($password, $db_pass); - - /*// Added handling for Drupal 7 passwords WD 2018-01-04 - if ($this->settings['set_crypt_type'] === 'drupal') { - if (!function_exists('user_check_password')) { - require_once('drupal.php'); - } - $ret = user_check_password($password, $db_pass); - } - // Joomla 2.5.18 switched to phPass, which doesn't play nice with the - // way we check passwords - elseif ($this->settings['set_crypt_type'] === 'joomla2') { - if (!class_exists('\PasswordHash')) { - require_once('PasswordHash.php'); - } - $hasher = new \PasswordHash(10, true); - $ret = $hasher->CheckPassword($password, $db_pass); - } elseif ($this->settings['set_crypt_type'] === 'password_hash') { - $ret = password_verify($password, $db_pass); - } - // Redmine stores the salt separatedly, this doesn't play nice with the - // way we check passwords - elseif ($this->settings['set_crypt_type'] === 'redmine') { - $salt = $this->helper->runQuery('getRedmineSalt', - array('uid' => $uid)); - if (!$salt) { - return false; - } - $ret = sha1($salt['salt'] . sha1($password)) === $db_pass; - } elseif ($this->settings['set_crypt_type'] == 'sha1') { - $ret = $this->hash_equals(sha1($password), $db_pass); - } elseif ($this->settings['set_crypt_type'] === 'courier_md5') { - $ret = '{MD5}' . OC_USER_SQL::hex_to_base64(md5($password)) === $db_pass; - } elseif ($this->settings['set_crypt_type'] === 'courier_md5raw') { - $ret = '{MD5RAW}' . md5($password) === $db_pass; - } elseif ($this->settings['set_crypt_type'] === 'courier_sha1') { - $ret = '{SHA}' . OC_USER_SQL::hex_to_base64(sha1($password)) === $db_pass; - } elseif ($this->settings['set_crypt_type'] === 'courier_sha256') { - $ret = '{SHA256}' . OC_USER_SQL::hex_to_base64(hash('sha256', $password, false)) === $db_pass; - } else { - // $ret = $this -> pacrypt($password, $db_pass) === $db_pass; - $ret = $this->hash_equals($this->pacrypt($password, $db_pass), - $db_pass); - }*/ - - if ($ret) { - Util::writeLog('OC_USER_SQL', - "Passwords matching, return true", - Util::DEBUG); - if ($this->settings['set_strip_domain'] === 'true') { - $uid = explode("@", $uid); - $uid = $uid[0]; - } - return $uid; - } else { - Util::writeLog('OC_USER_SQL', - "Passwords do not match, return false", - Util::DEBUG); - return false; - } - } - - /** - * Count the number of users - * @return int The user count - */ - public function countUsers() - { - Util::writeLog('OC_USER_SQL', "Entering countUsers()", - Util::DEBUG); - - $search = "%" . $this->doUserDomainMapping(""); - $userCount = $this->helper->runQuery('countUsers', - array('search' => $search)); - if ($userCount === false) { - $userCount = 0; - } else { - $userCount = reset($userCount); - } - - Util::writeLog('OC_USER_SQL', "Return usercount: " . $userCount, - Util::DEBUG); - return $userCount; - } - - /** - * Get a list of all users - * @param string $search The search term (can be empty) - * @param int $limit The search limit (can be null) - * @param int $offset The search offset (can be null) - * @return array with all uids - */ - public function getUsers($search = '', $limit = null, $offset = null) - { - Util::writeLog('OC_USER_SQL', - "Entering getUsers() with Search: $search, " . - "Limit: $limit, Offset: $offset", Util::DEBUG); - $users = array(); - - if ($search !== '') { - $search = "%" . $this->doUserDomainMapping($search . "%") . "%"; - } else { - $search = "%" . $this->doUserDomainMapping("") . "%"; - } - - $rows = $this->helper->runQuery('getUsers', - array('search' => $search), - false, - true, - array( - 'limit' => $limit, - 'offset' => $offset - )); - if ($rows === false) { - return array(); - } - - foreach ($rows as $row) { - $uid = $row[$this->settings['col_username']]; - if ($this->settings['set_strip_domain'] === 'true') { - $uid = explode("@", $uid); - $uid = $uid[0]; - } - $users[] = strtolower($uid); - } - Util::writeLog('OC_USER_SQL', "Return list of results", - Util::DEBUG); - return $users; - } - - /** - * Check if a user exists - * @param string $uid the username - * @return boolean - */ - public function userExists($uid) - { - - $cacheKey = 'sql_user_exists_' . $uid; - $cacheVal = $this->getCache($cacheKey); - Util::writeLog('OC_USER_SQL', - "userExists() for UID: $uid cacheVal: $cacheVal", - Util::DEBUG); - if (!is_null($cacheVal)) { - return (bool)$cacheVal; - } - - Util::writeLog('OC_USER_SQL', - "Entering userExists() for UID: $uid", - Util::DEBUG); - - // Only if the domain is removed for internal user handling, - // we should add the domain back when checking existance - if ($this->settings['set_strip_domain'] === 'true') { - $uid = $this->doUserDomainMapping($uid); - } - - $exists = (bool)$this->helper->runQuery('userExists', - array('uid' => $uid));; - $this->setCache($cacheKey, $exists, 60); - - if (!$exists) { - Util::writeLog('OC_USER_SQL', - "Empty row, user does not exists, return false", - Util::DEBUG); - return false; - } else { - Util::writeLog('OC_USER_SQL', "User exists, return true", - Util::DEBUG); - return true; - } - - } - - /** - * Get the display name of the user - * @param string $uid The user ID - * @return mixed The user's display name or FALSE - */ - public function getDisplayName($uid) - { - Util::writeLog('OC_USER_SQL', - "Entering getDisplayName() for UID: $uid", - Util::DEBUG); - - $this->doEmailSync($uid); - $uid = $this->doUserDomainMapping($uid); - - if (!$this->userExists($uid)) { - return false; - } - - $row = $this->helper->runQuery('getDisplayName', - array('uid' => $uid)); - - if (!$row) { - Util::writeLog('OC_USER_SQL', - "Empty row, user has no display name or " . - "does not exist, return false", - Util::DEBUG); - return false; - } else { - Util::writeLog('OC_USER_SQL', - "User exists, return true", - Util::DEBUG); - $displayName = $row[$this->settings['col_displayname']]; - return $displayName;; - } - return false; - } - - public function getDisplayNames($search = '', $limit = null, $offset = null) - { - $uids = $this->getUsers($search, $limit, $offset); - $displayNames = array(); - foreach ($uids as $uid) { - $displayNames[$uid] = $this->getDisplayName($uid); - } - return $displayNames; - } - - /** - * Returns the backend name - * @return string - */ - public function getBackendName() - { - return 'user_sql'; - } - - /** - * The following functions were directly taken from PostfixAdmin and just - * slightly modified - * to suit our needs. - * Encrypt a password,using the apparopriate hashing mechanism as defined in - * config.inc.php ($this->crypt_type). - * When wanting to compare one pw to another, it's necessary to provide the - * salt used - hence - * the second parameter ($pw_db), which is the existing hash from the DB. - * - * @param string $pw cleartext password - * @param string $pw_db encrypted password from database - * @return string encrypted password. - */ - /*private function pacrypt($pw, $pw_db = "") - { - Util::writeLog('OC_USER_SQL', "Entering private pacrypt()", - Util::DEBUG); - $pw = stripslashes($pw); - $password = ""; - $salt = ""; - - if ($this->settings['set_crypt_type'] === 'md5crypt') { - $split_salt = preg_split('/\$/', $pw_db); - if (isset($split_salt[2])) { - $salt = $split_salt[2]; - } - $password = $this->md5crypt($pw, $salt); - } elseif ($this->settings['set_crypt_type'] === 'md5') { - $password = md5($pw); - } elseif ($this->settings['set_crypt_type'] === 'system') { - // We never generate salts, as user creation is not allowed here - $password = crypt($pw, $pw_db); - } elseif ($this->settings['set_crypt_type'] === 'cleartext') { - $password = $pw; - } - -// See -// https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1793352&group_id=191583 -// this is apparently useful for pam_mysql etc. - elseif ($this->settings['set_crypt_type'] === 'mysql_encrypt') { - if ($pw_db !== "") { - $salt = substr($pw_db, 0, 2); - - $row = $this->helper->runQuery('mysqlEncryptSalt', - array('pw' => $pw, 'salt' => $salt)); - } else { - $row = $this->helper->runQuery('mysqlEncrypt', - array('pw' => $pw)); - } - - if ($row === false) { - return false; - } - $password = $row[0]; - } elseif ($this->settings['set_crypt_type'] === 'mysql_password') { - $row = $this->helper->runQuery('mysqlPassword', - array('pw' => $pw)); - - if ($row === false) { - return false; - } - $password = $row[0]; - } // The following is by Frédéric France - elseif ($this->settings['set_crypt_type'] === 'joomla') { - $split_salt = preg_split('/:/', $pw_db); - if (isset($split_salt[1])) { - $salt = $split_salt[1]; - } - $password = ($salt) ? md5($pw . $salt) : md5($pw); - $password .= ':' . $salt; - } elseif ($this->settings['set_crypt_type'] === 'ssha256') { - $salted_password = base64_decode( - preg_replace('/{SSHA256}/i', '', $pw_db)); - $salt = substr($salted_password, -(strlen($salted_password) - 32)); - $password = $this->ssha256($pw, $salt); - } else { - Util::writeLog('OC_USER_SQL', - "unknown/invalid crypt_type settings: " . - $this->settings['set_crypt_type'], - Util::ERROR); - die('unknown/invalid Encryption type setting: ' . - $this->settings['set_crypt_type']); - } - Util::writeLog('OC_USER_SQL', "pacrypt() done, return", - Util::DEBUG); - return $password; - }*/ - - /** - * md5crypt - * Creates MD5 encrypted password - * @param string $pw The password to encrypt - * @param string $salt The salt to use - * @param string $magic ? - * @return string The encrypted password - */ - - /*private function md5crypt($pw, $salt = "", $magic = "") - { - $MAGIC = "$1$"; - - if ($magic === "") { - $magic = $MAGIC; - } - if ($salt === "") { - $salt = $this->create_md5salt(); - } - $slist = explode("$", $salt); - if ($slist[0] === "1") { - $salt = $slist[1]; - } - - $salt = substr($salt, 0, 8); - $ctx = $pw . $magic . $salt; - $final = $this->pahex2bin(md5($pw . $salt . $pw)); - - for ($i = strlen($pw); $i > 0; $i -= 16) { - if ($i > 16) { - $ctx .= substr($final, 0, 16); - } else { - $ctx .= substr($final, 0, $i); - } - } - $i = strlen($pw); - - while ($i > 0) { - if ($i & 1) { - $ctx .= chr(0); - } else { - $ctx .= $pw[0]; - } - $i = $i >> 1; - } - $final = $this->pahex2bin(md5($ctx)); - - for ($i = 0; $i < 1000; $i++) { - $ctx1 = ""; - if ($i & 1) { - $ctx1 .= $pw; - } else { - $ctx1 .= substr($final, 0, 16); - } - if ($i % 3) { - $ctx1 .= $salt; - } - if ($i % 7) { - $ctx1 .= $pw; - } - if ($i & 1) { - $ctx1 .= substr($final, 0, 16); - } else { - $ctx1 .= $pw; - } - $final = $this->pahex2bin(md5($ctx1)); - } - $passwd = ""; - $passwd .= $this->to64(((ord($final[0]) << 16) | - (ord($final[6]) << 8) | (ord($final[12]))), 4); - $passwd .= $this->to64(((ord($final[1]) << 16) | - (ord($final[7]) << 8) | (ord($final[13]))), 4); - $passwd .= $this->to64(((ord($final[2]) << 16) | - (ord($final[8]) << 8) | (ord($final[14]))), 4); - $passwd .= $this->to64(((ord($final[3]) << 16) | - (ord($final[9]) << 8) | (ord($final[15]))), 4); - $passwd .= $this->to64(((ord($final[4]) << 16) | - (ord($final[10]) << 8) | (ord($final[5]))), 4); - $passwd .= $this->to64(ord($final[11]), 2); - return "$magic$salt\$$passwd"; - }*/ - - /** - * Create a new salte - * @return string The salt - */ - /*private function create_md5salt() - { - srand((double)microtime() * 1000000); - $salt = substr(md5(rand(0, 9999999)), 0, 8); - return $salt; - }*/ - - /** - * Encrypt using SSHA256 algorithm - * @param string $pw The password - * @param string $salt The salt to use - * @return string The hashed password, prefixed by {SSHA256} - */ - /*private function ssha256($pw, $salt) - { - return '{SSHA256}' . base64_encode(hash('sha256', $pw . $salt, true) . $salt); - }*/ - - /** - * PostfixAdmin's hex2bin function - * @param string $str The string to convert - * @return string The converted string - */ - /*private function pahex2bin($str) - { - if (function_exists('hex2bin')) { - return hex2bin($str); - } else { - $len = strlen($str); - $nstr = ""; - for ($i = 0; $i < $len; $i += 2) { - $num = sscanf(substr($str, $i, 2), "%x"); - $nstr .= chr($num[0]); - } - return $nstr; - } - }*/ - - /** - * Convert to 64? - */ - /*private function to64($v, $n) - { - $ITOA64 = - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - $ret = ""; - while (($n - 1) >= 0) { - $n--; - $ret .= $ITOA64[$v & 0x3f]; - $v = $v >> 6; - } - return $ret; - }*/ - - /** - * Store a value in memcache or the session, if no memcache is available - * @param string $key The key - * @param mixed $value The value to store - * @param int $ttl (optional) defaults to 3600 seconds. - */ - private function setCache($key, $value, $ttl = 3600) - { - if ($this->cache === null) { - $_SESSION[$this->session_cache_name][$key] = array( - 'value' => $value, - 'time' => time(), - 'ttl' => $ttl, - ); - } else { - $this->cache->set($key, $value, $ttl); - } - } - - /** - * Fetch a value from memcache or session, if memcache is not available. - * Returns NULL if there's no value stored or the value expired. - * @param string $key - * @return mixed|NULL - */ - private function getCache($key) - { - $retVal = null; - if ($this->cache === null) { - if (isset($_SESSION[$this->session_cache_name], - $_SESSION[$this->session_cache_name][$key])) { - $value = $_SESSION[$this->session_cache_name][$key]; - if (time() < $value['time'] + $value['ttl']) { - $retVal = $value['value']; - } - } - } else { - $retVal = $this->cache->get($key); - } - return $retVal; - } - - /*private function create_systemsalt($length = 20) - { - $fp = fopen('/dev/urandom', 'r'); - $randomString = fread($fp, $length); - fclose($fp); - $salt = base64_encode($randomString); - return $salt; - }*/ - - /*private function pw_hash($password) - { - $options = [ - 'cost' => 10, - ]; - return password_hash($password, PASSWORD_BCRYPT, $options); - - }*/ - - /*function hash_equals($a, $b) - { - $a_length = strlen($a); - - if ($a_length !== strlen($b)) { - return false; - } - $result = 0; - - // Do not attempt to "optimize" this. - for ($i = 0; $i < $a_length; $i++) { - $result |= ord($a[$i]) ^ ord($b[$i]); - } - - //Hide the length of the string - $additional_length = 200 - ($a_length % 200); - $tmp = 0; - $c = "abCD"; - for ($i = 0; $i < $additional_length; $i++) { - $tmp |= ord($c[0]) ^ ord($c[0]); - } - - return $result === 0; - }*/ - - /*private static function hex_to_base64($hex) - { - $hex_chr = ''; - foreach (str_split($hex, 2) as $hexpair) { - $hex_chr .= chr(hexdec($hexpair)); - } - return base64_encode($hex_chr); - }*/ -} diff --git a/templates/admin.php b/templates/admin.php index a181c11..7bf64a1 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -102,25 +102,25 @@ $cfgClass = 'section';

- 'Drupal 7', - 'MD5' => 'MD5', - 'md5crypt' => 'MD5 Crypt', - 'Cleartext' => 'Cleartext', - 'mysql_encrypt' => 'mySQL ENCRYPT()', - 'system' => 'System (crypt)', - 'password_hash' => 'password_hash', - 'mysql_password' => 'mySQL PASSWORD()', - 'joomla' => 'Joomla MD5 Encryption', - 'joomla2' => 'Joomla > 2.5.18 phpass', - 'ssha256' => 'Salted SSHA256', - 'redmine' => 'Redmine', - 'SHA1' => 'SHA1', - 'courier_md5' => 'Courier base64-encoded MD5', - 'courier_md5raw' => 'Courier hexadecimal MD5', - 'courier_sha1' => 'Courier base64-encoded SHA1', - 'courier_sha256' => 'Courier base64-encoded SHA256' - ); ?> + getVisibleName(); + } + ?> "; + echo ""; +} + +function print_checkbox_input(IL10N $l, $id, $label, $value = "", $div = true) +{ + if ($div) { + echo "

"; + } + echo ""; + echo ""; + if ($div) { + echo "
"; + } +} + +function print_select_options( + IL10N $l, $id, $label, $options = [], $select = false +) { + echo "
"; +} + ?> - -
-

t('SQL User Backend')); ?>

- -
- -
- - - - -
-

- 'MySQL', 'pgsql' => 'PostgreSQL'); ?> - -

- -

-

- -

-

- -

-

- -

-

- -

- + + +
+

+ t("This is the place for ")); ?> + t("User and Group SQL Backends")); ?> + t(" app settings. Please see the documentation for more information.")); ?> + +

+
+
+
+

t("Database connection")); ?>

+

t("Define your database connection parameters.")); ?>

+
"MySQL", "pgsql" => "PostgreSQL"]; + print_select_options($l, "db-driver", "SQL driver", $drivers, $_['db.driver']); + print_text_input($l, "db-hostname", "Hostname", $_['db.hostname']); + print_text_input($l, "db-database", "Database", $_['db.database']); + print_text_input($l, "db-username", "Username", $_['db.username']); + print_text_input($l, "db-password", "Password", $_['db.password']); ?> +
+ "> +
-
-

-

- -

-

- -

-

- -

- >
- t('Allow changing passwords. Imposes a security risk if password salts are not recreated.')); ?> -

- t('Only the encryption types "System","password_hash" and "Joomla2" are safe.')); ?>

- -

-

- -

- getVisibleName(); - } - ?> - -

- -

-

- -

/>
- t("Invert the logic of the active column (for blocked users in the SQL DB)")); ?> -

- -
- -
- -

-

- -

- 'No Synchronisation', - 'initial' => 'Synchronise only once', - 'forceoc' => 'Nextcloud always wins', - 'forcesql' => 'SQL always wins' - ); ?> - -

- -
- -
- -


- t('Append this string, e.g. a domain name, to each user name. The @-sign is automatically inserted.')); ?> -

- -

/>
- t("Strip Domain Part including @-sign from Username when logging in and retrieving username lists")); ?> -

- -
- -
-

/>

- -

- 'SQL Column', 'static' => 'Static (with Variables)'); ?> - -

- -

-

- -


- t('You can use the placeholders %%u to specify the user ID (before appending the default domain), %%ud to specify the user ID (after appending the default domain) and %%d to specify the default domain')); ?> -

- -
-
-

-

- -

-

- -

-

- -
- - - - -
t('Saving...')); ?>
-
t('Loading...')); ?>
-
t('Verifying...')); ?>
-
-
- -
+
+

t("Options")); ?>

+

t("Here are all currently supported options.")); ?>

+
+
+ "> +
+ getVisibleName(); + } + } catch (Throwable $e) { + } + } + + print_select_options($l, "opt-crypto_class", "Hashing algorithm", $hashing, $_['opt.crypto_class']); + print_select_options($l, "opt-email_sync", "Email sync", ["" => "None", "initial" => "Synchronise only once", "force_nc"=>"Nextcloud always wins", "force_sql"=>"SQL always wins"], $_['opt.email_sync']); + print_select_options($l, "opt-home_mode", "Home mode", ["" => "Default", "query" => "Query", "static" => "Static"], $_['opt.home_mode']); + print_text_input($l, "opt-home_location", "Home Location", $_['opt.home_location']); ?> +
+
+
+

t("User table")); ?>

+

t("Table containing user accounts.")); ?>

+
+

t("Columns")); ?>

+ +
+
+
+

t("Group table")); ?>

+

t("Group definitions table.")); ?>

+
+

t("Columns")); ?>

+ +
+
+
+

t("User group table")); ?>

+

t("Associative table which maps users to groups.")); ?>

+
+

t("Columns")); ?>

+ +
+
+
+
+ + + +
+ \ No newline at end of file From 8a50badca486866a5606fe7cf092fde54e9ca9e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Sun, 10 Jun 2018 09:49:50 +0200 Subject: [PATCH 11/29] Hide password --- templates/admin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/admin.php b/templates/admin.php index 2e30058..fb227f9 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -24,11 +24,11 @@ use OCP\IL10N; script('user_sql', 'settings'); style('user_sql', 'settings'); -function print_text_input(IL10N $l, $id, $label, $value = "") +function print_text_input(IL10N $l, $id, $label, $value = "", $type = "text") { echo "
"; @@ -98,7 +98,7 @@ function print_select_options( print_text_input($l, "db-hostname", "Hostname", $_['db.hostname']); print_text_input($l, "db-database", "Database", $_['db.database']); print_text_input($l, "db-username", "Username", $_['db.username']); - print_text_input($l, "db-password", "Password", $_['db.password']); ?> + print_text_input($l, "db-password", "Password", $_['db.password'], "password"); ?>
">
From 97146d64292caae58f42b8308f17835bb55bd320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Sun, 10 Jun 2018 10:07:57 +0200 Subject: [PATCH 12/29] New screenshot --- img/screenshot.png | Bin 24828 -> 67902 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/img/screenshot.png b/img/screenshot.png index fd2ed67420c361a039427b316bc365267cef7acb..1b28638e737d4547a1a23ed0a025cc5dfa42ac2d 100644 GIT binary patch literal 67902 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 K;pfa}ulq0d0ll#R literal 24828 zcmeFZ2UL?=*DeYopcK)qC>`ByHww~wM*(pwRlq1!Is^#4cMwnzP*LecPzW_h3xo~| zB3%ff7wIJg1VRZRXNA4>?EQ`Z-us_>zVD7Z#=VRo0`Hq-y=%=i=X{>|%=J`TQ;m_1 zjgEqXg7J^rD)%TTj?++3P<}lDzEcEswX1>uDBbR<-J~e)=2!y19Jjflaf5>5Lmd5q z88!I*r1R~EZWI)!TFCz>+nnH*6cmqM{GoC~&)Wn$e)82hs|noRnk*sJ57(Jmy*WXc z5GA-;&v%Xum)BIJRH7@#k$9^!&jaF(pMRpJywOWzsbl$CU*-In)5De*&R9))6+Fm~ zI+kx~dT!KaSAI5LMOD>W_5OK1eTB(M=?sh3moHwNF+10znEvG8^`*zBZ=N83dxCr` zq;&KX_~y+)NA>eU+yB!SQtvR+2$pTnHfCn#EAzZ5 z%8{p%UR+j7_QZ}PMKH3D>}=yECkr2zwH|!$5PVwwB`1)$KfjO>q{;B9r#+qri_(9! zx4Dp#Bx>_}1XOdYZnV-d<((tCKESVrSWh}6d^AEz(lT+01rYEW4CqexrLUh-6#`_0 zRsNcicOvaoLe5KHuk=^gLqt86_1y5Q4`nqO{lr@@2pHLZ|Neco>d}06nmzq7)4;v= z*REX?4k8gI9bL=_cx;YoL!fnIFy;J6h5gfNr%wybO1plhwcdT#jZp*T4#Qtz$WhLp zGyY9YM1Y|)S-himXTtC4+o)_VO5Wd6WxWK1a~$;aSVXO#u?m~3n0FRwvs}%HVV6u! zFb$Lzb|>643;t^@4{o=Hhct!Jrg*FjUWxd+ked-$3aMh^R!C(zo5me<(C7JjvLPtQ zyt50u1^0F#+z?q@9Z2*w@5KJ$c$EP@rSkKwO7FIYQyPzh!Md1V4RH4$pdqFj4DaJ$ zlD(y2)&1d=;*}L#f^}Oj>$cx&q)6oW?X2O4Pfkbd=Ia-z_oT~f>awpPX5J;SEi5y*^7PIYb^xqlxdMce2zvj1sXOz#rbYKLQR3g!9!l$jc zhON`U37f0e<1|!m7he~nyz&k=Tec_byO7{qhk=%i|pH(NRS4K`C%==JTuL~S&>sqf9!Dw?!J}wTzz2fu*bkI(OLN5!>_`x6rfY$ z(1EMM?xJ2Oq0E9lW^pleB5b0zI)LSo6r$k}wYOY=_(fTgy?OakW~6}iOE|75QhfP* zEX2g;%6*+%eV)B&;-l}Io7l>yzC#v5)6KyOx)3Zq9o;V$u;2T!Z$~fU*Tz#=-1vA; zEhf_4`a~tKbt(UO78jkt`EbfV-OGt~f!DkYS5ct_v}f{nf{Pgn`24Cy_YIxu^mEJ- z1yJTi5hf)!{B!B4sAx|Wu1h=xn|3t)w2sah6(j?g-7#Q4&oXE;aYes|_vh>L=^{+z zH}RuRxd+mp;kH4GbxpR!FeJmfs6k^zp1dj;VcJINY7&fTyz)8kelhRqszuModIV+p zU&}SFGW@koZhPjrn>DJ&^b{E)NBH`o4`>l8HX{~OdkYy_4C9??0t~jCWS@iao2(Cb z`oSt&V0XEa`*oVE*9hOf0Q3Z8{=)IB`W(8!UWi z9-Gp)uV(y#No}RLIhKnduQ{%`SM3UzGOPDdm38>EXkU(Zh7e}fzm2IKB{Y>4u{wE( zM~Xn=ay3${af)$g#VOFw8FNa(etS7{o@QX>5(~48J5$Zt41~&W@B5t9;9El^4F9Fl z-kWww6s_&4qg*ATh1c4tLtB{|uZ79eZjI3v#rrxQ=ca>Oi8+pl0c${g=k~8u%C{Z& zm~4ppjdxc?9;1}^1$zcO_b_VvlKxhs%1@{C(m20RD07jwhV8Kc^wCPbQ>y>|Qm#I} z;J7ba;O-qCJ%#=MU9$9Ja&6s$t$CVD>XO5J9R7;*rx~Gq2;^4r;mW= zefrk0kDmgVQSng0!VT3v)Cz`at3;XkuDjt4J+1KkF)nb;S8-83FKhI{-=-$-YjY#; z8XZP?n7VCLoBX)G=^WX&;pn|45e{ZbeOmMH{e-fz3WoDwtj;>w4;b}4q9N{+HC**9 zJjeo}%x%wb%C1}+Q5AW0?VjT&F3^-8@;2+eT1TxUoESK*=(}YLe4^eQ9$eY#kH~|W z_3ofOvwp_K;rDmwsrFwVBf^4&P~QqCkr>@=T~(ZJ!nSkiH3onDunj)UZxx#xhysSBLR|&hqaBb``{VJ#Z+tXdOnh109v`WQtS09eZ0-I@Lahyrk03C)&0G zvm%>QaI<9?doTY<-_VA6bPLI7>$zf)mzkLvn2t#dq(#zOwT_pb3hM1NSwAk(+0vt$ zC}I^wtP4UideDcYZ)bWqjaC+MUU)WWT6ZdRB_Eg1#VwFGXsnug^6c-wMZj|ME7hum zroenIRA(p;NI6D=@H{;F>)+NEgxAd6-2(f%z?yoU>|6MS-GN1jvL54CJ)LZAMdRFv z{9^Bw-1#l%hSz+MTZfu;Su~|@xUcM%6ZCXu40b-*2W%hrV;0zAI4*8^_wL=ZZsX5< z#o!@D9$%TgjrDN@dGSeNcK51%n71GI61Vpi42tLVU49#q>dq0$oRcx|8h`oL^dtx| zy5_}(ear_-{kfx~JmmuW;ZL?#Fr#*Pfz*$-m(iZ=s5$$Z<4z}USFEA1%8cIfioYi2 z50ULP%aF#sbBRSai#Vqh)*Irt-`zlECD6L+5fG2o}f_!)jn@@Lkyrk-CUlnGA= z30zQImN@p8ue|hl>`>3%Ov#vtt}yC3245{Z{v$IxeQ%F^McQjE71)nv67A%fA1|8i zem6q@Gi^JOSFg=-@kbITcj~7jzVvbC|Gxm{<^RJ|qFHo};b34GZSBpc|kXrsf@j~)H-U5;njNYByD?ma3431p;1L4kx5 zQ|+!Y9R2+K@?Sqp3DZ%1X5CMU$;$e*1_yH1XR^0PjYdrf7on5nJK@z=87|tu&3spf zgmv%TGY{OIrX9O6GOrfLRq@YzY%_Gv!4*dE2SK#pbps0LXr7A>yqC{!ijr0P=bhRt z@W6BAF$IrAHdDCLgoiAv9X%;Lfc#-0l9)|}${dIm`o3rs+$)`AFRJv!_>8Q|g z&E$vECV1qIa>}jJ9aN)lZ8%Zf ztOPRLu9sKt{+dgzk)bdyW@*?QkMgkZFELZ@ z&(UDt#3Cn?0hCC3!*4iZLSc_7*62n!W^!?8DH6-aJ;6>>*X*z~l+o8`c~EZq!e`^t z1*~rzr|jU?V&CP5EJLMM(c?5=EahT|Rwg#F&oIM)1t!IV-dF<2;?xF6GzjMMS3 zVWzPJp!khR+uk#8z~H4*w(wWpO40BAWz zORNkQm9_9bhYMxl*pWgPeFJ#>7;I%p%aDesccHfj{6hcqKNWG3;gmX5hKz>dn&>C} zXww)-m==!G@-~Gy=R?vQYKv6_? z)GyG3oRvG=*BRiAnI;rX0;GLSfaINAQwMF9zP@i?GRvc*8lhRf!@VOKI;sNc*5`0; z@il20_nI`emZg=)4_SDQE_#ePvg$F1hgfyI8BRae*}!z;Ij7<)WsJ(vL@h083CZIO-m zVwoyZ_c+ot_0OjPHa<}M{R^K}>k@{$yf`_hwJwS(7Uswz?^~WGXvETc0M%Z(f1DXI zu&LB$pdrX`yF@AzqqC{ZpPd9 z!yd#qZL>M|r|RZv4!16Re0sJ+gZ@0tma&JpDHEf6|8`n4WHW5#?0J2bUbhS7vCEpK zNjz`k!Q zAT@n=-^a2t)99VP7p6FrqSPY>{{tA#jf?SF!GGIa^GQ9p_ev4+B~t8oc!qH1 zE%-eB1PPbUcyW6BBzPkCj_}I6*|%aGl!utrMTpPb!zsrHGjAdI#1_juQf>_33v7W4 z(P8No*}6`#^Ne!)dS40H>*7j1b`Kf?>(X*&l$o;h5N8=_>8W@R7T+8fKeTFn##)IC zfj#a0@ZKu_!sB^;CkDnydMe)xU)HKQ49#B=vMr@K*zeZ{wpYuXnGuPo^_nHH~xO}4yH81f?=n8+9)uO1FRtW$D44g6p3hU0@snVWR zIoW^N-NZQ>=r7_DX!s!FtnGssOYvtO_R8KSA0hhTlzLo$MX9$!+Kleh(z_|diSoOiUb6a+2`S)VKo=7HcnBOUtt~l?j40?)xg;`}Y3hA(B zrR^V|PEK9^ZI|Qw!$UyaYrcGrCO-pzW1yZKVzu3LSd_YZ6$Gzcd+Jc~4c}k6K#~Q2 z&&0nK3QpD0)3c1_lE34U$!42kKWfjdf@LS~M{$Ve1)5@`>SJ+6_5Q;W>J>Qjdrq&| z%4)!E{Oyg&w^B4(NE@^CqVFF4@|^8x$|xx0-hk2EO%QnfVg57grcbO=&ICg3IOE0ig}N}l-ZkBE>*e$s$s0-Wt_I;STjzcGQ$p*Gsi25+0Y)pkl8 zGM-#}-VJ-iS^2pfd6|H?c3Bf!GV%4{$=LgVRIjXFu|s#owi~f`ka5F3htu9l92`7V zoL@O19Jz^l1&4qEA}Xa#FU!qXW_7w6O|&)XhG zF6wjj?hCIRj*oVL$&?B@^uOm!1`pvdd5M}?;*?X0?y%WE=B&c*!MwuNJHd1 z_)9MUc0c>PsL^Xj*DpwYHl7aX48*gyQGJ_|YQi=)NFOkJXtv)fsY?aR=eE#&C0z36 zKm-jhpSQ!(P;@eFwH6_L<|2}MN0`9M!Sp0-<~UM$z3N-y_q)5PFJm70J?!WbJ4X}z zeCore_F>bev*K+xV03F1cu^^?)3j|TVUbfVpM>WU)}^noH{na)q>y34r6!B$__Bsj z9%yXX*txN`RU2oyi>G4Gj-6_niL&@2IPG>vA{1-IFWEnk+}t=^W)t7cehGS+>NT@m zrIa**&pT^g>a#`@co3Sup5wG!u~g2%FABMqmxoLST}2tgDKGx!?cm~yhpek~xjat^ zB_t9VVrf4%xrB~h@&?ntcg6qcu?y#{lMQrPc0qRd@;~}1Y;;u8QzVX>4hADHIadP> z$XSfMw}bvdd-cOIYwNG?{&>;vs+-ZfV3b~#r+Vd^PLCN9k3G1A_HOIJLA8#7N# zy`wQUe+oQuzFk`sqU{e2g$&F5oQxo;oiT-qX(z3}Ce7QFZwf1%oGS4;=n@r zX8N@hHDqyHOZ^=hDKZ}UX*oX4{r65fVcgqZ;RsSGM2@kx7&dVcGCIld|NgYved*rp zf!7_0(bSo@zK1Sc6-Dm;+t^WLr<7f9W{AAtN+V9OB$KIZkkIuZv4Mzom*s0rb-XVkoqcsvn`EFJVf;~K*vNjfc) zu!D1|-qP&)j`-IWy2n%FMlPeQhF>M7+_-S5 zoDov^z^pZv({P5w^#NCw>$qrJoz%Jlh+f(Q%;m}?w*-W$W)EMT!=Vfza}N>WC{9{m zljz?qYnh*oX)R4T%pf{O`*_R=Z|3F^$PPPt&q)m?c@{agPaCA#zv*Ye{-dA$1}zuKy%^BUi+MN%|v(W z%);t|KWaz4+U_Nkm^~=EhJuvCmR;5r8yZ^hYt9|}J2bG;48r&C+4CSGiIVyK*dRjT!fMTQ0X)|QD}(le#R==3Ml%4a@)SF&hKKRHtrw? z0C8+`?E{G$&i!eiLNe6Tw-BEDw7yLiR~zrp3*|(^(TWdNFo=xWm-+E-15*5#4~+Q? zB=v)3z1AE^yVX`p-0k~gcKta?fJ_*PcnHdJpu}kZ64#-!u960P-7@#Kju;}A$}t=4 z2A(#jk@9w!DW_m^TMXt9J6x7KJ}DFXyL#fI=o2vC0nZp-hLX6l(H$XF#|^P*4KbgPg?jqhQ@qVQ?;URH7KQln7;8Fhcgmx=QQ!P7K24a^_1SU0X^HT16Mm-P7CeWOI9+Ndg?o+-nJR|orW8l4 zl0*X&_Pit&Ebcb>h>}|6l6Q!>s8ySl2?A-l4r|?=E;_$Sykb4L){m#FA6)8@9Gu>b znMEn$$#UA_E(1-?APH|~p?d-|sj zTB=O5HRjt-K}0sH!+>`_w&LSWvQC??G9}WD+TG06!~w z>}yejiCU43>Yrv~f3Wh9IyuMuaRgIZwPpPu{~2eZbW=-N^y`76r~Ac8&o_H zE2MdxLLy@}*FfT>UU!d3&l!$14zv_nkxj;Z@ew;W8^Y%5qC84wd0t-}67yT#8oD5X zRm@h~)ga$x8kY68( z!yt-nTEnf8E&|{QhZG0)XYv(i^9NVr-qhDr7R{dwipbvEVmc%88P#+lW%SIFrc0!L_?=7L`_`qztnN$QudeB?%IOFA>zAkBAcu61)Z6)v zJO-Gk!}&NC;a{c4IjNEX&`0bC2Xd=^j+qs)`MhB4{GYy-P+2k)U@==CZrS0HiUjcIuA{DkfET*II) z?uvBgq8fJ13K$_;aOl{l$-xYvgkmFcPFUv-Q%mItCV8h{KDU$PHzO(*l-BOoIo*FD zzN7u|1Wpe>Te$pIlcnjb?Q>0sCGRn7g7-&z6}& z*$24;x^Pj<$&()P=Zyn^2g1bA_v`17RUCWn%>!;{w+u+$z2D!NwM0~ozMk)yS4o48 z$8syeNRJk|1p%!iTQHhpZ?sY`rvF;Jp|~_JbnQ+2Q;@HgwuLOlAqLfgR5*yrcS)HT znJ>YVR4+I4bA$8ymMe4al;aana68oD2^v!3N?a`}XqgcG=6$gvIS?_PQrqz0wkgY~ z&}t43A(tqEEbR@UQfs8mqyt5xBw`O~GfyAA@f;SwS4MRAw^J<0WO--N!c3FDzngC> zpS|l^sE2m><=liPTP}u~*u||F=770#PhuYBDT)OF2OS+0(@sZkV(k z`?#h_yK0%l#&AC}L%kkTT@czzHUwTsu}N7BX@V~{$2h2qooobt1J2&#`v_@kC;nbH z#y~|oEz1o{^ox6&hzQt+I@;#`Z@mlBujQo+YTj@iWSxB@8*+SUT1e&ve0rgE>0_Qt zo-YGjR(GA72x3avCau=zroEYSG@;<92$<2i0Lipx9#&uV)gi@3c3R(Jxr%drfY`@) z?Hz}>z_LmjY}~ph-4Pjyf-eOQPjQRbEOe*g6=e0@TKd180P(<&kL(jTc-XS;f{}&rRcdYGdp7R{KwjcR~O&`tA{~@E%9PT zNu-5-qM{KqL9w<=ciQ{2QT}#OC;qO-sgvjbT1?%I=?8gVW`4U`g%#sCBuOtj)gRuf zT7uTvq1gDC9SQ3a?gJG41f$F9)K?|>(SD($r6O%+svyJnAGyDLh?syb$1JuMEWE7; zM9}F8S{J;rMB6)d9v9?m#NXF4_}Qd?Sv1j!XRVT{ir|2=6Fo>d<`-@p^JrWV!8e7v zso>OO=Z829(1mfHW)?T^*T8&7YYztOL^Gudr^IDcWFYK#^%mVcoJgtTxt$A=gKCiW zif6eB(vP@Hkl&p19&Qr5Zn>)#M20?MtIntxp*CwSi+Xe*Zj;CeTGkx5vEwt#CCVrl?`*Lb+>1%xX4C91? z_-HoIWwv5Mf_uixHQd0$;sg)#sVyddFTn(qO7%`n{A>2X1JuqP9s`e#uT)y)2S944 z+KoHxTZjlFEk-AsGCk=dZ~n9T&%`qhAJ~rbXr((W^vkUHEq*NU7)5y$U^U-wz*wQ5 z^Ods9^ow+3=n;2SS8~>@P-^NV+rB>xcH-=6P3#R<4n>J?zcMrFr;fXdoH>Fgwj_Ik zZG&_^Z*DRK`O9Jjs?d&Dv>$5eYzg(fX38Z%T-rD_a>>Eg*r^is+FxCbc zSFyGnk+*Qec5(6G&IlA zWJ$OhiF&1rcxjC}X1EHHMrmccYS|f$G&&mk76$@0eP!y?*AcYS%&B#${s{YzsA*=k zJJ|ij2A7zk$xHRyvjNd-eDhSV~`ybVslr|DoWJ78XsyY!PM2IJ4xurc&d zHluiKC4p8<;6Qq~7`eIKSLQi-(80cGKe`z5WJZGdN^Y(p3BLWTY;9=}yZXLhzRAuH zTas-^KVjh2j4$o2@AtJ$kw4rBjEA^ht4>uvo{-Vi{?I*i@TvNEvnrE^PMB7|yJD`U z0V=`BIDV_~ti0-Aouq&1J#h$+iig&q>j1^cjOSsS5PdTxeS-knqTKqhbddr@2^dQA zrNPc%ks%L8BS=V0Ln{$o!ds6*ileL4H3v{Q6Gj0>+5OA#jJdw2rX7R6a8$vUiu`t% zbQ16&Wzwg%;`XOdQG?>>+G0=+e9zm9y0@6K;_U(yikI$t7%-jf_XqCyLqDG`%Oh?Z zWJVa_0YTZAUXid`W~tNIzD3$|Cow@j9Wue(BsHbDN@cme0+3>ZB7QqZ^Nu%8kTKU# ztF6uAeSU0wRHboh!``x4j$vOpLstP`!Wwa@GQgXiW@))lf#<-BcQ@UARHT1K=-H+g zo`lz~{xApnq;-XQeSz6V0Sc{PpvB;2i z!I$n$f7Ra{-*Cg5g>BDItOjW715n{8FTEflKQ&i`oG8_INPCA4zYDRQ4A>d}yvKLM znEfAo@U7iDJTRuit}~{^obl*wB+pNtE^~0m|66Kb*)Q(Vk716zqAXjrAupq?YF4cO zBnS8ZP}buf??EF>8!REB`Y;dfk-g1fqPo=sGUw)Oqu&NdPmECo*1Jk~CHni?$4bPt z1x7Cq2`F3sDboBCK}>A>^8RT2Uo4`u4$G5~&q`L*aYZA(uD9_24SEpNXKseJo#(L$ zqShMVpsl`E1<2f~zqs7cHs-chrp&#IVR{9j@n zHHxk?9QZcoi2QfiO1(jZ(}~K2iZOLvK6)zB{CJU-gv!9JBlh+Gg1gKs4C1J-P(R{d zD@uigywpO9qN*6rRJ;iJLU*W@V}S#j>4^W+$FzbQ%LOew75S5C{n8v>3a&pZ z9u)u4TN-)!`NgTJsqqIsyX$5H_eO$7;zlxb2&@zo7s&%@yl3%!=z~ShyLZ32%0Owc z4cTgOBScnl&L7vm`ow1`!FmH{aTh5lo$MgJnZPukE!~gvkx{iE#&8Gptbr&~jSM5kQ0z7Sk zoe;li{g{~3#MnTdZri~$Q&7n!P!uv*uH3mrxAMY$AU=2%05$V?MLjzeD@25;^gs(NirT#SLvj4G-Lj` zS{V{Ru^`58P+s!s#7>gVeT0c4kXJBEV>R=Eb+T;$%9d9&u>Iwg$`{;7q26pYCP29* zTAE!^RGh5$`uOBbyH9x?xCwe*&;%qho_cRHLDAj1`SHp2y(2??cgu`Ise1&7A?iXA zSxN(2Jn7!eor%KPW8Tb6hg-RdSJ>aZzQ!OG9v(jbLXGQ#>IudbQGFq}X+yoSq(;!e zMq3vk-Btlg2*Y9Y*LxI6WA%f~TgApT$w0k2A_u~gl>#5M8fIXm|Byvn>**sZll`qF zi?-?`olb{8Ef%C`MpPzs^gv3!GV3lKcu)mY-iZN4I5;-jguBVd60EzYA&0c<$5XoG zX}ulOOc9*=zF-S_I{$|6`c#uh|0xcsM{B5+V#~{->PW7t2uq1@%B4{x;ys4<*diSg z#_3E=4`JC|Z(-5^B9fQ5emN9>)AsM$Jz+bOL6i0OvvFi8Op2tFroiReF?D?_vnetk z%t!#57+KAZ`?!;>-Rk#`{PkBhlW`J~0ZY%KHk1yg@vA8G@}Wj|aUa_pd6 zv_~$!);Gh^ObOCs9A?V6yH3P`T%hUhsYg#Z*QP`Y5}aiA{#4PkR^vBv&Ec<{zd8&5(uO#|J@ zFj}TcBn^E1Ef?*GX7VA>HV-+j%`^2Eod6o0a)iBoTnPM|QtDszezGA?Q5%QfzpRfu zu?VeP5zZ`L(%CEsDdrpUO>;Dx+QyhlQqeG!Ake{+Kn|3&1jda)g%-CKvVG#Ut|Dyd z_f{>W`#Cf<`)u{8b!FZNd->;}jajtMD8)PoNWf!9M+**{nu8aoLzk)FhDLG;!F@tI z=)M+R;(b;1YX{iS{dk~jI0bc!qvUzO(Ypfo$vP4v91V`ySd~lGvoL@NlxM#quF@{C zQZXs)J}RXT0+t|uL8;?w*p3*-^%Z1O%+U>*8#8ACTF2enDItXx-P~1c0E5|16QCMSSyYhDnaPJe%cBY0O>uA>hqTCE zz`&vh<7Dy!mR|dDh0Je_wLY7x&Olv^{aWd0=$E4A%)a6$4kTio>GHCBr#}Pdo($Me z$%mGwH8A`%2F1SNwm!TPwn=2UK{sTSp6d0D|2bS&t)&JaPg+HL8izoXMWo`2B_x4( zPNAKIY#u120~iE?;&Sl%F*Q|XtcWq;mDv7#yY8z>(@GZcmF2Ma$hz5Za+!)3_POU39hdUHUoK9d~f|8sHf zUn6Upp>7EqS+ z%*;t3>hW}^e@w8=xN!dbh{eU_AuvscGG6WcO`$eTblJXQyQHEBC&toCqoPrx5Peu z`s8U~XP3t+V)?`ew3%SHfMe`-7^~_dYjegxEb#OPqr*xeYojdhu?*FCA;`sJ^#lQ9 zvH-FZj0Nj$1yUE!I>QR6)xt>uFVJ<81MDFOl%aD#UD=wf<@eV!n<_xm9~Fl+lEs99 zUMGETF2QuQHc!E@pGPCvGNIsCB~X^=1chsCIUqKNt)R)ir=Bk!IaRQ>Q>UI7vh=Ql zSmk(T3glNgUbu;Q5MRps2QDiyl0cjoG811k>dOS}4#=b~CtCc7#yykJ?S@Q_K;;m&+LVU2G_vSCl7R4CKt zI5`QF@E<3*Zxhn});`RTvjVQbT{BTXyn~^b^X6x)0E7Q#mn8m9pb#k1h{p41NdU{0 z1TB8|%vZY#cA>j91w>H()vUkICJwb!lmtv3Zs|MFo{mgVFDVefTvT5D;5v85ZEdXj z<3P$=q0@p#$}u4LsiOL}#iA|gJAUePYH>OhFISaYa`E$mrUT&LlR=gA3jJ|lH6@@% zzuC&}^jpqYCn$w>J~?x_6G)ZSGZX@TvFK3iH}%7c`|$-28iVOm(=)rc`;3xbm+{a& zqX?cG3d_|-9OE~oJ|Et!RQtDO(q$Pcvx&nBXVR3V6q_6?ZVP7T+1uO80eJ~X28BI$ zJweOQ*s<|R?q>>q%L94%Ln4qi^R!N^3OfU(IiVhS?Lh@ErH*@thdT|UqnAXkF}x$J zJ}NeCfGLm;+z38&;UV5XHe@5`=^a)o(ENjxrwr|3Sp;cTS`JOBEYi-GbV$V3vcW*R zOdWE9pQpI$NdA-rc1aSs@S1D)0J0#iF}?>3#WFWaE(Z zM*&z3-)d8uD%ZIvBG9e7m#Cg%W(4(odu~lQEp_WPhO1!LbU<8GMj;IfnLQKLZnEEYVSYjQgLzo})QI7K15~ecmmzKh={*e)HdW0W9@AD4{P>86)^P} z;nN-tV21@A4WBG(JF;yGiglJBf;Ipaj=tiK@Xf#8vd*FiSriN`K21R(b@Y(`Zx0TF z0|?W}LW7F@v0c!Vn>^Q%kid?MUcO2eK{t^_cfzk^$QX>=HJ}JKg1I_+maNVJdh5Fk zXMThOL2Z^N_c_Bu$hvpnQhtxP7unpHcJi-v55B<5%K+5f$(NKP5|1DeIT`?EzbHU< z<(uRd6#$k-?0OUkh2*ZM@5E%trrn;$@_;bFT%Kb<{-Xh`OdZ4;b>Otf#q0$Cp0Drk zViy#)2XyB*+PEb_%E(_<3tpW}Rv^(ZvL)UxG9b%~l0jOXGT)Vw;=8^4`kLiCL!{JK zW|{#Zj4!mNZnIl92Q*faLGe6jIrz}e#3g5I0vr%1CfnTIyhaA3pz~8pVi8~%N6ZEo zyaYG z4b<7%BX6q}A)oJ-H4JoA$fGP77}`{L6de^vwLTzvQl%~03O?w8T*DLux{+GYx!%43 z)c+;JwLWE>_gm_L!lTlq;9DsB4(NjiBA{Pn<$z}&g=6f80e+Qso(c}Av+6kS)+4_& z)LP_+TR}9Wr$SqS(eVf)1;}TboeR2Vls3 z+rMihCjzZet7d=Yy)(1B8#A8X0AN~^tEUP@GoUGd)m!{~g*wKfkzZ|8Md!>r5Y#;D zAA#hZ%U0G2#J=ua$AaeQ!7IjQN`zT*vu$8KotVt|s|;gwe>VvD+u~alY#SieyrYTH z-%teHMSEz-)(WP_L>gl+J_`!}iK+9g)Qa{%XEYD0$Ja%*db8scpg>0hGhM0Uy;o%i zLVd+2O36Z+U7)Ua#N=jqL|-;Gn_3+%t86OTGa67;%!a0BG)mB;=(t%*?}kV`WU|9En78<71op)#<;%4@boHEdgq1$AsrGMk zP%yKVk5?E0E6{FkxRYt9WCSi!-u%Q>6p1hL6Z%$a)!~4nc3k)){`XRggvhD1giZ5;QjlO zowescBRF={^Jd@yj%)d8ZD=6v1d)&Phz=%u(0N1v5FF(@Q^N5jn8+pXJLLFoaZ?sZr!Z#UXWKnl z|F*pv4RwAHu{B;e3EEQ}B?u(Y?t$TRjh;q31OBpOo8`7-0~-MV1g(jDp}+(0esCNH z-DE+JHWjfmNz^l$%@xMFJiZQuzdUV<2kR}?K*QlF6$`q8G$3IFAXrAWK!?D)ewCON zG^%=(EM{j;Rtw8&tn?Q?6m>h;b&-_=?SZ18qd+!ea04ivJ!{$a402Y4r`}}aiVKZv z2G6UDnS%BhLnd;&WF>4Ix}Y0(YJ0601p*)({{3LHhewfAgR3ti#56a8vuVIy0}k7p z4-|nRpFC7$n$y=5m|_EwRJf zo+mHR3?fXOOnjHF5Davj9&ax6jFMmrLjdHw-SY|fc#3Mk<|!#+Q+)gd!n4CI3nV-WKR@(C}a z1ye~j>3@867jF&Ac%k`^==`wS_5H(A%cs~+ncsr54Jm)uOifJeAHp!Qi3tIn%-v_# zOj&we%RAx6>8Vg%-(n;uZmU-(v5HzJp1FMM9Y2E#e}hd=`Z=0oKcLOetvTeSvxZ17;b+EV)$w; zp!6HC0^F%QXF&jjH@;ms_U;S0*AkBwWxf^5k;GzHFO<2!u()?zVEJ0+4wRg}#rVq` zUSx5kl8<}~9ANiCdO+r4(lOt-$^ze@LF7>~A@@|Fxa=8=zw!fjxRPJICxd?!dQu)g`15PbOMzRZPR;M0g(sI1l+ zI^MOop7(bXRz+zf0Gf_O``wghYCbvvgr%ydUyN~OI_AF_wcj@@foAGeeXsEXL{>1W zq2^X)6g7%u4Ec`MFlBW1Nb+I~5Es~{KbD-6PQ~1XFumN1J+=lp={`3?%!-U+|05UXz!?HZ1Ze6|6oS>`1vasm5s&kC%En^|7)-(hx7j$Ws|P}E`j{tzueMjabWbe0fck_|H(co zF3;=%Xl?^EPP&xeFQ!=mCJ!Fig2K+voWWZi5_64immTZJ`HvuvdUduT`yXTd_oYSB z=DW!CkA|FR4<}lPN z_czd7F#}Fh>3V)ixsx1v)4ji)+#GZ38E*B?-*6l$7Y5GvPM{{BFUe)zmo4Oe`pxAE zK%Z_O@?`jbB{xljc72`&v^Rel@a2_AWizw4WGHHf&VQYjGpCs(GFN$yhJ1`b{lWLU zWu91rqtm>G3^xLN9hrXMK`_t|&`6#_ZlwS?{Yq{@Q@~UsCBYZejOPK7DGbW_fI<_m zeB?ae$ttVC$SXdf8w0eQwLaTu2v&+w5p-2oP6sabUXq1@lCO1d<_)|D;0!v+-0h1S zbu7L+YmO8Cn;NnjdYQH(<$1#u_6ccfGi+kEj}(;=(NR(A;G+s^g)-gj$TR~;hKfL9 zGrCi~s~~^jXoVIh<&q*m+0{TJJcO`T({r%b6I98#bVwxRI&#Q^^8lhV z0o`e%tu-m>(Ap?EUYf;iz*uX5KtS%GUVR-9qpKVQB=KbSz4C(6`uzw{iW~`j%%0oa z2pnmA|IX^L#pF!XnXDy!P#m0Y7LVfG&U6M7Ch#K{ZTsNE*m-#D}((lrXn5WW9>3 z!OS~m8!=w>g7q;6jE81UQ0BGTKgh_Y1*Nqh#tt%)&tMXQjaAK70n%r5=Xi#2FTmZP zIfsnqZagNRpvHNh=`jdLAHL920a~Ym>HdHyOL_M`btE_urRtwm7#unIv2S2o zTNcl}g$HR9mTF<(>LmH3I`cwPN^J}Yv_OrR(%u#~>FBS%4bDOE@yvMJQ@>JN(+NI4 zeujK-;6lDlNZ=7Siw_Bf`Bn*C1n(9a1~b)uF%_?+kOw9@n(eb9aZA@6?(d&rlJbM( zr-=K+&+vQC?Y6v2QXmoQ~Y3+b@$@|LU$m-xFZu&e6&}`&aDcU07Z|Ai>~) zeqj7%nhERnPk&1G)Bm-@CSUn4$<@!nfnW1LA_CY!)x)i`P;Ts9tZra2J-9y@ah1Um zoU{}gddv;fN8PrU^=B!t9iU1)6u@5517?fjB9Nba4lWkZJ@;9DBzFX8Ps7!XNNu3f_q#JY)=% zv%%NVX9qVct^Fx>YJ{Al5m7R`==CQXJjF*x#hNMfyyj@HP^^Ok9vHM)J{uo-Zi?Ng zW+j@d46{c9A_@wBRq(OH=V(9<Ll;(#xD$`NaT zNd`WP{6&5YC5iA5aJ<$?>qfa<|CeXDk%|Jlp^~@P`1$!o>wg7=n~-S`u>v?RE!Q!7 zM4h#w@(SDk=;g|zn##{;KmixFsem3-L_Ka%aEb)5kPt)!dIpt>qJ~AsWhCMh5pZEC zAqSmGvDg_GP&U!9$s(bEL4$zfxUiZKfdBzFlnA8k1jOE7m^q?P&yUFcS5B zPIPF9a5*na#>c~?BPMA1EtG5@VuULjN1HJfdgnRG$ep1d-VeJW9v=Dq;xI!YN~aK; zuaY|$c>uRO5EezLJrDjWy!2Yfr@jmgid{wi@lEjd41`8pj>*{gS`W@*o11MjlzA-S z7-LbGfV+McV(o@70q> z!{40!9DSsP-D+tEn$30`jlauSPt&GS<6g{TT9dw$x`@BS6jv#XTi&7a8<0JbWchfam3Q#f^ z+r^6H;0BschX4$}Q^02DV7lMJmT`x!T?+UVUA)~a!%QjPPqf^Y-m3K5sWaN1Grhb+ zArN$cH($TL>|1)Bjo}wTtGPbeb0e>`;o;bBj#let-IW{{nHjIxeAT7KbJvv5pa8fe zR48cAE)VN_=_<`nf)8gRFLbP-aXWXnXRT8uv@|YO*R^zvfAHD?B}lx@(QEIuX+^=a zBN;4tJI}d(V5#%DM)gREQ?xqmfhZ@r%`?7&8PG}$7kzLgRWLYmKJ|Nw7yklnNk}fiW0}{!E1jYX@zOeB?FK9F2xZE#jwyr2075jZwVUo zsk6ZVoSLI$nOrCJ8>5oZbyMO;3LI{Bucdt*yo@noy5T*QBbbnfsL{kkIR$ae!P3W` zSQHu$));Osc%irO4;}{-(tKxc?O+zuGR7uQB~$|xxgij^!F=_d-CM~P(O~$-;nBk^ zjWex|M(~jI@DH$$A3>|;Lg<6Yic^i41CW$wKCa6GlQiza5EClf?a`mN6W`X)BM}+G!cs4YGS+o)-3-}x*_3+1Hb6vZQHiwqn000v zU1ll15udMws@>w+V?=2!UPQagds?Zpof%L`_0Q1S5RjC$@nZ;1u`<*gxK|E_T$(;A ze_SfDXA2YF5aK^QQW6R|z|h<;g0k=B@2yJOscFL&1Id1P zGu|rpdJ{6emHH)oR3Vgze|R!meah`=_L#>!_^U(uf00Q@H`m--V9=DmvHM1N)+gDF z>F$0Wc3snd>G zDOXAkB8;%=;Qx`Px9Um-6Kh{ZrCPxA>9wMxa=oj}P3A76jkKz=vCEGzq%p1n0CKQ84EF%^s6iViaZEzkL@G_reqdcd~E$`JOdzn<2x`-PXS&I{62E4g4 z$a|5#J&=D*Coh3WcmLnp_k$Ge4(mX@iJ*ZKr8rC*lfkU5@qlx+Z{p9-1yU;gO5|KO zq*gbG(yE~XsDdP*3ifYqz#-KTNGy?UoBDTdTlSKBXpbZ=IR5IfA>Y5rf)C-#%M#+M z3|cpSQ><}3dia;o&6WNOElDfLVb(!)^XMcQ7bhth>W%gM`J8I`E*AAyS)zP&)A77a9^#U5wDm+PPB@ zl$q%H!qSd>LtWxkqU)}6L{JEg30H07HTnS@t>%w^H5qt`IM9@bil86KrCB;t9B>IO zv;-6wO>dRj^fM_a{B&!P18WFkl#XDSKp4J>!>a~=xEY=Xd^3wTgGl_{g@pc#sz8^r zJK(^Sb2|#6+fl9;EzUDhry689a~O`%)95iwy%h$u5i;T?dj^N>&=`*K1e#-obp66L zbUw4+Zx;-=i!ALRqzFu2_;WqT^fJ)=x)FmRqP8$b?+Yj1@oW9L zzR_GTXtnd}6cE9F`@t41URxjfEX(nF=SA^QATGb1r1i$R|#@{v0lb1dUt{rg?jJA3HC+B1{t=R+Op&SKL|a$;eLG zI_c{)6`8z(%kZ%DSRP$a=-d?uI>4{|1R82QdHu From f2f3a897a5ba2d1c8fa7382f05616d819d30d434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Sun, 10 Jun 2018 21:30:01 +0200 Subject: [PATCH 13/29] Unit tests for Crypto package --- lib/Crypto/AbstractCrypt.php | 2 +- lib/Crypto/CryptArgon2.php | 6 +++ lib/Crypto/Joomla.php | 9 ++--- lib/Crypto/SSHA.php | 2 +- tests/Crypto/CleartextTest.php | 51 ++++++++++++++++++++++++ tests/Crypto/CourierMD5RawTest.php | 55 ++++++++++++++++++++++++++ tests/Crypto/CourierMD5Test.php | 55 ++++++++++++++++++++++++++ tests/Crypto/CourierSHA1Test.php | 55 ++++++++++++++++++++++++++ tests/Crypto/CourierSHA256Test.php | 56 +++++++++++++++++++++++++++ tests/Crypto/CryptArgon2Test.php | 56 +++++++++++++++++++++++++++ tests/Crypto/CryptBlowfishTest.php | 56 +++++++++++++++++++++++++++ tests/Crypto/CryptExtendedDESTest.php | 53 +++++++++++++++++++++++++ tests/Crypto/CryptMD5Test.php | 55 ++++++++++++++++++++++++++ tests/Crypto/CryptSHA256Test.php | 56 +++++++++++++++++++++++++++ tests/Crypto/CryptSHA512Test.php | 56 +++++++++++++++++++++++++++ tests/Crypto/CryptStandardDESTest.php | 53 +++++++++++++++++++++++++ tests/Crypto/CryptTest.php | 56 +++++++++++++++++++++++++++ tests/Crypto/JoomlaTest.php | 56 +++++++++++++++++++++++++++ tests/Crypto/MD5Test.php | 55 ++++++++++++++++++++++++++ tests/Crypto/SHA1Test.php | 55 ++++++++++++++++++++++++++ tests/Crypto/SSHA256Test.php | 56 +++++++++++++++++++++++++++ tests/Crypto/SSHA512Test.php | 56 +++++++++++++++++++++++++++ 22 files changed, 1003 insertions(+), 7 deletions(-) create mode 100644 tests/Crypto/CleartextTest.php create mode 100644 tests/Crypto/CourierMD5RawTest.php create mode 100644 tests/Crypto/CourierMD5Test.php create mode 100644 tests/Crypto/CourierSHA1Test.php create mode 100644 tests/Crypto/CourierSHA256Test.php create mode 100644 tests/Crypto/CryptArgon2Test.php create mode 100644 tests/Crypto/CryptBlowfishTest.php create mode 100644 tests/Crypto/CryptExtendedDESTest.php create mode 100644 tests/Crypto/CryptMD5Test.php create mode 100644 tests/Crypto/CryptSHA256Test.php create mode 100644 tests/Crypto/CryptSHA512Test.php create mode 100644 tests/Crypto/CryptStandardDESTest.php create mode 100644 tests/Crypto/CryptTest.php create mode 100644 tests/Crypto/JoomlaTest.php create mode 100644 tests/Crypto/MD5Test.php create mode 100644 tests/Crypto/SHA1Test.php create mode 100644 tests/Crypto/SSHA256Test.php create mode 100644 tests/Crypto/SSHA512Test.php diff --git a/lib/Crypto/AbstractCrypt.php b/lib/Crypto/AbstractCrypt.php index 9d053ec..c13e1b5 100644 --- a/lib/Crypto/AbstractCrypt.php +++ b/lib/Crypto/AbstractCrypt.php @@ -48,7 +48,7 @@ abstract class AbstractCrypt extends AbstractAlgorithm */ public function getPasswordHash($password) { - return crypt($password, self::getSalt()); + return crypt($password, $this->getSalt()); } /** diff --git a/lib/Crypto/CryptArgon2.php b/lib/Crypto/CryptArgon2.php index 736b68d..a8c2d3e 100644 --- a/lib/Crypto/CryptArgon2.php +++ b/lib/Crypto/CryptArgon2.php @@ -59,6 +59,12 @@ class CryptArgon2 extends AbstractAlgorithm $timeCost = PASSWORD_ARGON2_DEFAULT_TIME_COST, $threads = PASSWORD_ARGON2_DEFAULT_THREADS ) { + if (version_compare(PHP_VERSION, "7.2.0") === -1) { + throw new \RuntimeException( + "PASSWORD_ARGON2I requires PHP 7.2.0 or above." + ); + } + parent::__construct($localization); $this->memoryCost = $memoryCost; $this->timeCost = $timeCost; diff --git a/lib/Crypto/Joomla.php b/lib/Crypto/Joomla.php index abc9a72..e5dd2ca 100644 --- a/lib/Crypto/Joomla.php +++ b/lib/Crypto/Joomla.php @@ -45,12 +45,11 @@ class Joomla extends AbstractAlgorithm */ public function getPasswordHash($password) { - return md5( - $password . ":" . Utils::randomString( - 32, - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" - ) + $salt = Utils::randomString( + 32, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" ); + + return md5($password . $salt) . ":" . $salt; } /** diff --git a/lib/Crypto/SSHA.php b/lib/Crypto/SSHA.php index cfe7119..8e3642e 100644 --- a/lib/Crypto/SSHA.php +++ b/lib/Crypto/SSHA.php @@ -48,7 +48,7 @@ abstract class SSHA extends AbstractAlgorithm $saltedPassword = base64_decode( preg_replace("/" . $this->getPrefix() . "/i", "", $dbHash) ); - $salt = substr($saltedPassword, -(strlen($saltedPassword) - 32)); + $salt = substr($saltedPassword, -32); $hash = self::ssha($password, $salt); return hash_equals($dbHash, $hash); diff --git a/tests/Crypto/CleartextTest.php b/tests/Crypto/CleartextTest.php new file mode 100644 index 0000000..d4eaaef --- /dev/null +++ b/tests/Crypto/CleartextTest.php @@ -0,0 +1,51 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\Cleartext; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class Cleartext. + * + * @author Marcin Łojewski + */ +class CleartextTest extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue($this->crypto->checkPassword("password", "password")); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new Cleartext($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CourierMD5RawTest.php b/tests/Crypto/CourierMD5RawTest.php new file mode 100644 index 0000000..fe30008 --- /dev/null +++ b/tests/Crypto/CourierMD5RawTest.php @@ -0,0 +1,55 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CourierMD5Raw; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CourierMD5Raw. + * + * @author Marcin Łojewski + */ +class CourierMD5RawTest extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", "{MD5RAW}5f4dcc3b5aa765d61d8327deb882cf99" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CourierMD5Raw($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CourierMD5Test.php b/tests/Crypto/CourierMD5Test.php new file mode 100644 index 0000000..0d1e82d --- /dev/null +++ b/tests/Crypto/CourierMD5Test.php @@ -0,0 +1,55 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CourierMD5; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CourierMD5. + * + * @author Marcin Łojewski + */ +class CourierMD5Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", "{MD5}X03MO1qnZdYdgyfeuILPmQ==" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CourierMD5($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CourierSHA1Test.php b/tests/Crypto/CourierSHA1Test.php new file mode 100644 index 0000000..0621655 --- /dev/null +++ b/tests/Crypto/CourierSHA1Test.php @@ -0,0 +1,55 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CourierSHA1; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CourierSHA1. + * + * @author Marcin Łojewski + */ +class CourierSHA1Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", "{SHA}W6ph5Mm5Pz8GgiULbPgzG37mj9g=" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CourierSHA1($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CourierSHA256Test.php b/tests/Crypto/CourierSHA256Test.php new file mode 100644 index 0000000..ee86310 --- /dev/null +++ b/tests/Crypto/CourierSHA256Test.php @@ -0,0 +1,56 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CourierSHA256; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CourierSHA256. + * + * @author Marcin Łojewski + */ +class CourierSHA256Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", + "{SHA256}XohImNooBHFR0OVvjcYpJ3NgPQ1qq73WKhHvch0VQtg=" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CourierSHA256($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CryptArgon2Test.php b/tests/Crypto/CryptArgon2Test.php new file mode 100644 index 0000000..7a44ddd --- /dev/null +++ b/tests/Crypto/CryptArgon2Test.php @@ -0,0 +1,56 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CryptArgon2; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CryptArgon2. + * + * @author Marcin Łojewski + */ +class CryptArgon2Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", + "\$argon2i\$v=19\$m=1024,t=2,p=2\$NnpSNlRNLlZobnJHUDh0Sw\$oW5E1cfdPzLWfkTvQFUyzTR00R0aLwEdYwldcqW6Pmo" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CryptArgon2($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CryptBlowfishTest.php b/tests/Crypto/CryptBlowfishTest.php new file mode 100644 index 0000000..ea4dc0c --- /dev/null +++ b/tests/Crypto/CryptBlowfishTest.php @@ -0,0 +1,56 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CryptBlowfish; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CryptBlowfish. + * + * @author Marcin Łojewski + */ +class CryptBlowfishTest extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", + "$2y$10$5rsN1fmoSkaRy9bqhozAXOr0mn0QiVIfd2L04Bbk1Go9MjdvotwBq" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CryptBlowfish($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CryptExtendedDESTest.php b/tests/Crypto/CryptExtendedDESTest.php new file mode 100644 index 0000000..31ca7c1 --- /dev/null +++ b/tests/Crypto/CryptExtendedDESTest.php @@ -0,0 +1,53 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CryptExtendedDES; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CryptExtendedDES. + * + * @author Marcin Łojewski + */ +class CryptExtendedDESTest extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword("password", "..UZoIyj/Hy/c") + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CryptExtendedDES($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CryptMD5Test.php b/tests/Crypto/CryptMD5Test.php new file mode 100644 index 0000000..0a6f405 --- /dev/null +++ b/tests/Crypto/CryptMD5Test.php @@ -0,0 +1,55 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CryptMD5; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CryptMD5. + * + * @author Marcin Łojewski + */ +class CryptMD5Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", "$1\$RzaFbNcU\$u9adfTY/Q6za6nu0Ogrl1/" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CryptMD5($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CryptSHA256Test.php b/tests/Crypto/CryptSHA256Test.php new file mode 100644 index 0000000..020bb61 --- /dev/null +++ b/tests/Crypto/CryptSHA256Test.php @@ -0,0 +1,56 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CryptSHA256; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CryptSHA256. + * + * @author Marcin Łojewski + */ +class CryptSHA256Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", + "$5\$rounds=5000\$VIYD0iHkg7uY9SRc\$v2XLS/9dvfFN84mzGvW9wxnVt9Xd/urXaaTkpW8EwD1" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CryptSHA256($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CryptSHA512Test.php b/tests/Crypto/CryptSHA512Test.php new file mode 100644 index 0000000..7667d1f --- /dev/null +++ b/tests/Crypto/CryptSHA512Test.php @@ -0,0 +1,56 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CryptSHA512; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CryptSHA512. + * + * @author Marcin Łojewski + */ +class CryptSHA512Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", + "$6\$rounds=5000\$yH.Q0OL4qbCOUJ3q\$Xry5EVFva3wKnfo8/ktrugmBd8tcl34NK6rXInv1HhmdSUNLEm0La9JnA57rqwQ.9/Bz513MD4tvmmISLUIHs/" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CryptSHA512($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CryptStandardDESTest.php b/tests/Crypto/CryptStandardDESTest.php new file mode 100644 index 0000000..ca8712b --- /dev/null +++ b/tests/Crypto/CryptStandardDESTest.php @@ -0,0 +1,53 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\CryptStandardDES; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class CryptStandardDES. + * + * @author Marcin Łojewski + */ +class CryptStandardDESTest extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword("password", "yTBnb7ab/N072") + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new CryptStandardDES($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/CryptTest.php b/tests/Crypto/CryptTest.php new file mode 100644 index 0000000..f556289 --- /dev/null +++ b/tests/Crypto/CryptTest.php @@ -0,0 +1,56 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\Crypt; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class Crypt. + * + * @author Marcin Łojewski + */ +class CryptTest extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", + "$2y$10$5rsN1fmoSkaRy9bqhozAXOr0mn0QiVIfd2L04Bbk1Go9MjdvotwBq" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new Crypt($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/JoomlaTest.php b/tests/Crypto/JoomlaTest.php new file mode 100644 index 0000000..feaa96e --- /dev/null +++ b/tests/Crypto/JoomlaTest.php @@ -0,0 +1,56 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCA\UserSQL\Crypto\Joomla; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class Joomla. + * + * @author Marcin Łojewski + */ +class JoomlaTest extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", + "14d21b49b0f13e2acba962b6b0039edd:haJK0yTvBXTNMh76xwEw5RYEVpJsN8us" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new Joomla($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/MD5Test.php b/tests/Crypto/MD5Test.php new file mode 100644 index 0000000..d8f2950 --- /dev/null +++ b/tests/Crypto/MD5Test.php @@ -0,0 +1,55 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\MD5; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class MD5. + * + * @author Marcin Łojewski + */ +class MD5Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", "5f4dcc3b5aa765d61d8327deb882cf99" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new MD5($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/SHA1Test.php b/tests/Crypto/SHA1Test.php new file mode 100644 index 0000000..2ed51ab --- /dev/null +++ b/tests/Crypto/SHA1Test.php @@ -0,0 +1,55 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\SHA1; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class SHA1. + * + * @author Marcin Łojewski + */ +class SHA1Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new SHA1($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/SSHA256Test.php b/tests/Crypto/SSHA256Test.php new file mode 100644 index 0000000..f26b0e7 --- /dev/null +++ b/tests/Crypto/SSHA256Test.php @@ -0,0 +1,56 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\SSHA256; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class SSHA256. + * + * @author Marcin Łojewski + */ +class SSHA256Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", + "{SSHA256}+WxTB3JxprNteeovsuSYtgI+UkVPA9lfwGoYkz3Ff7hjd1FSdmlTMkNsSExyR21KM3NvNTZ5V0p4WXJMUjFzUg==" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new SSHA256($this->createMock(IL10N::class)); + } +} diff --git a/tests/Crypto/SSHA512Test.php b/tests/Crypto/SSHA512Test.php new file mode 100644 index 0000000..10cfbd7 --- /dev/null +++ b/tests/Crypto/SSHA512Test.php @@ -0,0 +1,56 @@ + + * @author Marcin Łojewski + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +namespace Tests\UserSQL\Crypto; + +use OCA\UserSQL\Crypto\SSHA512; +use OCA\UserSQL\Crypto\IPasswordAlgorithm; +use OCP\IL10N; +use Test\TestCase; + +/** + * Unit tests for class SSHA512. + * + * @author Marcin Łojewski + */ +class SSHA512Test extends TestCase +{ + /** + * @var IPasswordAlgorithm + */ + private $crypto; + + public function testCheckPassword() + { + $this->assertTrue( + $this->crypto->checkPassword( + "password", + "{SSHA512}It+v1kAEUBbhMJYJ2swAtz+RLE6ispv/FB6G/ALhK/YWwEmrloY+0jzrWIfmu+rWUXp8u0Tg4jLXypC5oXAW00IyYnRVdEZJbE9wak96bkNRVWFCYmlJNWxrdTA0QmhL" + ) + ); + } + + protected function setUp() + { + parent::setUp(); + $this->crypto = new SSHA512($this->createMock(IL10N::class)); + } +} From 0ff0a54e8c0f6148b8740454ff774f97a6228426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Tue, 12 Jun 2018 21:56:08 +0200 Subject: [PATCH 14/29] Fixes --- appinfo/info.xml | 4 ++-- img/screenshot.png | Bin 67902 -> 78136 bytes lib/Action/EmailSync.php | 1 + lib/AppInfo/Application.php | 2 +- templates/admin.php | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 67aa41e..0e5c94b 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -11,7 +11,7 @@ 4.0.0-dev agpl Andreas Böhler <dev (at) aboehler (dot) at> - Marcin Łojewski <dev (at) mlojewski (dot) me> + Marcin Łojewski <dev@mlojewski.me> UserSQL https://github.com/nextcloud/user_sql/issues https://github.com/nextcloud/user_sql @@ -21,7 +21,7 @@ auth - + diff --git a/img/screenshot.png b/img/screenshot.png index 1b28638e737d4547a1a23ed0a025cc5dfa42ac2d..633de7ebca0eba690ed6ac3418484a3136488de1 100644 GIT binary patch literal 78136 zcmeFZbyU^c+b@cRC}9C2Aqq%HNp~0si|!5)>CQ!iCByFB2*+Kr8}e>C8f{v zb?^6_an613Ib)o^?j7T0|MvbNv0~0=KF_D7@8xC1@h_8J#=^qFM@c+U#KO8jkA-z^ z0tXwua>Z}E9R54%s;usysE@v5V`pt-YGHWC!Ntb#j-j)u5f+y7NPdiQ=uBm#@2LS% z$$94z@}YMXuQX2FFDl=caa2LqM=M8U(J)-CoF_>eK0Qn_IC-12Sj@u~5v$c1nKbl# zE8$ANut-<;u=C_ba3ObXr>B7RK>5$AS4s!lM@CzoK?U~09-be+4etLwu3^|ZPBTs( zyntON@=$JIVbEiTOa51v%ih6w>ENF0QE~jBmxx}2C(}yvM$y%P2ohH38MMup&Gnt| z&v=jU6Ab2c)Eox3_+Ec?!&@&jFrJ|FI=@jCs`uRZa3$!M5Mk5&ApX91fbN3Mf$fQb zsMz94z*w{R>9G&x?ogqK-g9(k&cdp(qmU6*M2EQo<=vX3O53ZgHuaG%L??8@QHN$V z_od=rSX_Jc#hi37o-U(VtU?>zyyg~f#ooAB!Af46Bs^x%ML2m>gL>~;H6vxBf6H#R zfyVr0?}^Y&bkgYhRz|L%3*Y*7(3i1}nc%4X+_2M*6`>z|l9l$C=iQ$-*3_8An$p|5 zF0fpm?qtkZYTB!77syW%k+it;YUxc?@n@@Mj&Bm{CFNf`?5FBpq!!7UR~GA@yGoUq z5FLQ~;GlBOj^;WsuuVQKLpY?KtYSX;3!tVM8W=>+J;D0NzFaf)re=(u;!n9nc(uW8Ml ze?0-y)qc!oP21=d!E=gfzm>jzN^So%+s$x&u;y57K((Hi+{&lV*Do9Y;xhrmh4#yX z@jf{n&*}mb=zfW;@LKwgnAeHk98at&>qzUoWFJBOh&k_jDfbp?D{rjw&UxnXD4l73 z>h>S=ch6?tYhv*WOnA+6!=9Bkz`l~-KIqzOLGMTF{rfT0&q%^5jPvAo$+>aQgk`m2 z6U*4l-15Ztb1Zen@rp4pl{m-iD(>+|n{Ml8c4A{C`PWXGqNp+#mPuKILN2F(^u)@i zOu44tbj+CCyV_f+H2MQxSEf-6SaB2ZWWDaz(1=A?`A1zv5$np4G<~4L6X&w8pHC5I8;?b=d zI!`y}t~`Sd!GUJtWKz8mE6r|fTU5NF=pwd%j6igc#&t%c(h~ZZ?1*k7j>FH71a4TN zxdTQej1^Zl-zk5mOZT8Bo6O)~RwWHEVt#Rd)y2YI1=l9`$0O#q64rYAViDfwB7=%C zyTkq)9Q2K%`8?0}oNp!UE(8$DO;3u5^c;)U=vNO+<|WABK3IBMVw^auH4$i(#W@~S zn?C#$`v&(DA${pM+U6S`yo(f#^sf~n4wPwsYIV%jM$9IR55Fw>Zl1tWSjGNwICWp$ zq$MKvf~Vy5(p&h~7+!y3B5HYi{-@H1!?DdY4Yg;Sm)~vYbG2c;=KcQqzVkz^g{+AO zmej&HC$_aA$&t>c8cp*k^3@$&jPhpz3 zyv^I)Ac9YKxw$Z<3_n#XW@YlQTCbTr*jO6yyY-ABkk_jB+~h3Zdzb3R5j{8)*PK2v z3vC(o_@i1)@L6Tz3Ca|*d{WVP$&)}ZqZk4 zyHpxD-0KnXCly~2@8X@o=@Hb_Jzwh`vXsPUJUlphyFx^gxkk^=_Q;!;b(V@MX6Yx! zFHw6>V7}H*2OTh8)k>6ZZZIb*6*bCJl3Z@UK7VwHq1!M2k6onHD>MENXR3o`KeCK7 z*|O~9VmdU8UlwP#RxS^^+-osb-%@P26mJLL6z8mqoArbcCaI2VWoVisd(| z-}b=t_*a;-5M_Z~C3QHo6dnUM+{i8D-wSva5ZIoz;a6dD`t+HAge`DkT7JBY>` z=9b0QT>gZ%XoyrI)ir-SW?LevK6Jg?%7^+rMa}uIcgX3!{+8jzoT13NWVeKK=}z|g z!TGt8$O9aICyCTs2Sdc4`G~rwv@iB}`*25N@7_I*pxn8n_a@qBlI+sik#h%5jb|b+ zMaJ*{`Sq6ibI+ndM)>j)cUq>CNtnjLYd`%>GvWwef`@Vs&V*7XTBR&lb*x`fPqH07 zAdc}S`Km;P9sf?-J2z~j>B}Ka>TDB=gj6RWqnkwZ(tU5w^0U-UxaK&iP8a_yWnNlK zR;Ev?YJ2w7^cR++{p`}r2X60ju6I-+=1kWTp6xM@WZrgb@qTs8d-Y^Bcj~F&TV?qxE>|4iy7S`Ar8~2jR@DXVHK>YD#m#U7|s~^vQTyXd_k(A(bbu{DF4YL=$g?l=(IqzI+ z>mCQ3A1{6%j^nOyk6yXT%gw=qZc{Fu?c<`%m#2eoutdGLN26zyZOHlS`qgtyG7Vju zFW$f5y5xzsour3FuhU4S!6mJ=@|36BzPG&AhCfGGMG|#`{U_tp`jbdW|Ia0R`hEID z8C7Sct??>`_k?3_F=I`IkSXI5p`O^Qn(sbVK2rB+QgOzq!91MPc~A7{vp0kvxCkRJEl*Y33 zhySlT_UGe#X?w_fdf%1HoURDp>HIwYqW(!8u7lKW%jZ76GlB1|Rlckd&}Gj5FmhO0 ze8v#tGr_YM8g=1a)W->$$g6j#>|UB495YA~9G*#2v_;P>RbDaS@OoX!+I-*Z<@IOt z-yJunK7J*?k>;NMsw$V|%u8iCn-&)OJ!{^i%bO#qMSPPA^cLFO{N`Vm$hho2TS>nq z%YRfxnDRr*cQMh(fsEoD$xz}V3-iuC{-U@w@3-T`$l~tSrzPBD zurI}TEp0w);mh%q$bsipR;Pe6Z#u5?S@xE@8so3e-&+jkb9=YVw0?QeWDfnoiIBm{ zAJyY?F82vT&V+y7t?RW#R7b?`Mn0Fv{?ghszd4L!{`Q?)xX)Q4B?iK4O%?%POw+zT zBX9C{Wy=V^!+F+_kqY1D38hZ7c*(}=k%yli2>Q*N#j$3RH3}v5UYL}WzsPcZ@nYxC zM8iY^X&SN)No*zNWUk1JiQ{*CZ@3kX=ywl-XgG^&vjQ`PAD=FUJPh~{97h%L;I@hn zf#W%f&DF#h&Xx!1*V0GJl+OlqR_&@V6RX_CGwa}AEWpAF@~bMK@MR*saErQ(L|N5D zmzCpCb5j6Y4c9B4Tcqn;u^e5o1aAV{6Ojv_?|iE)Th<}FU8uHN=Chdp-Q^d32~~9Y z)ztH|Oiy(Es#H2}FJQvms=D84J`2Dh3s1z3+KO&@9GybJA!v4OjDRbd$5)$#dKsVM zJ-&`grP~kxW7Sm?vM>p?bsW6AdUn zu}<<~nF^ET5AM%@o;$yRHTrwg&4z%F{vo~SatbhAhvX*rRNfE$dv0~dsH2c>^TZc9deS8Zx0l% zi|pl{!+j|by%l2kf#j?GCj$RK1*Vr=?pxYKJm*L;MCm;tnrhNh(((*T(}6M4A41#1 zxhTB12;%sgd_FIT6+dDHAmRFX^2OZ<9x zTj(D&{rvpt=Jz}SqWeTMldo!&xo=F@aTGI^85nPBL%5L?oU5Z96NgdPCJ%(z(FD| z5IT93cB!$(U#8xvoqv`XFN;$#5u;d3}ZKLDzxx#PTfn*jnw;wQ`t+Y zeYBfRLuil98M0QK-K$S#UpU01Y*Rygdvlb&Z~WSus|`!n2Mg%v>N< z6&s~~y{38+A@o_45sR9ad6{>PMJD`wQlw*Yd74m09YZ*N}>8V6)onI>G*Q1-{ysK zKW9Q6=XQQyjOgRsHVZEvkZcilv7bwcKfyXh{zx z(^f33J6NbE50#xqR>#o}%8nWeEnf;4-w(jC!ATLqGGCkDL6wK zZGK0p4%djqMCF6d7Ee>rCo|TfE=llkUb`ysne+Pf9;5Y*E3)%(cVoUwKZ>UBYUYbS z$C0!@CWlGt8skZFYkooU<}SPrhs-~pVSQG@kw5#-=f6nKhX4Cj!8cg<{{1xg zuIQzIKK*R)UqAZ4SpoT%(sA4}v|*^WNaj>FEUeG?FaIv0{7b^~w3lF!y~%ue{w}*R zd9cVy<)g=scjn`)dq}Xbrrtbb$7@Kw_3x59Kk}_@bo=w`r=+xW&D}PK+Muw6gnX}) ztt8ijrOcf#7b$JH2{-o_l2+c+B_`h$r03>V)$`aP^6+?-{m%Y0sjL%&-WU)$`F#bu z-|=g#q=2>*om^ty_b@tB94suGhF?R>6I~*wHHwOgG$;)XjmtPVAHKf`t*@^)>PlSe zSwH(FtR=x7A!9qP&5fKrO?QZd6&3wa7>%J@nvw^&r zM3?znqvkhRw14!AaL4MMz4Tqo(W9xKyO;x^ypr*LJ!!ZF()grA5MVV?xK{aMv)hw$m>T zWhRivVfx!87dN-I(NV2HQZ7Xci#)TwEZc_NE3Jjc1q(y<1LkI8)3R|YrA}EATS>VY zGI1Fd6RuL--Q6Rf^v}@=V_{X^b!HOP_~X@o5sxGpwog6czKY%cR>K>7`<1g@W<#Go(tNj=-wV}tocer5CQ(pBUtfQDvc5hgB_%vEGNZ(}OEr3G zw$cA4mtiX*m-U496_KM)?Ck7>l$3=(e#oPGM#{{&%mYFeyl#o-dfzwMWa=L^cK7 zN-eh>z0bp=1~0SUZKD?5uv%JuZ6MOG&vVdz^)zBo89kDhQubIZ?lc}HC8czFa(qb= zsaQqdlaTnzN?v$sSw22KCtVhFnqsDvXwaom~-^nCVAnf6kbnDH>m**~yI8~;n zrI}3BxbVAfXE71`W5d4a*1A?H2c4em)sK{0#J{&a81+cvJEIGf?!O+cjaJCf$;Qi@m}K2{TV*S=8rKZn zUMZ|M>x}2)N3X}na+*#%s5Qp(*(+Ds8P=Yj9Ku5|aR;Vup8Rg6JXkI1f?8p1saW_56SuIA5UUh_y^hdnzG`kmRckk&?$}tF z=kdYwg%Te=w)^)b<%D*^v9H|DL$-vDPCRsVzC1wyy$mZILIW+}k+87v@<>_k8+@|) zo}-m_g@uLdRSUP7waTScbIT+iGz@FcXI+u(wKB9st1X;v>S{r`W@?leEgkJ|U52-D zxVyGC!K%(d-tjwVARLy-Yn|y zhIMCCQ&W~eX0-)>^L_&ArvWy(>qPo^+PH8$`Y%$tCl?tso6R%@mOGOD9S+J^Y;0^z z@Fc6cZkylf0{14|x>`CqxbPYt5VL5Txc~Zc(P@K@hK2;*1&1zlZ)y>d$p?515)u-h zj*pj*#!wBHT}c)9&%ByaR<4wiG9Lhnfh938n+)6q4zw6xgdl0!q| zR?Sn_KitbLtTS_m5`kZQ>f}_;=Cb+1V5ukFY0ecIaRBa3mZ4VpA$Tc)w>XT3YMoAw zT&QVjn}#ZFQ}s#S6xlDx{{3T}2gdeb+tgsZ+OcVWYXRTC@p%BH$OO{=113EWJBCV4 z!>--9VX!(@)eG;GM9}#Yo5j!rgOO6xrfSC(3rA*)jfq<1(*O?RP7>Haj_1#x2f!H^ z6&88Xa@7F7`&3ael+CnCf+(K$twYM2@$^kk>KOa7Ba@wr6u| z%YU}ksDl)FQ^7@0aR@QjU($&e!d4F{W4|7Y62NnoSKV0K}F45oO~=3HCg znRD1AP@485JjDKuBmz!(e;-Z&z0L^@H2@Cw@bW>wn%*t1qu+1Yo`1ucsok4E-nx`Q zda1{niMwvcu**{G{@UvC+0Oa<#tY82_ED+(dCwAEkh(*5Z21$^&gfWVM1-N>?{7EC z4+=C&nw&Rk_avE8sSE2*s-boX8Xn-yK&NP`aoGw$Pq<_b+41FOrV7(rVj{}MbrR5R z=9Wd8`AwC!GXW8dYNSvqOG`^luP@yQfU(;)$2ZX(ySbPeJTiZ$;Xwd&)?w%4ox!zM z5#vsBExrlo8T^?T<3u)g4h|^Pfc{)HveS*zW09!k84D(UGZEtj1C+sJgkzV6ORK$% zV}*{Cy&$@-qLN)tJJ-pkVx7nkPn!{*mz#zNBYO@D>qtdq(d~ol-a0cSB_&ERS2f=O z4nLJCGONSG(=12J8AL?%6ciN7Pj^^?FiSejy-<=!vl~sUx=BQo4#&r|D^aL%zBgZs zXLND{vmv}TQYJ<0pDs}y%VmCFP*6LxuhdjYgNfMC$ml*Bo5Dh8Lhq|9!t^kW_74v3 z)6=)C*%3-eODjKmq2v+__p6 zR(=5ieeZA3IV|@v2p#=u$Wbdy-V-Ga9`YF(cXD`d7g`<)c3)oEkGlCdQ1IeL}2#%ZbN zUd5pktg9=)O)iH;d1m!bqUSCWl#b6YWLe9`^L~VrZSrgCi&<|*pk{@YWrY?SKpYtI z<$&%!LLIhRaAP=CB}WH?nlf`2(sLIo7#HeOt8z*goKddZi~0hEWIR?DJQWu%UL0K> z%~GHqb!J?1Kj;>xGzIisPEpe(d}tBEd9S}$fik>oTyksQyqnHYN9+3a>*1lHDTzXE zBTk&?jfwHU6+4~7qEjsqDoq;(Z?I4`UvtD9)>^5U~{*+Lt5HaQQk@-X09sI zJSTTeGj=AzaIAWS*3k5#+KR41v#4o;po`*7R^3v})){F0Pvt*a|0cl2Ejb>y;ARvN zsh5ZakSi0w%#PL{{Q_w+GtLCaOFfd%k#bs2qLboaWvH$q-qtm`hwxZbg z@86x4;*UT04qHU(lQZ--) z1-CC3-gCgtCm`6Xudk1)IqC(*Ii%p|gVaMe;xtwqeo4jt92I||r(fV_jnAGvyS+PV zy#izS;8(+ywH{raiL|sdDi`r5Pg)+}0mdVAYoGQR@NJg;;tbG~(J2pUe3B9pKNga_ z3K*0!7RS+(W&Izg&Srh`ald@laouF3H2b#Kk?q{v+!D+g%}Se(N5{v=TD|p9`aug% z&dA-RlB>!9#p1X!P_`4p_;2?k9vji@aamg4Uu)gpFe$jd#-|(l)sacC0@%=fAt4<& zwMu|m901aDL5WFkEg^IVpmiiK-9HV^91}6WHJBpTT3w!&kpTyPtY8gyL8FI!!$ihb z#m457&i?W7@!E;bgQzM+N^yhkkkHQN;sUqz$OX-OKnJ;)X2!Nk$1<7L9)f~_+LWM| zJtIJqXtJ%ws~b~`4R@`cj$^z`q~iwH0Id~0qt|M}Gy&}Hb?h6ckjO)g*%TF>q?Gv~M1 zkB%{m|HK{c>r=)Yg@%Uu2|k(7NP6<*3E{Ac{HNX=o6lJ=Ld*sW5_UHx3->0y^rRx0 ziq^tO07^3dx%+*c?_DQLJRFF8pqJXz;z0=F4UdV*)^B)IrM&Bd>z$TH)1R+3sQt+{PlKd^yGexg`_3I{lT`O1|jV5i?-C|X$+tZ~4% z=tHd^%FBgXUVLBT9}N)Jygi!Db+xG3VYcPk&SLjtDB+Q6$K3V$Q%@Lp#fJWm9zC*{ zvloB%ESZ$kSlD8I($0cg)~{8n|f_ z0wapI9c^c}zSAW+EY&#d968M$p*hvY-M2bqyM9kEueWM1)62jkzagN=8PxOA0Vu5W z;zb%1;BUpQ`T{%dsEEFc>82IMrEbrkr?k054UQ;&q6Hk)#z;-w@V9YL>0H{pNw7<} zmqb=jFj&yntf8w`uhye(6FFF>zSk;Xtrn~Uy<+$9kxNwDxPfvXoBROQoMpv$lL`b- zDnA}Ac^R?ayVqzns8(jyA3wpeVs-$;33zqWoZS;KF$TcTlkQuAYmZp?_y8$rG-l|P znMG`FZoVkfEOY+-92i7Fi4??L##KtZ= z@m;<+f%Mmnx7)ue+>o;#^!o!&XF+(U|EVt!-6u;fHqfp_T@rB@^DfsWxp3I6O_W z%*?bqMQo(PI;q@xvH*^JHqgz@-@ikKEmUEjkO!g=be4xP+7EQwfA$8vcziN$6QI8b z2P=gtwXTl+*-FhU9qZ#5F0T`Jq;tCMt@ry}z{tU>Aftl0@_}<&s!>)fuu2DFWrx zx}?;)tkpWb#O+m3f594NYq+1=dLj=*7mXWqvVBT&LWZNhD;B~DB3_;$;#VpgG=vg% z9-5BkGp((6)@bRPOTkJIUB8|Jt#Ek$+t-ThNX}*fO{L2d0#2*ZX^aBBuyyJz$IE`X zqlIZ(-5PFs{*Hx$gMFLAx*CTmDW$J6n?*Gi_>IrBB1;GOTRR^Mlmnl=q}sDE%lZOt zafFA3QI`zo0Zif>ubnYFh>j-lIQreJS#A;26hx7Gu(J}S9{GEw+5F^aA0bcxNOP34 zQ{XE%F_;3Et$Ej-ezl0i!~$%5Qj^)15V4+8V9Ut1Eq15QZEO_Y7IGc3BIAycj(wo- zGv5)HNyMl+)ankXv|1%7x9t>8ugP3%#OBV93ZNp(dfGKV*#v$B)iJ8({Q$5ux3ZEu zYK4(`{06T`D5}$}%nT??warhTqoX4S=nVI1X`dREXt35F6$_sp*~31|3=a?c`S}%( zR?SNT=kEhT+mRrkcIM0(zxVGI!f0i*5AuM8>N@|t-~re6Td23jGa?*0GS8kzqip>R=tbQYrMfjLvGm8D^Gc51StI6m8`Fx7)JUw7h7jO0I`VcmZ0ef^(L zy_^5*NB?UD{{OTB&TiFM!GfFbz<;@idZXV0ofjG`baa)y_3{2RRM_QidGX-e{V<4k z2DGf%%uc=rk@Kb8lZrF}wT2Vh+k6_hk7ku!`t-~UGL*c%u>jMmAq^b}f+2U*W<1=Iva)2Eo6w_$~V-85bFDNLZLSZ`k*YDp7 z^72>l&rijw7r%Hvkf)If^8)`C`x9^vT7l3(V=o2y#d4$+#aj0#1!zr7FLDmYKHZ;X zp7{CmXEjKJJ12)5E8pJV&@44kh}k@ZKP{P7a?&EC6qsR;C|0Y*@xjgr;NlGFm=qYD zS&|X=ktPocH4w|4CNk?Rm?F?xiS0?@!M({eeLb-afnhWSQx;Ns{&@)4Ry=!?7es1B zC8a`?i!|*G>Uq{F&7ezI^s>6TiNs9m$%qLAS_Q#i_|Jy7E5O6}-TyrJ_wgdpVyw>q zBm-&B2SIlQ9IevYI#4JqCu%eR3`X^vMO0K&z)WEQaMHFbSct4XsBw}qGX3^lLUbsA z2cfibiL0u@$dwRP`m=+S(#}4U``Y zR6qlLwQlI0mBB8Saaf@3nP8D+5W1kR=4e$EfWnB#JQxS0et;eof)KwXa=IUkR7z43 ztCyFT#VG^_V3oC2M0xCR1r%w*eEEvP<6ei7? z7pY}Y;ii_asWQ_XJP3vE2rh@>T&;1}ZHyjARKY6w8mMjKjX!~m8ylr-aL(xa8RtH_5jaufus#zANBEt(ncV(DsZWJ|07keX1y_q{;Xbg4S1=@^gaA4WwAvWC*Uq=KNKC&X050%c- zgKPl+W~N6>7dAg8c!53%&PO(2b1~h$-Ce}1Ed|e4aZV@oDSl&PBj52DY+WCqx947g z@ZSO;SW&%Qg?jb6py$#5j(W~xIg$n%q&PS?ViV?|*&w8{)@^U3_BI&2T2@u*5(taE zaQ-~u@W&-tSM>6l8O6Ax(8&4EdQxC4wAqIwB_-L}+XFFOoA(2(ST?ki0k3?d$UxjT zp;ueuZ)^O#uDQ@9-vY+r1#Ik*+Q{hWtd06p-M3dLRpCL_c5=}k;olP6!DXKR_0|s1 zkosktt}By5imUB%tK2K3l`P%f(^P7u2epq0On6Ev^RB$18MMC3~V|0OMgfm$N; zl3=nBIsvc?L-e5@*h3B5FJHcdvj_Vrk==t)vQ}GJELiEL#X8Z1_PsXmVGQdzyRu@w zSLx?NG1G`V#(T`X5MO3haRxF(MD@M=una*L9&a20_RD2IFWm?*J4F0;(FIm!Vt>T) zva4I4pIKN~*lf%aK$J5?6YB?fS!yxN-jOJz18v-L3H)1{PQ^NI``qFf}~HM9)MCkQmZ<~LT)^U+K{c)$xp=;h{s|5F@Fz| zGvHWlNjD&`;O6$v@qO#+>YAI%q?_kd8~EoCt;$_X9;^4N2M!L-5}?@aiuz+2;5VgG z=$#8HsId+@9-cvcT~H&OzObRUxZ^s^M$7ZTx6K7R5+Q=Hjc;|`*0_LT?;jqT1E6o5 z*j%^_JrqR2A)&Y;-iHq#%J!ybWJHqS)kcnGSL8Z6sEL{1z#`HEoW2eHqB@*gSh%i* z)mXqS52dN88FSmvR%pI7^q<%G3G*gv@q(boK`FH7ekdB0no|deCK*G<`rs`V3<=^j z&~Iv*Zt?;3FLFVtc_ybjt&OC2Vm`saT=KoC`vWXF#N0+Hf_LfwG)%DqF{~Ux&A#5- zU#K@}S{+6wmjlHxn14F{_XTp&o-kRSO`gUa?~X=5Eh1i)X?0DFAmXqi?S6da{rmR> z3)!G;6UNxz-;7rsi~WnxeN`5*3?(J~5cmLeKqW^R6*>#L+0@iCMAt>>jadbOe4i}4oPr&LpA;u3v3FH+lFx(gr^1=DI4`Q;i<#4*xO~j0kV%2ksEr8Q| z@bfLD-*~P4pI`d-Xla+rfe~97d`@u1Xo`z_Y#E!v(k8)NeuH-_1>y?wQ7k%k(N?fk zW@D8_ASgcHa|IO#q(MCz4>((hRW~l_&lI4Ri zp0l_~pAJP}4^3 z(H{Yc=?*S1R{uTE7Se>7DKNlA-oly70g2Rge=e%bw3k*ZnH`AsTLOw6a8FXf@Czj8 zD{e6c*CDU4?m!a0QQRR1Li@pB{Yg4Z^IVX5iR@(U9siDU@2~g2anJ*nutX~WTh2gc zdQTeCz%@g*Au)lN@jG8}SrN=bL-PaxM?JsOY8GtzXgXJ1hbt^BCwg5QktINLa|P=V zQM4*HL()Kr$p#e)k;aWWQQq?j&A%J%#(_Iq=)IK&F%fm=YfNKmK7 z`S+WRK4>ZQLP81M9uy-HY|TUG$n&jXF_>~`BiAe1uG1G)Mhws5>+F8f5QO<1 zuo#x%d@2Rs7Agfx{1`kM77y-w_r$z{$w^7iM`MeNyZ01>fEvq z5W@QJk7hWdqi}f|dKG|xm5*<4_rN?rPBB0|w(Je_n;ACQw4ke%08bT}~$eQFr=BIoRi5G$F zdLO=NK9JW9mMs*r<5mYxF02rHT;VtONv~6nz}rHaFrh=!KrJ-^aS#z}XqF&FqX;VS z4sZxYMn;=%dN(9py#3#0S7s>F;^gDg&!sh z@S{0+TXi0XIWRK_dT;VVT8V(1HyJuU=+QDj*9yUTo!wRkBMwBIAHdK+YezIqu$T3q z$=hao;2!7$isg6P&C65GMNT;4E$X8C>hA4WYaG;9vO{+1=4gR$v$jT?_7I59X|M(> z5J_n5=um-}lJ@cqaRcPf1if7V<0%B3`k;MKvp_FZx^?Ro5=H~StV2Ty z2_x7_9VFBB{Y4K11xq1!HSTqK96I}8vNeKnbh8qA31ZugihT!~0V}M6ak4}j3&Q(h zqoI&8f%}*Pfj671tCiX*)yxNW6b6ir@cQ-VH{&_+9>W|_18Ue;?P!kBNdKFxs-mLa z%ref-mA73N?}FUA(jLR13B=v1Zr{jpZA1kz#i13YBY-@*ZmJS-{cp$#-i5M8C_Ga4 z=dK7&ZI^(ikN6!s2u1>#8QyF8u6?@4JyUS6kX$4vt!M z@%*;LllX0?UrX(mnsk44`l(!EBm)|! zRA}2i5HDrp&UghQql`4ht{RJpnyQ|jp77Y%90(BTgd&{-b{%%k!>YdojEo%ZD!UMW z44hIB0#JZ)LTO+SEdrn^ky1*RBpO|l1so6xTpw^sgF!_233$*D2aKZ0hUr~CexXyC z3`j^o03HQUNSG_2zkou*Qeh3TMHqQ~bslbjOCeIq2x0?l7fV@T>It*dsla_DRDnti zE(WBdwWe0U5K^mf_;S;>q4c9@Vx(!I=VgN|fTZ_isZqDQ3l2W@lqg+nZVhGC)zqX%Erw! zLw!cGVMVi;{%o$8)xk$K2>y-$X#u@F6%Qg;0Dp}|w+2y&hCQ+&@8@**atm~(#=1mk zACUFL9N}8c-MF5Vna$^OLfVL^dVP@Q#UkLQ1~U_>mUF;G|lF|uJgf=Q|fryPRGx;ZuE zYlJwLFWd1=E-sqnYgZ|PIf^(Vkl=*I3~3}_qLzAQy}i9_x2M+U<_yt4Atp7ax{rK| z#5rOG@BT5H2=tOie}AmnlaH z=-veS03y#pC2N~a!e$VeHv9MohK>ws97d#{hJ}UsGyhw7(3{t))DdW2C08H}X{7|) zg)v*M)aMI7+OZb-SFYUT?S zF6{e)7s+5_jz!_$M9fqV&#qkE()wQ~< zBAjnpwhnB~FgRNf>(ZVw@8z&XuSz= z6N&1voWDF-2LS>G=u)EuFOeizd20I9qX!HO-{-b36v6|vJ;1Y^tkVf3^k47iS*wvHbuF}FXNf@s-I@A=&rrZ){08Lp6)Tt$erTS zH5V@9Elldh*@8};g1)Y9cfFp&bRD;`m|Up?S;g409~vHQ_W6c^z~-|m1?yhf!Gaus zEDIZrEE_U`fzN!Zoh;N7L1-XEYC{{JD}Z6?2%_ZZ_-$p<^;x%3%L-F~0j?1Cv@C?q zt_Qs{70^2aOcO5Co+s!r+qY}S;8dH#Pa(?-co|4pO2gYL7-eqYP#14Iiy~d$^I(Y% z0WZ)808B*FAn6PUG!Fs_WP$^R$VfucC!GQteISaILYfaEMw#EX0a^q6e_!`!8W#fR zxj^ifVPw5;hQwH(9}y#T7CLwmKzO50cPo49;35P9+W@g64jzQIk*N*!d%wt|tyN>6 zJYs3tDPOm?S|@R^y4`WPuNw(mgGz(+#B^Z>DBQLlr^d1nfrZ#qHaI<=$2)3BbYy+d z@udg{dXPu0Cu-iEwa^{co*OA)CMh>!)t;mEMT{uQJ}P(eA`Gj78ok)E=JBeLVRUG2 zmEvvV9fq#5NG<^R$?|_NO}7ykuTMqMGxNdqcD=Kprv%;JBd?jRtElnnz}82zd)IGs>(dbzzHBAA+fd zLB8v49-vk8_va87t-|@QP7Bv?{=a|WrpEMacvN^eAutF9Vt?NzEGsNsUERz0_$un^ zL-^waqrqC+U-tMUTOW)aXg~RcnsGhMwmip*eFJ&dWPaZt;Jq^XTowr_N(AsistiU9 zCyvcINH42E`W6&0qT9DU8_F9}If}Q%pDslXyt^7kEOMje8FDGf=J8Kr>u~?=Z3hre zug9Oax&y!N_wL;fAW7DXPV|;GilHYG3#WL<+KxHn$fszl=c~H7*v3)Wq=G!~vxvYd z=jInhJoxrhQ4ZY5`~-ygNw0?C$@Kh0bnTdsp2 zQz{i!5b+anwmzTZ=h+!Bzw+n%Xkdgh1fvfiiK6jwWe2qE70|yO9>5P`MO}j*o#JOC zk3Z_#73|Q6(wa7gZjRjl02IT>$5-`rz!Fp}fUTDkkXQ8C5bR!nM5(&3HRw)1f!M~& zyWbco*fANtqNuA?ZlQn}5!bGL1VCd7it#;9THsy(`8|dS&qGTDaY8CAltw0&69r=z z6owocq-7vcCtB&~XHg4?#17OvLBvb<%a<<*(j7m9RL&r{UWB)9WnaK0HUW$Zy-*Dx zS|Z$N=+DzoLWm?lWFj~zknjVi-30DvKnXA_zJ;41%o@c{K*VFmdkoP`Wyl`yv@#ZE zd7Yjhavt+qG@AjZSs(qlT^n=xV4~|X1O9D6bx0qo%E|`OECJ0^RaOq~J;D_}{6D4Y zp_9;|5CaI91`>DO-`_X=k^B&e#x!{H{ZE%bhFeR((V3f_MR1E%M8Ad*dVMV0x^Dkz zC~^}B2?T&5O)BhO**1qT{#IOs@V9=UUi09ri7T8qW)U|hn3uX=ZQs*Bl|}fdcI_^zSe*$1zTqcu$wev@xe|k(<(P3r-91I-%eB8cOxaC!mK0&NTk@gii!BlJmJ zApyhbwrf!f883h#ec*hRLTs$|XtOOe4YHr2FtrAxSZmWjbgSJRF-MfR{0ZN~bi=kt zBw_-@($4UM!Px_ZoCbyL4;-=8O=$@Uc~Dk?{4$`B z%OHRU{DnNBFhN}`wH)OJn864cI_P}mdl<(Rqr*ekuuNbIM2EP)Afc@c6p$tx6hzn@ zBtQ)hjARiZbBPKC>XHVkM#~F!qVJ$K-Yy?R)ISJvL`HkP{9gjYh|d(-_euXT+?J9E z1%sgwp|v1wmi5=eT@|qdhW|7=zUzrZC}(Dw>JCs50!Px| ztb$R#=A@yTt=PDG)CzQ#0R#~Ul_FUiM2rC3iiF)^%16S!0%S0XG6t3e;nKBDJjfOA z{(<{bvAnh^fUPn>=7HkSUGB{cUMm4fx;Pyl4-cS26qLT-*nI839`OFYn$yR50C#3( zt#Ee>Ib#TDhFycMV(Ge&fc9gS0D99GOFYVmvDl@j5`i=6YISVpJX$5+0c6} zF%;>HUHG+28F8zvu$L)dYrMti;Z|f~kVOKa14zdT#H?}@Qr{q|%+o;9DiteOtYkr? znE4cib zI?T4Uixwam#qwAe0Fp(5Scr%OFKP$;TX?>wVpbcGX%K6KDuFRMDq9Q4;jLkzQf5%1 z$F2t08fLBG3{Z{bYw^+$9DqK44+VZDl$g^QZWIF8VDtd+qk&@s>tqH&`0_os?ZuCX zG!G*~1{j;cmkqEEQ@FAu+e=ic|I?FUqZk_-+ida2M_0IE z0oY3jChanqs_5J?SO!s-X<}>Wj0z9sH~pE{#|Lzt!CMFGynM830Wx49?>~l4>i7q_ z_ml;zhh#-*P*qh`NPe=v%v?G-n(B4TAwM5!C26_K!G>gn;6K~`sS|9$yif{Z)cE%ydcah<(!v(Et!_D&kmEQ&XY;FpaWG zNFnzpK{%lT!M8@j6XyR7TInC)5pRRWj4Ux2Q@vm@_@~vvH6+Bs0KF144EXhSmUlxn zF7~zH2};Vzse!Y=X*b(KN{r6?^Ounu>Q?3m4Anu66$4~zq3lw1h8l0u3+ zKj2;j+s8a|^K*KuJbcQRvs_ zbLF_=XTv}52%Mhg-A)Ke7h#vID1G`my7W&>y{EhhM0SwiJX{QFjUNQkqb&g0XXEJ zzZXCTXoz26U_YqM=(WlENtR$REK-LO$OgY|b%_)LXL%qgm`8k$A$ zRh+K;_L_@OL#7s{s}6P)k1`W9N1v_%x7NMKtvX#%ioCPZxkvd?iheKKw zh&&evzKFX9XV~Gq6$#h^kiNgaEBD2IWooE$!qX3jyXv?KPVt66t1m?i7a-FjM5&PL=MHlk zC?r^t=)Q?6vlvzk-G(>00ym_7aC8aIY)45IMnLHedrD&^DuHr~xBxKoka3sBSRv?i zdb&F9;vC*Te)@Z_ohIyRiFD+pyYe_VIE`k*A44c|EU3%a~JJ)S2bp8l1{cWYv69~_UiBrZy1FzwB?{Z6{#~pY9=1W>Q+h8 zal19fSyq++U^2u*QoojYZKqQH+}h`LTqZ<eYUCu;+`KI>@>s*Ng#11{#3tdJ}ZW8qoUG$dd)p>*UbH=U|+? z_Vrc4c?xA215BY9Zb86^gG)EmTwD?0>}=-h9s9xkACi}fNnOogo5nyy%n6eK!^U>L z{TAFEfSZ%#0E_aAyGB&cMR;xPyW^4bet`5rPqq@>m=zCllU=>eoe!XRhV6u$=jILM zG9PHcaLw^2Tz8{kV+;BGSv1+9Yz>6n4%qw0Acl|#xpIO?Jcrq+qrP+JGd+n-6^w4E zIDv5-Q+bvviWzBX48%F6Xvu|2{I$^DI+BDw&E9WiDf)GE{~JB$Wn26HZfxRFWih zQZ!IVQc0!;WsD?AX^=`NLTUJa_nhZ-U(@|OZ=TQd>VJIh^SaT|G5mh}zOS{mZCl%# zp)poY?m+yfxbzSuKM#-T#FZmim-G~%aMfu)JWKhcMiadwl&U*al zQIc6y>2S?GU+Ip#y7peH2^Oyc^MejFJzn_kXs>j`5rFJ&721>g0>XnSzO5yZG$Dh_8x9;4lu?~BIpTF`N z7p+}8M7!V5GE@Y#-Q<7Fj_NRInzSobACj-za7gAKmqskGwjM+7UDQ~g*tp)}bHqcW zSU;f&YbcTrW|{{>b9p;|7m{O&!%15|_Mw*<^|aopbg>y&rUVDu+!h;;4Rrdpq}ZQ= zmxsq>-N@NCyZ7wb4&1dJ^?&K>Xay3e4(uVWhz;uedF{OnZaQ?0$#I&k@ERG=K{vN? z?apeHUe8TWN=eaw{njk%S%l#fAxqXP)b|~@q2TE-?1CM zAcXq@adYJCSs9i%DSk0klj+A-SG-%L&lZc1N0EAO>!}^?a$9mjXzsNojh?+=K?hVw z-_xhJ4famx-mP2M!`{pL`aRm0UVOLYYhQ)F?c24JKdqlDpF-MOg+Ra?whm3_bbik= z#*fSqaxvWEg11-JV>GUU0){|lX-a0!A)UYij>BpQHcjzZ; z+B&~~%H6cAL*x<4pJQjvJYL;ct4~VW{J3T5(L;xfK_KYDZWfh&nC(eMfwX^jdGuv= zKw?Q^ZDwTMnGwT=>26qRV6cFvw(Z<`;?Z0xRK?Y|Zob|GlK3E`n=>ju=bH4@>#i&h z8{mE*wRl>?-I-~F4yBI#Vz^|=&XWhTXYT&6HGH<0T+w2xxrfh~)uU(6uDyGwP$$)gIW@m%5Sw8YTp<3Ymp~!~-Fy#Va67ef zo6emttWI?HelLA-9;X92339u8qcu*QKK+np6Rmmk?iN;d88BcWWlFQ-)zBINpiir} zboph2$b_!@uc$h{(7qu0i5Es3c#)Q_-}Q8hRHZLhs@!K=?3|aU-n6QM){d=loR)WF z%u~{_!|<2mIe9GOD<UHlrZ!b7F0-mui1SdCeLfp=R5+OH~J&@XQ#2w4`cGva0 z5BYuBPSnilXR&Ub44J2nwa%B-+N}gI)C}{G3w|7YgKDi=~J_Qzu3kW8`|+JWphkxhNZV2kyjV;$B{w3 zvce+Wr_~;yNNFCQ`gqCTbPl|OFrht`v9^0fqL|3^(4#;Xi|9qY&cR;QC3auG{Pc|2#G4fGvN)VBrReAWQtbbg@^eMP4i(_6 zpy1#w*dY))(g`zdz@RxyR2~=d9z-AdsP++w`hVUA%_)}RfB}zCEgd*?D157ugzmHZ zF#HcvQv*Y=0FA7mG3ZsS?Fb0~l+2hh$M|OBxE-96E4avTsYBTO$RwUoqdDDS?{jzO zOU)A}@0T_18pFRwRTZ3(`99FLc~AXCFDIzB{o<2Yx0iO?E`9qxK9&b~mDf)_pE`_5miR2;m@ndo8?%tijsb0g{j-~!l_*Po! zplbWRLu2*o#+J8|>XzN`x{AHp1H`|o z_%83h`oYhzodKrCv>c8nEtbV;VZ-<}w>b1i%H zZv1u2i6i_by4n`4T3rQqpe#s+zYq6s@Acr1tny-llj6#2ZM+`bhf_Ino&BGa;SU+X?YY%M$B*}-CCB5~G1pwntlnotTz+%xTGFbrKa$qn zso1(nW>&vGF*%zruIxU>Z_V2;gIm2FXsw$QmwtM(eY>da1<3EOWLuERThrxco?~KW zX2XKui!{@qFQBv97YXS~%Q4MdwO0;)51W0C{aKgSSU*TYC)P+{lDWZ7KMu z&pVx+H8`T74f;!SMEq4Z@EewLIs*c zF@@>K7<4}2RSug|eh4W0*R*untNXjdjdH=OHgyMnDcxy5*?-oYIeM`xqaCM2Wq&+@ z8XE%@MviQI;rYgkSK|##Ok^qU91@I%-Z)y4!C~C=4%kIx%upXqz=r*(6vTl7$Y0*5J?4AKz5f>t|YRS9vts ze)G&3GaP=t+rRz2?|SsogC|Tlft;y_E2jXds}|sY?~_e?O1Vei@yT4?P>sC@lpRbJ zMvgLj-m~=xDPY7KoGVB2Wi>Q3M2=HLy%~9R`65S0HBJRy0I?aN=3s z^Ml>wv3`$USxjIdZ+LTKEVY2{z{rZ9=3l3chFj?l7MdMnH3;cLJ^?~R6reKQ9TB;f z>p41;ua^NA^-E0Do!C1%;WHKY1u81%l){1n4)_0(4*l_={UQ+{Ej63sgkdv?vPE2r%v!2ess} zE#*XRT{OqEiWF$!9^zMYWt6^>hoQB7-pY!1!>>=ZcWUhm!j#G-KX~ZS^G6Xw#SJ6| z5%$(buS8(Bj`Nn&U$5WAULuc(eHQ8#!wab>@6_z_ea!QoF;V;dGzWGIYTM&h{r6S$ zvb$xPx16WHWwLaqb;iajlbX)0r5U}f2%DQiaxV3{KK0V2>o(QI|M@Fd_G7IinT&f^ zy`%JP!W5y`EfQ-tb)nX(n}62@vx44kXc_#X?}g`DMn(e%y3h3*k|7~2v6!&xNam5h zo|U%LRi|tg00QgEdD1oZy&kzQf2UMsXDk%2%HxHbTal(eE^8w&`?{m$(dxc=^tzaw z2kGh0O@2Q^^U_F-k@k1XtI3O%yUKK2Km&5dO{HH#=|8dB4yLjF3C$odhi6B@H6;|(1>6_P`;5BPj3vSb?4kCv*D+v}C z@>`W|ixE;++dE#YGwzymrrk4HH_hOySFeJhCtJpJN9EDB<_sP?`8Kg%Y8)|F+AxC; zQ098w;gERqY_eYE*YAHR?~>68-o3jSxLc3Yb!QMSbnDw!3&rB_nX_gE9hK7oPd9xUf&@;O;CWfcv-E_TcvJ(pEY!Nb$ks;)N3WN0Q}pbQF*a!rSgWdnVE9EvgE-8%{1bFP|e374(0mUy&RB{)8J2#iZ)e z1kxJb^i-R!p|yS&+rIDEd0l>mlzrT#DN0I50k9!$TyrXhD=Bq4lmvd&8vs&~Z$9yH z`O`m}qhG7s6u<{0z}^6(1C&D^Kp>IAreGw*faKbytWNGJ_mC5WZ*D$@9;#-|n@fE_ zTkN3_b=|m|I21hgoiozcR$6iO4>IZu>aoN^ny4Q7O?3a`k3Ygc{emrcRk0P|)ZQo3 zR>|iOy@8@CZuS&lAJW}5bLGm+2|z!<&DQX*AOv^}tVL&1N8kK<1joWFjr%F=9X^3+ z&5PUus7y-vlahb$BQs-;;N+6@&-{n(q{_#Bs%*oUPFyC?{W#=fA)oO~o z1ZF>R>8uWk^*35s_H2g^#g1U%XQz(j_)%6E=Jm?K`2Wz=_q zMW0Ul_Ym}ri)A#Z@9EU}Rt`eMMmv~oQ2F@;0bs*cf>JZ@Zu zgT(~DBj2M3c!`~HKv{ZXMX%2&jK=^Yx0JIIE9DKK%EMDC?YYo&>ZSF!x_O6-Cbc}) zW*8*KdMba3L7ZJ%S4x;M7DV!O`{(y?-0HseZv_WimEhV|Di<8v43 z>Gcx1=~4PBY-n}hO(mE~PJ(QwFUg12l!I`EIEO5zY=a)k{BG5hw~#d@x)ze^AjoS^ zN;ynkz8#yG$}4>H((_?~=F65XyOb>3w8=WA*bfR+oPWC!IB4ya<1A1w$t=3yB}!;`ePh3K2Q)W( zUkbW*a-qJz?NzJ1TXo-K5`)2ss8_VLwQnO*u6eN7d3UCHQmNg#34T;EoVrhMY%!iU zZyuSQGB9-573wUGqX)UVDaLE=o=`TgVA>qaHT#qVrl+jQ(WOh%@eYg2aB zc7?8AmBI*xr8#2{rv6w@Z`HT5%tHWg8|t{sI-?_gNs6IjK4eFYfXE0A2{`~Cadqbp zOA7TBrb}G+58QE}u|BVH7@9$==!5@W+0{2)<=f@eHe5V9Ne(9UP>cabAyf_D z?GIqJtMDlhT%AKC8k;BiFJjH-mH8pzU^_#of-3SaT~8~120|2WjLDje#!?fn19w7&VjJpL%S9 z1QdZrk%o_Xi2(@fyGct6g!ZsqFWu-+`OG=nqx*UtFj&=CSE8Psuyf*S$I6zpZ*rvJ zwQ}E8s=2bra&$hIO-=JWb!z31S4*$&ok*3-_8iZ7DPi@Bk0&-WOaz>~$_zY(&1lfcvi`RN|Kr zQZ-q3v&zNNS_%89F!aJ18L%}pF}{=nV<0uF;8qU&cU zN_2;P-0x!5xm9COy|(=j*Kwv&;a9JluG*J=#^+MnQYqKhhuAUHt>P>-d)P;9U}tjl zU@jfy2fXG2(1sc!$P?apS4PEGA`kE|__Bn{O)l#qmo$Ce&Kn1dhD<-D(KYt{TgR^p`OH6)MmtZ})-G)v50VpE z<+%Ue9okCdsJCfD_p2ZJK>*#u?0m3{cf{C2E0BQ}r2rn#m3>=v$;F)Lqvzjj^zP-^uMI5~FM2@I99+APvbDX*qD z*$wDNf32$jBIo+@)!hdUe9V~u{$!kgdl%*XJ}%Bx=lUI%3DtT-t)|>2x!af(F#tn~ zHf)Hnr;QwCwB#1yL6~G7t+RZ28|}?`nbFN1Py+XbT?20@?CkQhIc8TSDe4VlDMK@F z4HCu6G=nUuw4Xm6AiYG4M70;lb;io(5ZGU{Wh;6}=IPIKrv1rzl3e&wu9`w{Gl|M7 z0rS5yi_(2HW4RGf0B!|O6r>j~S`?w%SUhNEX<80DH?ypke842ht*7^`m$W``nS%Yu zxn;60anW2?_O6}cRI3cA_>LVXHZ?kg-ROP2XtWw@ov)Foo{9|Wxahd!h}QkNViQ5% z`@0B?TR?-zWc2=YHL-Wn&+3#vSH0H5qxp{u>h&WLW2)b_OOQx=V50h|TkGofSi|3tJnRGM8cT)Q&Ltti04aQ!Vhii&LOm&oNa#Wro2u_T z(Ncbs&WU*=M~yl{!qyx>z~bYY9rT6%gjhqIO5LWbd9cN@U$)y;G@4GjpB^6Zx$L!+ z^IkbvI_*;t4~lJce>oH0ifXkZrP8j-jPp@QEEokaNKUM~!^nQNl+Y&7g~)YEOLQG`Ws@x6p+A7cO3 z0(4dv7E^}{Nx&O_B{mvUwyIU74*m8yZxBQ*Tg>QB_cEI)Y?EfetDdBfZWR*xIqbFf zpgiy2OT+m$JPu;82&9K{+v~)MWXj@F0uX1a0Nmg;25futZksc&P1n&d(IV?H=fOMc zF4EE#MUKjTk4~$*oJnk`j{NDUuh-=w%0A2*PLjZNr%DGwBL^Md?4WM7p>90cT9!jX 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Ξ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 literal 67902 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 K;pfa}ulq0d0ll#R diff --git a/lib/Action/EmailSync.php b/lib/Action/EmailSync.php index c027faf..3c9bc79 100644 --- a/lib/Action/EmailSync.php +++ b/lib/Action/EmailSync.php @@ -79,6 +79,7 @@ class EmailSync implements IUserAction /** * @inheritdoc + * @throws \OCP\PreConditionNotMetException */ public function doAction(User $user) { diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 3cec6bb..730b953 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -39,7 +39,7 @@ class Application extends App */ public function __construct(array $urlParams = array()) { - parent::__construct('user_sql', $urlParams); + parent::__construct("user_sql", $urlParams); } /** diff --git a/templates/admin.php b/templates/admin.php index fb227f9..c0bc1ba 100644 --- a/templates/admin.php +++ b/templates/admin.php @@ -146,7 +146,7 @@ function print_select_options( print_text_input($l, "db-table-user-column-email", "Email", $_['db.table.user.column.email']); print_text_input($l, "db-table-user-column-home", "Home", $_['db.table.user.column.home']); print_text_input($l, "db-table-user-column-password", "Password", $_['db.table.user.column.password']); - print_text_input($l, "db-table-user-column-name", "Username", $_['db.table.user.column.name']); + print_text_input($l, "db-table-user-column-name", "Display name", $_['db.table.user.column.name']); print_text_input($l, "db-table-user-column-avatar", "Can change avatar", $_['db.table.user.column.avatar']); ?>
From d0533e5eddccdb29463af151e2a59d286abde4d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Tue, 12 Jun 2018 22:34:06 +0200 Subject: [PATCH 15/29] Changelog updated --- CHANGELOG.md | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d7622f..15dba21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,28 +6,48 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] ### Added -- Options for Courier authlib authentication: courier_md5, courier_md5raw, courier_sha1, courier_sha256 -- crypt_type 'drupal' for Drupal 7 authentication +- New hashing algorithms: Argon2 Crypt (PHP 7.2 and above), Blowfish Crypt, Courier base64-encoded MD5, Courier base64-encoded SHA1, + Courier base64-encoded SHA256, Courier hexadecimal MD5, Extended DES Crypt, SHA256 Crypt, + SHA512 Crypt, SSHA512, Standard DES Crypt +- Option to allow users to change their display names +- Option to allow user to change its avatar +- Database query results cache +- Option for group display name +- Option for group is admin flag + +### Changed +- The whole core implementation, which is NOT COMPATIBLE with the previous versions. +- Minimum supported PHP version - 7.0 + +## Removed +- MySQL ENCRYPT() hashing implementation - Function is deprecated as of MySQL 5.7.6 and will be removed in a future MySQL release. +- MySQL PASSWORD() hashing implementation - Function is deprecated as of MySQL 5.7.6 and will be removed in a future MySQL release. +- Redmine hashing implementation - Cannot implement in new core system. +- User active column - Use database view instead +- Domain support ## [3.1.0] - 2018-02-06 ### Added - Column autocomplete for PostgreSQL - Currently supported parameters in README.md - SALT support for password algorithms "system" and "password_hash" + ### Changed - Updated README.me file - Nextcloud 12 & 13 support - Moved files to be more on the standard places - Renamed some files to be more standard like - Source code changes to be more standard like (max 80 characters) + ### Fixed - Column autocomplete in "Groups Settings" - Security fix for password length sniffing attacks - Small bug fixes + ## Removed - Code for supervisor mode -## [2.4.0] - 2017-12-26 +## 2.4.0 - 2017-12-26 ### Added - This CHANGELOG.md file - Support for PHP 7 @@ -37,3 +57,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Supported version of ownCloud, Nextcloud: ownCloud 10, Nextcloud 12 + +[Unreleased]: https://github.com/nextcloud/user_sql/compare/v3.1.0...develop +[3.1.0]: https://github.com/nextcloud/user_sql/compare/v2.4.0...v3.1.0 From 2bc05286560a028096af6020866035ebbf0cedd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Tue, 12 Jun 2018 23:45:53 +0200 Subject: [PATCH 16/29] New readme pt. 1 --- README.md | 63 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1ec67ec..9ba1649 100644 --- a/README.md +++ b/README.md @@ -5,21 +5,66 @@ user_sql ![](https://github.com/nextcloud/user_sql/blob/master/screenshot.png) +Use external database as a source for Nextcloud users and groups. +Retrieve the users and groups info. Allow the users to change their passwords. +Sync the users' email addresses with the addresses stored by Nextcloud. + ## Getting Started -1. SSH into your server -2. Get into the apps folder of your Nextcloud installation, for example /var/www/nextcloud/apps +1. SSH into your server. -3. Git clone this project -``` -git clone https://github.com/nextcloud/user_sql.git -``` +2. Get into the apps folder of your Nextcloud installation, for example */var/www/nextcloud/apps*. -4. Login your Nextcloud as admin +3. Git clone this project: `git clone https://github.com/nextcloud/user_sql.git` -5. Navigate to Apps from the menu and enable the SQL user backend +4. Login to your Nextcloud instance as admin. -6. Navigate to Admin from menu and switch to Additional Settings, scroll down the page and you will see SQL User Backend settings +5. Navigate to Apps from the menu then find and enable the *User and Group SQL Backends* app. + +6. Navigate to Admin from menu and switch to Additional Settings, scroll down the page and you will see *SQL Backends* settings. + +*You can skip the first three steps as this app is available in the official Nextcloud App Store.* + +## Configuration + +Below are detailed descriptions of all available options. The options are mandatory if not said differently. + +### Database connection + +This section contains database connection parameters. + +**SQL driver** - The database driver to use. Currently supported drivers are: mysql, pgsql. + +**Hostname** - The hostname on which the database server resides. + +**Database** - The name of the database. + +**Username** - The name of the user for the connection. (optional) + +**Password** - The password of the user for the connection. (optional) + +#### Options + +**Allow display name change** - With this option enabled user can change its display name. The change is propagated to the database. (optional, default: 0) + +**Allow password change** - Can user change its password. The password hash is propagated to the database. See [Hash algorithms](#Hash algorithms). (optional, default: 0) + +**Use cache** - Use database query results cache. The cache can be cleared any time with the *Clear cache* button click. (optional, default: 0) + +**Hashing algorithm** - How users passwords are store in the database. See [Hash algorithms](#Hash algorithms). + +**Email sync** - Sync e-mail address with the Nextcloud. + - *None* - Disables this feature. This is the default option. + - *Synchronise only once* - Copy the e-mail address to the Nextcloud storage if its not set. + - *Nextcloud always wins* - Always copy the e-mail address to the database. This updates the user table. + - *SQL always wins* - Always copy the e-mail address to the Nextcloud storage. + +**Home mode** - User's storage path. + - *Default* - Let the Nextcloud manage this. The default option. + - *Query* - Use location from the database pointed by the home column. + - *Static* - Use static location. The `%u` variable by replaced with the username of the user. + +**Home Location** - User storage location for the static home mode. Mandatory if the *Home mode* is set to `Static`. ## Integrations From 8986b9f0b449caff223f6bb661b0c16cd9389949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 08:26:19 +0200 Subject: [PATCH 17/29] New readme pt. 2 --- README.md | 99 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 72 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 9ba1649..c9f4902 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ user_sql **Nextcloud SQL user authentication.** -![](https://github.com/nextcloud/user_sql/blob/master/screenshot.png) +![screenshot](https://github.com/nextcloud/user_sql/blob/develop/img/screenshot.png) Use external database as a source for Nextcloud users and groups. Retrieve the users and groups info. Allow the users to change their passwords. @@ -15,7 +15,7 @@ Sync the users' email addresses with the addresses stored by Nextcloud. 2. Get into the apps folder of your Nextcloud installation, for example */var/www/nextcloud/apps*. -3. Git clone this project: `git clone https://github.com/nextcloud/user_sql.git` +3. Git clone this project: `git clone https://github.com/nextcloud/user_sql.git`. 4. Login to your Nextcloud instance as admin. @@ -23,48 +23,93 @@ Sync the users' email addresses with the addresses stored by Nextcloud. 6. Navigate to Admin from menu and switch to Additional Settings, scroll down the page and you will see *SQL Backends* settings. -*You can skip the first three steps as this app is available in the official Nextcloud App Store.* +*You can skip the first three steps as this app is available in the official [Nextcloud App Store](https://apps.nextcloud.com/apps/user_sql).* ## Configuration -Below are detailed descriptions of all available options. The options are mandatory if not said differently. +Below are detailed descriptions of all available options. ### Database connection -This section contains database connection parameters. +This section contains the database connection parameters. + +Name | Description | Details +--- | --- | --- +**SQL driver** | The database driver to use. Currently supported drivers are: mysql, pgsql. | Mandatory. +**Hostname** | The hostname on which the database server resides. | Mandatory. +**Database** | The name of the database. | Mandatory. +**Username** | The name of the user for the connection. | Optional. +**Password** | The password of the user for the connection. | Optional. + +### Options + +Here are all currently supported options. + +Name | Description | Details +--- | --- | --- +**Allow display name change** | With this option enabled user can change its display name. The display name change is propagated to the database. | Optional. Default: false. +**Allow password change** | Can user change its password. The password change is propagated to the database. See [Hash algorithms](#Hash algorithms). | Optional. Default: false. +**Use cache** | Use database query results cache. The cache can be cleared any time with the *Clear cache* button click. | Optional. Default: false. +**Hashing algorithm** | How users passwords are stored in the database. See [Hash algorithms](#Hash algorithms). | Mandatory. +**Email sync** | Sync e-mail address with the Nextcloud. | Optional, default: *None*. +- | - *None* - Disables this feature. This is the default option. +- | - *Synchronise only once* - Copy the e-mail address to the Nextcloud storage if its not set. +- | - *Nextcloud always wins* - Always copy the e-mail address to the database. This updates the user table. +- | - *SQL always wins* - Always copy the e-mail address to the Nextcloud storage. +**Home mode** | User storage path. | Optional, default: *Default*. +- | - *Default* - Let the Nextcloud manage this. The default option. +- | - *Query* - Use location from the user table pointed by the *home* column. +- | - *Static* - Use static location. The `%u` variable is replaced with the username of the user. +**Home Location** | User storage path for the `static` *home mode*. | Mandatory if the *Home mode* is set to `Static`. + +## User table + +The definition of user table. The table containing user accounts. + +Name | Description | Details +--- | --- | --- +**Table name** | The table name. | Mandatory for user backend. +**Username** | Username column. | Mandatory for user backend. +**Email** | E-mail column. | Mandatory for *Email sync* option. +**Home** | Home path column. | Mandatory for `Query` *Home sync* option. +**Password** | Password hash column. | Mandatory for user backend. +**Display name** | Display name column. | Optional. +**Can change avatar** | Flag indicating if user can change its avatar. | Optional. Default: false. + +## Group table + +Group definitions table. + +Name | Description | Details +--- | --- | --- +**Table name** | The table name. | Mandatory for group backend. +**Is admin** | Flag indicating if its the admin group | Optional. +**Display name** | Display name column. | Optional. +**Group name** | Group name column. | Mandatory for group backend. + +## User group table + +Associative table which maps users to groups. + +Name | Description | Details +--- | --- | --- +**Table name** | The table name. | Mandatory for group backend. +**Username** | Username column. | Mandatory for group backend. +**Group name** | Group name column. | Mandatory for group backend. + + + -**SQL driver** - The database driver to use. Currently supported drivers are: mysql, pgsql. -**Hostname** - The hostname on which the database server resides. - -**Database** - The name of the database. -**Username** - The name of the user for the connection. (optional) -**Password** - The password of the user for the connection. (optional) -#### Options -**Allow display name change** - With this option enabled user can change its display name. The change is propagated to the database. (optional, default: 0) -**Allow password change** - Can user change its password. The password hash is propagated to the database. See [Hash algorithms](#Hash algorithms). (optional, default: 0) - -**Use cache** - Use database query results cache. The cache can be cleared any time with the *Clear cache* button click. (optional, default: 0) -**Hashing algorithm** - How users passwords are store in the database. See [Hash algorithms](#Hash algorithms). -**Email sync** - Sync e-mail address with the Nextcloud. - - *None* - Disables this feature. This is the default option. - - *Synchronise only once* - Copy the e-mail address to the Nextcloud storage if its not set. - - *Nextcloud always wins* - Always copy the e-mail address to the database. This updates the user table. - - *SQL always wins* - Always copy the e-mail address to the Nextcloud storage. -**Home mode** - User's storage path. - - *Default* - Let the Nextcloud manage this. The default option. - - *Query* - Use location from the database pointed by the home column. - - *Static* - Use static location. The `%u` variable by replaced with the username of the user. -**Home Location** - User storage location for the static home mode. Mandatory if the *Home mode* is set to `Static`. ## Integrations From f872cb8b299c0f30a7a0343bebe219d7b0c52243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 08:38:07 +0200 Subject: [PATCH 18/29] Readme formatting --- README.md | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index c9f4902..bfdaf86 100644 --- a/README.md +++ b/README.md @@ -47,19 +47,12 @@ Here are all currently supported options. Name | Description | Details --- | --- | --- -**Allow display name change** | With this option enabled user can change its display name. The display name change is propagated to the database. | Optional. Default: false. -**Allow password change** | Can user change its password. The password change is propagated to the database. See [Hash algorithms](#Hash algorithms). | Optional. Default: false. -**Use cache** | Use database query results cache. The cache can be cleared any time with the *Clear cache* button click. | Optional. Default: false. +**Allow display name change** | With this option enabled user can change its display name. The display name change is propagated to the database. | Optional.
Default: false.
Requires user's *Display name* column. +**Allow password change** | Can user change its password. The password change is propagated to the database. See [Hash algorithms](#Hash algorithms). | Optional.
Default: false. +**Use cache** | Use database query results cache. The cache can be cleared any time with the *Clear cache* button click. | Optional.
Default: false. **Hashing algorithm** | How users passwords are stored in the database. See [Hash algorithms](#Hash algorithms). | Mandatory. -**Email sync** | Sync e-mail address with the Nextcloud. | Optional, default: *None*. -- | - *None* - Disables this feature. This is the default option. -- | - *Synchronise only once* - Copy the e-mail address to the Nextcloud storage if its not set. -- | - *Nextcloud always wins* - Always copy the e-mail address to the database. This updates the user table. -- | - *SQL always wins* - Always copy the e-mail address to the Nextcloud storage. -**Home mode** | User storage path. | Optional, default: *Default*. -- | - *Default* - Let the Nextcloud manage this. The default option. -- | - *Query* - Use location from the user table pointed by the *home* column. -- | - *Static* - Use static location. The `%u` variable is replaced with the username of the user. +**Email sync** | Sync e-mail address with the Nextcloud.
- *None* - Disables this feature. This is the default option.
- *Synchronise only once* - Copy the e-mail address to the Nextcloud storage if its not set.
- *Nextcloud always wins* - Always copy the e-mail address to the database. This updates the user table.
- *SQL always wins* - Always copy the e-mail address to the Nextcloud storage. | Optional.
Default: *None*. Requires user's *Email* column. +**Home mode** | User storage path.
- *Default* - Let the Nextcloud manage this. The default option.
- *Query* - Use location from the user table pointed by the *home* column.
- *Static* - Use static location. The `%u` variable is replaced with the username of the user. | Optional
Default: *Default*. **Home Location** | User storage path for the `static` *home mode*. | Mandatory if the *Home mode* is set to `Static`. ## User table @@ -74,7 +67,7 @@ Name | Description | Details **Home** | Home path column. | Mandatory for `Query` *Home sync* option. **Password** | Password hash column. | Mandatory for user backend. **Display name** | Display name column. | Optional. -**Can change avatar** | Flag indicating if user can change its avatar. | Optional. Default: false. +**Can change avatar** | Flag indicating if user can change its avatar. | Optional.
Default: false. ## Group table From 302f64733429a3db3ee664ab0105a488a3e72749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 08:56:46 +0200 Subject: [PATCH 19/29] Integration description --- README.md | 66 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index bfdaf86..2802e56 100644 --- a/README.md +++ b/README.md @@ -51,11 +51,11 @@ Name | Description | Details **Allow password change** | Can user change its password. The password change is propagated to the database. See [Hash algorithms](#Hash algorithms). | Optional.
Default: false. **Use cache** | Use database query results cache. The cache can be cleared any time with the *Clear cache* button click. | Optional.
Default: false. **Hashing algorithm** | How users passwords are stored in the database. See [Hash algorithms](#Hash algorithms). | Mandatory. -**Email sync** | Sync e-mail address with the Nextcloud.
- *None* - Disables this feature. This is the default option.
- *Synchronise only once* - Copy the e-mail address to the Nextcloud storage if its not set.
- *Nextcloud always wins* - Always copy the e-mail address to the database. This updates the user table.
- *SQL always wins* - Always copy the e-mail address to the Nextcloud storage. | Optional.
Default: *None*. Requires user's *Email* column. +**Email sync** | Sync e-mail address with the Nextcloud.
- *None* - Disables this feature. This is the default option.
- *Synchronise only once* - Copy the e-mail address to the Nextcloud storage if its not set.
- *Nextcloud always wins* - Always copy the e-mail address to the database. This updates the user table.
- *SQL always wins* - Always copy the e-mail address to the Nextcloud storage. | Optional.
Default: *None*.
Requires user's *Email* column. **Home mode** | User storage path.
- *Default* - Let the Nextcloud manage this. The default option.
- *Query* - Use location from the user table pointed by the *home* column.
- *Static* - Use static location. The `%u` variable is replaced with the username of the user. | Optional
Default: *Default*. **Home Location** | User storage path for the `static` *home mode*. | Mandatory if the *Home mode* is set to `Static`. -## User table +### User table The definition of user table. The table containing user accounts. @@ -69,7 +69,7 @@ Name | Description | Details **Display name** | Display name column. | Optional. **Can change avatar** | Flag indicating if user can change its avatar. | Optional.
Default: false. -## Group table +### Group table Group definitions table. @@ -80,7 +80,7 @@ Name | Description | Details **Display name** | Display name column. | Optional. **Group name** | Group name column. | Mandatory for group backend. -## User group table +### User group table Associative table which maps users to groups. @@ -90,22 +90,52 @@ Name | Description | Details **Username** | Username column. | Mandatory for group backend. **Group name** | Group name column. | Mandatory for group backend. - - - - - - - - - - - - - - ## Integrations +The basic functionality requires only one database table: [User table](#User table). + +For all options to work three tables are required: + - [User table](#User table), + - [Group table](#Group table), + - [User group table](#User group table). + +If you already have an existing database you can always create database views which fits this model, +but be aware that some functionalities requires data changes (update queries). + +If you don't have any database model yet you can use below tables (MySQL): +``` +CREATE TABLE sql_users +( + id INT AUTO_INCREMENT PRIMARY KEY, + username VARCHAR(16) NOT NULL, + display_name TEXT NULL, + email TEXT NULL, + home TEXT NULL, + password TEXT NOT NULL, + can_change_avatar BOOLEAN NOT NULL DEFAULT FALSE, + CONSTRAINT users_username_uindex UNIQUE (username) +); + +CREATE TABLE sql_group +( + id INT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(16) NOT NULL, + display_name TEXT NULL, + admin BOOLEAN NOT NULL DEFAULT FALSE, + CONSTRAINT group_name_uindex UNIQUE (name) +); + +CREATE TABLE sql_user_group +( + id INT AUTO_INCREMENT PRIMARY KEY, + group_name VARCHAR(16) NOT NULL, + username VARCHAR(16) NOT NULL, + CONSTRAINT user_group_group_name_username_uindex UNIQUE (group_name, username), + INDEX user_group_group_name_index (group_name), + INDEX user_group_username_index (username) +); +``` + ### WordPress Thanks to this app, Nextcloud can easily integrate with Wordpress. From fa4c540b3867afcc9e99718029ddbfd8a4d5553c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 08:59:09 +0200 Subject: [PATCH 20/29] fix anchors --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2802e56..ac69a02 100644 --- a/README.md +++ b/README.md @@ -48,9 +48,9 @@ Here are all currently supported options. Name | Description | Details --- | --- | --- **Allow display name change** | With this option enabled user can change its display name. The display name change is propagated to the database. | Optional.
Default: false.
Requires user's *Display name* column. -**Allow password change** | Can user change its password. The password change is propagated to the database. See [Hash algorithms](#Hash algorithms). | Optional.
Default: false. +**Allow password change** | Can user change its password. The password change is propagated to the database. See [Hash algorithms](#hash-algorithms). | Optional.
Default: false. **Use cache** | Use database query results cache. The cache can be cleared any time with the *Clear cache* button click. | Optional.
Default: false. -**Hashing algorithm** | How users passwords are stored in the database. See [Hash algorithms](#Hash algorithms). | Mandatory. +**Hashing algorithm** | How users passwords are stored in the database. See [Hash algorithms](#hash-algorithms). | Mandatory. **Email sync** | Sync e-mail address with the Nextcloud.
- *None* - Disables this feature. This is the default option.
- *Synchronise only once* - Copy the e-mail address to the Nextcloud storage if its not set.
- *Nextcloud always wins* - Always copy the e-mail address to the database. This updates the user table.
- *SQL always wins* - Always copy the e-mail address to the Nextcloud storage. | Optional.
Default: *None*.
Requires user's *Email* column. **Home mode** | User storage path.
- *Default* - Let the Nextcloud manage this. The default option.
- *Query* - Use location from the user table pointed by the *home* column.
- *Static* - Use static location. The `%u` variable is replaced with the username of the user. | Optional
Default: *Default*. **Home Location** | User storage path for the `static` *home mode*. | Mandatory if the *Home mode* is set to `Static`. @@ -92,12 +92,12 @@ Name | Description | Details ## Integrations -The basic functionality requires only one database table: [User table](#User table). +The basic functionality requires only one database table: [User table](#user-table). For all options to work three tables are required: - - [User table](#User table), - - [Group table](#Group table), - - [User group table](#User group table). + - [User table](#user-table), + - [Group table](#group-table), + - [User group table](#user-group-table). If you already have an existing database you can always create database views which fits this model, but be aware that some functionalities requires data changes (update queries). From 6d4c57193dc5ed3c755df28d363d7c342625aa14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 09:07:29 +0200 Subject: [PATCH 21/29] Integration --- README.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ac69a02..065473a 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,8 @@ Name | Description | Details **SQL driver** | The database driver to use. Currently supported drivers are: mysql, pgsql. | Mandatory. **Hostname** | The hostname on which the database server resides. | Mandatory. **Database** | The name of the database. | Mandatory. -**Username** | The name of the user for the connection. | Optional. -**Password** | The password of the user for the connection. | Optional. +**Username** | The name of the user for the connection. | Optional. +**Password** | The password of the user for the connection. | Optional. ### Options @@ -137,29 +137,29 @@ CREATE TABLE sql_user_group ``` ### WordPress -Thanks to this app, Nextcloud can easily integrate with Wordpress. -In the Nextcloud Column Settings of SQL User Backend, configure it as +Thanks to this app, Nextcloud can easily integrate with Wordpress. +In the Nextcloud user table settings of SQL Backends, configure it as: ``` -Table: wp_users -Username Column: user_login -Password Column: user_pass -Encryption Type: Joomla > 2.5.18 phppass +User table: wp_users +Username column: user_login +Password column: user_pass + +Hashing algorithm: Unix (Crypt) ``` ### JHipster + It is very easy to integrate Nextcloud with JHipster. - Follow the Using the Database instructions in [Using Jhipster in development](http://www.jhipster.tech/development/) to configure your database. Assume you chose MySQL as JHipster database. - -In the Nextcloud Column Settings of SQL User Backend, configure it as +In the Nextcloud user table settings of SQL Backends, configure it as: ``` -Table: jhi_users -Username Column: login -Password Column: password_hash -Encryption Type: Joomla > 2.5.18 phppass -User Activate Column: activated -Email Column: email +User table: jhi_users +Username column: login +Password column: password_hash +Email column: email + +Hashing algorithm: Unix (Crypt) ``` ## Features From e3e6aded01818a8651820057de0850556be6cb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 09:12:38 +0200 Subject: [PATCH 22/29] Add TODOs --- README.md | 52 ++++++++++++++-------------------------------------- 1 file changed, 14 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 065473a..a3d1f13 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,7 @@ CREATE TABLE sql_user_group ### WordPress Thanks to this app, Nextcloud can easily integrate with Wordpress. + In the Nextcloud user table settings of SQL Backends, configure it as: ``` User table: wp_users @@ -151,6 +152,7 @@ Hashing algorithm: Unix (Crypt) ### JHipster It is very easy to integrate Nextcloud with JHipster. + Follow the Using the Database instructions in [Using Jhipster in development](http://www.jhipster.tech/development/) to configure your database. Assume you chose MySQL as JHipster database. In the Nextcloud user table settings of SQL Backends, configure it as: ``` @@ -162,54 +164,28 @@ Email column: email Hashing algorithm: Unix (Crypt) ``` -## Features -Currently, it supports most of postfixadmin's encryption options, except dovecot and saslauthd. -It was tested and developed for a postfixadmin database. +# Hash algorithms -Password changing is disabled by default, but can be enabled in the Admin area. -Caution: user_sql does not recreate password salts, which imposes a security risk. -Password salts should be newly generated whenever the password changes. +TODO -The column autocomplete works only for MySQL and PostgreSQL database which is used to validate form data. -If you use other database use *occ* command to set the application config parameters with domain suffix. +# Development -For example to set 'sql_hostname' parameter in default domain use: +## Add new database support -```occ config:app:set user_sql 'sql_hostname_default' --value='localhost'``` +TODO + +## Add new hashing algorithm -### Currently supported parameters +TODO -- sql_hostname -- sql_username -- sql_password -- sql_database -- sql_table -- sql_driver -- col_username -- col_password -- col_active -- col_displayname -- col_email -- col_gethome -- set_active_invert -- set_allow_pwchange -- set_default_domain -- set_strip_domain -- set_crypt_type -- set_mail_sync_mode -- set_enable_gethome -- set_gethome_mode -- set_gethome -- sql_group_table -- col_group_username -- col_group_name +# Acknowledgments -## Acknowledgments This repository contains continuation of work done in [this repo](https://www.aboehler.at/hg/user_sql/). +This plugin was heavily based on user_imap, user_pwauth, user_ldap and user_redmine! -This plugin is heavily based on user_imap, user_pwauth, user_ldap and user_redmine! +Since version 4.0.0 the whole core implementation has been rewritten. -### Credits +# Credits * Andreas Boehler for releasing the first version of this application * Johan Hendriks provided his user_postfixadmin From 29f1fa0730da0b2ba998699e7cbba7fd7d5ebeb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 09:47:18 +0200 Subject: [PATCH 23/29] Fix bugs + new screenshot --- img/screenshot.png | Bin 78136 -> 42650 bytes lib/Backend/UserBackend.php | 1 + lib/Query/QueryProvider.php | 12 ++++++------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/img/screenshot.png b/img/screenshot.png index 633de7ebca0eba690ed6ac3418484a3136488de1..d47dbd87cf77cf016bd21ef857f90f8653ecd0b7 100644 GIT binary patch literal 42650 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 Y9yHwSuuo>1_&M!)OEhoI+3?5z1#-@V4*&oF literal 78136 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%0A2*PLjZNr%DGwBL^Md?4WM7p>90cT9!jX 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ΞYbLc#98x)+5vf>QMI(;Fw4-XEX4dYXjoNQR;kMG}z zu|-ok4SC^$an}rAP9=%&D5m=-Ae!eWr6eOcD=~DQpBZA5ygKRpkOt#kqVd7#On6}< zVo6@ybPZw=y7>)9)?<&99lYogPtP%)EU^wydQlxwLC{n>KA^_I#9` z$)hsI2~DrFUYuTSyIZ+GbE<`{U-%D>AFOEaRaQ*59TN?IOdc_j1dVzcsoKqd*dUQR zRp$IOPML}48~nFSsZF~*a?bnXhktK&8WDoD4{!=ea_QxzKq6xWjye6K{YRb$D0D?qK-ipvp9q>GsI z`M8WyW|xxC8G=Mie&j1&*TZq1g|lD3ESUH_2z-+!2PQ9IUc-ThyVPHB8TjY-0% zxXT*}Gl4Mhv9YGHBPZ4^N_0ld9qS8bJ-4c6ZByKQH2-$KImgfa`t#+3&J#9V`aJCm zV)l<8Dnk5e6*`T(`Sb(%99v7zuGq%FpAdXLLuSPvrn@A1s`}}GQPv|KmtH)3ZsMX( z=g@{6L6YmE)uH!?(>yG;19p{@ZMaNXxj-rX7Lw#aJ`Atf@G>YbbW@`R`M}AlxZw#g zMU(4J$$g}`>GaJtxltc{dCMA|ozW~LWjdCx-f(k!k#r&}f zMb=%xmjEk=<4^~mtMJPo9euKCq3!d+jNTZn8o?Q-T?j)ZO+piM<+nG?>!-QxjBe~0 ze6hLq>4Qa*dDhggpoV4FF5o>`OREm-Yi_&mTj#yE{=e^km(lNU{^vh%!T%Ep;GI47 zy^@qnqNW@87EPL;{&SP&bxp-}O|MrSyj~TL5na#v#S89`@JJy*l8N#lUAj8YFZEU` z85b}WEa>il0dZ~kuk|N)uiv3Ld^(bMNQrmtbh`lc9EZP$UfP5gnv;Cmq z+bF_>i}&iCkehor_ZwaJcKr8)z2XP^)nEQ6q_eG$`+t*V&q~6oMJAE=ZmZyzDfpz1 zCw=kvUj_x?fFhTKRlRPLf;&+tKFCMo)M3=|DH|E50WQ2xl^t{|Ki^{TKE^6}03dxh zvv?9Vo^mEaKfnnlk`)6cEMPY}3ogxwZ~#1ks2FDcg1&~exZd}(_oSK?krl!XRlS?L z`)32Bp7A6a5Atx~5sLl{yzxuwGbxea*Hl{@5Akn2haKLaAw$-IW3u_CpUrKvAnL>X zAMCxm=i?A~8uW$gRgc`)n}{PCCmJn3-%v)VFb0g}te7mhpE8J(&YGJ5d%~`+M?xII zZY^t^>{=9g{g{SAX1U>)Hh-v8?RsS#mS9hL6pcvo$B3&FQhsS)M5HTgY$3HrFk&yM zPM^KKA0zh40?dCwyHC=JvoyZwlYJJp-(qU&lNU5BFOP2Vu zL1l`)FhO0qbP0)w$c8!smbqfK$f71e7XG>&M7bOEU z*9usKJww8UK9E=TNJA*a?*02$Y6fJNXK{Y*vL7S+i-U136mW^{ zZvL5@_TIN|V8HE@(n>4}M3{T&V7S5_6Hzg4OQu;T<`}(gALCe;*0f8kNy!kBiyRW| zF3_&}Y0a`9ehau=qFs3@IVlM12e29-#jrz^C=Oazp=*I1}@2Qi| zyE8I34}%{zkk(y6b$Ft$QypFA@z%f+;{_uVX5=rcMzU77#5YGdO88Mq~V zdeWt!It-|k)|+hcuP&Sf#n&fSCbT2>(oFQGJ5@(TMr>4>TSL6^==yG|NHRn7Uei|d* zA393K;_j)qxMk`-;sfcvr_CPw!rbYa9s@15z6{Gd@=Q=R`gA_+?|vb-qV6+P>|>j| zcI)PowbsbU$UA>^Tdoxn7B(Sn`o5r?oTUh-Lld2kT$#(*(hGOBEH?Lcov|z8JU-XE zRjyq)Z+qzz-U;~}uVwm-8LW0a_8W?pC_K6(nn|2=c6JtS=V4jVkRd~u$~FyZ$A={b zcJKJe`R0uqr}%B5E}onO0d9R+_D*3I}W>v2GFKHi1S5QRTKXvO~Cgr>ptd?T=$Y)ZOxFNl2v z&6RwDGdG;)WYCiTLR7p12TsG#kmZ7O$7bx~rAxaicz>p*g{B}hM>hWP-Wy3T$+iBX z6LZHr8kK***Y`AtoE66e%~DyECQXqc!Lc^uk!#Bd%}oj+gxV&#W3PYn2ypAg2Jp9w zp4VW%OY3Y8zDU*VDk^Xm134#r|0PGeS%(oW!P;J7`3nt@vL*^Tlz2O&;6+pCtRuSS zr!>q{q(hpn@A36!=s!GaLoIsk-rYy*kDlvq>(r#U`FP&wZt?^dk?O-Pcl9;>UGtFB zb7UItyS-)em60Pmwnn=zOLFn5JqE;e<<%cMh_Z{OP5TxN&Uw_`G{u}u%tjbHxU#ax ztYsR)oz2+YFLis**3Xpr=WBJKPee*M+OQBc(i0xS-u(3T_U+rt;ge11lOSqH%id%r z73r(1jT^T}P)Ux5qNUiRFMZxe40X=f`w?D^#b z0`HKuzv$mm)xYm+Wv9U79?fm4D_TC`@WC-KixtP=Eg^FGRYe{rai{m*v)nPUhS@y^ncvc#q0Lejh=TuR0OmHj)@xfCTmx; z@BGf+tV6z-w)L&ghHm9r~OtR^Ws2A_V@1H`^o!(-=2zyFwxWd5jwl{{XO=)MK7}5xOY-yo`_A4 zbK9z`9WaS;)9E*<-4g|%CM+bS?~{N0-kojV3Ld=zfB)!j<;H*JX5ZYl;(zM5-g}w; z1K^1C`_m0Vj3TPa_Vhk*phtSS&nSy<-gkLqviiy$Z526Pc*1gMDZFYrZ`$ero{iQC z*Z7)M=RNNB;S}acMt4;_J~lnB4Ubu&X!~(y+ak^dIss2?ein1n{!-#9<+b0Jmn#(N zvkO%eya>gB^A~|TTwP-QoXO%B381eoZw-tdQV)E>$PoD==<+G2&l-RNswxqSMGc{?=?!L5J*C4i#c&(hNxk}V~TqZ zT+eB79^v`O#lPq(3GTJnt1N-G{bj>289~{4`_d8_Vs@p4jj5Pl0$P>uW<=78T=Sgyqt!khGpgbQ9xFuO0PWYntqL4CC85)W9c_8 zW4cmtb}<}HIgpc&Dp5NtGm~Ta(Z(rzTDmFLTmSiKt^5PK554x=Z-yo&*?;Ivm@t7; zeE)-|`Ey~oh_jXFn@I=bZ^G4ZoO|4jT^5mFfMO&5CS*?rBBGsM4L+XrJw-xD{=UfC zdRV2p;)$0m5zf0dilsxW-kD8P4pG&}#6(kjcWy=8fbz9#weBXbyKWkf311|zghonvjytP7;#l8D_bj0I79!Z zDI!G0uXQWW7_1)0NN2h{G@2}=IiczIZl2Ol$`{JY%Yg|T(ykaN6h2e_+_zVK-BY*J zzVkLJ*{00x`SyRl+oO{hK*^tPzW;l$JF5HEN@;-AP-#JzKkxSbpZTq4Gv2XMn|E>% z$pnGSsY7}jy1hyH5TK^_;&>qR*LU!8?|d+^q^ADPg}3R&stfncK;-(-BI+i`(~ zMMOr10ULpIYEpalS9O=xA8bR=Klfu&(rknwAK2-3{D{N|{fm*I;XhsZQ#qU>vSGx( z-I5w`!8Lwh{K5+=!8>f29FRQ0h!(aLzgyC3#71Jw{| zbnDl9UJ2|m6kR|V;D-OWE%;W5LCF0{3a=d*V9eq4YP;mdAub3B3i_^#^WM#vxnND8 zJ5#Z|v4i5`lO?5X+h3zqQTP%bpI!!#eK+Y!!nf$a?UK8|yoQSx58Zw9I1NW)`~khY zaP{h70Ky2^u4Eex(H7i+(HyELJ=+O=fO96S4SD~!MT>O0caP$>9Qv9S;D`+m1=n>AH)Z|32sT0?b+(}Y}( zMI!(!BICQ%UXbm9RF!%exa{wzMOIG&yMQQ%4)w<1FVC~3>C*4ttElRcsby`c%R4C| z9*P}`k!-Y{=P^E=Fn+w0PBgWdP$3UGeIxq!MhR2+*@}w}#~phBa8)UNuwt@AfL7iu zHAG-1vMrPaNhLLXNH?s^5_=g4e5dp5qFwmbH zK>tWE&0lAFcoB>>PC`GTK)^^Ovq#N`VRsF}&(QKs4brOQ;&7YH3@ncbTia*u4d+J| z^;L}aSjk)2Ri%=CM=uA^sQZG9TGUJ&;) zTM4sQBHIHCO z<#wHT-`W=xFglG50jv;k!B#Qp#DU1CHmOB>RHb#Ei8PtQb%cZrZ^DDg82xd+*Dn*a zYAb$SHK+cEd)DeE!`0M4NX~G&=qYL6MzJko$@(i((jQ{WS#subaBMq8g8k0?PvggU zw9AQdF%O(Ocdj9yD7-bNhE&`4>CfXvK~iy7$1fCCzP1V9Z^^t&#ucIT2)4uAMmT?++4# z_EPNWxchZbO~OM{8HPnhjwQo=?Vq>M)HD=LTd&=>o7V&{1X;~bJH6rLU_Ato3z7GX zNu|N!;_;{lHu}%Tx3gA3zxYRXJSUyUZP$t%BMNat!Yd$fFldxW8j(Vh78^xX`rpI% zRmO85C^2Af=qdX#`ML7k8C0^Jb2Jn_KNm-ysTxr4u4TAvnK}XiP0s<_!ipV2hK(#5 zs6ICw<8pZ#jLpc63<>#ZUc2=Rzkaj%yrMtKY|9v^SR$ynPQ;Hs#d~y_2nv!7!g+>b z0B&wBoBdK*NGMYck762Pyv@>4`v{Rk$XL>O0X9Kd2#xJFRb0^O^D{9czmHcRydZ?P z+jKe-17^ zY+oRvPNE^#s4cxa6N$W1Rif0W*yrDfpNq?7+FBI$ zVOAqDNAW}Jw|gdfc6vn`=Y2L7Z8HS*Ote0%TwDnz*qv%HH@g*W9uj`>k4}?oGZ%T> z?R~)(BIewR8$S)Uz$RNpx=*Noh-;$bBWu*Z3Hk>Z|AI{AfsIOhQ;vvkE6*bE<9Kbm zR>kY*(BKiBRkyQ@kSMeYtZ{V!D3IKmWMx)K^th5_Zz63|nMphl5E4nxl80KGn-5fX zRY>5IGpCDH<=nWaO1sWx17I?mmvwwk@v5<1YR6K059nu^KV-J-cN6QQ(GLzZC9w$`h#tM8}!KPWA@POS+fQ_^y{tV<^-Erx_Ji_&W=<7-)5JsRypy9!<~ehYM*e7aY@ovI9P?U_ zif&k3DA|cwK%&xu#YVgIG&1?g0L4|;6Vmz z_>mS~VoaSAgF9xwJ~3Ahkz?gLm6c_L2x`V78+zeH8X36 z4!yPewxt%2T~B5!J@(GDPpZ@u7Z$eKqCL3nanGg!D~SDQ{s3zv-UAiAX0H5E6x9Km zj;4q6NA~TkunG_f8EsGNa8nZl4)Qis)?vJ+MSii@Tm5>_4Z-`$>!7qJBPFMr!$T&# zWujS@^omCr%5RX9f)r0xFMHYMFzM8zMAD;3kz&fSPv@qB{w?Y7W9PB87`Uiy>X#1h zUmU+UcilDd5RiUJWYmJW2;&X?wGK7xS}UssTee&gS6WV^*-9LRPC|wY)HEevK7L8@ zBJ>3%Oxv8dCkWO<=w5Ag*%CHh1mSu|yzu4ckLcT^h8?t<^jB49Sbi%8-zfUXG583ih+LU4wR3rQ-{l=HxAP=+@6&&!!T@-%2bO zc>hLZSx|M6iS_@oVv;&YjCkHw0v65HJ*9u?LVQz&R#F%Co~}9*$ZYX%2Wo zPBWoc8!K!;vT%}5M+fZLo5X;#$Eamz06aVTMTMn4MT2SXoMp5Lx64|wO62;m2AR|2 zckS4*oybAg)M#%1K}tKJYHPwH&e!+7bynf^@&*M5kDc7dcEc2q6Et+v z4uOs-^~8eFrFEr!^F+l=W2;vH5wG3pr{& zHsezbUKUlkxG=Lhid>@letPV0T7b)g^x$*DI!#f$I?8h4nhpAM{;9A$;uzhcubEfq z`n-iB@6(3(s0lvb0*U7!nln@Pp&$@JO&1z@CqABP%HkYz1<5u}BkxYMY?u0!?n)6k zj86LrYivW-KrKFJ;=X$2)CK#M{R6JpLi8N+)1)mB=2|3d%RK5=w@Up9wYydxi`s2L z!bs6!v}~E(`yst2_-rM(2t@M&pRcuay70Tw@kVI(dMZhO)4jY`+m_EMUuWyl(P4xl zu&JVe6;)UlvkWB*a?w$QJ(B<4OGcxH!J}!;>-cdOD=!uR3&7OTt{#E=mb5T;+Sv4F zck@l5mo6<8v(47o*z}C>o^4-Fyk6>r#equ0meRwc*5qCyEL=3C=R1eC6@I$j z+A6y)u<>QuuWO+^f)ZD@Qb*U?Ftlo zfznlqiVSX4465QKx86jTl(;2v8Zcmep%~z8_`v<;)(y}KFlJOhX)$NQV)~qWU~`Es z$@8fBp(19;Tj!#OZ7d3cop)*FUOc1gppl-UuBNug);0|N!Ac#AH-)eHi`;A+8zLhO zD9-PDuq;y3^6`R8Wo`o5o=`lLA*5&bev+$$W9V^+P{%7%xGE4{3VZwQ>P|cYHeNhnN|n0NoOiz zHf;4sXKcl})yX}i8yeXn2`J~(s`BVXSOH6?>N2;Y?s=I05!fMhNUA(Ke!SHx)@?(< zR$R`vatz3mpSNMdSsK1% z&$l#72*)pNny7u&*pJRPd)7f2wRKH2r#3((nho_BTUMzh%c&gHbpa8Aqf_*`6SN}k zmhOLGLtB;!mnUvyrl&90X#uVa1w4e{zDqtqDA?_o_NkUd2b|o^DXpc~8w95DN=tla z-f9(OIX> z;8|m2*7;4Lhxb9=lew%Vmk~cD4u)l$N(afV-q?*+i+`iWNONeLC|Qxy;!)c?e|w`2 znCRWW-MnZx@O}mU-2XzRP@Cos7}zRATbb}ag|DQX2@xS}bT=|612Ka1?!Cw5F!f*CQQRd?v zl_|s>J&H*-8lh*-Fuuw8(i6{zDSuT>=V;X!8yZ@nV1ap+Ha)zz$75++P%nBwG=@|* z3+S;w6sx1X=l!|*`mIv}*v_7nEtOwdKHD~_hvNCQdg#+|ba=_-wZjJunobfGa{BZb zkDVump~#XBAaFEEjkB_|*P*Ku1N1TT(LhMYb(elRi;;8iI;OCi3qNza=R!~vQ+6b( zXu;@dv?E7I(z-cemsIcMDdOGDRufp=B2E8@j_94!397-Qvf=?l`tFhZu4?DRF^@Ao ze9^XuZm`C0RjmCPeo2frAM7MDH3Op2u#rb*;bE;{^_SqAPw=0004>Cuj?u+O}>id zd=-!v1m4`EzDOE2;}&&&CU>-{STId6omPKUJ%M#-9y>JBaKf`t8KK8`Z%+ewJ8+XS*Oo+4;2>Fi zO(k$j#PGewe&q>?({$j&S^bojwguvc&T%0w5@c7WDV*uyl*R>~@ZG|R$s7w86jn*y zP0Ws-JhCatKIcOGSGL1i-^R-7szupW?Z7Th%wn$e%{p-{BU%;u^-rr;7ju@f{w=Sz zGyG5QW^_$m9g36lIO5@;-?Vw;Nuo2UaVFeFCRu=9{=;>)B(NnZDsN;b8l!dN%&Xmg zxECL9a%S;SHbTzDbNLl6(t#))Fr&Zzty}BaR9bx4TfdFsYH(_i10VhMKB2ZVdiA|7 z868kIzC}4h=grQ4STa&m(}#AS_BMZ9|50+hT25UwrilerR%EgSi-+AF^^jPw5V6SP zkD}4$f+dKhf1Il4k{1R}pV{d}Zme1{=_AGZFPP0%cJ^k!%TFRdxO!uoken5n^q9oe zjXj`lK6_?c#U%HBWb2ya%-`1b0~Y_sjNOkKU!PqJ_E!3C;I|tt=MmYR+W!MwF=OjT zwx5H*ar_ueo7T?1jnfCUwY5mlXhs@>nU^u1Gu z*4u~YZ6!*dbTG3bt(6)RJtLiWr5^;g6GaV)K3!!DSL@rh^;4ks_y=re`ST7=1Bemu zEhf{azw`F)`5t*7zm?abpiBQyx8uhjee~Pvh&SY{BJjVBApLx(6vr}Z#_7$2)9pC( z??R)+hz5{Rn$f^5^O^El^e4-4$XE!!_TWq5MCsmsv3+Xe7t$t$Fq51v2zGKfLO9^g zUVU4y*%IKbuKSAs*O(|u4=u^5_#Yh~%A_utCL&GAN~enR*|gmy zRL>I_Lm>PH3TXoP9Y6t5$mtpUOX~F23`P3j|0OWN^`%jlh%bQ=HPnk87L8vrO!Z_&;O<#B`qwAYj}2-nFXhyFUTka z6_I`+et{tjI!{k!TLkET!SX5eLrKX&|FqkX_P@%HktqdlNXEm5Lz(9$ z{u1Ogt@Ri_jccK$l~R)bM?7P1J*Mx5ii-~USz@V^^!r0Xl#DP}*vin{x9z55m`D0$ zwwdFus*V4ipQXMWx#kgaq6jH=*|5qNlnTDHWFyv4on;c{JMDO;aT?)ERK)`9tdg{LHH@J5^#S2XwA zFGjlHD#79n#5Cb-k_=IA7Pv)Zhf0x0vB*E0aECNNorJWNXG>}*I_NQ;bX=W{70C&6 zM*#s(ZXD8HY}(nvs@9Sj!T+o3(Frzb(~DE6O27+NonI;@a$=nY50g;Np<&mUhl11` zyAEL4guk(l1YGp8Gmc*UeZ36ffFNHrP;v1w05EVEQ&uv2l+j{yB|TStql5;E8S;Zwnvpi)S6083_|Fk4|nWZtUq`kQ?$b5Dmpq3Cmy5{@lh3zSn&_tIZhuy1siA2 zEi@Qhf~RrQY`jX&v@@PgOp@0z7f~%IJf5dys47qawM;Onq@Drkbye&Go0peuBCF0* z7XO{Ota4|6a{4FDP^|wIEg~pHqJ4nCZ$eCyok18)a9Bro4Dr<7sM!BDMe(Xef8_lg z`)$5}Gh+y}B`+X6%Igzw62Ab-DGZ#wz7>g3j6$O+5)aGMDK> z?npffxax-LU9Asm<|m|VIG-GD+}lTwl4M=v0vNzz&6W$@idAkWHN3nUNMZ}ZdT5;G z&sFZMH*~c(v_E^dcgGv~YyQ-G|KUuF14^X)=&pvG94s{G$*iZ7+C2V}S-k0}!kkcO z@JaOqNgSjnQgn+k!?m;?ywXlj(GG~}ycAr6^OSpATRpZiVa^Sen#i+O|ICRlo;7gu zZ7Q)p>sN+(wDOxHBIR84QMzpDmh`3!Avx~dE*gCg#qaCXo=>*M{8=5{udZ19mvZg+ zt(ya}L>C7inGtY_S=9`kD|Cp#d#9;GiDLa{s;a83mLMp@nc`}l_MpD|tYS=!<3Im; z`t%!G$pq7c2fIjK~hR%Aj?K#cVT(=`GbbZ6PlmvuRMDZhh1vk zeCs8x@mPIO#p{03T0tVOq5g3weIit36INXRq4HcTU@oRo(nm9)!$uZV!k{9nsif)B z&CsNB;U;qb`U?KA3@4r(37(km@;gN+Ixz&wJ;WD;Yygrc@;$HO-#Or%ST+9T5L)|5_$@=7%^$;m48*^R8sYB6}^5J@hm8j6aN zZ%fz`_59jKtOy(XG5uG1k4E>)t#Bz&-qKy>2|xULa`fU63^O`hHIc{-9(k;wP2&LK z#u-N32tqE(dsX=*!X1F4y!IbwPe++dUXh$v9Drq#6vLuT;#Zpy-T*&EucRK|=pYj8 zFuRt2RknP#Io>i(?BkhaDqBYpccXA!qu#v7ZJEROysmdj+s8G#?;VEnd5gPG`nFC} zF{Oned*f4_-b$Limj8puj=YRTOH!(l-YUFPpXB$qVTS*i{O&K4QL;G^r~OFBI~D0{ zSPt}YUu0%yGpFw>oD~0E()S;zqG`=TXw4^C>wKV~;~kuRBUnB-4| zyXR)X(Q#f~uhLdwcR_9N;P2B~FVY^_bdYC#FTZSiLocx1d(>Dk`7n@A-k2U=9lGF{KBJ+@W+t_LvK&12Vwk+L|HiDdZO?Rw zo9W&I}!q38HB`4 z{9PB3OOUT>*gZT2zd1`u1-w+cO4wgB4$HViWM1^DN!iD{O&9tL9GW9gJoRkMT0f7M z@h{On-!l`t3=B&8IEW`y?*E#)LZBsG)!ZyF+)o@HKv}3jG7DeOf-Gi;LO!+5^8iv~ z>+V&R{x6x~5l$LJ?+;$=j&JS#X{g0eWg^Q!F9X_Xyl1n!5R$}O8Mz^BDfmwrM?Dhf zOwt-ROaJX;aN-@0WJ~%RM|sxokSQ14A17I}SSwKo2+}vnU+x*&;jrHnnkM8c z183}9KoAxDg>!;mE_!hciPF8=v{TjN=cIK6eW4n;x#WAJ;$9tNGSZ53_5UQ?3&N+j z)lU5H+?H}z=hg?D-l?Lv9|xKOsqRO9ERhuap(J zWgM@u8=xEs1GgsrDP+yU;J0RrGSKkRk~Y|6y^7a7_P5T#IZ9F8acu)>hd@1UXk;{q zlo>8oda0;Uvt`}_4mYAXa4C;D8wfnCndaS;mQbT6P*rR7t?ewSB;V^XxQ# zDv%Mh@{v#r#@DSH2oP~O&(65A~1vQtP z6;oIvDKsUkUvpAsz1wLWZYp?O&``%8e>*ne1p&VMU)o$y}f{5D>x7RgniGNmS*}QRCWrJf~nRh}$f~p>) zA^?}EA+4?T)~#EoG%*S7+H0(8MMZ`E#mRavVdokd8ho2Ty2!#J0FZwT60#%+TJxAX zK=(9|x+B!qYUbwVrB9yR>gMtM+dk{BwmF<~Ih!u#1)!~aq~SwP866$n_|$T$BfO46 z@#vdFb!AtVnws7PwjMuzysDlceo3>FXm}RQ_}Q~#NO5{`fk8nz4_~U*-jA2aqH0E!lC8-2zT0#_@j)=HT z4IePAtCng+Z1rppkR;2K{w`xLM=z%+i+OTvMVAqt&Lv42xC+ir-H(QgHoAoO1JSuh%0pK%~C3ClI+0u2=lfV%; z^Yk=#y3=F0sM5yxWE_L(yZHQY_phU||-_^cf*PlU6orIqR&vZ|s=}{Nojh#cz`6PiDSpXZd8tU;dqFyl}X8#+^Gy zKltTa7UZnch6ZwlOZvKeg%ymLBnThuG0Qui#j$9FMVt-`?I+fx?gb1_jpzfrbUUnb9X`|Uz^#jdM%ozE!O>1Z2U;cft_n_tL z*j_>2Pq&2(#eyOyywEeROZS(3omsj3+ zMv`RvAH7=JGKcQ`FaNEq`wlWpE5kkJ^$rS^Q4#x5@luvX^6;))2PioS8FcqN4dR#a~+!)3FvG zNS7gcag9ZzPNGSFmg%wvqBsVgKhnLvng~<4FQBn-a6<&KN_Gl=twYJ=L;e+Prhbyf z0$*e_$UuC#PRYTQKPRGq_LE&692mg(^dQFFLJ$r z`V`A*4C!MXo^p0OW-gpr^l`we>ncBcQl@I*a45rnPlkn!B(Q36LXM;Q*Q~HFh#BIy z{!45h4&J+W??qXb8a4w*eVFLYRddf5Amo+3#AeY?-_3Qr3F<`U# z6?v-BMiVN1w`OLp!b&@Z2j{>A6w_A%$rmi^fbPunb>lTn%4jIg4MabEdBN_nx{1=H8s_G-MTqSChrX5l<>IwQu9cIt7n~S zJuMjf=xbTcs?{nxb=(2fSTO5e7CUHpBv|DTJw$5e@0}pVJEDmyIo`kNiOZO(aOM*O z&P$)m~LPOPL(gs1@n;_fB3UNgu z>2J@e9U zyw(9?RS+S+o6d7xJFE)L91;iF=U9-#X0SsC%{j0N_D)Z!7Jl(_S`*#kYWypMPM;n| zir0EzfU~IUIb<1`tR^bU?_Roesl%`D^px-ynj%Swm+gbi&oqZN)Rz0mDY^vbw!yhH zfZfqyj9Co$uH&^XnyXOIc`x|IOudA+mdFg&S~Hgit9y-E@fCiB38~TXyws9!I;-E3 zLrS&^OGaK^S5T0LG$(l%NNjd;aaqG+d05y;tQfH@b|R2V(jXr*Dm21oclQ3 z`s{SLN3Gh6U%PpXMo|A-kA~bQUhTS`a_^_*u<9k5+IX1iW@J2WNktA!U-3nFR?HYj zeI;L5&2hivoYmfzWxR*0E=P;6Ogwes#EDp}Mh@Gk=xkgsKS1@k2J@G&@Aj$mbxQxj z`!-x^HNXOH5pW2mwf}iLVN*Lyx?B-$8dvQdu?huA z3~NSmz@(%^wn$Rh4GsmKss1C?IKZm4Y-c4|Gtvj79vYMD? z|Efo+W~ZN`Gn)_lH~7fjBE1$kG&e6u8a)6$rF3@wx1C%esI6V6NTek(6%F zwd3MiKQxOF!RT%Lp^g9K_4jX1F<#<-VIegNXP3F#_&PYu+*P#&cwXFvJ!^b2 zb81fE-l}Ig1`YN%;48;%eE#?$`Kwm(!IcKEGjizgvO;t|ilaCV5pNL^Q@@mesZ$ZK zBodwWa?s3-&~`zL8$-m1;*gOn8qXvx&@;6LW*6?;p?+zo)BtRC&4!IH5z5ry4KN9t z6g|>locT=LroEgYuZ7$-AOeq)%2%&1-OV@MAcrzgSt{kgU3MGm&ySwOwvz5Hzr0|h zt{W9)kl}EGi6v)Z>X@5-q8=F8$nW~+jQ;Rr(U6n9%=IY{+*t4f%}+ZuH?!q_X*#v=n-&We zPIJxFmT@hwcDJ1RRQrbrBsohs4&)=vp6IJeHtIWhb97rtVr^EpO=`J~gRc}!?k}SP z^3)&gzcTPu^334;pXaE@eD#@pSEqC43`Y|g#o5W`Q|s__fQHTeJw?erCs7BD z;g>y$rpYo~ef9EniwWIS&Wrx4mf)Kefus8|WsyIf1_rj`>wo$8qT}stI9W&XEcKI$ zB3E4P8ptA~{)PZI66C$LayrX%;Jz%eDj>d{{N`%c);kah>mf#yG6;Las|K7`R}<^lpzS+mmRk-Af)Ig_pj* zz7_>_6rPna+Le*WNp#wEcz+hc!B4(@=$vh?1wI7ipnF5E-f5AQZau-N2ng9l@?zP_ zrReu0b;-PU@6tHaUlAI56aAVef4G2Q2a_;6b%aDx{`~XL?o4J&dvA!}p1&$6R0T6| ze0ug~F$1UOnVOpB<8C}XcXwWE{o+t~Yvi&T0C)$#e)qPOgRZDXswzUkKmlP`Iu03nLslcmpRc6E>ZMh*e^JK6 zhkn2ps)=B@V+rBewRgcJa57lKG_+wp$y&dE_p#&*hOaN;tS5&U!OJ!yLA%rwv1JTt z$39j0;Am<0l2eXGB#=Tquhzy0*l6CA`a<^?$NO)|yO@8fh5n5qMytYa0_+emeRbR% z(&##5->-=(aj)E*pG*hTA*z63kmXuX5K&|sv85B_5!UBq#~qNQ9yvxTWd4566xX6h zo+aA(iKI5Z5$;85dP>>^2IwznD(|*Z=KaI4!}fV{@c=lGI9i9>@4zxej6We zeTWx*OrdhlBV!A_>cjbsgT;k!k%@^9RH!8a8}FBoo-NMF$#KYY&Mq>|e{IZkn1htD zMK`B5Z;;ohD%r+ZKEM1~Xwi z9uHrKw4gr2CvHDHmi^g)UD@1vD{zpNovBVK(?zizX7&YU^yv6nY znfb|QVhg!JgVg|$-j>wY0IRpZ*B7&??L8U``j_DNkW9_caLJ{$r0X?qFw}&8j9D67 z!|(*Ma6Qb@&nx3A%hg3}}cRfmw?Ln7b zX9dh_dfaj9LFBZxwsqdBQYBEYD^(%)!oEwYTs49?B=3Is?s>a$?WGPgQ?9~#VaX*Y zYbjS%t=Fzi;^RbF-8rV&WoW+D2o}rjcnpe`~jA zV?k0JSfYCVs{~D@ssO{Z!qgzqEnF1v+VDcSC$}3zZ7NAsW>yxzREsQr`Gtf=<8?B@ zC0>2vmXngJlNZhY;pI|fswr&WJ%mfuL~QOd9z0m`ARl>hy&1WjLri0I!)zr~sqqw_ z*}?ibn=h~IHF~)&%^yY5GxY#hfa=TnP2nGPidcGnI3JoN7Uq{rv>+p_(~l_Fm0$oE zNSbkN$;I_wcb)R;F=dX4@miOX-jCKcS!i4E92JkcYM(CIMiHo^0haBsZMaOoiCjkU; zNE1;{s4~x>+=s|(M&nf8vb~pr&-Nkc#Gr|hMZ&8wD$Y2N){xwMVMdcAInhDCc!}Fx zDfdc0;2zdZtX&H=&{&QIGjtiU3M?%xC4T7tTsrUST?zu~79a*YjUe|Zud<4l`4qG6 z?AVm)J16pWlr{Ohn*o#40PEnYIPtntOksbTGZ&(o@u zltSzrA5to4m7j@vR5d|L-q^l4t(u!p@4CDoH=Gfs4+t5mNn0sd`R8Cglz)?B>%$sZ?r5#xoSt#kVJY;B=ZpNgLBwarv&~pRZ2KY z7mycCK2^EtrGyKAFg?oMeB$Nf7XhE5zzzI1m7P8v7N!p=BcMy`xw7TQk8SK-3M;4b z;qA?TZ&UR0i5zk%vbz7?+2a0ZYoBMok2%bw>hlp>Dx7mWLYt9L zHD^UMK?A4IqvCz7tM-|(akS$Gk(_fA)fyYR{1WEg!X~}{GHd9smn)G~L6cSQP0IZ( zG$bSvK*qgrVE=`FVPk$=w^rk_L-f#-eh#w*Cln-5d{j7eA^4h3?Dme&4wv2jIO0a9 zq_D>z^eK|l0Ay-$Y?nTLnsRf>%d>r4A8xRJrBPL}tGnSZ1=US}@{hwlSP*IS?$E3M z=T<=fQHAvXfBk=5LHIud<&{a82WcUF^%qSdxE zmc7Fldn|BqcDB|0y>Ldbf%WB$W_{)A%}d{o>-)b!zP%yu=B7q#JO=n2kE5X_MMeyz z<{E6UZ|e>5-%q`nl_zh?%Qi)$`+{cra+1)Fj-ycXbH2A^3DBq1pBPQJwq7mzi(Et9 z7|1aJaRjj9c-f~)su}Ur6FLqQrcssRc@AY0u$Ip#;uH{G8bRiuze~X9H$k(URJ?|;h3=a5ou?&(L11)GZEL9=0rTJtYLhDdw z2n$EGQ;$!j54y+_t~Ozg{NCki4^ABDh>6Fzp363VEro&PK0?9B@Ux_5ik%XAlT(27 z9Miw($RNkTk_jtU#W%g2bJ{RTC?nO@LxmztNPPjPqy!Y9K`-WrdD@(> z^99)+`18ci8TGY5o<1kDH~Cm^pwlKn)b_@5gAUAgodkBGbYq+pQ9B1#ne)_=#;G{-y9>l1f}p*de!h>V>UlM zJG1DO!Rb}s%hj(MpVNP5e|$q;C9PP0K>+aEs; zkxJ(Th$soDC>bId&JaWzB619lPdVi|7Dw>JZVxUYsjvh}xGk_fKWZ1bh03)aN6mvA znuUlW=dtb_e|vAp!O!GF{nFjYxv6OEwRk0m=~zLZT};w}NT;Cb7#}6y5vUU4Eq^P9 z{`6mD&F4}pbAIySqC-~@OrYhXI>{9;ou)#A(-Qdve2RLfCF(wcbFd8#8p$`L>l>NB zqrMUrY&8Mqg86s*LD5NNW$&a8m+yFT;>&ieT8ZU1iw9}RzvzD5zE#ot|IOe2eXa>W j;2>In|2OZYxxfAMnl0a+nITA`LT~!Kufo4v{>}ddNN(wf diff --git a/lib/Backend/UserBackend.php b/lib/Backend/UserBackend.php index 0552b04..91e71a8 100644 --- a/lib/Backend/UserBackend.php +++ b/lib/Backend/UserBackend.php @@ -560,6 +560,7 @@ final class UserBackend extends Backend && !empty($this->properties[DB::HOSTNAME]) && !empty($this->properties[DB::USERNAME]) && !empty($this->properties[DB::USER_TABLE]) + && !empty($this->properties[DB::USER_UID_COLUMN]) && !empty($this->properties[DB::USER_PASSWORD_COLUMN]) && !empty($this->properties[Opt::CRYPTO_CLASS]); } diff --git a/lib/Query/QueryProvider.php b/lib/Query/QueryProvider.php index 4de8084..c1fdd52 100644 --- a/lib/Query/QueryProvider.php +++ b/lib/Query/QueryProvider.php @@ -83,14 +83,14 @@ class QueryProvider implements \ArrayAccess $groupColumns = "$gGID AS gid, " . - "$gName AS name, " . - "$gAdmin AS admin"; + (empty($gName) ? "null" : $gName) . " AS name, " . + (empty($gAdmin) ? "false" : $gAdmin) . " AS admin"; $userColumns = "$uUID AS uid, " . - "$uName AS name, " . - "$uEmail AS email, " . - "$uHome AS home, " . - "$uAvatar AS avatar"; + (empty($uName) ? "null" : $uName) . " AS name, " . + (empty($uEmail) ? "null" : $uEmail) . " AS email, " . + (empty($uHome) ? "null" : $uHome) . " AS home, " . + (empty($uAvatar) ? "false" : $uAvatar) . " AS avatar"; $this->queries = [ Query::BELONGS_TO_ADMIN => From dae53a49e2072ec960a2bbda468a7f1f38c5780b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 09:49:19 +0200 Subject: [PATCH 24/29] Chapter levels --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index a3d1f13..2261982 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Sync the users' email addresses with the addresses stored by Nextcloud. Below are detailed descriptions of all available options. -### Database connection +#### Database connection This section contains the database connection parameters. @@ -41,7 +41,7 @@ Name | Description | Details **Username** | The name of the user for the connection. | Optional. **Password** | The password of the user for the connection. | Optional. -### Options +#### Options Here are all currently supported options. @@ -55,7 +55,7 @@ Name | Description | Details **Home mode** | User storage path.
- *Default* - Let the Nextcloud manage this. The default option.
- *Query* - Use location from the user table pointed by the *home* column.
- *Static* - Use static location. The `%u` variable is replaced with the username of the user. | Optional
Default: *Default*. **Home Location** | User storage path for the `static` *home mode*. | Mandatory if the *Home mode* is set to `Static`. -### User table +#### User table The definition of user table. The table containing user accounts. @@ -69,7 +69,7 @@ Name | Description | Details **Display name** | Display name column. | Optional. **Can change avatar** | Flag indicating if user can change its avatar. | Optional.
Default: false. -### Group table +#### Group table Group definitions table. @@ -80,7 +80,7 @@ Name | Description | Details **Display name** | Display name column. | Optional. **Group name** | Group name column. | Mandatory for group backend. -### User group table +#### User group table Associative table which maps users to groups. @@ -136,7 +136,7 @@ CREATE TABLE sql_user_group ); ``` -### WordPress +#### WordPress Thanks to this app, Nextcloud can easily integrate with Wordpress. @@ -149,7 +149,7 @@ Password column: user_pass Hashing algorithm: Unix (Crypt) ``` -### JHipster +#### JHipster It is very easy to integrate Nextcloud with JHipster. @@ -164,28 +164,28 @@ Email column: email Hashing algorithm: Unix (Crypt) ``` -# Hash algorithms +## Hash algorithms TODO -# Development +## Development -## Add new database support +#### Add new database support TODO -## Add new hashing algorithm +#### Add new hashing algorithm TODO -# Acknowledgments +### Acknowledgments This repository contains continuation of work done in [this repo](https://www.aboehler.at/hg/user_sql/). This plugin was heavily based on user_imap, user_pwauth, user_ldap and user_redmine! Since version 4.0.0 the whole core implementation has been rewritten. -# Credits +### Credits * Andreas Boehler for releasing the first version of this application * Johan Hendriks provided his user_postfixadmin From 1df4cebf76ba43769a374eb25604f81a451a7509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 12:26:52 +0200 Subject: [PATCH 25/29] Development chapter --- README.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2261982..3c3c95b 100644 --- a/README.md +++ b/README.md @@ -47,11 +47,11 @@ Here are all currently supported options. Name | Description | Details --- | --- | --- -**Allow display name change** | With this option enabled user can change its display name. The display name change is propagated to the database. | Optional.
Default: false.
Requires user's *Display name* column. +**Allow display name change** | With this option enabled user can change its display name. The display name change is propagated to the database. | Optional.
Default: false.
Requires: user *Display name* column. **Allow password change** | Can user change its password. The password change is propagated to the database. See [Hash algorithms](#hash-algorithms). | Optional.
Default: false. **Use cache** | Use database query results cache. The cache can be cleared any time with the *Clear cache* button click. | Optional.
Default: false. **Hashing algorithm** | How users passwords are stored in the database. See [Hash algorithms](#hash-algorithms). | Mandatory. -**Email sync** | Sync e-mail address with the Nextcloud.
- *None* - Disables this feature. This is the default option.
- *Synchronise only once* - Copy the e-mail address to the Nextcloud storage if its not set.
- *Nextcloud always wins* - Always copy the e-mail address to the database. This updates the user table.
- *SQL always wins* - Always copy the e-mail address to the Nextcloud storage. | Optional.
Default: *None*.
Requires user's *Email* column. +**Email sync** | Sync e-mail address with the Nextcloud.
- *None* - Disables this feature. This is the default option.
- *Synchronise only once* - Copy the e-mail address to the Nextcloud storage if its not set.
- *Nextcloud always wins* - Always copy the e-mail address to the database. This updates the user table.
- *SQL always wins* - Always copy the e-mail address to the Nextcloud storage. | Optional.
Default: *None*.
Requires: user *Email* column. **Home mode** | User storage path.
- *Default* - Let the Nextcloud manage this. The default option.
- *Query* - Use location from the user table pointed by the *home* column.
- *Static* - Use static location. The `%u` variable is replaced with the username of the user. | Optional
Default: *Default*. **Home Location** | User storage path for the `static` *home mode*. | Mandatory if the *Home mode* is set to `Static`. @@ -71,7 +71,7 @@ Name | Description | Details #### Group table -Group definitions table. +The group definitions table. Name | Description | Details --- | --- | --- @@ -153,7 +153,8 @@ Hashing algorithm: Unix (Crypt) It is very easy to integrate Nextcloud with JHipster. -Follow the Using the Database instructions in [Using Jhipster in development](http://www.jhipster.tech/development/) to configure your database. Assume you chose MySQL as JHipster database. +Follow the Using the Database instructions in [Using Jhipster in development](http://www.jhipster.tech/development/) +to configure your database. Assume you chose MySQL as JHipster database. In the Nextcloud user table settings of SQL Backends, configure it as: ``` User table: jhi_users @@ -170,13 +171,16 @@ TODO ## Development -#### Add new database support +#### New database driver support -TODO - -#### Add new hashing algorithm +Add a new class in the `OCA\UserSQL\Platform` namespace which extends the `AbstractPlatform` class. +Add this driver in `admin.php` template to `$drivers` variable and in method `getPlatform(Connection $connection)` +of `PlatformFactory` class. -TODO +#### New hashing algorithm support + +Create a new class in `OCA\UserSQL\Crypto` namespace which implements `IPasswordAlgorithm` interface. +Do not forget to write unit tests. ### Acknowledgments From db6b5e0d2f14d4685b4f99f64b13d7d64a4c3577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 12:47:56 +0200 Subject: [PATCH 26/29] Fix SSHA hash --- lib/Crypto/SSHA.php | 9 ++++++++- lib/Crypto/SSHA256.php | 8 ++++++++ lib/Crypto/SSHA512.php | 8 ++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/Crypto/SSHA.php b/lib/Crypto/SSHA.php index 8e3642e..f0f46d9 100644 --- a/lib/Crypto/SSHA.php +++ b/lib/Crypto/SSHA.php @@ -48,7 +48,7 @@ abstract class SSHA extends AbstractAlgorithm $saltedPassword = base64_decode( preg_replace("/" . $this->getPrefix() . "/i", "", $dbHash) ); - $salt = substr($saltedPassword, -32); + $salt = substr($saltedPassword, -(strlen($saltedPassword) - $this->getHashLength())); $hash = self::ssha($password, $salt); return hash_equals($dbHash, $hash); @@ -84,6 +84,13 @@ abstract class SSHA extends AbstractAlgorithm */ public abstract function getAlgorithm(); + /** + * Get hash length. + * + * @return int The hash length. + */ + public abstract function getHashLength(); + /** * @inheritdoc */ diff --git a/lib/Crypto/SSHA256.php b/lib/Crypto/SSHA256.php index a1c9d38..a01cdf9 100644 --- a/lib/Crypto/SSHA256.php +++ b/lib/Crypto/SSHA256.php @@ -56,6 +56,14 @@ class SSHA256 extends SSHA return "sha256"; } + /** + * @inheritdoc + */ + public function getHashLength() + { + return 32; + } + /** * @inheritdoc */ diff --git a/lib/Crypto/SSHA512.php b/lib/Crypto/SSHA512.php index b2e15d8..78e66a1 100644 --- a/lib/Crypto/SSHA512.php +++ b/lib/Crypto/SSHA512.php @@ -56,6 +56,14 @@ class SSHA512 extends SSHA return "sha512"; } + /** + * @inheritdoc + */ + public function getHashLength() + { + return 64; + } + /** * @inheritdoc */ From 21711275609710c87dea8402c399e920de1169de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 13:11:07 +0200 Subject: [PATCH 27/29] Hash algorithms desc --- README.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3c3c95b..d1475de 100644 --- a/README.md +++ b/README.md @@ -167,7 +167,29 @@ Hashing algorithm: Unix (Crypt) ## Hash algorithms -TODO +Below is a table containing all of the supported hash implementations with example hashes. +The hashed password is "password", the salt if required have been generated randomly. + +Name | Hash | Details +--- | --- | --- +Cleartext | password | Never use this. Only for development. +Courier base64-encoded MD5 | {MD5RAW}5f4dcc3b5aa765d61d8327deb882cf99 | No salt supported. +Courier hexadecimal MD5 | {MD5}X03MO1qnZdYdgyfeuILPmQ== | No salt supported. +Courier base64-encoded SHA1 | {SHA}W6ph5Mm5Pz8GgiULbPgzG37mj9g= | No salt supported. +Courier base64-encoded SHA256 | {SHA256}XohImNooBHFR0OVvjcYpJ3NgPQ1qq73WKhHvch0VQtg= | No salt supported. +Unix (Crypt) | $2y$10$5rsN1fmoSkaRy9bqhozAXOr0mn0QiVIfd2L04Bbk1Go9MjdvotwBq | See [crypt](http://php.net/manual/en/function.crypt.php). +Argon2 (Crypt) | $argon2i$v=19$m=1024,t=2,p=2$NnpSNlRNLlZobnJHUDh0Sw$oW5E1cfdPzLWfkTvQFUyzTR00R0aLwEdYwldcqW6Pmo | Requires PHP >= 7.2.
Uses default parameters. See [password_hash](http://php.net/manual/en/function.password-hash.php). +Blowfish (Crypt) | $2y$10$5rsN1fmoSkaRy9bqhozAXOr0mn0QiVIfd2L04Bbk1Go9MjdvotwBq | Uses default parameters. See [password_hash](http://php.net/manual/en/function.password-hash.php). +Extended DES (Crypt) | ..UZoIyj/Hy/c | +MD5 (Crypt) | $1$RzaFbNcU$u9adfTY/Q6za6nu0Ogrl1/ | +SHA256 (Crypt) | $5$rounds=5000$VIYD0iHkg7uY9SRc$v2XLS/9dvfFN84mzGvW9wxnVt9Xd/urXaaTkpW8EwD1 | Generates hash with 5000 rounds. +SHA512 (Crypt) | $6$rounds=5000$yH.Q0OL4qbCOUJ3q$Xry5EVFva3wKnfo8/ktrugmBd8tcl34NK6rXInv1HhmdSUNLEm0La9JnA57rqwQ.9/Bz513MD4tvmmISLUIHs/ | Generates hash with 5000 rounds. +Standard DES (Crypt) | yTBnb7ab/N072 | +Joomla MD5 Encryption | 14d21b49b0f13e2acba962b6b0039edd:haJK0yTvBXTNMh76xwEw5RYEVpJsN8us | Generates 32 chars salt. +MD5 | 5f4dcc3b5aa765d61d8327deb882cf99 | No salt supported. +SHA1 | 5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8 | No salt supported. +SSHA256 | {SSHA256}+WxTB3JxprNteeovsuSYtgI+UkVPA9lfwGoYkz3Ff7hjd1FSdmlTMkNsSExyR21KM3NvNTZ5V0p4WXJMUjFzUg== | Generates 32 chars salt. +SSHA512 | {SSHA512}It+v1kAEUBbhMJYJ2swAtz+RLE6ispv/FB6G/ALhK/YWwEmrloY+0jzrWIfmu+rWUXp8u0Tg4jLXypC5oXAW00IyYnRVdEZJbE9wak96bkNRVWFCYmlJNWxrdTA0QmhL | Generates 32 chars salt. ## Development From 72600cc465cdc26a19c4746fbbc22b87b1b6e3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 13:14:56 +0200 Subject: [PATCH 28/29] column order --- README.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index d1475de..2cdcfcf 100644 --- a/README.md +++ b/README.md @@ -170,26 +170,26 @@ Hashing algorithm: Unix (Crypt) Below is a table containing all of the supported hash implementations with example hashes. The hashed password is "password", the salt if required have been generated randomly. -Name | Hash | Details +Hash name | Details | Hash example value --- | --- | --- -Cleartext | password | Never use this. Only for development. -Courier base64-encoded MD5 | {MD5RAW}5f4dcc3b5aa765d61d8327deb882cf99 | No salt supported. -Courier hexadecimal MD5 | {MD5}X03MO1qnZdYdgyfeuILPmQ== | No salt supported. -Courier base64-encoded SHA1 | {SHA}W6ph5Mm5Pz8GgiULbPgzG37mj9g= | No salt supported. -Courier base64-encoded SHA256 | {SHA256}XohImNooBHFR0OVvjcYpJ3NgPQ1qq73WKhHvch0VQtg= | No salt supported. -Unix (Crypt) | $2y$10$5rsN1fmoSkaRy9bqhozAXOr0mn0QiVIfd2L04Bbk1Go9MjdvotwBq | See [crypt](http://php.net/manual/en/function.crypt.php). -Argon2 (Crypt) | $argon2i$v=19$m=1024,t=2,p=2$NnpSNlRNLlZobnJHUDh0Sw$oW5E1cfdPzLWfkTvQFUyzTR00R0aLwEdYwldcqW6Pmo | Requires PHP >= 7.2.
Uses default parameters. See [password_hash](http://php.net/manual/en/function.password-hash.php). -Blowfish (Crypt) | $2y$10$5rsN1fmoSkaRy9bqhozAXOr0mn0QiVIfd2L04Bbk1Go9MjdvotwBq | Uses default parameters. See [password_hash](http://php.net/manual/en/function.password-hash.php). -Extended DES (Crypt) | ..UZoIyj/Hy/c | -MD5 (Crypt) | $1$RzaFbNcU$u9adfTY/Q6za6nu0Ogrl1/ | -SHA256 (Crypt) | $5$rounds=5000$VIYD0iHkg7uY9SRc$v2XLS/9dvfFN84mzGvW9wxnVt9Xd/urXaaTkpW8EwD1 | Generates hash with 5000 rounds. -SHA512 (Crypt) | $6$rounds=5000$yH.Q0OL4qbCOUJ3q$Xry5EVFva3wKnfo8/ktrugmBd8tcl34NK6rXInv1HhmdSUNLEm0La9JnA57rqwQ.9/Bz513MD4tvmmISLUIHs/ | Generates hash with 5000 rounds. -Standard DES (Crypt) | yTBnb7ab/N072 | -Joomla MD5 Encryption | 14d21b49b0f13e2acba962b6b0039edd:haJK0yTvBXTNMh76xwEw5RYEVpJsN8us | Generates 32 chars salt. -MD5 | 5f4dcc3b5aa765d61d8327deb882cf99 | No salt supported. -SHA1 | 5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8 | No salt supported. -SSHA256 | {SSHA256}+WxTB3JxprNteeovsuSYtgI+UkVPA9lfwGoYkz3Ff7hjd1FSdmlTMkNsSExyR21KM3NvNTZ5V0p4WXJMUjFzUg== | Generates 32 chars salt. -SSHA512 | {SSHA512}It+v1kAEUBbhMJYJ2swAtz+RLE6ispv/FB6G/ALhK/YWwEmrloY+0jzrWIfmu+rWUXp8u0Tg4jLXypC5oXAW00IyYnRVdEZJbE9wak96bkNRVWFCYmlJNWxrdTA0QmhL | Generates 32 chars salt. +Cleartext | Never use this. Only for development. | password +Courier base64-encoded MD5 | No salt supported. | {MD5RAW}5f4dcc3b5aa765d61d8327deb882cf99 +Courier hexadecimal MD5 | No salt supported. | {MD5}X03MO1qnZdYdgyfeuILPmQ== +Courier base64-encoded SHA1 | No salt supported. | {SHA}W6ph5Mm5Pz8GgiULbPgzG37mj9g= +Courier base64-encoded SHA256 | No salt supported. | {SHA256}XohImNooBHFR0OVvjcYpJ3NgPQ1qq73WKhHvch0VQtg= +Unix (Crypt) | See [crypt](http://php.net/manual/en/function.crypt.php). | $2y$10$5rsN1fmoSkaRy9bqhozAXOr0mn0QiVIfd2L04Bbk1Go9MjdvotwBq +Argon2 (Crypt) | Requires PHP >= 7.2.
Uses default parameters. See [password_hash](http://php.net/manual/en/function.password-hash.php). | $argon2i$v=19$m=1024,t=2,p=2$NnpSNlRNLlZobnJHUDh0Sw$oW5E1cfdPzLWfkTvQFUyzTR00R0aLwEdYwldcqW6Pmo +Blowfish (Crypt) | Uses default parameters. See [password_hash](http://php.net/manual/en/function.password-hash.php). | $2y$10$5rsN1fmoSkaRy9bqhozAXOr0mn0QiVIfd2L04Bbk1Go9MjdvotwBq +Extended DES (Crypt) | | ..UZoIyj/Hy/c +MD5 (Crypt) | | $1$RzaFbNcU$u9adfTY/Q6za6nu0Ogrl1/ +SHA256 (Crypt) | Generates hash with 5000 rounds. | $5$rounds=5000$VIYD0iHkg7uY9SRc$v2XLS/9dvfFN84mzGvW9wxnVt9Xd/urXaaTkpW8EwD1 +SHA512 (Crypt) | Generates hash with 5000 rounds. | $6$rounds=5000$yH.Q0OL4qbCOUJ3q$Xry5EVFva3wKnfo8/ktrugmBd8tcl34NK6rXInv1HhmdSUNLEm0La9JnA57rqwQ.9/Bz513MD4tvmmISLUIHs/ +Standard DES (Crypt) | | yTBnb7ab/N072 +Joomla MD5 Encryption | Generates 32 chars salt. | 14d21b49b0f13e2acba962b6b0039edd:haJK0yTvBXTNMh76xwEw5RYEVpJsN8us +MD5 | No salt supported. | 5f4dcc3b5aa765d61d8327deb882cf99 +SHA1 | No salt supported. | 5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8 +SSHA256 | Generates 32 chars salt. | {SSHA256}+WxTB3JxprNteeovsuSYtgI+UkVPA9lfwGoYkz3Ff7hjd1FSdmlTMkNsSExyR21KM3NvNTZ5V0p4WXJMUjFzUg== +SSHA512 | Generates 32 chars salt. | {SSHA512}It+v1kAEUBbhMJYJ2swAtz+RLE6ispv/FB6G/ALhK/YWwEmrloY+0jzrWIfmu+rWUXp8u0Tg4jLXypC5oXAW00IyYnRVdEZJbE9wak96bkNRVWFCYmlJNWxrdTA0QmhL ## Development From ea6c5de9e70666c2fcf811d801ce1e129b77a9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=81ojewski?= Date: Wed, 13 Jun 2018 13:22:07 +0200 Subject: [PATCH 29/29] Set version to 4.0.0-rc1 --- CHANGELOG.md | 4 ++-- appinfo/info.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15dba21..3e0c8f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [4.0.0-rc1] ### Added - New hashing algorithms: Argon2 Crypt (PHP 7.2 and above), Blowfish Crypt, Courier base64-encoded MD5, Courier base64-encoded SHA1, Courier base64-encoded SHA256, Courier hexadecimal MD5, Extended DES Crypt, SHA256 Crypt, @@ -58,5 +58,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - Supported version of ownCloud, Nextcloud: ownCloud 10, Nextcloud 12 -[Unreleased]: https://github.com/nextcloud/user_sql/compare/v3.1.0...develop +[4.0.0-rc1]: https://github.com/nextcloud/user_sql/compare/v3.1.0...v4.0.0-rc1 [3.1.0]: https://github.com/nextcloud/user_sql/compare/v2.4.0...v3.1.0 diff --git a/appinfo/info.xml b/appinfo/info.xml index 0e5c94b..66b9100 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -8,7 +8,7 @@ Retrieve the users and groups info. Allow the users to change their passwords. Sync the users' email addresses with the addresses stored by Nextcloud. - 4.0.0-dev + 4.0.0-rc1 agpl Andreas Böhler <dev (at) aboehler (dot) at> Marcin Łojewski <dev@mlojewski.me>