Enforce domain restrictions on the domain part of the email address

Author: fguillot

.travis.yml

@@ -10,10 +10,9 @@ php:
 env:
   global:
     - PLUGIN=GoogleAuth
-    - KANBOARD_REPO=https://github.com/fguillot/kanboard.git
+    - KANBOARD_REPO=https://github.com/kanboard/kanboard.git
   matrix:
     - DB=sqlite
-    - DB=mysql
     - DB=postgres
 
 matrix:

Auth/GoogleAuthProvider.php

@@ -224,7 +224,12 @@ public function validateDomainRestriction(array $profile, $domains)
         foreach (explode(',', $domains) as $domain) {
             $domain = trim($domain);
 
-            if (strpos($profile['email'], $domain) > 0) {
+            if (strpos($profile['email'], '@') === false) {
+                return false;
+            }
+
+            list(, $hostname) = explode('@', $profile['email']);
+            if (strpos($hostname, $domain) === 0) {
                 return true;
             }
         }

Plugin.php

@@ -71,7 +71,7 @@ public function getPluginAuthor()
 
     public function getPluginVersion()
     {
-        return '1.0.4';
+        return '1.0.5';
     }
 
     public function getPluginHomepage()

Test/GoogleAuthTest.php

@@ -39,6 +39,24 @@ public function testEmailRestrictions()
         $this->container['memoryCache']->flush();
         $this->assertTrue($provider->isAccountCreationAllowed(array('email' => 'me@mydomain.tld')));
         $this->assertFalse($provider->isAccountCreationAllowed(array('email' => 'me@my-other-domain.tld')));
+        $this->assertFalse($provider->isAccountCreationAllowed(array('email' => 'test+mydomain.tld+@example.org')));
+
+        $this->assertTrue($this->container['configModel']->save(array('google_account_creation' => '1', 'google_email_domains' => 'example.org, example.com')));
+        $this->container['memoryCache']->flush();
+        $this->assertTrue($provider->isAccountCreationAllowed(array('email' => 'me@example.org')));
+        $this->assertTrue($provider->isAccountCreationAllowed(array('email' => 'me@example.com')));
+        $this->assertFalse($provider->isAccountCreationAllowed(array('email' => 'me@example.net')));
+        $this->assertFalse($provider->isAccountCreationAllowed(array('email' => 'invalid email')));
+
+        $this->assertTrue($this->container['configModel']->save(array('google_account_creation' => '1', 'google_email_domains' => 'example')));
+        $this->container['memoryCache']->flush();
+        $this->assertTrue($provider->isAccountCreationAllowed(array('email' => 'me@example')));
+        $this->assertFalse($provider->isAccountCreationAllowed(array('email' => 'example@localhost')));
+
+        $this->assertTrue($this->container['configModel']->save(array('google_account_creation' => '1', 'google_email_domains' => 'example.org')));
+        $this->container['memoryCache']->flush();
+        $this->assertTrue($provider->isAccountCreationAllowed(array('email' => 'me@example.org')));
+        $this->assertFalse($provider->isAccountCreationAllowed(array('email' => 'me@subdomain.example.org')));
     }
 
     public function testGetClientId()