From 1aed791258e8df083eeffe3be664c9b0fee8432e Mon Sep 17 00:00:00 2001
From: Rishwanth Yeddula <rish@cpanel.net>
Date: Thu, 5 Jul 2018 12:46:51 -0500
Subject: [PATCH] Ensure that database names with '.' are handled properly when
 DisableIS is true

Closes: #13267

Signed-off-by: Rishwanth Yeddula <rish@cpanel.net>
---
 libraries/classes/CheckUserPrivileges.php | 24 ++++++++++++-----
 test/classes/CheckUserPrivilegesTest.php  | 33 +++++++++++++++++++++++
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php
index 1783fe05c3..62accf0b1a 100644
--- a/libraries/classes/CheckUserPrivileges.php
+++ b/libraries/classes/CheckUserPrivileges.php
@@ -44,10 +44,24 @@ class CheckUserPrivileges
     public function getItemsFromShowGrantsRow(string $row): array
     {
         $db_name_offset = mb_strpos($row, ' ON ') + 4;
+
+        $tblname_end_offset = mb_strpos($row, ' TO ');
+        $tblname_start_offset = false;
+
+        if ($__tblname_start_offset = mb_strpos($row, '`.', $db_name_offset)) {
+            if ($__tblname_start_offset < $tblname_end_offset) {
+                $tblname_start_offset = $__tblname_start_offset + 1;
+            }
+        }
+
+        if (!$tblname_start_offset) {
+            $tblname_start_offset = mb_strpos($row, '.', $db_name_offset);
+        }
+
         $show_grants_dbname = mb_substr(
             $row,
             $db_name_offset,
-            mb_strpos($row, '.', $db_name_offset) - $db_name_offset
+            $tblname_start_offset - $db_name_offset
         );
 
         $show_grants_dbname = Util::unQuote($show_grants_dbname, '`');
@@ -58,14 +72,10 @@ class CheckUserPrivileges
             (mb_strpos($row, ' ON ') - 6)
         );
 
-        // extrac table from GRANT sytax
-        $tblname_start_offset = mb_strpos($row, '.') + 1;
-        $tblname_end_offset = mb_strpos($row, ' TO ');
-
         $show_grants_tblname = mb_substr(
             $row,
-            $tblname_start_offset,
-            $tblname_end_offset - $tblname_start_offset
+            $tblname_start_offset + 1,
+            $tblname_end_offset - $tblname_start_offset - 1
         );
         $show_grants_tblname = Util::unQuote($show_grants_tblname, '`');
 
diff --git a/test/classes/CheckUserPrivilegesTest.php b/test/classes/CheckUserPrivilegesTest.php
index 4638a040d6..8e44792de3 100644
--- a/test/classes/CheckUserPrivilegesTest.php
+++ b/test/classes/CheckUserPrivilegesTest.php
@@ -129,6 +129,39 @@ class CheckUserPrivilegesTest extends TestCase
             "columns_priv",
             $show_grants_tblname
         );
+
+        // TEST CASE 4
+        $show_grants_full_row = "GRANT ALL PRIVILEGES ON `cptest\_.`.* TO "
+            . "'cptest'@'localhost'";
+
+        list(
+            $show_grants_str,
+            $show_grants_dbname,
+            $show_grants_tblname
+        ) = $this->checkUserPrivileges->getItemsFromShowGrantsRow(
+            $show_grants_full_row
+        );
+
+        $this->assertEquals(
+            "cptest\_.",
+            $show_grants_dbname
+        );
+
+        $show_grants_full_row = "GRANT ALL PRIVILEGES ON `cptest\_.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z`.* TO "
+            . "'cptest'@'localhost'";
+
+        list(
+            $show_grants_str,
+            $show_grants_dbname,
+            $show_grants_tblname
+        ) = $this->checkUserPrivileges->getItemsFromShowGrantsRow(
+            $show_grants_full_row
+        );
+
+        $this->assertEquals(
+            "cptest\_.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z",
+            $show_grants_dbname
+        );
     }
 
     /**