postfix_admin 0.2.0 → 0.3.0

data/docker-db/postfix.v740.sql

@@ -0,0 +1,269 @@
+
+-- phpMyAdmin SQL Dump
+-- version 3.5.7
+-- http://www.phpmyadmin.net
+--
+-- ホスト: localhost
+-- 生成日時: 2013 年 5 月 09 日 08:25
+-- サーバのバージョン: 5.5.29
+-- PHP のバージョン: 5.3.20
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+
+--
+-- データベース: `postfix`
+--
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `admin`
+--
+
+CREATE TABLE IF NOT EXISTS `admin` (
+  `username` varchar(255) NOT NULL,
+  `password` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`username`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Admins';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `alias`
+--
+
+CREATE TABLE IF NOT EXISTS `alias` (
+  `address` varchar(255) NOT NULL,
+  `goto` text NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`address`),
+  KEY `domain` (`domain`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Aliases';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `alias_domain`
+--
+
+CREATE TABLE IF NOT EXISTS `alias_domain` (
+  `alias_domain` varchar(255) NOT NULL,
+  `target_domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`alias_domain`),
+  KEY `active` (`active`),
+  KEY `target_domain` (`target_domain`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Domain Aliases';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `config`
+--
+
+CREATE TABLE IF NOT EXISTS `config` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(20) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  `value` varchar(20) CHARACTER SET utf8 NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=INNODB  DEFAULT CHARSET=utf8 COMMENT='PostfixAdmin settings' AUTO_INCREMENT=2 ;
+
+--
+-- テーブルのデータのダンプ `config`
+--
+
+INSERT INTO `config` (`id`, `name`, `value`) VALUES
+(1, 'version', '740');
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `domain`
+--
+
+CREATE TABLE IF NOT EXISTS `domain` (
+  `domain` varchar(255) NOT NULL,
+  `description` varchar(255) CHARACTER SET utf8 NOT NULL,
+  `aliases` int(10) NOT NULL DEFAULT '0',
+  `mailboxes` int(10) NOT NULL DEFAULT '0',
+  `maxquota` bigint(20) NOT NULL DEFAULT '0',
+  `quota` bigint(20) NOT NULL DEFAULT '0',
+  `transport` varchar(255) NOT NULL,
+  `backupmx` tinyint(1) NOT NULL DEFAULT '0',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`domain`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Domains';
+
+--
+-- テーブルのデータのダンプ `domain`
+--
+
+INSERT INTO `domain` (`domain`, `description`, `aliases`, `mailboxes`, `maxquota`, `quota`, `transport`, `backupmx`, `created`, `modified`, `active`) VALUES
+('ALL', '', 0, 0, 0, 0, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1);
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `domain_admins`
+--
+
+CREATE TABLE IF NOT EXISTS `domain_admins` (
+  `username` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  KEY `username` (`username`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Domain Admins';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `fetchmail`
+--
+
+CREATE TABLE IF NOT EXISTS `fetchmail` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `mailbox` varchar(255) NOT NULL,
+  `src_server` varchar(255) NOT NULL,
+  `src_auth` enum('password','kerberos_v5','kerberos','kerberos_v4','gssapi','cram-md5','otp','ntlm','msn','ssh','any') CHARACTER SET utf8 DEFAULT NULL,
+  `src_user` varchar(255) NOT NULL,
+  `src_password` varchar(255) NOT NULL,
+  `src_folder` varchar(255) NOT NULL,
+  `poll_time` int(11) unsigned NOT NULL DEFAULT '10',
+  `fetchall` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `keep` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `protocol` enum('POP3','IMAP','POP2','ETRN','AUTO') CHARACTER SET utf8 DEFAULT NULL,
+  `usessl` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `extra_options` text,
+  `returned_text` text,
+  `mda` varchar(255) NOT NULL,
+  `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=INNODB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `log`
+--
+
+CREATE TABLE IF NOT EXISTS `log` (
+  `timestamp` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `username` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `action` varchar(255) NOT NULL,
+  `data` text NOT NULL,
+  KEY `timestamp` (`timestamp`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Log';
+
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `mailbox`
+--
+
+CREATE TABLE IF NOT EXISTS `mailbox` (
+  `username` varchar(255) NOT NULL,
+  `password` varchar(255) NOT NULL,
+  `name` varchar(255) CHARACTER SET utf8 NOT NULL,
+  `maildir` varchar(255) NOT NULL,
+  `quota` bigint(20) NOT NULL DEFAULT '0',
+  `local_part` varchar(255) NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`username`),
+  KEY `domain` (`domain`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Mailboxes';
+
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `quota`
+--
+
+CREATE TABLE IF NOT EXISTS `quota` (
+  `username` varchar(255) CHARACTER SET utf8 NOT NULL,
+  `path` varchar(100) CHARACTER SET utf8 NOT NULL,
+  `current` bigint(20) DEFAULT NULL,
+  PRIMARY KEY (`username`,`path`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `quota2`
+--
+
+CREATE TABLE IF NOT EXISTS `quota2` (
+  `username` varchar(100) CHARACTER SET utf8 NOT NULL,
+  `bytes` bigint(20) NOT NULL DEFAULT '0',
+  `messages` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`username`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `vacation`
+--
+
+CREATE TABLE IF NOT EXISTS `vacation` (
+  `email` varchar(255) NOT NULL,
+  `subject` varchar(255) CHARACTER SET utf8 NOT NULL,
+  `body` text CHARACTER SET utf8 NOT NULL,
+  `cache` text NOT NULL,
+  `domain` varchar(255) NOT NULL,
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  PRIMARY KEY (`email`),
+  KEY `email` (`email`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Vacation';
+
+-- --------------------------------------------------------
+
+--
+-- テーブルの構造 `vacation_notification`
+--
+
+CREATE TABLE IF NOT EXISTS `vacation_notification` (
+  `on_vacation` varchar(150) CHARACTER SET utf8 NOT NULL,
+  `notified` varchar(150) NOT NULL,
+  `notified_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`on_vacation`,`notified`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Postfix Admin - Virtual Vacation Notifications';
+
+--
+-- ダンプしたテーブルの制約
+--
+
+--
+-- テーブルの制約 `vacation_notification`
+--
+ALTER TABLE `vacation_notification`
+  ADD CONSTRAINT `vacation_notification_pkey` FOREIGN KEY (`on_vacation`) REFERENCES `vacation` (`email`) ON DELETE CASCADE;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;

data/lib/postfix_admin/admin.rb

@@ -22,9 +22,18 @@ module PostfixAdmin
       admin.errors.add(:username, 'cannot be changed') if admin.username_changed?
     end
 
+    def reload
+      @super_admin = nil
+      super
+    end
+
     def super_admin?
       if @super_admin.nil?
-        @super_admin = rel_domains.exists?("ALL")
+        @super_admin = if has_superadmin_column?
+          self.superadmin && rel_domains.exists?("ALL")
+        else
+          rel_domains.exists?("ALL")
+        end
       else
         @super_admin
       end
@@ -35,10 +44,16 @@ module PostfixAdmin
         domain_ids = self.rel_domain_ids.dup
         domain_ids << "ALL"
         self.rel_domain_ids = domain_ids
-        save!
+        self.superadmin = true if has_superadmin_column?
       else
         domain_admins.where(domain: "ALL").delete_all
+        self.superadmin = false if has_superadmin_column?
       end
+      save!
+    end
+
+    def has_superadmin_column?
+      has_attribute?(:superadmin)
     end
 
     def has_admin?(admin)

data/lib/postfix_admin/alias.rb

@@ -24,30 +24,11 @@ module PostfixAdmin
     scope :pure, -> { joins("LEFT OUTER JOIN mailbox ON alias.address = mailbox.username").where("mailbox.username" => nil) }
 
     attribute :local_part, :string
-    attr_writer :forward_addresses
-
-    def forward_addresses
-      if @forward_addresses.nil?
-        if goto.nil?
-          [nil]
-        else
-          goto.split(",") + [nil]
-        end
-      else
-        @forward_addresses
-      end
-    end
 
     before_validation do |a|
       unless a.address
         a.address = "#{a.local_part}@#{a.domain}" unless a.local_part.empty?
       end
-
-      unless a.forward_addresses.empty?
-        forward_addresses = a.forward_addresses.dup
-        forward_addresses.delete_if { |f| f.blank? }
-        a.goto = forward_addresses.join(",")
-      end
     end
 
     def mailbox?

data/lib/postfix_admin/base.rb

@@ -8,40 +8,41 @@ module PostfixAdmin
     attr_reader :config
 
     DEFAULT_CONFIG = {
-      'database'  => 'mysql2://postfix:password@localhost/postfix',
-      'aliases'   => 30,
-      'mailboxes' => 30,
-      'maxquota'  => 100,
-      'scheme'    => 'CRAM-MD5',
-    }
+      "database" => "mysql2://postfix:password@localhost/postfix",
+      "aliases" => 30,
+      "mailboxes" => 30,
+      "maxquota" => 100,
+      "scheme" => "CRAM-MD5",
+      "passwordhash_prefix" => true
+    }.freeze
 
     def initialize(config)
       @config = {}
-      @config[:database]  = config['database']
-      @config[:aliases]   = config['aliases']   || 30
-      @config[:mailboxes] = config['mailboxes'] || 30
-      @config[:maxquota]  = config['maxquota']  || 100
-      @config[:scheme]    = config['scheme']    || 'CRAM-MD5'
+      @config[:database]  = config["database"]
+      @config[:aliases]   = config["aliases"]   || DEFAULT_CONFIG["aliases"]
+      @config[:mailboxes] = config["mailboxes"] || DEFAULT_CONFIG["mailboxes"]
+      @config[:maxquota]  = config["maxquota"]  || DEFAULT_CONFIG["maxquota"]
+      @config[:scheme]    = config["scheme"]    || DEFAULT_CONFIG["scheme"]
+      @config[:passwordhash_prefix] = if config.has_key?("passwordhash_prefix")
+                                        config["passwordhash_prefix"]
+                                      else
+                                        DEFAULT_CONFIG["passwordhash_prefix"]
+                                      end
     end
 
     def db_setup
-      raise "'database' parameter is required in '#{CLI.config_file}'" unless @config[:database]
+      database = ENV.fetch("DATABASE_URL") { @config[:database] }
 
-      uri = URI.parse(@config[:database])
-
-      if uri.scheme == "mysql"
-        uri.scheme = "mysql2"
-        warn("Deprecation Warning: Use 'mysql2' as a DB adopter instead of 'mysql' in '#{CLI.config_file}'")
+      unless database
+        raise_error "'database' parameter is required in '#{CLI.config_file}' or specify 'DATABASE_URL' environment variable"
       end
 
-      if uri.scheme != "mysql2"
-        raise "'#{uri.scheme}' is not supported as a DB adopter. Use 'mysql2' instead in '#{CLI.config_file}'."
-      end
+      uri = URI.parse(database)
 
       ActiveRecord::Base.establish_connection(uri.to_s)
 
     rescue LoadError => e
-      raise e.message
+      raise_error e.message
     end
 
     def add_admin_domain(user_name, domain_name)
@@ -51,11 +52,11 @@ module PostfixAdmin
       domain = Domain.find(domain_name)
 
       if admin.has_domain?(domain)
-        raise Error, "#{user_name} is already registered as admin of #{domain_name}."
+        raise_error "Admin '#{user_name}' has already been registered for Domain '#{domain_name}'"
       end
 
       admin.rel_domains << domain
-      admin.save or raise "Relation Error: Domain of Admin"
+      admin.save || raise_error("Relation Error: Domain of Admin")
     end
 
     def delete_admin_domain(user_name, domain_name)
@@ -65,135 +66,116 @@ module PostfixAdmin
       domain_admin_query = admin.domain_admins.where(domain: domain_name)
 
       unless domain_admin_query.take
-        raise Error, "#{user_name} is not registered as admin of #{domain_name}."
+        raise_error "#{user_name} is not registered as admin of #{domain_name}."
       end
 
       domain_admin_query.delete_all
     end
 
     def add_admin(username, password)
-      password_check(password)
+      validate_password(password)
 
       if Admin.exists?(username)
-        raise Error, "#{username} is already registered as admin."
+        raise_error "Admin has already been registered: #{username}"
       end
+
       admin = Admin.new
       admin.attributes = {
         username: username,
-        password: password,
+        password: password
       }
-      unless admin.save
-        raise "Could not save Admin #{admin.errors.map(&:to_s).join}"
-      end
-    end
-
-    def add_account(address, password, in_name = nil)
-      name = in_name || ''
-      password_check(password)
-
-      if address !~ /.+\@.+\..+/
-        raise Error, "Invalid mail address #{address}"
-      end
-      user, domain_name = address_split(address)
-      path = "#{domain_name}/#{address}/"
 
-      unless Domain.exists?(domain_name)
-        raise Error, "Could not find domain #{domain_name}"
-      end
+      raise_save_error(admin) unless admin.save
+    end
 
-      if Alias.exists?(address)
-        raise Error, "#{address} is already registered."
-      end
+    # Adds an email account that consists of a Mailbox and an Alias.
+    def add_account(address, password, name: "")
+      validate_account(address, password)
 
-      domain = Domain.find(domain_name)
+      local_part, domain_name = address_split(address)
+      domain_must_exist!(domain_name)
 
       attributes = {
-          username: address,
-          password: password,
-          name: name,
-          maildir: path,
-          local_part: user,
-          quota_mb: @config[:maxquota]
+        local_part: local_part,
+        domain: domain_name,
+        password: password,
+        name: name,
+        quota_mb: @config[:maxquota]
       }
 
+      # An Alias also will be added when a Mailbox is saved.
       mailbox = Mailbox.new(attributes)
 
-      domain.rel_mailboxes << mailbox
-
-      unless domain.save
-        raise "Could not save Mailbox and Domain #{mailbox.errors.map(&:to_s).join} #{domain.errors.map(&:to_s).join}"
-      end
+      raise_save_error(mailbox) unless mailbox.save
     end
 
     def add_alias(address, goto)
       if Mailbox.exists?(address)
-        raise Error, "mailbox #{address} is already registered!"
-      end
-      if Alias.exists?(address)
-        raise Error, "alias #{address} is already registered!"
+        raise_error "Mailbox has already been registered: #{address}"
       end
 
-      local_part, domain_name = address_split(address)
+      alias_must_not_exist!(address)
 
-      unless Domain.exists?(domain_name)
-        raise Error, "Invalid domain! #{domain_name}"
-      end
+      local_part, domain_name = address_split(address)
 
-      domain = Domain.find(domain_name)
+      domain = find_domain(domain_name)
 
       attributes = {
         local_part: local_part,
         goto: goto
       }
+
       domain.rel_aliases << Alias.new(attributes)
-      domain.save or raise "Could not save Alias"
+
+      raise_save_error(domain) unless domain.save
     end
 
     def delete_alias(address)
       if Mailbox.exists?(address)
-        raise Error, "Can not delete mailbox by delete_alias. Use delete_account"
+        raise_error "Can not delete mailbox by delete_alias. Use delete_account"
       end
 
       unless Alias.exists?(address)
-        raise Error, "#{address} is not found!"
+        raise_error "#{address} is not found!"
       end
 
       Alias.where(address: address).delete_all
     end
 
-    def add_domain(domain_name)
+    def add_domain(domain_name, description: nil)
       domain_name = domain_name.downcase
-      if domain_name !~ /.+\..+/
-        raise Error, "Ivalid domain! #{domain_name}"
+
+      unless valid_domain_name?(domain_name)
+        raise_error "Invalid domain name: #{domain_name}"
       end
+
       if Domain.exists?(domain_name)
-        raise Error, "#{domain_name} is already registered!"
+        raise_error "Domain has already been registered: #{domain_name}"
       end
+
+      new_description = description || domain_name
+
       domain = Domain.new
       domain.attributes = {
         domain: domain_name,
-        description: domain_name,
+        description: new_description,
         aliases: @config[:aliases],
         mailboxes: @config[:mailboxes],
-        maxquota: @config[:maxquota],
+        maxquota: @config[:maxquota]
       }
       domain.save!
     end
 
     def delete_domain(domain_name)
       domain_name = domain_name.downcase
-      unless Domain.exists?(domain_name)
-        raise Error, "Could not find domain #{domain_name}"
-      end
 
-      domain = Domain.find(domain_name)
-      domain.rel_mailboxes.delete_all
-      domain.rel_aliases.delete_all
+      domain = find_domain(domain_name)
 
       admin_names = domain.admins.map(&:username)
 
-      domain.admins.delete_all
+      domain.destroy!
 
+      # Remove admins who had the deleted domain only
       admin_names.each do |name|
         next unless Admin.exists?(name)
 
@@ -201,16 +183,14 @@ module PostfixAdmin
 
         # check if the admin is needed or not
         if admin.rel_domains.empty?
-          admin.destroy
+          admin.destroy!
         end
       end
-
-      domain.destroy
     end
 
     def delete_admin(user_name)
       unless Admin.exists?(user_name)
-        raise Error, "Could not find admin #{user_name}"
+        raise_error "Could not find admin #{user_name}"
       end
 
       admin = Admin.find(user_name)
@@ -220,26 +200,72 @@ module PostfixAdmin
 
     def delete_account(address)
       unless Alias.exists?(address) && Mailbox.exists?(address)
-        raise Error, "Could not find account #{address}"
+        raise_error "Could not find account: #{address}"
       end
 
       Mailbox.where(username: address).delete_all
       Alias.where(address: address).delete_all
     end
 
+    private
+
+    def find_domain(domain_name)
+      domain_must_exist!(domain_name)
+      Domain.find(domain_name)
+    end
+
+    def raise_error(message)
+      raise PostfixAdmin::Error, message
+    end
+
+    def raise_save_error(obj)
+      raise_error "Failed to save #{obj.class}: #{obj.errors.full_messages.join(', ')}"
+    end
+
     def address_split(address)
       address.split('@')
     end
 
-    private
+    def valid_domain_name?(domain_name)
+      /.+\..+/.match?(domain_name)
+    end
+
+    def valid_email_address?(address)
+      /.+@.+\..+/.match?(address)
+    end
+
+    def domain_must_exist!(domain_name)
+      unless Domain.exists?(domain_name)
+        raise_error "Could not find domain: #{domain_name}"
+      end
+    end
+
+    def alias_must_not_exist!(address)
+      if Alias.exists?(address)
+        raise_error "Alias has already been registered: #{address}"
+      end
+    end
 
     def admin_domain_check(user_name, domain_name)
-      raise Error, "#{user_name} is not registered as admin." unless Admin.exists?(user_name)
-      raise Error, "Could not find domain #{domain_name}"     unless Domain.exists?(domain_name)
+      unless Admin.exists?(user_name)
+        raise_error "#{user_name} is not registered as admin."
+      end
+
+      domain_must_exist!(domain_name)
+    end
+
+    def validate_password(password)
+      raise_error "Empty password" if password.nil? || password.empty?
     end
 
-    def password_check(password)
-      raise Error, "Empty password" if password.nil? || password.empty?
+    def validate_account(address, password)
+      validate_password(password)
+
+      unless valid_email_address?(address)
+        raise_error "Invalid email address: #{address}"
+      end
+
+      alias_must_not_exist!(address)
     end
   end
 end