vmm: comparison VirtualMailManager/VirtualMailManager.py

equal deleted inserted replaced

-:191d5a5adc4a
+:0d5f58f8b8f5
 self.__warnings = []
 self.__Cfg = None
 self.__dbh = None
 if os.geteuid():
-raise VMMNotRootException((_(u"You are not root.\n\tGood bye!\n"),
+raise VMMNotRootException(_(u"You are not root.\n\tGood bye!\n"),
-ERR.CONF_NOPERM))
+ERR.CONF_NOPERM)
 if self.__chkCfgFile():
 self.__Cfg = Cfg(self.__cfgFileName)
 self.__Cfg.load()
 self.__Cfg.check()
 self.__cfgSections = self.__Cfg.getsections()
 self.__chkenv()
 def __chkCfgFile(self):
 """Checks the configuration file, returns bool"""
 if not os.path.isfile(self.__cfgFileName):
-raise VMMException((_(u"The file »%s« does not exists.") %
+raise VMMException(_(u"The file »%s« does not exists.") %
-self.__cfgFileName, ERR.CONF_NOFILE))
+self.__cfgFileName, ERR.CONF_NOFILE)
 fstat = os.stat(self.__cfgFileName)
-try:
+fmode = int(oct(fstat.st_mode & 0777))
-fmode = self.__getFileMode()
-except:
-raise
 if fmode % 100 and fstat.st_uid != fstat.st_gid \
 or fmode % 10 and fstat.st_uid == fstat.st_gid:
-raise VMMPermException((self.__permWarnMsg, ERR.CONF_ERROR))
+raise VMMPermException(self.__permWarnMsg, ERR.CONF_ERROR)
 else:
 return True
 def __chkenv(self):
 """"""
 os.makedirs(self.__Cfg.get('domdir', 'base'), 0771)
 os.chown(self.__Cfg.get('domdir', 'base'), 0,
 self.__Cfg.getint('misc', 'gid_mail'))
 os.umask(old_umask)
 elif not os.path.isdir(self.__Cfg.get('domdir', 'base')):
-raise VMMException((_(u'»%s« is not a directory.\n\
+raise VMMException(_(u'»%s« is not a directory.\n\
 (vmm.cfg: section "domdir", option "base")') %
-self.__Cfg.get('domdir', 'base'), ERR.NO_SUCH_DIRECTORY))
+self.__Cfg.get('domdir', 'base'), ERR.NO_SUCH_DIRECTORY)
 for opt, val in self.__Cfg.items('bin'):
 if not os.path.exists(val):
-raise VMMException((_(u'»%s« doesn\'t exists.\n\
+raise VMMException(_(u'»%s« doesn\'t exists.\n\
-(vmm.cfg: section "bin", option "%s")') % (val, opt), ERR.NO_SUCH_BINARY))
+(vmm.cfg: section "bin", option "%s")') %
+(val, opt), ERR.NO_SUCH_BINARY)
 elif not os.access(val, os.X_OK):
