smailr 0.7.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dd1155588b6637a588d5284aefb168421f2a5325
-  data.tar.gz: d750025813678d2d6aadff17b3ebf3efc729fd7e
+SHA256:
+  metadata.gz: 711ed3fbc0dd02795b873d6b8c5dae375ee2db772765d607550040b1946357f2
+  data.tar.gz: bdd43490822316051212b776a8834eb6ae41348d3df98fbe887d152126ab9f3e
 SHA512:
-  metadata.gz: a1d9da463d534d61cc9e1e7942d11a7d7756b18b74b150c85e31498cc2b3e1f12778c00be5fcbe9c444b9b0434cd22e2f32e070c0f9845d344602bff906ce034
-  data.tar.gz: 2297af6c3b3ce95dd82f9cc6279487f2de6cf37c8faaeb8141e768a0b6596890024c21c1f175ed8d969bb295b054350fada39601d2ba36f3c84cbc592919965d
+  metadata.gz: 79c3f97dea293a130fdfa8ba385c8609700b3d91b0d3268f9e7bca211bb207cf21f643d4df0b64ac93ebaa8f274e23de4156773d0a47e1ae4ed7748142d78791
+  data.tar.gz: dbbacb1c5f7940d1bed41b22ba809faa5628698924e77f68ee4336e8550010cab560f863c87b2ed6dda56195ad2a6f4391067003f98c788b3cb9b8e84c6a3e78

data/bin/smailr

@@ -12,4 +12,11 @@ require 'smailr'
 require 'smailr/cli'
 require 'smailr/setup'
 
+begin
+  Smailr.initialize!
+rescue Smailr::ConfigurationError => e
+  warn "ERROR: #{e.message}"
+  exit 1
+end
+
 Smailr::Cli.new.run

data/lib/smailr/cli.rb

@@ -1,5 +1,11 @@
 require 'commander'
 
