From 92d8d339e366005ccd3e6e7da2c54cb53d63582e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 5 Nov 2020 17:08:35 +0100 Subject: Improve query type detection Signed-off-by: Joas Schilling --- lib/private/legacy/db.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/private/legacy/db.php b/lib/private/legacy/db.php index 9371e733d28..31e3c24ceb7 100644 --- a/lib/private/legacy/db.php +++ b/lib/private/legacy/db.php @@ -72,8 +72,7 @@ class OC_DB { throw new \OC\DatabaseException($e->getMessage()); } // differentiate between query and manipulation - $result = new OC_DB_StatementWrapper($result, $isManipulation); - return $result; + return new OC_DB_StatementWrapper($result, $isManipulation); } /** @@ -84,22 +83,26 @@ class OC_DB { * @return bool */ static public function isManipulation( $sql ) { + $sql = trim($sql); $selectOccurrence = stripos($sql, 'SELECT'); - if ($selectOccurrence !== false && $selectOccurrence < 10) { + if ($selectOccurrence === 0) { return false; } $insertOccurrence = stripos($sql, 'INSERT'); - if ($insertOccurrence !== false && $insertOccurrence < 10) { + if ($insertOccurrence === 0) { return true; } $updateOccurrence = stripos($sql, 'UPDATE'); - if ($updateOccurrence !== false && $updateOccurrence < 10) { + if ($updateOccurrence === 0) { return true; } $deleteOccurrence = stripos($sql, 'DELETE'); - if ($deleteOccurrence !== false && $deleteOccurrence < 10) { + if ($deleteOccurrence === 0) { return true; } + + \OC::$server->getLogger()->logException(new \Exception('Can not detect if query is manipulating: ' . $sql)); + return false; } -- cgit v1.2.3