-raise VMMException((_(u'»%s« is not executable.\n\
+raise VMMException(_(u'»%s« is not executable.\n\
-(vmm.cfg: section "bin", option "%s")') % (val, opt), ERR.NOT_EXECUTABLE))
+(vmm.cfg: section "bin", option "%s")') %
+(val, opt), ERR.NOT_EXECUTABLE)
-def __getFileMode(self):
-"""Determines the file access mode from file __cfgFileName,
-returns int.
-"""
-try:
-return int(oct(os.stat(self.__cfgFileName).st_mode & 0777))
-except:
-raise
 def __dbConnect(self):
 """Creates a pyPgSQL.PgSQL.connection instance."""
 try:
 self.__dbh = PgSQL.connect(
 client_encoding='utf8', unicode_results=True)
 dbc = self.__dbh.cursor()
 dbc.execute("SET NAMES 'UTF8'")
 dbc.close()
 except PgSQL.libpq.DatabaseError, e:
-raise VMMException((str(e), ERR.DATABASE_ERROR))
+raise VMMException(str(e), ERR.DATABASE_ERROR)
 def chkLocalpart(localpart):
 """Validates the local part of an e-mail address.
 Keyword arguments:
 localpart -- the e-mail address that should be validated (str)
 """
 if len(localpart) < 1:
-raise VMMException((_(u'No localpart specified.'),
+raise VMMException(_(u'No localpart specified.'),
-ERR.LOCALPART_INVALID))
+ERR.LOCALPART_INVALID)
 if len(localpart) > 64:
-raise VMMException((_(u'The local part »%s« is too long') %
+raise VMMException(_(u'The local part »%s« is too long') %
-localpart, ERR.LOCALPART_TOO_LONG))
+localpart, ERR.LOCALPART_TOO_LONG)
 ic = re.compile(RE_LOCALPART).findall(localpart)
 if len(ic):
 ichrs = ''
 for c in set(ic):
 ichrs += u"»%s« " % c
-raise VMMException((
+raise VMMException(
 _(u"The local part »%s« contains invalid characters: %s") %
-(localpart, ichrs), ERR.LOCALPART_INVALID))
+(localpart, ichrs), ERR.LOCALPART_INVALID)
 return localpart
 chkLocalpart = staticmethod(chkLocalpart)
 def idn2ascii(domainname):
 """Converts an idn domainname in punycode.
 """
 re.compile(RE_ASCII_CHARS)
 if not re.match(RE_ASCII_CHARS, domainname):
 domainname = VirtualMailManager.idn2ascii(domainname)
 if len(domainname) > 255:
-raise VMMException((_(u'The domain name is too long.'),
+raise VMMException(_(u'The domain name is too long.'),
-ERR.DOMAIN_TOO_LONG))
+ERR.DOMAIN_TOO_LONG)
 re.compile(RE_DOMAIN)
 if not re.match(RE_DOMAIN, domainname):
-raise VMMException((_(u'The domain name is invalid.'),
+raise VMMException(_(u'The domain name is invalid.'),
-ERR.DOMAIN_INVALID))
+ERR.DOMAIN_INVALID)
 return domainname
 chkDomainname = staticmethod(chkDomainname)
 def chkEmailAddress(address):
 try:
 localpart, domain = address.split('@')
 except ValueError:
-raise VMMException((_(u"Missing '@' sign in e-mail address »%s«.") %
+raise VMMException(_(u"Missing '@' sign in e-mail address »%s«.") %
-address, ERR.INVALID_ADDRESS))
+address, ERR.INVALID_ADDRESS)
 except AttributeError:
-raise VMMException((_(u"»%s« looks not like an e-mail address.") %
+raise VMMException(_(u"»%s« looks not like an e-mail address.") %
-address, ERR.INVALID_ADDRESS))
+address, ERR.INVALID_ADDRESS)
 domain = VirtualMailManager.chkDomainname(domain)
 localpart = VirtualMailManager.chkLocalpart(localpart)
 return '%s@%s' % (localpart, domain)
 chkEmailAddress = staticmethod(chkEmailAddress)
 def __maildirdelete(self, domdir, uid, gid):
 if uid > 0 and gid > 0:
 maildir = '%s' % uid
 if maildir.count('..') or domdir.count('..'):
-raise VMMException((_(u'Found ".." in maildir path.'),
+raise VMMException(_(u'Found ".." in maildir path.'),
-ERR.FOUND_DOTS_IN_PATH))
+ERR.FOUND_DOTS_IN_PATH)
 if os.path.isdir(domdir):
 os.chdir(domdir)
 if os.path.isdir(maildir):
 mdstat = os.stat(maildir)
 if (mdstat.st_uid, mdstat.st_gid) != (uid, gid):
-raise VMMException((
+raise VMMException(
 _(u'Owner/group mismatch in maildir detected.'),
-ERR.MAILDIR_PERM_MISMATCH))
+ERR.MAILDIR_PERM_MISMATCH)
 rmtree(maildir, ignore_errors=True)
 else:
-raise VMMException((_(u"No such directory: %s/%s") %
+raise VMMException(_(u"No such directory: %s/%s") %
-(domdir, uid), ERR.NO_SUCH_DIRECTORY))
+(domdir, uid), ERR.NO_SUCH_DIRECTORY)
 def __domdirdelete(self, domdir, gid):
 if gid > 0:
 if not self.__isdir(domdir):
 return
 basedir = '%s' % self.__Cfg.get('domdir', 'base')
 domdirdirs = domdir.replace(basedir+'/', '').split('/')
 if basedir.count('..') or domdir.count('..'):
 raise VMMException(
-(_(u'FATAL: ".." in domain directory path detected.'),
+_(u'FATAL: ".." in domain directory path detected.'),
-ERR.FOUND_DOTS_IN_PATH))
+ERR.FOUND_DOTS_IN_PATH)
 if os.path.isdir('%s/%s' % (basedir, domdirdirs[0])):
 os.chdir('%s/%s' % (basedir, domdirdirs[0]))
 if os.lstat(domdirdirs[1]).st_gid != gid:
 raise VMMException(
-(_(u'FATAL: group mismatch in domain directory detected'),
+_(u'FATAL: group mismatch in domain directory detected'),
-ERR.DOMAINDIR_GROUP_MISMATCH))
+ERR.DOMAINDIR_GROUP_MISMATCH)
 rmtree(domdirdirs[1], ignore_errors=True)
 def __getSalt(self):
 from random import choice
 salt = None
 """Checks if vmm is configured, returns bool"""
 try:
 return self.__Cfg.getboolean('config', 'done')
 except ValueError, e:
 raise VMMConfigException(_(u"""Configurtion error: "%s"
-(in section "connfig", option "done") see also: vmm.cfg(5)\n""") %
+(in section "connfig", option "done") see also: vmm.cfg(5)\n""") % str(e),
-str(e))
+ERR.CONF_ERROR)
 def configure(self, section=None):
 """Starts interactive configuration.
 Configures in interactive mode options in the given section.
 Keyword arguments:
 section -- the section to configure (default None):
 'database', 'maildir', 'bin' or 'misc'
 """
-try:
+if section is None:
-if not section:
+self.__Cfg.configure(self.__cfgSections)
-self.__Cfg.configure(self.__cfgSections)
+elif section in self.__cfgSections:
-elif section not in self.__cfgSections:
+self.__Cfg.configure([section])
-raise VMMException((_(u"Invalid section: '%s'") % section,
+else:
-ERR.INVALID_SECTION))
+raise VMMException(_(u"Invalid section: '%s'") % section,
-else:
+ERR.INVALID_SECTION)
-self.__Cfg.configure([section])
-except:
-raise
 def domain_add(self, domainname, transport=None):
 dom = self.__getDomain(domainname, transport)
 dom.save()
 self.__domdirmake(dom.getDir(), dom.getID())
 def domain_transport(self, domainname, transport, force=None):
 if force is not None and force != 'force':
-raise VMMDomainException((_(u"Invalid argument: '%s'") % force,
+raise VMMDomainException(_(u"Invalid argument: '%s'") % force,
-ERR.INVALID_OPTION))
+ERR.INVALID_OPTION)
 dom = self.__getDomain(domainname, None)
 if force is None:
 dom.updateTransport(transport)
 else:
 dom.updateTransport(transport, force=True)
 def domain_delete(self, domainname, force=None):
 if not force is None and force not in ['deluser','delalias','delall']:
-raise VMMDomainException((_(u"Invalid argument: »%s«") % force,
+raise VMMDomainException(_(u"Invalid argument: »%s«") % force,
-ERR.INVALID_OPTION))
+ERR.INVALID_OPTION)
 dom = self.__getDomain(domainname)
 gid = dom.getID()
 domdir = dom.getDir()
 if self.__Cfg.getboolean('misc', 'forcedel') or force == 'delall':
 dom.delete(True, True)
 return dominfo
 elif detailed == 'detailed':
 return (dominfo, dom.getAliaseNames(), dom.getAccounts(),
 dom.getAliases())
 else:
-raise VMMDomainException((_(u'Invalid argument: »%s«') % detailed,
+raise VMMDomainException(_(u'Invalid argument: »%s«') % detailed,
-ERR.INVALID_OPTION))
+ERR.INVALID_OPTION)
 def domain_alias_add(self, aliasname, domainname):
 """Adds an alias name to the domain.
 Keyword arguments:
 domain = pattern[1:]
 elif pattern.endswith('%'):
 domain = pattern[:-1]
 re.compile(RE_DOMAIN_SRCH)
 if not re.match(RE_DOMAIN_SRCH, domain):
-raise VMMException((
+raise VMMException(
 _(u"The pattern '%s' contains invalid characters.") %
-pattern, ERR.DOMAIN_INVALID))
+pattern, ERR.DOMAIN_INVALID)
 else:
 pattern = VirtualMailManager.chkDomainname(pattern)
 # XXX chk by domain if not like
 self.__dbConnect()
 return search(self.__dbh, pattern=pattern, like=like)
 gid = acc.getGID()
 acc.delete()
 if self.__Cfg.getboolean('maildir', 'delete'):
 try:
 self.__maildirdelete(acc.getDir('domain'), uid, gid)
-except (VMMException), e:
+except VMMException, e:
-if e[0][1] in [ERR.FOUND_DOTS_IN_PATH,
+if e.code() in [ERR.FOUND_DOTS_IN_PATH,
 ERR.MAILDIR_PERM_MISMATCH, ERR.NO_SUCH_DIRECTORY]:
 warning = _(u"""\
 The account has been successfully deleted from the database.
 But an error occurred while deleting the following directory:
 »%s«
-Reason: %s""") % (acc.getDir('home'), e[0][0])
+Reason: %s""") % (acc.getDir('home'), e.msg())
 self.__warnings.append(warning)
 else:
 raise e
 def alias_info(self, aliasaddress):
 return getAccountByID(uid, self.__dbh)
 def user_password(self, emailaddress, password):
 acc = self.__getAccount(emailaddress)
 if acc.getUID() == 0:
-raise VMMException((_(u"Account doesn't exists"),
+raise VMMException(_(u"Account doesn't exists"),
-ERR.NO_SUCH_ACCOUNT))
+ERR.NO_SUCH_ACCOUNT)
 if password is None:
 password = self._readpass()
 acc.modify('password', self.__pwhash(password))
 def user_name(self, emailaddress, name):

changeset 48	0d5f58f8b8f5
parent 47	191d5a5adc4a
child 49	9bd033177377