Merge pull request #17982 from owncloud/appframework-sanitize-name

Sanitize class names before registerService/query

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/lib/appframework/utility/SimpleContainerTest.php b/tests/lib/appframework/utility/SimpleContainerTest.php
index 8217749aed4..e21e0ca13f2 100644
--- a/tests/lib/appframework/utility/SimpleContainerTest.php
+++ b/tests/lib/appframework/utility/SimpleContainerTest.php
@@ -170,6 +170,25 @@ class SimpleContainerTest extends \Test\TestCase {
             $this->container->query('test'), $this->container->query('test1'));
     }
 
+    public function sanitizeNameProvider() {
+        return [
+            ['ABC\\Foo', 'ABC\\Foo'],
+            ['\\ABC\\Foo', '\\ABC\\Foo'],
+            ['\\ABC\\Foo', 'ABC\\Foo'],
+            ['ABC\\Foo', '\\ABC\\Foo'],
+        ];
+    }
+
+    /**
+     * @dataProvider sanitizeNameProvider
+     */
+    public function testSanitizeName($register, $query) {
+        $this->container->registerService($register, function() {
+            return 'abc';
+        });
+        $this->assertEquals('abc', $this->container->query($query));
+    }
+
     /**
      * @expectedException \OCP\AppFramework\QueryException
      */