From 99c9423766a01feff5f9fd6ef67153d45158dcd7 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 16 Sep 2020 15:53:51 +0200
Subject: [PATCH] Remove @suppress SqlInjectionChecker
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
apps/dav/lib/CalDAV/CalDavBackend.php | 7 -------
apps/dav/lib/CardDAV/CardDavBackend.php | 3 ---
apps/files_external/lib/Service/DBConfigService.php | 4 ----
core/Command/Db/ConvertType.php | 1 -
core/Migrations/Version14000Date20180404140050.php | 2 --
lib/private/BackgroundJob/JobList.php | 2 --
lib/private/Comments/Manager.php | 3 ---
lib/private/DB/Adapter.php | 3 ---
lib/private/DB/AdapterPgSql.php | 3 ---
lib/private/DB/Connection.php | 1 -
lib/private/Files/Cache/Cache.php | 3 ---
lib/private/Files/Cache/Propagator.php | 2 --
lib/private/Files/Config/UserMountCache.php | 1 -
lib/private/Lock/DBLockingProvider.php | 4 ----
lib/private/Repair/CleanTags.php | 1 -
lib/private/Repair/OldGroupMembershipShares.php | 1 -
lib/private/Repair/RepairInvalidShares.php | 1 -
lib/private/Security/Bruteforce/Throttler.php | 1 -
lib/private/Setup/PostgreSQL.php | 1 -
lib/public/AppFramework/Db/QBMapper.php | 3 ---
20 files changed, 47 deletions(-)
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index 8f37cab384d..d0f88195e58 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -742,7 +742,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
* @param string $calendarUri
* @param array $properties
* @return int
- * @suppress SqlInjectionChecker
*/
public function createCalendar($principalUri, $calendarUri, array $properties) {
$values = [
@@ -818,9 +817,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$supportedProperties = array_keys($this->propertyMap);
$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
- /**
- * @suppress SqlInjectionChecker
- */
$propPatch->handle($supportedProperties, function ($mutations) use ($calendarId) {
$newValues = [];
foreach ($mutations as $propertyName => $propertyValue) {
@@ -2148,9 +2144,6 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
$supportedProperties = array_keys($this->subscriptionPropertyMap);
$supportedProperties[] = '{http://calendarserver.org/ns/}source';
- /**
- * @suppress SqlInjectionChecker
- */
$propPatch->handle($supportedProperties, function ($mutations) use ($subscriptionId) {
$newValues = [];
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
index 28f48b61e99..14ade3f16e2 100644
--- a/apps/dav/lib/CardDAV/CardDavBackend.php
+++ b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -374,9 +374,6 @@ class CardDavBackend implements BackendInterface, SyncSupport {
'{' . Plugin::NS_CARDDAV . '}addressbook-description',
];
- /**
- * @suppress SqlInjectionChecker
- */
$propPatch->handle($supportedProperties, function ($mutations) use ($addressBookId) {
$updates = [];
foreach ($mutations as $property => $newValue) {
diff --git a/apps/files_external/lib/Service/DBConfigService.php b/apps/files_external/lib/Service/DBConfigService.php
index b1313f96e45..eaa5815cd30 100644
--- a/apps/files_external/lib/Service/DBConfigService.php
+++ b/apps/files_external/lib/Service/DBConfigService.php
@@ -153,7 +153,6 @@ class DBConfigService {
* Get admin defined mounts
*
* @return array
- * @suppress SqlInjectionChecker
*/
public function getAdminMounts() {
$builder = $this->connection->getQueryBuilder();
@@ -198,7 +197,6 @@ class DBConfigService {
* @param int $type any of the self::APPLICABLE_TYPE_ constants
* @param string|null $value user_id, group_id or null for global mounts
* @return array
- * @suppress SqlInjectionChecker
*/
public function getAdminMountsFor($type, $value) {
$builder = $this->connection->getQueryBuilder();
@@ -214,7 +212,6 @@ class DBConfigService {
* @param int $type any of the self::APPLICABLE_TYPE_ constants
* @param string[] $values user_ids or group_ids
* @return array
- * @suppress SqlInjectionChecker
*/
public function getAdminMountsForMultiple($type, array $values) {
$builder = $this->connection->getQueryBuilder();
@@ -238,7 +235,6 @@ class DBConfigService {
* @param int $type any of the self::APPLICABLE_TYPE_ constants
* @param string|null $value user_id, group_id or null for global mounts
* @return array
- * @suppress SqlInjectionChecker
*/
public function getUserMountsFor($type, $value) {
$builder = $this->connection->getQueryBuilder();
diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php
index 2c4b7d14de3..05bdef95bcb 100644
--- a/core/Command/Db/ConvertType.php
+++ b/core/Command/Db/ConvertType.php
@@ -295,7 +295,6 @@ class ConvertType extends Command implements CompletionAwareInterface {
* @param Table $table
* @param InputInterface $input
* @param OutputInterface $output
- * @suppress SqlInjectionChecker
*/
protected function copyTable(Connection $fromDB, Connection $toDB, Table $table, InputInterface $input, OutputInterface $output) {
if ($table->getName() === $toDB->getPrefix() . 'migrations') {
diff --git a/core/Migrations/Version14000Date20180404140050.php b/core/Migrations/Version14000Date20180404140050.php
index 80312c162fa..d9d7cf30d41 100644
--- a/core/Migrations/Version14000Date20180404140050.php
+++ b/core/Migrations/Version14000Date20180404140050.php
@@ -78,8 +78,6 @@ class Version14000Date20180404140050 extends SimpleMigrationStep {
* @param IOutput $output
* @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
* @param array $options
- *
- * @suppress SqlInjectionChecker
*/
public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
$qb = $this->connection->getQueryBuilder();
diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php
index d9d80374cfd..37aecd61693 100644
--- a/lib/private/BackgroundJob/JobList.php
+++ b/lib/private/BackgroundJob/JobList.php
@@ -180,7 +180,6 @@ class JobList implements IJobList {
* get the next job in the list
*
* @return IJob|null
- * @suppress SqlInjectionChecker
*/
public function getNext() {
$query = $this->connection->getQueryBuilder();
@@ -300,7 +299,6 @@ class JobList implements IJobList {
* Remove the reservation for a job
*
* @param IJob $job
- * @suppress SqlInjectionChecker
*/
public function unlockJob(IJob $job) {
$query = $this->connection->getQueryBuilder();
diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php
index a0a670817f4..1acfe79824c 100644
--- a/lib/private/Comments/Manager.php
+++ b/lib/private/Comments/Manager.php
@@ -594,8 +594,6 @@ class Manager implements ICommentsManager {
* @param int $folderId
* @param IUser $user
* @return array [$fileId => $unreadCount]
- *
- * @suppress SqlInjectionChecker
*/
public function getNumberOfUnreadCommentsForFolder($folderId, IUser $user) {
$qb = $this->dbConn->getQueryBuilder();
@@ -935,7 +933,6 @@ class Manager implements ICommentsManager {
* @param \DateTime $dateTime
* @param IUser $user
* @since 9.0.0
- * @suppress SqlInjectionChecker
*/
public function setReadMark($objectType, $objectId, \DateTime $dateTime, IUser $user) {
$this->checkRoleParameters('Object', $objectType, $objectId);
diff --git a/lib/private/DB/Adapter.php b/lib/private/DB/Adapter.php
index f27a90dd690..562fea25f5c 100644
--- a/lib/private/DB/Adapter.php
+++ b/lib/private/DB/Adapter.php
@@ -130,9 +130,6 @@ class Adapter {
}
}
- /**
- * @suppress SqlInjectionChecker
- */
public function insertIgnoreConflict(string $table,array $values) : int {
try {
$builder = $this->conn->getQueryBuilder();
diff --git a/lib/private/DB/AdapterPgSql.php b/lib/private/DB/AdapterPgSql.php
index 7f7f5150780..77f0b6b7722 100644
--- a/lib/private/DB/AdapterPgSql.php
+++ b/lib/private/DB/AdapterPgSql.php
@@ -41,9 +41,6 @@ class AdapterPgSql extends Adapter {
return $statement;
}
- /**
- * @suppress SqlInjectionChecker
- */
public function insertIgnoreConflict(string $table,array $values) : int {
if ($this->isPre9_5CompatMode() === true) {
return parent::insertIgnoreConflict($table, $values);
diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php
index 3b24703d434..c5766dcd7e0 100644
--- a/lib/private/DB/Connection.php
+++ b/lib/private/DB/Connection.php
@@ -279,7 +279,6 @@ class Connection extends ReconnectWrapper implements IDBConnection {
* @return int number of new rows
* @throws \Doctrine\DBAL\DBALException
* @throws PreConditionNotMetException
- * @suppress SqlInjectionChecker
*/
public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) {
try {
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 77289e674b3..8a173f35197 100644
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -254,8 +254,6 @@ class Cache implements ICache {
*
* @return int file id
* @throws \RuntimeException
- *
- * @suppress SqlInjectionChecker
*/
public function insert($file, array $data) {
// normalize file
@@ -613,7 +611,6 @@ class Cache implements ICache {
* @param string $targetPath
* @throws \OC\DatabaseException
* @throws \Exception if the given storages have an invalid id
- * @suppress SqlInjectionChecker
*/
public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
if ($sourceCache instanceof Cache) {
diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php
index 92fa6436548..c9200d33b11 100644
--- a/lib/private/Files/Cache/Propagator.php
+++ b/lib/private/Files/Cache/Propagator.php
@@ -63,7 +63,6 @@ class Propagator implements IPropagator {
* @param string $internalPath
* @param int $time
* @param int $sizeDifference number of bytes the file has grown
- * @suppress SqlInjectionChecker
*/
public function propagateChange($internalPath, $time, $sizeDifference = 0) {
// Do not propogate changes in ignored paths
@@ -156,7 +155,6 @@ class Propagator implements IPropagator {
/**
* Commit the active propagation batch
- * @suppress SqlInjectionChecker
*/
public function commitBatch() {
if (!$this->inBatch) {
diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php
index 0dc3e5d4529..6fa9cd96bfe 100644
--- a/lib/private/Files/Config/UserMountCache.php
+++ b/lib/private/Files/Config/UserMountCache.php
@@ -375,7 +375,6 @@ class UserMountCache implements IUserMountCache {
/**
* @param array $users
* @return array
- * @suppress SqlInjectionChecker
*/
public function getUsedSpaceForUsers(array $users) {
$builder = $this->connection->getQueryBuilder();
diff --git a/lib/private/Lock/DBLockingProvider.php b/lib/private/Lock/DBLockingProvider.php
index f48bf57028f..2ad7c162f36 100644
--- a/lib/private/Lock/DBLockingProvider.php
+++ b/lib/private/Lock/DBLockingProvider.php
@@ -216,8 +216,6 @@ class DBLockingProvider extends AbstractLockingProvider {
/**
* @param string $path
* @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
- *
- * @suppress SqlInjectionChecker
*/
public function releaseLock(string $path, int $type) {
$this->markRelease($path, $type);
@@ -288,8 +286,6 @@ class DBLockingProvider extends AbstractLockingProvider {
/**
* release all lock acquired by this instance which were marked using the mark* methods
- *
- * @suppress SqlInjectionChecker
*/
public function releaseAll() {
parent::releaseAll();
diff --git a/lib/private/Repair/CleanTags.php b/lib/private/Repair/CleanTags.php
index 959eb50e5a7..f414ef09efc 100644
--- a/lib/private/Repair/CleanTags.php
+++ b/lib/private/Repair/CleanTags.php
@@ -171,7 +171,6 @@ class CleanTags implements IRepairStep {
* @param string $sourceId
* @param string $sourceNullColumn If this column is null in the source table,
* the entry is deleted in the $deleteTable
- * @suppress SqlInjectionChecker
*/
protected function deleteOrphanEntries(IOutput $output, $repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
$qb = $this->connection->getQueryBuilder();
diff --git a/lib/private/Repair/OldGroupMembershipShares.php b/lib/private/Repair/OldGroupMembershipShares.php
index 2b2fd9cd470..38254188221 100644
--- a/lib/private/Repair/OldGroupMembershipShares.php
+++ b/lib/private/Repair/OldGroupMembershipShares.php
@@ -66,7 +66,6 @@ class OldGroupMembershipShares implements IRepairStep {
* Must throw exception on error.
*
* @throws \Exception in case of failure
- * @suppress SqlInjectionChecker
*/
public function run(IOutput $output) {
$deletedEntries = 0;
diff --git a/lib/private/Repair/RepairInvalidShares.php b/lib/private/Repair/RepairInvalidShares.php
index 27defdeda01..1fc98a1d466 100644
--- a/lib/private/Repair/RepairInvalidShares.php
+++ b/lib/private/Repair/RepairInvalidShares.php
@@ -56,7 +56,6 @@ class RepairInvalidShares implements IRepairStep {
/**
* Adjust file share permissions
- * @suppress SqlInjectionChecker
*/
private function adjustFileSharePermissions(IOutput $out) {
$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
diff --git a/lib/private/Security/Bruteforce/Throttler.php b/lib/private/Security/Bruteforce/Throttler.php
index 61e18088e94..01c0e02ef8f 100644
--- a/lib/private/Security/Bruteforce/Throttler.php
+++ b/lib/private/Security/Bruteforce/Throttler.php
@@ -115,7 +115,6 @@ class Throttler {
* @param string $action
* @param string $ip
* @param array $metadata Optional metadata logged to the database
- * @suppress SqlInjectionChecker
*/
public function registerAttempt(string $action,
string $ip,
diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php
index 17ae991a1de..3d7a0b2a4b1 100644
--- a/lib/private/Setup/PostgreSQL.php
+++ b/lib/private/Setup/PostgreSQL.php
@@ -39,7 +39,6 @@ class PostgreSQL extends AbstractDatabase {
/**
* @param string $username
* @throws \OC\DatabaseSetupException
- * @suppress SqlInjectionChecker
*/
public function setupDatabase($username) {
try {
diff --git a/lib/public/AppFramework/Db/QBMapper.php b/lib/public/AppFramework/Db/QBMapper.php
index ebbe92e7875..f6009c5de87 100644
--- a/lib/public/AppFramework/Db/QBMapper.php
+++ b/lib/public/AppFramework/Db/QBMapper.php
@@ -106,7 +106,6 @@ abstract class QBMapper {
* @param Entity $entity the entity that should be created
* @return Entity the saved entity with the set id
* @since 14.0.0
- * @suppress SqlInjectionChecker
*/
public function insert(Entity $entity): Entity {
// get updated fields to save, fields have to be set using a setter to
@@ -145,7 +144,6 @@ abstract class QBMapper {
* @return Entity the saved entity with the (new) id
* @throws \InvalidArgumentException if entity has no id
* @since 15.0.0
- * @suppress SqlInjectionChecker
*/
public function insertOrUpdate(Entity $entity): Entity {
try {
@@ -161,7 +159,6 @@ abstract class QBMapper {
* @param Entity $entity the entity that should be created
* @return Entity the saved entity with the set id
* @since 14.0.0
- * @suppress SqlInjectionChecker
*/
public function update(Entity $entity): Entity {
// if entity wasn't changed it makes no sense to run a db query
--
GitLab