Fix type issues in PrivilegesController

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
phpmyadmin · Dec 1, 2021 · 9245cec · 9245cec
1 parent f4493bb
commit 9245cec
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 50 deletions.
diff --git a/libraries/classes/Controllers/Server/PrivilegesController.php b/libraries/classes/Controllers/Server/PrivilegesController.php
@@ -25,6 +25,7 @@
 use function header;
 use function implode;
 use function is_array;
+use function is_string;
 use function ob_get_clean;
 use function ob_start;
 use function str_replace;
@@ -201,8 +202,8 @@ public function __invoke(): void
             $_add_user_error,
         ] = $serverPrivileges->addUser(
             $dbname ?? null,
-            $username ?? null,
-            $hostname ?? null,
+            $username ?? '',
+            $hostname ?? '',
             $password ?? null,
             $relationParameters->menuswork
         );
@@ -220,12 +221,12 @@ public function __invoke(): void
         /**
          * Changes / copies a user, part III
          */
-        if (isset($_POST['change_copy'])) {
+        if (isset($_POST['change_copy']) && $username !== null && $hostname !== null) {
             $queries = $serverPrivileges->getDbSpecificPrivsQueriesForChangeOrCopyUser($queries, $username, $hostname);
         }
 
         $itemType = '';
-        if (! empty($routinename)) {
+        if (! empty($routinename) && is_string($dbname)) {
             $itemType = $serverPrivileges->getRoutineType($dbname, $routinename);
         }
 
@@ -263,7 +264,7 @@ public function __invoke(): void
             ! empty($_POST['changeUserGroup']) && $relationParameters->menuswork
             && $this->dbi->isSuperUser() && $this->dbi->isCreateUser()
         ) {
-            $serverPrivileges->setUserGroup($username, $_POST['userGroup']);
+            $serverPrivileges->setUserGroup($username ?? '', $_POST['userGroup']);
             $message = Message::success();
         }
 
@@ -272,10 +273,10 @@ public function __invoke(): void
          */
         if (isset($_POST['revokeall'])) {
             [$message, $sql_query] = $serverPrivileges->getMessageAndSqlQueryForPrivilegesRevoke(
-                ($dbname ?? ''),
+                (is_string($dbname) ? $dbname : ''),
                 ($tablename ?? ($routinename ?? '')),
-                $username,
-                $hostname,
+                $username ?? '',
+                $hostname ?? '',
                 $itemType
             );
         }
@@ -284,7 +285,7 @@ public function __invoke(): void
          * Updates the password
          */
         if (isset($_POST['change_pw'])) {
-            $message = $serverPrivileges->updatePassword($errorUrl, $username, $hostname);
+            $message = $serverPrivileges->updatePassword($errorUrl, $username ?? '', $hostname ?? '');
         }
 
         /**
@@ -392,7 +393,7 @@ public function __invoke(): void
         if (isset($_GET['adduser']) || $_add_user_error === true) {
             // Add user
             $this->response->addHTML(
-                $serverPrivileges->getHtmlForAddUser(Util::escapeMysqlWildcards($dbname ?? ''))
+                $serverPrivileges->getHtmlForAddUser(Util::escapeMysqlWildcards(is_string($dbname) ? $dbname : ''))
             );
         } elseif (isset($_GET['checkprivsdb'])) {
             if (isset($_GET['checkprivstable'])) {
@@ -437,7 +438,7 @@ public function __invoke(): void
                     $serverPrivileges->getHtmlForRoutineSpecificPrivileges(
                         $username,
                         $hostname ?? '',
-                        $dbname,
+                        is_string($dbname) ? $dbname : '',
                         $routinename,
                         Util::escapeMysqlWildcards($url_dbname ?? '')
                     )

diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
@@ -515,7 +515,7 @@ public function getGrantsArray()
      *
      * @return string sql query
      */
-    public function getSqlQueryForDisplayPrivTable($db, $table, $username, $hostname)
+    public function getSqlQueryForDisplayPrivTable(string $db, string $table, string $username, string $hostname)
     {
         if ($db === '*') {
             return 'SELECT * FROM `mysql`.`user`'
@@ -721,10 +721,10 @@ public function getHtmlToDisplayPrivilegesTable(
      * @return string
      */
     public function getHtmlForRoutineSpecificPrivileges(
-        $username,
-        $hostname,
-        $db,
-        $routine,
+        string $username,
+        string $hostname,
+        string $db,
+        string $routine,
         $urlDbname
     ) {
         $privileges = $this->getRoutinePrivileges($username, $hostname, $db, $routine);
@@ -1111,8 +1111,8 @@ public function updatePassword($errorUrl, $username, $hostname)
     public function getMessageAndSqlQueryForPrivilegesRevoke(
         string $dbname,
         string $tablename,
-        $username,
-        $hostname,
+        string $username,
+        string $hostname,
         $itemType
     ) {
         $dbAndTable = $this->wildcardEscapeForGrant($dbname, $tablename);
@@ -2587,8 +2587,8 @@ public function getDataForQueries(array $queries, $queriesForDisplay)
      */
     public function addUser(
         $dbname,
-        $username,
-        $hostname,
+        string $username,
+        string $hostname,
         ?string $password,
         $isMenuwork
     ) {
@@ -2888,7 +2888,7 @@ public function getDataForDBInfo()
      *
      * @return array ($title, $export)
      */
-    public function getListForExportUserDefinition($username, $hostname)
+    public function getListForExportUserDefinition(string $username, string $hostname)
     {
         $export = '<textarea class="export" cols="60" rows="15">';
 
@@ -3349,8 +3349,8 @@ public function getTablePrivsQueriesForChangeOrCopyUser(
      */
     public function getDbSpecificPrivsQueriesForChangeOrCopyUser(
         array $queries,
-        $username,
-        $hostname
+        string $username,
+        string $hostname
     ) {
         $userHostCondition = ' WHERE `User`'
             . ' = \'' . $this->dbi->escapeString($_POST['old_username']) . "'"
@@ -3369,9 +3369,7 @@ public function getDbSpecificPrivsQueriesForChangeOrCopyUser(
 
         $this->dbi->freeResult($res);
 
-        $queries = $this->getTablePrivsQueriesForChangeOrCopyUser($userHostCondition, $queries, $username, $hostname);
-
-        return $queries;
+        return $this->getTablePrivsQueriesForChangeOrCopyUser($userHostCondition, $queries, $username, $hostname);
     }
 
     /**
@@ -3732,7 +3730,7 @@ public function getSqlQueriesForDisplayAndAddUser($username, $hostname, $passwor
      *
      * @return string type
      */
-    public function getRoutineType($dbname, $routineName)
+    public function getRoutineType(string $dbname, string $routineName)
     {
         $routineData = $this->dbi->getRoutines($dbname);
 

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -2521,29 +2521,6 @@
       <code>$export</code>
       <code>$title</code>
     </MixedOperand>
-    <PossiblyInvalidArgument occurrences="4">
-      <code>$dbname</code>
-      <code>$dbname</code>
-      <code>$dbname ?? ''</code>
-      <code>$dbname ?? ''</code>
-    </PossiblyInvalidArgument>
-    <PossiblyInvalidCast occurrences="4">
-      <code>$dbname</code>
-      <code>$dbname</code>
-      <code>$dbname ?? ''</code>
-      <code>$dbname ?? ''</code>
-    </PossiblyInvalidCast>
-    <PossiblyNullArgument occurrences="9">
-      <code>$hostname</code>
-      <code>$hostname</code>
-      <code>$hostname</code>
-      <code>$hostname ?? null</code>
-      <code>$username</code>
-      <code>$username</code>
-      <code>$username</code>
-      <code>$username</code>
-      <code>$username ?? null</code>
-    </PossiblyNullArgument>
     <RedundantCondition occurrences="1">
       <code>$sub_part</code>
     </RedundantCondition>