docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace other occurences of domain names with idna

Browse Source
This commit is contained in:
Stefan Auditor
2018-04-12 20:30:19 +02:00
parent 1b666cd25b
commit 5a7272ff12
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/admin/mailu/models.py
View File

@@ -15,7 +15,7 @@ import smtplib
# Many-to-many association table for domain managers # Many-to-many association table for domain managers
managers = db.Table('manager', managers = db.Table('manager',
db.Column('domain_name', db.String(80), db.ForeignKey('domain.name')), db.Column('domain_name', Idna, db.ForeignKey('domain.name')),
db.Column('user_email', db.String(255), db.ForeignKey('user.email')) db.Column('user_email', db.String(255), db.ForeignKey('user.email'))
) )
@@ -123,8 +123,8 @@ class Alternative(Base):
__tablename__ = "alternative" __tablename__ = "alternative"
name = db.Column(db.String(80), primary_key=True, nullable=False) name = db.Column(Idna, primary_key=True, nullable=False)
domain_name = db.Column(db.String(80), db.ForeignKey(Domain.name)) domain_name = db.Column(Idna, db.ForeignKey(Domain.name))
domain = db.relationship(Domain, domain = db.relationship(Domain,
backref=db.backref('alternatives', cascade='all, delete-orphan')) backref=db.backref('alternatives', cascade='all, delete-orphan'))
@@ -139,8 +139,8 @@ class Relay(Base):
__tablename__ = "relay" __tablename__ = "relay"
name = db.Column(db.String(80), primary_key=True, nullable=False) name = db.Column(Idna, primary_key=True, nullable=False)
smtp = db.Column(db.String(80), nullable=True) smtp = db.Column(Idna, nullable=True)
def __str__(self): def __str__(self):
return self.name return self.name
@@ -154,7 +154,7 @@ class Email(object):
@declarative.declared_attr @declarative.declared_attr
def domain_name(cls): def domain_name(cls):
return db.Column(db.String(80), db.ForeignKey(Domain.name), return db.Column(Idna, db.ForeignKey(Domain.name),
nullable=False) nullable=False)
# This field is redundant with both localpart and domain name. # This field is redundant with both localpart and domain name.