+class String
+  def unindent
+    gsub(/^#{scan(/^\s*/).min_by{|l|l.length}}/, "")
+  end
+end
+
 module Smailr
   class Cli
 
@@ -52,7 +58,7 @@ module Smailr
         c.example 'Add a domain',  'smailr add example.com'
         c.example 'Add a mailbox', 'smailr add user@example.com'
         c.example 'Add an alias',  'smailr add alias@localdom.com --alias user@example.com,user1@example.com'
-        c.example 'Setup DKIM for a domain', 'smailr add ono.at --dkim'
+        c.example 'Setup DKIM for a domain', 'smailr add ono.at --dkim mail'
         c.option  '--alias DESTINATION', String, 'Specify the alias destination.'
         c.option  '--password PASSWORD', String, 'The password for a new mailbox. If you omit this option, it prompts for one.'
         c.option  '--dkim SELECTOR',     String, 'Add a DKIM Key with the specified selector for domain.'
@@ -65,8 +71,16 @@ module Smailr
               if options.dkim
                 selector = options.dkim
                 key = Smailr::Dkim.add(address, selector)
+                key_fmt = key.split("\n").slice(1..-2).join
 
-                puts "public-key " + key.split("\n").slice(1..-2).join
+                puts <<-EOM.unindent
+                .
+                  DKIM is active now, please setup domainkey records in zone #{address}:
+
+                          _domainkey IN TXT "t=y\; o=~\;"
+                  #{selector}._domainkey IN TXT "v=DKIM1\; t=y\; k=rsa\; p=#{key_fmt}
+                .
+                EOM
               else
                 Smailr::Domain.add(address)
               end
@@ -92,6 +106,11 @@ module Smailr
           case args[0]
           when /^[^@][A-Z0-9.-]+\.[A-Z]{2,6}$/i then
             domain = Smailr::Model::Domain[:fqdn => args[0]]
+            unless domain
+              error "No such domain: #{args[0]}"
+              exit 1
+            end
+
             domain.mailboxes.each do |mbox|
               puts "m: #{mbox.localpart}@#{args[0]}"
             end

data/lib/smailr/model.rb

@@ -1,4 +1,4 @@
-require 'digest/sha1'
+require 'bcrypt'
 
 module Smailr
   module Model
@@ -30,8 +30,14 @@ module Smailr
       many_to_one :domain
 
       def password=(clear)
-        self[:password_scheme] = '{SHA}'
-        self[:password] = Digest::SHA1.hexdigest(clear)
+        crypted = BCrypt::Password.create(
+          clear,
+          cost: BCrypt::Engine::DEFAULT_COST,
+          salt: BCrypt::Engine.generate_salt
+        )
+
+        self[:password_scheme] = '{BLF-CRYPT}'
+        self[:password] = crypted
       end
 
       def rm_related

data/lib/smailr/version.rb

@@ -0,0 +1,3 @@
+module Smailr
+  VERSION = '0.8.2'
+end

data/lib/smailr.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'smailr/version'
 
 require 'fileutils'
 require 'logger'
@@ -19,29 +20,61 @@ module Smailr
 
   # Exception Classes
   class MissingDomain < StandardError ; end
-
-  VERSION = '0.7.0'
+  class ConfigurationError < StandardError ; end
 
   class << self;
     attr_accessor :config
     attr_accessor :config_files
-    attr_accessor :load_config
     attr_accessor :contrib_directory
     attr_accessor :migrations_directory
+    attr_accessor :bundled_config_file
   end
 
   def self.load_config
     config = {}
-    config_files.each do |f|
-      if File.readable?(f)
-        config.merge!(YAML.load_file(f))
+    runtime_config_files = config_files.reject { |f| f == bundled_config_file }
+    readable_runtime_config_files = runtime_config_files.select { |f| File.file?(f) && File.readable?(f) }
+    unreadable_runtime_config_files = runtime_config_files.select { |f| File.exist?(f) && !File.readable?(f) }
+
+    if readable_runtime_config_files.empty?
+      if unreadable_runtime_config_files.any?
+        raise ConfigurationError, "Cannot read configuration file: #{unreadable_runtime_config_files.join(', ')}"
       end
+
+      raise ConfigurationError, "Cannot find configuration file. Checked: #{runtime_config_files.join(', ')}"
+    end
+
+    if bundled_config_file && File.readable?(bundled_config_file)
+      config.merge!(YAML.load_file(bundled_config_file) || {})
+    end
+
+    readable_runtime_config_files.each do |f|
+      config.merge!(YAML.load_file(f) || {})
     end
+
     self.config = config
   end
 
   def self.db_connect
+    unless self.config && self.config['database']
+      raise ConfigurationError, "Configuration file is missing database settings."
+    end
+
     Sequel.connect(self.config['database'])
+  rescue Sequel::DatabaseConnectionError => e
+    raise ConfigurationError, "Cannot open database connection: #{e.message}"
+  end
+
+  def self.initialize!
+    load_config
+
+    unless defined?(Smailr::Model)
+      require 'smailr/model'
+    end
+
+    Smailr.send(:remove_const, :DB) if Smailr.const_defined?(:DB, false)
+    Smailr.const_set(:DB, db_connect)
+    Smailr::DB.sql_log_level = :debug
   end
 
   def self.logger
@@ -66,8 +99,5 @@ end
 
 Smailr.contrib_directory    ||= File.expand_path('../../contrib', __FILE__)
 Smailr.migrations_directory ||= File.expand_path('../../migrations', __FILE__)
-Smailr.config_files         ||= [ File.expand_path('../../smailr.yml', __FILE__),  '/etc/smailr.yml']
-Smailr.load_config
-Smailr::DB = Smailr::db_connect
-require 'smailr/model'
-Smailr::DB.sql_log_level = :debug
+Smailr.bundled_config_file  ||= File.expand_path('../../smailr.yml', __FILE__)
+Smailr.config_files         ||= [ Smailr.bundled_config_file, '/etc/smailr.yml' ]

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: smailr
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Stefan Schlesinger
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2026-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -26,18 +25,94 @@ dependencies:
         version: '4.3'
 - !ruby/object:Gem::Dependency
   name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.26'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.26'
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-smtp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Smailr is a CLI tool which lets you manage your virtual mailhosting setup
                              from the shell. It currently uses SQLite as a backend, samples for Dovecot/Exim provided.
@@ -60,6 +135,7 @@ files:
 - lib/smailr/mailbox.rb
 - lib/smailr/model.rb
 - lib/smailr/setup.rb
+- lib/smailr/version.rb
 - migrations/001_domains.rb
 - migrations/002_mailboxes.rb
 - migrations/003_aliases.rb
@@ -99,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -108,9 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Exim
 - Dovecot
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Simple MAIL manageR - Virtual mail hosting management from the CLI
 test_files: []
+...