Fix for alias custom local part with extension

h-town · Oct 8, 2020 · 0fe31fe · 0fe31fe
1 parent 1917f0b
commit 0fe31fe
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/SELF-HOSTING.md b/SELF-HOSTING.md
@@ -564,7 +564,7 @@ user = anonaddy
 password = your-database-password
 hosts = 127.0.0.1
 dbname = anonaddy_database
-query = SELECT (SELECT 'DISCARD' FROM additional_usernames WHERE (CONCAT(username, '.example.com') = SUBSTRING_INDEX('%s','@',-1)) AND active = 0) AS usernames, (SELECT 'DISCARD' FROM domains WHERE domain = SUBSTRING_INDEX('%s','@',-1) AND active = 0) AS domains LIMIT 1;
+query = SELECT (SELECT 'DISCARD' FROM additional_usernames WHERE (CONCAT(username, '.example.com') = SUBSTRING_INDEX('%s','@',-1)) AND active = 0) AS usernames, (SELECT CASE WHEN NOT EXISTS(SELECT NULL FROM aliases WHERE email='%s') AND catch_all = 0 THEN 'REJECT' WHEN active=0 THEN 'DISCARD' ELSE NULL END FROM domains WHERE domain = SUBSTRING_INDEX('%s','@',-1)) AS domains LIMIT 1;
 ```
 
 This file is responsible for checking whether the alias is for an additional username/custom domain and if so then is that additional username/custom domain set as active. If it is not set as active then the email is discarded.

diff --git a/app/Http/Controllers/Api/AliasController.php b/app/Http/Controllers/Api/AliasController.php
@@ -43,9 +43,18 @@ public function store(StoreAliasRequest $request)
         }
 
         if (isset($request->validated()['local_part'])) {
+            $localPart = $request->validated()['local_part'];
+
+            // Local part has extension
+            if (Str::contains($localPart, '+')) {
+                $extension = Str::after($localPart, '+');
+                $localPart = Str::before($localPart, '+');
+            }
+
             $data = [
-                'email' => $request->validated()['local_part'] . '@' . $request->domain,
-                'local_part' => $request->validated()['local_part'],
+                'email' => $localPart . '@' . $request->domain,
+                'local_part' => $localPart,
+                'extension' => $extension ?? null
             ];
         } else {
             if ($request->input('format', 'uuid') === 'random_words') {

diff --git a/app/Models/Alias.php b/app/Models/Alias.php
@@ -27,6 +27,7 @@ class Alias extends Model
         'description',
         'email',
         'local_part',
+        'extension',
         'domain',
         'aliasable_id',
         'aliasable_type'

diff --git a/tests/Feature/Api/AliasesTest.php b/tests/Feature/Api/AliasesTest.php
@@ -124,6 +124,23 @@ public function user_can_generate_new_alias_with_local_part()
         $this->assertEquals('valid-local-part@'.$this->user->username . '.anonaddy.com', $this->user->aliases[0]->email);
     }
 
+    /** @test */
+    public function user_can_generate_new_alias_with_local_part_and_extension()
+    {
+        $response = $this->json('POST', '/api/v1/aliases', [
+            'domain' => $this->user->username . '.anonaddy.com',
+            'format' => 'custom',
+            'description' => 'the description',
+            'local_part' => 'valid-local-part+extension'
+        ]);
+
+        $response->assertStatus(201);
+        $this->assertCount(1, $this->user->aliases);
+        $this->assertEquals('valid-local-part', $response->getData()->data->local_part);
+        $this->assertEquals('extension', $response->getData()->data->extension);
+        $this->assertEquals('valid-local-part@'.$this->user->username . '.anonaddy.com', $this->user->aliases[0]->email);
+    }
+
     /** @test */
     public function user_cannot_generate_new_alias_with_invalid_local_part()
     {