sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23933 from nextcloud/bugfix/noid/user-ldap-ocdb 

Use query builder instead of OC_DB in user_ldap
pull/23993/head
Morris Jobke 2020-11-09 10:07:25 +07:00 committed by GitHub
parent 05d3326664 3f370f3732
commit 46002a46a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/ajax/deleteConfiguration.php
Unescape Escape View File

@ -32,7 +32,7 @@
\OC_JSON::callCheck();
$prefix = (string)$_POST['ldap_serverconfig_chooser'];
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
if ($helper->deleteServerConfiguration($prefix)) {
\OC_JSON::success();
} else {

2
apps/user_ldap/ajax/getNewServerConfigPrefix.php
Unescape Escape View File

@ -29,7 +29,7 @@
\OC_JSON::checkAppEnabled('user_ldap');
\OC_JSON::callCheck();
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
$serverConnections = $helper->getServerConfigurationPrefixes();
sort($serverConnections);
$lk = array_pop($serverConnections);

2
apps/user_ldap/ajax/wizard.php
Unescape Escape View File

@ -70,7 +70,7 @@ $access = new \OCA\User_LDAP\Access(
$con,
$ldapWrapper,
$userManager,
new \OCA\User_LDAP\Helper(\OC::$server->getConfig()),
new \OCA\User_LDAP\Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
\OC::$server->getConfig(),
\OC::$server->getUserManager()
);

2
apps/user_ldap/appinfo/install.php
Unescape Escape View File

@ -29,5 +29,5 @@ if ($state === 'doSet') {
\OC::$server->getConfig()->setSystemValue('ldapIgnoreNamingRules', false);
}
$helper = new \OCA\User_LDAP\Helper($config);
$helper = new \OCA\User_LDAP\Helper($config, \OC::$server->getDatabaseConnection());
$helper->setLDAPProvider();

2
apps/user_ldap/appinfo/update.php
Unescape Escape View File

@ -23,5 +23,5 @@
*
*/
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
$helper->setLDAPProvider();

2
apps/user_ldap/lib/Command/Search.php
Unescape Escape View File

@ -109,7 +109,7 @@ class Search extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output): int {
$helper = new Helper($this->ocConfig);
$helper = new Helper($this->ocConfig, \OC::$server->getDatabaseConnection());
$configPrefixes = $helper->getServerConfigurationPrefixes(true);
$ldapWrapper = new LDAP();

2
apps/user_ldap/lib/Command/SetConfig.php
Unescape Escape View File

@ -60,7 +60,7 @@ class SetConfig extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output): int {
$helper = new Helper(\OC::$server->getConfig());
$helper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
$availableConfigs = $helper->getServerConfigurationPrefixes();
$configID = $input->getArgument('configID');
if (!in_array($configID, $availableConfigs)) {

2
apps/user_ldap/lib/Command/TestConfig.php
Unescape Escape View File

@ -48,7 +48,7 @@ class TestConfig extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output): int {
$helper = new Helper(\OC::$server->getConfig());
$helper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
$availableConfigs = $helper->getServerConfigurationPrefixes();
$configID = $input->getArgument('configID');
if (!in_array($configID, $availableConfigs)) {

2
apps/user_ldap/lib/Connection.php
Unescape Escape View File

@ -120,7 +120,7 @@ class Connection extends LDAPUtility {
if ($memcache->isAvailable()) {
$this->cache = $memcache->createDistributed();
}
$helper = new Helper(\OC::$server->getConfig());
$helper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
$this->doNotValidate = !in_array($this->configPrefix,
$helper->getServerConfigurationPrefixes());
}

49
apps/user_ldap/lib/Helper.php
Unescape Escape View File

@ -35,23 +35,25 @@
namespace OCA\User_LDAP;
use OC\Cache\CappedMemoryCache;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IConfig;
use OCP\IDBConnection;
class Helper {
/** @var IConfig */
private $config;
/** @var IDBConnection */
private $connection;
/** @var CappedMemoryCache */
protected $sanitizeDnCache;
/**
* Helper constructor.
*
* @param IConfig $config
*/
public function __construct(IConfig $config) {
public function __construct(IConfig $config,
IDBConnection $connection) {
$this->config = $config;
$this->connection = $connection;
$this->sanitizeDnCache = new CappedMemoryCache(10000);
}
@ -160,30 +162,23 @@ class Helper {
return false;
}
$saveOtherConfigurations = '';
if (empty($prefix)) {
$saveOtherConfigurations = 'AND `configkey` NOT LIKE \'s%\'';
}
$query = $this->connection->getQueryBuilder();
$query->delete('appconfig')
->where($query->expr()->eq('appid', $query->createNamedParameter('user_ldap')))
->andWhere($query->expr()->like('configkey', $query->createNamedParameter((string)$prefix . '%')))
->andWhere($query->expr()->notIn('configkey', $query->createNamedParameter([
'enabled',
'installed_version',
'types',
'bgjUpdateGroupsLastRun',
], IQueryBuilder::PARAM_STR_ARRAY)));
$query = \OC_DB::prepare('
DELETE
FROM `*PREFIX*appconfig`
WHERE `configkey` LIKE ?
' . $saveOtherConfigurations . '
AND `appid` = \'user_ldap\'
AND `configkey` NOT IN (\'enabled\', \'installed_version\', \'types\', \'bgjUpdateGroupsLastRun\')
');
$delRows = $query->execute([$prefix . '%']);
if ($delRows === null) {
return false;
}
if ($delRows === 0) {
return false;
if (empty($prefix)) {
$query->andWhere($query->expr()->notLike('configkey', $query->createNamedParameter('s%')));
}
return true;
$deletedRows = $query->execute();
return $deletedRows !== 0;
}
/**

2
apps/user_ldap/lib/Jobs/CleanUp.php
Unescape Escape View File

@ -88,7 +88,7 @@ class CleanUp extends TimedJob {
if (isset($arguments['helper'])) {
$this->ldapHelper = $arguments['helper'];
} else {
$this->ldapHelper = new Helper(\OC::$server->getConfig());
$this->ldapHelper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
}
if (isset($arguments['ocConfig'])) {

2
apps/user_ldap/lib/Jobs/Sync.php
Unescape Escape View File

@ -308,7 +308,7 @@ class Sync extends TimedJob {
if (isset($argument['helper'])) {
$this->ldapHelper = $argument['helper'];
} else {
$this->ldapHelper = new Helper($this->config);
$this->ldapHelper = new Helper($this->config, \OC::$server->getDatabaseConnection());
}
if (isset($argument['ldapWrapper'])) {

28
apps/user_ldap/lib/Jobs/UpdateGroups.php
Unescape Escape View File

@ -201,17 +201,20 @@ class UpdateGroups extends TimedJob {
*/
private function handleCreatedGroups($createdGroups) {
\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with created Groups.', ILogger::DEBUG);
$query = \OC_DB::prepare('
INSERT
INTO `*PREFIX*ldap_group_members` (`owncloudname`, `owncloudusers`)
VALUES (?, ?)
');
$query = $this->dbc->getQueryBuilder();
$query->insert('ldap_group_members')
->setValue('owncloudname', $query->createParameter('owncloudname'))
->setValue('owncloudusers', $query->createParameter('owncloudusers'));
foreach ($createdGroups as $createdGroup) {
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – new group "' . $createdGroup . '" found.',
ILogger::INFO);
$users = serialize($this->groupBackend->usersInGroup($createdGroup));
$query->execute([$createdGroup, $users]);
$query->setParameter('owncloudname', $createdGroup)
->setParameter('owncloudusers', $users);
$query->execute();
}
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – FINISHED dealing with created Groups.',
@ -223,16 +226,17 @@ class UpdateGroups extends TimedJob {
*/
private function handleRemovedGroups($removedGroups) {
\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – dealing with removed groups.', ILogger::DEBUG);
$query = \OC_DB::prepare('
DELETE
FROM `*PREFIX*ldap_group_members`
WHERE `owncloudname` = ?
');
$query = $this->dbc->getQueryBuilder();
$query->delete('ldap_group_members')
->where($query->expr()->eq('owncloudname', $query->createParameter('owncloudname')));
foreach ($removedGroups as $removedGroup) {
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – group "' . $removedGroup . '" was removed.',
ILogger::INFO);
$query->execute([$removedGroup]);
$query->setParameter('owncloudname', $removedGroup);
$query->execute();
}
\OCP\Util::writeLog('user_ldap',
'bgJ "updateGroups" – FINISHED dealing with removed groups.',

2
apps/user_ldap/lib/Proxy.php
Unescape Escape View File

@ -87,7 +87,7 @@ abstract class Proxy {
new Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(),
$coreUserManager, $coreNotificationManager, $shareManager);
$connector = new Connection($this->ldap, $configPrefix);
$access = new Access($connector, $this->ldap, $userManager, new Helper($ocConfig), $ocConfig, $coreUserManager);
$access = new Access($connector, $this->ldap, $userManager, new Helper($ocConfig, \OC::$server->getDatabaseConnection()), $ocConfig, $coreUserManager);
$access->setUserMapper($userMap);
$access->setGroupMapper($groupMap);
self::$accesses[$configPrefix] = $access;

2
apps/user_ldap/lib/Settings/Admin.php
Unescape Escape View File

@ -48,7 +48,7 @@ class Admin implements ISettings {
* @return TemplateResponse
*/
public function getForm() {
$helper = new Helper(\OC::$server->getConfig());
$helper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
$prefixes = $helper->getServerConfigurationPrefixes();
if (count($prefixes) === 0) {
$newPrefix = $helper->getNextServerConfigurationPrefix();

2
apps/user_ldap/lib/Wizard.php
Unescape Escape View File

@ -739,7 +739,7 @@ class Wizard extends LDAPUtility {
//this did not help :(
//Let's see whether we can parse the Host URL and convert the domain to
//a base DN
$helper = new Helper(\OC::$server->getConfig());
$helper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
$domain = $helper->getDomainFromURL($this->configuration->ldapHost);
if (!$domain) {
return false;

2
apps/user_ldap/tests/AccessTest.php
Unescape Escape View File

@ -118,7 +118,7 @@ class AccessTest extends TestCase {
$this->createMock(INotificationManager::class),
$this->shareManager])
->getMock();
$helper = new Helper(\OC::$server->getConfig());
$helper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
return [$lw, $connector, $um, $helper];
}

5
apps/user_ldap/tests/HelperTest.php
Unescape Escape View File

@ -28,6 +28,9 @@ namespace OCA\User_LDAP\Tests;
use OCA\User_LDAP\Helper;
use OCP\IConfig;
/**
* @group DB
*/
class HelperTest extends \Test\TestCase {
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
@ -40,7 +43,7 @@ class HelperTest extends \Test\TestCase {
parent::setUp();
$this->config = $this->createMock(IConfig::class);
$this->helper = new Helper($this->config);
$this->helper = new Helper($this->config, \OC::$server->getDatabaseConnection());
}
public function testGetServerConfigurationPrefixes() {

2
apps/user_ldap/tests/Integration/AbstractIntegrationTest.php
Unescape Escape View File

@ -137,7 +137,7 @@ abstract class AbstractIntegrationTest {
* initializes the test Helper
*/
protected function initHelper() {
$this->helper = new Helper(\OC::$server->getConfig());
$this->helper = new Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
}
/**

4
apps/user_ldap/tests/LDAPProviderTest.php
Unescape Escape View File

@ -224,7 +224,7 @@ class LDAPProviderTest extends \Test\TestCase {
$server = $this->getServerMock($userBackend, $this->getDefaultGroupBackendMock());
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
$ldapProvider = $this->getLDAPProvider($server);
$this->assertEquals(
@ -240,7 +240,7 @@ class LDAPProviderTest extends \Test\TestCase {
$server = $this->getServerMock($userBackend, $this->getDefaultGroupBackendMock());
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig());
$helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection());
$ldapProvider = $this->getLDAPProvider($server);
$this->assertEquals(