From 87e8f5213e8590da559bacdb2d7169cbe2a91f0e Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 17 Jan 2017 16:52:09 +0100
Subject: [PATCH] Allow local addresses for forward definition.

fix #998
---
 modoboa/admin/forms/forward.py | 30 +++++++++---------------------
 modoboa/admin/views/user.py    |  2 +-
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/modoboa/admin/forms/forward.py b/modoboa/admin/forms/forward.py
index 00334f14a..5cd7b1b7c 100644
--- a/modoboa/admin/forms/forward.py
+++ b/modoboa/admin/forms/forward.py
@@ -1,15 +1,13 @@
 """Forms related to forwards management."""
 
 from django import forms
-from django.utils.translation import ugettext as _, ugettext_lazy
-
-from modoboa.lib.email_utils import split_mailbox
-from modoboa.lib.exceptions import BadRequest, PermDeniedException
-
-from ..models import Domain
+from django.core import validators
+from django.utils.translation import ugettext_lazy
 
 
 class ForwardForm(forms.Form):
+    """Forward definition form."""
+
     dest = forms.CharField(
         label=ugettext_lazy("Recipient(s)"),
         widget=forms.Textarea(attrs={"class": "form-control"}),
@@ -24,23 +22,13 @@ class ForwardForm(forms.Form):
             "Forward messages and store copies into your local mailbox")
     )
 
-    def get_recipients(self):
+    def clean_dest(self):
+        """Check recipients validity."""
+        rawdata = self.cleaned_data.get("dest", "").strip()
         recipients = []
-        rawdata = self.cleaned_data["dest"].strip()
         if not rawdata:
             return recipients
         for rcpt in rawdata.split(","):
-            local_part, domname = split_mailbox(rcpt)
-            if not local_part or not domname:
-                raise BadRequest("Invalid mailbox syntax for %s" % rcpt)
-            try:
-                Domain.objects.get(name=domname)
-            except Domain.DoesNotExist:
-                recipients += [rcpt]
-            else:
-                raise PermDeniedException(
-                    _("You can't define a forward to a local destination. "
-                      "Please ask your administrator to create an alias "
-                      "instead.")
-                )
+            validators.validate_email(rcpt)
+            recipients += [rcpt]
         return recipients
diff --git a/modoboa/admin/views/user.py b/modoboa/admin/views/user.py
index 9afa398a5..18808e74c 100644
--- a/modoboa/admin/views/user.py
+++ b/modoboa/admin/views/user.py
@@ -27,7 +27,7 @@ def forward(request, tplname="admin/forward.html"):
                 al = Alias.objects.create(
                     address=mb.full_address, domain=mb.domain,
                     enabled=mb.user.is_active)
-            recipients = form.get_recipients()
+            recipients = form.cleaned_data["dest"]
             if form.cleaned_data["keepcopies"]:
                 recipients.append(mb.full_address)
             al.set_recipients(recipients)