author | Pascal Volk <neverseen@users.sourceforge.net> |
Thu, 22 Jul 2010 23:56:14 +0000 | |
branch | v0.6.x |
changeset 306 | 504fd29b4712 |
parent 302 | 32b4a39b5640 |
child 316 | 31d8931dc535 |
permissions | -rw-r--r-- |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
1 |
# -*- coding: UTF-8 -*- |
162
0ac9ef587769
Updated copyright notices to include the year 2010.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
156
diff
changeset
|
2 |
# Copyright (c) 2007 - 2010, Pascal Volk |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
3 |
# See COPYING for distribution information. |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
4 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
5 |
""" |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
6 |
VirtualMailManager.Account |
302
32b4a39b5640
VMM/maillocation: Reworked class MailLocation to match the new
Pascal Volk <neverseen@users.sourceforge.net>
parents:
293
diff
changeset
|
7 |
~~~~~~~~~~~~~~~~~~~~~~~~~~ |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
8 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
9 |
Virtual Mail Manager's Account class to manage e-mail accounts. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
10 |
""" |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
11 |
|
185
6e1ef32fbd82
VMM/*: Moved some methods from classes to modules __init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
162
diff
changeset
|
12 |
from VirtualMailManager.Domain import Domain |
6e1ef32fbd82
VMM/*: Moved some methods from classes to modules __init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
162
diff
changeset
|
13 |
from VirtualMailManager.EmailAddress import EmailAddress |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
14 |
from VirtualMailManager.Transport import Transport |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
15 |
from VirtualMailManager.common import version_str |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
16 |
from VirtualMailManager.constants.ERROR import \ |
252
af555e6967c8
VMM/Account: renamed function getAccountByID -> get_account_by_uid.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
250
diff
changeset
|
17 |
ACCOUNT_EXISTS, ACCOUNT_MISSING_PASSWORD, ALIAS_PRESENT, \ |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
18 |
INVALID_AGUMENT, INVALID_MAIL_LOCATION, NO_SUCH_ACCOUNT, NO_SUCH_DOMAIN, \ |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
19 |
UNKNOWN_SERVICE |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
20 |
from VirtualMailManager.errors import AccountError as AErr |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
21 |
from VirtualMailManager.maillocation import MailLocation |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
22 |
from VirtualMailManager.password import pwhash |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
23 |
|
225
a51809f7940b
VMM/Transport: reworked Transport class.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
216
diff
changeset
|
24 |
|
a51809f7940b
VMM/Transport: reworked Transport class.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
216
diff
changeset
|
25 |
_ = lambda msg: msg |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
26 |
cfg_dget = lambda option: None |
225
a51809f7940b
VMM/Transport: reworked Transport class.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
216
diff
changeset
|
27 |
|
a51809f7940b
VMM/Transport: reworked Transport class.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
216
diff
changeset
|
28 |
|
121
7ccc05774118
Converted to new-style class, added __slots__, updated queries.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
115
diff
changeset
|
29 |
class Account(object): |
3
a9b44e04bf01
* VirtualMailManager/Account.py:
Pascal Volk <neverseen@users.sourceforge.net>
parents:
0
diff
changeset
|
30 |
"""Class to manage e-mail accounts.""" |
293
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
31 |
__slots__ = ('_addr', '_dbh', '_domain', '_mail', '_new', '_passwd', |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
32 |
'_transport', '_uid') |
216
0c8c053b451c
Moved VirtualMailManager/Exceptions to VirtualMailManager/errors.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
185
diff
changeset
|
33 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
34 |
def __init__(self, dbh, address): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
35 |
"""Creates a new Account instance. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
36 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
37 |
When an account with the given *address* could be found in the |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
38 |
database all relevant data will be loaded. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
39 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
40 |
Arguments: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
41 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
42 |
`dbh` : pyPgSQL.PgSQL.Connection |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
43 |
A database connection for the database access. |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
44 |
`address` : VirtualMailManager.EmailAddress.EmailAddress |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
45 |
The e-mail address of the (new) Account. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
46 |
""" |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
47 |
if not isinstance(address, EmailAddress): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
48 |
raise TypeError("Argument 'address' is not an EmailAddress") |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
49 |
self._addr = address |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
50 |
self._dbh = dbh |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
51 |
self._domain = Domain(self._dbh, self._addr.domainname) |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
52 |
if not self._domain.gid: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
53 |
raise AErr(_(u"The domain '%s' doesn't exist.") % |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
54 |
self._addr.domainname, NO_SUCH_DOMAIN) |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
55 |
self._uid = 0 |
293
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
56 |
self._mail = None |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
57 |
self._transport = self._domain.transport |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
58 |
self._passwd = None |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
59 |
self._new = True |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
60 |
self._load() |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
61 |
|
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
62 |
def __nonzero__(self): |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
63 |
"""Returns `True` if the Account is known, `False` if it's new.""" |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
64 |
return not self._new |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
65 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
66 |
def _load(self): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
67 |
"""Load 'uid', 'mid' and 'tid' from the database and set _new to |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
68 |
`False` - if the user could be found. """ |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
69 |
dbc = self._dbh.cursor() |
290
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
70 |
dbc.execute('SELECT uid, mid, tid FROM users WHERE gid = %s AND ' |
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
71 |
'local_part = %s', self._domain.gid, self._addr.localpart) |
9
e3d3dbeb5b84
* 'create_tables.pgsql'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
8
diff
changeset
|
72 |
result = dbc.fetchone() |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
73 |
dbc.close() |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
74 |
if result: |
293
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
75 |
self._uid, _mid, _tid = result |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
76 |
if _tid != self._transport.tid: |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
77 |
self._transport = Transport(self._dbh, tid=_tid) |
306
504fd29b4712
VMM/Account: s/prefix/mbformat/ and pass the dbh to MailLocation.__init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
302
diff
changeset
|
78 |
self._mail = MailLocation(self._dbh, mid=_mid) |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
79 |
self._new = False |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
80 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
81 |
def _set_uid(self): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
82 |
"""Set the unique ID for the new Account.""" |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
83 |
assert self._uid == 0 |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
84 |
dbc = self._dbh.cursor() |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
85 |
dbc.execute("SELECT nextval('users_uid')") |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
86 |
self._uid = dbc.fetchone()[0] |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
87 |
dbc.close() |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
88 |
|
9
e3d3dbeb5b84
* 'create_tables.pgsql'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
8
diff
changeset
|
89 |
def _prepare(self, maillocation): |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
90 |
"""Check and set different attributes - before we store the |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
91 |
information in the database. |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
92 |
""" |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
93 |
if maillocation.dovecot_version > cfg_dget('misc.dovecot_version'): |
306
504fd29b4712
VMM/Account: s/prefix/mbformat/ and pass the dbh to MailLocation.__init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
302
diff
changeset
|
94 |
raise AErr(_(u"The mailbox format '%(mbfmt)s' requires Dovecot " |
504fd29b4712
VMM/Account: s/prefix/mbformat/ and pass the dbh to MailLocation.__init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
302
diff
changeset
|
95 |
u">= v%(version)s") % {'mbfmt': maillocation.mbformat, |
504fd29b4712
VMM/Account: s/prefix/mbformat/ and pass the dbh to MailLocation.__init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
302
diff
changeset
|
96 |
'version': version_str(maillocation.dovecot_version)}, |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
97 |
INVALID_MAIL_LOCATION) |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
98 |
if not maillocation.postfix and \ |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
99 |
self._transport.transport.lower() in ('virtual:', 'virtual'): |
306
504fd29b4712
VMM/Account: s/prefix/mbformat/ and pass the dbh to MailLocation.__init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
302
diff
changeset
|
100 |
raise AErr(_(u"Invalid transport '%(transport)s' for mailbox " |
504fd29b4712
VMM/Account: s/prefix/mbformat/ and pass the dbh to MailLocation.__init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
302
diff
changeset
|
101 |
u"format '%(mbfmt)s'") % |
290
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
102 |
{'transport': self._transport, |
306
504fd29b4712
VMM/Account: s/prefix/mbformat/ and pass the dbh to MailLocation.__init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
302
diff
changeset
|
103 |
'mbfmt': maillocation.mbformat}, INVALID_MAIL_LOCATION) |
293
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
104 |
self._mail = maillocation |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
105 |
self._set_uid() |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
106 |
|
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
107 |
def _switch_state(self, state, service): |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
108 |
"""Switch the state of the Account's services on or off. See |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
109 |
Account.enable()/Account.disable() for more information.""" |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
110 |
self._chk_state() |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
111 |
if service not in (None, 'all', 'imap', 'pop3', 'sieve', 'smtp'): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
112 |
raise AErr(_(u"Unknown service: '%s'.") % service, UNKNOWN_SERVICE) |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
113 |
if cfg_dget('misc.dovecot_version') >= 0x10200b02: |
134
6ca3d22e5dd0
Fixed a Python2.4.4 SyntaxError
Pascal Volk <neverseen@users.sourceforge.net>
parents:
133
diff
changeset
|
114 |
sieve_col = 'sieve' |
6ca3d22e5dd0
Fixed a Python2.4.4 SyntaxError
Pascal Volk <neverseen@users.sourceforge.net>
parents:
133
diff
changeset
|
115 |
else: |
6ca3d22e5dd0
Fixed a Python2.4.4 SyntaxError
Pascal Volk <neverseen@users.sourceforge.net>
parents:
133
diff
changeset
|
116 |
sieve_col = 'managesieve' |
115
21f264a88ab2
Added sieve/managesieve switching stuff,
Pascal Volk <neverseen@users.sourceforge.net>
parents:
114
diff
changeset
|
117 |
if service in ('smtp', 'pop3', 'imap'): |
21f264a88ab2
Added sieve/managesieve switching stuff,
Pascal Volk <neverseen@users.sourceforge.net>
parents:
114
diff
changeset
|
118 |
sql = 'UPDATE users SET %s = %s WHERE uid = %d' % (service, state, |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
119 |
self._uid) |
115
21f264a88ab2
Added sieve/managesieve switching stuff,
Pascal Volk <neverseen@users.sourceforge.net>
parents:
114
diff
changeset
|
120 |
elif service == 'sieve': |
21f264a88ab2
Added sieve/managesieve switching stuff,
Pascal Volk <neverseen@users.sourceforge.net>
parents:
114
diff
changeset
|
121 |
sql = 'UPDATE users SET %s = %s WHERE uid = %d' % (sieve_col, |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
122 |
state, |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
123 |
self._uid) |
115
21f264a88ab2
Added sieve/managesieve switching stuff,
Pascal Volk <neverseen@users.sourceforge.net>
parents:
114
diff
changeset
|
124 |
else: |
21f264a88ab2
Added sieve/managesieve switching stuff,
Pascal Volk <neverseen@users.sourceforge.net>
parents:
114
diff
changeset
|
125 |
sql = 'UPDATE users SET smtp = %(s)s, pop3 = %(s)s, imap = %(s)s,\ |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
126 |
%(col)s = %(s)s WHERE uid = %(uid)d' % \ |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
127 |
{'s': state, 'col': sieve_col, 'uid': self._uid} |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
128 |
dbc = self._dbh.cursor() |
115
21f264a88ab2
Added sieve/managesieve switching stuff,
Pascal Volk <neverseen@users.sourceforge.net>
parents:
114
diff
changeset
|
129 |
dbc.execute(sql) |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
130 |
if dbc.rowcount > 0: |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
131 |
self._dbh.commit() |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
132 |
dbc.close() |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
133 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
134 |
def _count_aliases(self): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
135 |
"""Count all alias addresses where the destination address is the |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
136 |
address of the Account.""" |
66
995d538a6eb5
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
65
diff
changeset
|
137 |
dbc = self._dbh.cursor() |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
138 |
sql = "SELECT COUNT(destination) FROM alias WHERE destination = '%s'"\ |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
139 |
% self._addr |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
140 |
dbc.execute(sql) |
66
995d538a6eb5
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
65
diff
changeset
|
141 |
a_count = dbc.fetchone()[0] |
995d538a6eb5
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
65
diff
changeset
|
142 |
dbc.close() |
995d538a6eb5
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
65
diff
changeset
|
143 |
return a_count |
995d538a6eb5
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
65
diff
changeset
|
144 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
145 |
def _chk_state(self): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
146 |
"""Raise an AccountError if the Account is new - not yet saved in the |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
147 |
database.""" |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
148 |
if self._new: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
149 |
raise AErr(_(u"The account '%s' doesn't exist.") % self._addr, |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
150 |
NO_SUCH_ACCOUNT) |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
151 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
152 |
@property |
250
73cd082cd724
VMM/{Account,Alias,Relocated}: added a address property to the classes
Pascal Volk <neverseen@users.sourceforge.net>
parents:
246
diff
changeset
|
153 |
def address(self): |
73cd082cd724
VMM/{Account,Alias,Relocated}: added a address property to the classes
Pascal Volk <neverseen@users.sourceforge.net>
parents:
246
diff
changeset
|
154 |
"""The Account's EmailAddress instance.""" |
73cd082cd724
VMM/{Account,Alias,Relocated}: added a address property to the classes
Pascal Volk <neverseen@users.sourceforge.net>
parents:
246
diff
changeset
|
155 |
return self._addr |
73cd082cd724
VMM/{Account,Alias,Relocated}: added a address property to the classes
Pascal Volk <neverseen@users.sourceforge.net>
parents:
246
diff
changeset
|
156 |
|
73cd082cd724
VMM/{Account,Alias,Relocated}: added a address property to the classes
Pascal Volk <neverseen@users.sourceforge.net>
parents:
246
diff
changeset
|
157 |
@property |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
158 |
def domain_directory(self): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
159 |
"""The directory of the domain the Account belongs to.""" |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
160 |
if self._domain: |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
161 |
return self._domain.directory |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
162 |
return None |
38
c44ea4526546
* 'VirtualMailManager/Alias.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
34
diff
changeset
|
163 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
164 |
@property |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
165 |
def gid(self): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
166 |
"""The Account's group ID.""" |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
167 |
if self._domain: |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
168 |
return self._domain.gid |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
169 |
return None |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
170 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
171 |
@property |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
172 |
def home(self): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
173 |
"""The Account's home directory.""" |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
174 |
if not self._new: |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
175 |
return '%s/%s' % (self._domain.directory, self._uid) |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
176 |
return None |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
177 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
178 |
@property |
293
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
179 |
def mail_location(self): |
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
180 |
"""The Account's MailLocation.""" |
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
181 |
return self._mail |
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
182 |
|
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
183 |
@property |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
184 |
def uid(self): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
185 |
"""The Account's unique ID.""" |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
186 |
return self._uid |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
187 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
188 |
def set_password(self, password): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
189 |
"""Set a password for the new Account. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
190 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
191 |
If you want to update the password of an existing Account use |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
192 |
Account.modify(). |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
193 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
194 |
Argument: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
195 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
196 |
`password` : basestring |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
197 |
The password for the new Account. |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
198 |
""" |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
199 |
if not isinstance(password, basestring) or not password: |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
200 |
raise AErr(_(u"Couldn't accept password: '%s'") % password, |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
201 |
ACCOUNT_MISSING_PASSWORD) |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
202 |
self._passwd = password |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
203 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
204 |
def set_transport(self, transport): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
205 |
"""Set the transport for the new Account. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
206 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
207 |
If you want to update the transport of an existing Account use |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
208 |
Account.modify(). |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
209 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
210 |
Argument: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
211 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
212 |
`transport` : basestring |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
213 |
The string representation of the transport, e.g.: 'dovecot:' |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
214 |
""" |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
215 |
self._transport = Transport(self._dbh, transport=transport) |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
216 |
|
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
217 |
def enable(self, service=None): |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
218 |
"""Enable a/all service/s for the Account. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
219 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
220 |
Possible values for the *service* are: 'imap', 'pop3', 'sieve' and |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
221 |
'smtp'. When all services should be enabled, use 'all' or the |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
222 |
default value `None`. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
223 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
224 |
Arguments: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
225 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
226 |
`service` : basestring |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
227 |
The name of a service ('imap', 'pop3', 'smtp', 'sieve'), 'all' |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
228 |
or `None`. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
229 |
""" |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
230 |
self._switch_state(True, service) |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
231 |
|
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
232 |
def disable(self, service=None): |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
233 |
"""Disable a/all service/s for the Account. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
234 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
235 |
For more information see: Account.enable().""" |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
236 |
self._switch_state(False, service) |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
237 |
|
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
238 |
def save(self): |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
239 |
"""Save the new Account in the database.""" |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
240 |
if not self._new: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
241 |
raise AErr(_(u"The account '%s' already exists.") % self._addr, |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
242 |
ACCOUNT_EXISTS) |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
243 |
if not self._passwd: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
244 |
raise AErr(_(u"No password set for '%s'.") % self._addr, |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
245 |
ACCOUNT_MISSING_PASSWORD) |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
246 |
if cfg_dget('misc.dovecot_version') >= 0x10200b02: |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
247 |
sieve_col = 'sieve' |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
248 |
else: |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
249 |
sieve_col = 'managesieve' |
306
504fd29b4712
VMM/Account: s/prefix/mbformat/ and pass the dbh to MailLocation.__init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
302
diff
changeset
|
250 |
self._prepare(MailLocation(self._dbh, mbfmt=cfg_dget('mailbox.format'), |
504fd29b4712
VMM/Account: s/prefix/mbformat/ and pass the dbh to MailLocation.__init__.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
302
diff
changeset
|
251 |
directory=cfg_dget('mailbox.root'))) |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
252 |
sql = "INSERT INTO users (local_part, passwd, uid, gid, mid, tid,\ |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
253 |
smtp, pop3, imap, %s) VALUES ('%s', '%s', %d, %d, %d, %d, %s, %s, %s, %s)" % ( |
276
f2ecfe0a0e09
VMM/Account: always pass the EmailAddress to the pwhash() call.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
275
diff
changeset
|
254 |
sieve_col, self._addr.localpart, pwhash(self._passwd, |
f2ecfe0a0e09
VMM/Account: always pass the EmailAddress to the pwhash() call.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
275
diff
changeset
|
255 |
user=self._addr), |
293
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
256 |
self._uid, self._domain.gid, self._mail.mid, self._transport.tid, |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
257 |
cfg_dget('account.smtp'), cfg_dget('account.pop3'), |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
258 |
cfg_dget('account.imap'), cfg_dget('account.sieve')) |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
259 |
dbc = self._dbh.cursor() |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
260 |
dbc.execute(sql) |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
261 |
self._dbh.commit() |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
262 |
dbc.close() |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
263 |
self._new = False |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
264 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
265 |
def modify(self, field, value): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
266 |
"""Update the Account's *field* to the new *value*. |
128
cf8116625866
Converted VirtualMailManager and Postconf to new-style classes.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
121
diff
changeset
|
267 |
|
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
268 |
Possible values for *field* are: 'name', 'password' and |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
269 |
'transport'. *value* is the *field*'s new value. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
270 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
271 |
Arguments: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
272 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
273 |
`field` : basestring |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
274 |
The attribute name: 'name', 'password' or 'transport' |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
275 |
`value` : basestring |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
276 |
The new value of the attribute. |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
277 |
""" |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
278 |
if field not in ('name', 'password', 'transport'): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
279 |
raise AErr(_(u"Unknown field: '%s'") % field, INVALID_AGUMENT) |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
280 |
self._chk_state() |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
281 |
dbc = self._dbh.cursor() |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
282 |
if field == 'password': |
121
7ccc05774118
Converted to new-style class, added __slots__, updated queries.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
115
diff
changeset
|
283 |
dbc.execute('UPDATE users SET passwd = %s WHERE uid = %s', |
276
f2ecfe0a0e09
VMM/Account: always pass the EmailAddress to the pwhash() call.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
275
diff
changeset
|
284 |
pwhash(value, user=self._addr), self._uid) |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
285 |
elif field == 'transport': |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
286 |
if value != self._transport.transport: |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
287 |
self._transport = Transport(self._dbh, transport=value) |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
288 |
dbc.execute('UPDATE users SET tid = %s WHERE uid = %s', |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
289 |
self._transport.tid, self._uid) |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
290 |
else: |
121
7ccc05774118
Converted to new-style class, added __slots__, updated queries.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
115
diff
changeset
|
291 |
dbc.execute('UPDATE users SET name = %s WHERE uid = %s', |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
292 |
value, self._uid) |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
293 |
if dbc.rowcount > 0: |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
294 |
self._dbh.commit() |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
295 |
dbc.close() |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
296 |
|
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
297 |
def get_info(self): |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
298 |
"""Returns a dict with some information about the Account. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
299 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
300 |
The keys of the dict are: 'address', 'gid', 'home', 'imap' |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
301 |
'mail_location', 'name', 'pop3', 'sieve', 'smtp', transport' and |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
302 |
'uid'. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
303 |
""" |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
304 |
self._chk_state() |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
305 |
if cfg_dget('misc.dovecot_version') >= 0x10200b02: |
134
6ca3d22e5dd0
Fixed a Python2.4.4 SyntaxError
Pascal Volk <neverseen@users.sourceforge.net>
parents:
133
diff
changeset
|
306 |
sieve_col = 'sieve' |
6ca3d22e5dd0
Fixed a Python2.4.4 SyntaxError
Pascal Volk <neverseen@users.sourceforge.net>
parents:
133
diff
changeset
|
307 |
else: |
6ca3d22e5dd0
Fixed a Python2.4.4 SyntaxError
Pascal Volk <neverseen@users.sourceforge.net>
parents:
133
diff
changeset
|
308 |
sieve_col = 'managesieve' |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
309 |
sql = 'SELECT name, smtp, pop3, imap, %s FROM users WHERE uid = %d' % \ |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
310 |
(sieve_col, self._uid) |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
311 |
dbc = self._dbh.cursor() |
115
21f264a88ab2
Added sieve/managesieve switching stuff,
Pascal Volk <neverseen@users.sourceforge.net>
parents:
114
diff
changeset
|
312 |
dbc.execute(sql) |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
313 |
info = dbc.fetchone() |
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
314 |
dbc.close() |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
315 |
if info: |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
316 |
keys = ('name', 'smtp', 'pop3', 'imap', sieve_col) |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
317 |
info = dict(zip(keys, info)) |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
318 |
for service in keys[1:]: |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
319 |
if info[service]: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
320 |
# TP: A service (pop3/imap) is enabled/usable for a user |
41
fbcb7e314510
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
38
diff
changeset
|
321 |
info[service] = _('enabled') |
20
55146c78b3fb
* 'create_tables.pgsql'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
19
diff
changeset
|
322 |
else: |
156
a849843115e9
Added comments for the Translation Project. Updated PO template.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
155
diff
changeset
|
323 |
# TP: A service (pop3/imap) isn't enabled/usable for a user |
41
fbcb7e314510
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
38
diff
changeset
|
324 |
info[service] = _('disabled') |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
325 |
info['address'] = self._addr |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
326 |
info['gid'] = self._domain.gid |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
327 |
info['home'] = '%s/%s' % (self._domain.directory, self._uid) |
293
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
328 |
info['mail_location'] = self._mail.mail_location |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
329 |
info['transport'] = self._transport.transport |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
330 |
info['uid'] = self._uid |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
331 |
return info |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
332 |
# nearly impossible‽ |
290
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
333 |
raise AErr(_(u"Couldn't fetch information for account: '%s'") % |
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
334 |
self._addr, NO_SUCH_ACCOUNT) |
0
bb0aa2102206
Initial import @sf.net
Pascal Volk <neverseen@users.sourceforge.net>
parents:
diff
changeset
|
335 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
336 |
def get_aliases(self): |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
337 |
"""Return a list with all alias e-mail addresses, whose destination |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
338 |
is the address of the Account.""" |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
339 |
self._chk_state() |
90
1734eb5101c6
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
82
diff
changeset
|
340 |
dbc = self._dbh.cursor() |
290
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
341 |
dbc.execute("SELECT address ||'@'|| domainname FROM alias, " |
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
342 |
"domain_name WHERE destination = %s AND domain_name.gid = " |
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
343 |
"alias.gid AND domain_name.is_primary ORDER BY address", |
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
344 |
str(self._addr)) |
90
1734eb5101c6
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
82
diff
changeset
|
345 |
addresses = dbc.fetchall() |
1734eb5101c6
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
82
diff
changeset
|
346 |
dbc.close() |
1734eb5101c6
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
82
diff
changeset
|
347 |
aliases = [] |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
348 |
if addresses: |
144
4c6aa6c29dd7
Small optimizations in Account.getAliases() and Alias.getInfo().
Pascal Volk <neverseen@users.sourceforge.net>
parents:
138
diff
changeset
|
349 |
aliases = [alias[0] for alias in addresses] |
90
1734eb5101c6
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
82
diff
changeset
|
350 |
return aliases |
1734eb5101c6
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
82
diff
changeset
|
351 |
|
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
352 |
def delete(self, delalias=False): |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
353 |
"""Delete the Account from the database. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
354 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
355 |
Argument: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
356 |
|
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
357 |
`delalias` : bool |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
358 |
if *delalias* is `True`, all aliases, which points to the Account, |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
359 |
will be also deleted. If there are aliases and *delalias* is |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
360 |
`False`, an AccountError will be raised. |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
361 |
""" |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
362 |
assert isinstance(delalias, bool) |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
363 |
self._chk_state() |
66
995d538a6eb5
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
65
diff
changeset
|
364 |
dbc = self._dbh.cursor() |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
365 |
if delalias: |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
366 |
dbc.execute('DELETE FROM users WHERE uid = %s', self._uid) |
65
5506433db9a3
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
55
diff
changeset
|
367 |
# delete also all aliases where the destination address is the same |
5506433db9a3
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
55
diff
changeset
|
368 |
# as for this account. |
114
e671210b04b8
Fixed a libpq.OperationalError in Account.delete()
Pascal Volk <neverseen@users.sourceforge.net>
parents:
113
diff
changeset
|
369 |
dbc.execute("DELETE FROM alias WHERE destination = %s", |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
370 |
str(self._addr)) |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
371 |
self._dbh.commit() |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
372 |
else: # check first for aliases |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
373 |
a_count = self._count_aliases() |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
374 |
if a_count > 0: |
66
995d538a6eb5
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
65
diff
changeset
|
375 |
dbc.close() |
290
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
376 |
raise AErr(_(u"There are %(count)d aliases with the " |
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
377 |
u"destination address '%(address)s'.") % |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
378 |
{'count': a_count, 'address': self._addr}, |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
379 |
ALIAS_PRESENT) |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
380 |
dbc.execute('DELETE FROM users WHERE uid = %s', self._uid) |
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
381 |
self._dbh.commit() |
66
995d538a6eb5
* 'VirtualMailManager/Account.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
65
diff
changeset
|
382 |
dbc.close() |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
383 |
self._new = True |
293
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
384 |
self._uid = 0 |
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
385 |
self._addr = self._dbh = self._domain = self._passwd = None |
293
a77b67673aa6
VMM/Account: replaced attribute _mid : int by _mail : MailLocation.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
290
diff
changeset
|
386 |
self._mail = self._transport = None |
19
bf9a03c476fc
* 'VirtualMailManager/VirtualMailManager.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
17
diff
changeset
|
387 |
|
225
a51809f7940b
VMM/Transport: reworked Transport class.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
216
diff
changeset
|
388 |
|
252
af555e6967c8
VMM/Account: renamed function getAccountByID -> get_account_by_uid.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
250
diff
changeset
|
389 |
def get_account_by_uid(uid, dbh): |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
390 |
"""Search an Account by its UID. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
391 |
|
252
af555e6967c8
VMM/Account: renamed function getAccountByID -> get_account_by_uid.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
250
diff
changeset
|
392 |
This function returns a dict (keys: 'address', 'gid' and 'uid'), if an |
af555e6967c8
VMM/Account: renamed function getAccountByID -> get_account_by_uid.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
250
diff
changeset
|
393 |
Account with the given *uid* exists. |
af555e6967c8
VMM/Account: renamed function getAccountByID -> get_account_by_uid.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
250
diff
changeset
|
394 |
|
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
395 |
Argument: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
396 |
|
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
397 |
`uid` : long |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
398 |
The Account unique ID. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
399 |
`dbh` : pyPgSQL.PgSQL.Connection |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
400 |
a database connection for the database access. |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
401 |
""" |
19
bf9a03c476fc
* 'VirtualMailManager/VirtualMailManager.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
17
diff
changeset
|
402 |
try: |
bf9a03c476fc
* 'VirtualMailManager/VirtualMailManager.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
17
diff
changeset
|
403 |
uid = long(uid) |
bf9a03c476fc
* 'VirtualMailManager/VirtualMailManager.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
17
diff
changeset
|
404 |
except ValueError: |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
405 |
raise AErr(_(u'UID must be an int/long.'), INVALID_AGUMENT) |
19
bf9a03c476fc
* 'VirtualMailManager/VirtualMailManager.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
17
diff
changeset
|
406 |
if uid < 1: |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
407 |
raise AErr(_(u'UID must be greater than 0.'), INVALID_AGUMENT) |
19
bf9a03c476fc
* 'VirtualMailManager/VirtualMailManager.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
17
diff
changeset
|
408 |
dbc = dbh.cursor() |
290
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
409 |
dbc.execute("SELECT local_part||'@'|| domain_name.domainname AS address, " |
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
410 |
"uid, users.gid FROM users LEFT JOIN domain_name ON " |
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
411 |
"(domain_name.gid = users.gid AND is_primary) WHERE uid = %s", |
e2785e04f92e
VMM/…: re-indented long queries and error messages.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
276
diff
changeset
|
412 |
uid) |
19
bf9a03c476fc
* 'VirtualMailManager/VirtualMailManager.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
17
diff
changeset
|
413 |
info = dbc.fetchone() |
bf9a03c476fc
* 'VirtualMailManager/VirtualMailManager.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
17
diff
changeset
|
414 |
dbc.close() |
245
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
415 |
if not info: |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
416 |
raise AErr(_(u"There is no account with the UID '%d'.") % uid, |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
417 |
NO_SUCH_ACCOUNT) |
f9a6b6701cf9
VMM/Account: reworked class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
236
diff
changeset
|
418 |
info = dict(zip(('address', 'uid', 'gid'), info)) |
19
bf9a03c476fc
* 'VirtualMailManager/VirtualMailManager.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
17
diff
changeset
|
419 |
return info |
bf9a03c476fc
* 'VirtualMailManager/VirtualMailManager.py'
Pascal Volk <neverseen@users.sourceforge.net>
parents:
17
diff
changeset
|
420 |
|
275
524f7ed5ad5b
VMM/Account: some modifications and small improvements in class Account.
Pascal Volk <neverseen@users.sourceforge.net>
parents:
266
diff
changeset
|
421 |
del _, cfg_dget |