postfix_admin 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70bd18f454fd77684ab652949e36829f6d9e3e8e275e475819b60b025b3fea6e
-  data.tar.gz: 477da494d685bcaeb45f090d92edbfb1abc6af811e04172a4e4f1865b51eac46
+  metadata.gz: 8a15e49758d586d12c05d2e0f15f04b123345942d9de889a3617d9cb13ca25bb
+  data.tar.gz: 9b0a5e9d4741ad9dc8562347c4ca63616bddf97b5e20e6669ae7088bbb04bb29
 SHA512:
-  metadata.gz: a7b8c5f69e4f15589ca5c10250e88d9dfb76e623bed02548161e24c29fca02e74e97b154bf5f876936922e7b7d134f4fb6f46ab2e85765198fbaf5c7dddb1c32
-  data.tar.gz: 777b1af93896c8df8a4eab31af493af872a694502cab871c0ea99bcf7e8a82ce014228e82b117c37a3c9953ec86bd54648a01954c2bcae72c373fca94d1c18dc
+  metadata.gz: eeee12bb7ba7e2d3530878a431f82bfd0c239f64b96225577d46a20e90d60f870a6df73fe96a3dbc02cc69363b380f63976074d8d0e4debd465ae0c014d337a4
+  data.tar.gz: 257ad43dfbb601927501abab85a6ecf8c0c1bc2d353f2bf7f6be93db81a50c6f27eaf685cc9c6386c5c734a0989e3909346e8aa66247dbabb77c1fb66562b40e

data/.github/workflows/ci.yml

@@ -0,0 +1,54 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+        # change this to (see https://github.com/ruby/setup-ruby#versioning):
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install dovecotpw
+        run: sudo apt-get install -y dovecot-core
+      - name: Copy configure file
+        run: cp ./test/misc/postfix_admin.conf ~/.postfix_admin.conf
+      - name: Copy my.cnf (for `rake setup_test_db`)
+        run: cp ./test/misc/ci.my.cnf ~/.my.cnf
+      - name: docker-compose up
+        run: docker-compose up -d db
+      - name: Sleep (work around)
+        # wait-for-it.sh doesn't work with docker compose port mapping
+        run: sleep 10
+      - name: Set up test database
+        run: bundle exec rake setup_test_db
+      - name: Run tests
+        run: bundle exec rake test
+      - name: Run specs
+        run: bundle exec rake spec

data/.gitignore

@@ -17,3 +17,5 @@ test/version_tmp
 tmp
 .idea
 .vagrant
+.ruby-version
+.rspec_status

data/.rubocop.yml

@@ -1,2 +1,22 @@
+AllCops:
+  NewCops: enable
 Style/StringLiterals:
   Enabled: false
+Style/EmptyMethod:
+  Enabled: false
+Style/IfUnlessModifier:
+  Enabled: false
+Style/AsciiComments:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Style/EmptyElse:
+  EnforcedStyle: empty

data/CHANGELOG.md

@@ -1,22 +1,29 @@
+# CHANGELOG
+
+## 0.3.0
+ * Added support for table display format
+ * No longer supports `dovecotpw` for password hash generation
+   + Only `doveadm pw` is supported
+
 ## 0.2.1
- * Supported `superadmin` column of `admin` table
+ * Added support for the `superadmin` column in the `admin` table
  * Added `passwordhash_prefix` keyword in the configuration format for backward compatibility
 
 ## 0.2.0
- * Switched its object-relational mapper from DataMapper to ActiveRecord
- * Stored password hash includes scheme prefix: like `{CRAM-MD5}`, `{PLAIN}`
+ * Switched the object-relational mapper from DataMapper to ActiveRecord
+ * Stored password hashes now include scheme prefixes, such as `{CRAM-MD5}` and `{PLAIN}`
 
 ## 0.1.4
  * Added "log" subcommand
 
 ## 0.1.3
- * Support for activation and deactivation of domain, admin and account
+ * Added support for activation and deactivation of domains, admins, and accounts
  * Added "edit_admin" subcommand
 
 ## 0.1.2
- * Support password hash by doveadm (external subcommand)
- * Show active status
- * Don't show passwords using list format
+ * Added support for password hashing by doveadm (external subcommand)
+ * Display active status
+ * Hide passwords in list format
 
-## 0.1.1, release 2013-05-10
- * Fixed string length of password
+## 0.1.1, released 2013-05-10
+ * Fixed string length issue for passwords

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in postfix_admin.gemspec
 gemspec

data/LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -10,19 +10,25 @@ Command Line Tools for Postfix Admin
   + Web Site http://postfixadmin.sourceforge.net/
   + GitHub https://github.com/postfixadmin/postfixadmin
 
-* Postfix Admin 3.2 is supported.
+* Supports Postfix Admin 3.2
 
-* MySQL/MariaDB is supported.
+* Supports MySQL/MariaDB
 
-* Other database engines are not supported.
+* Other database engines are not supported
+
+## Requirements
+
+* Ruby 2.6 or higher
+* MySQL/MariaDB
+* Dovecot (required for setting passwords using the `doveadm pw` subcommand)
 
 ## Installation
 
-Install postfix_admin as:
+Install `postfix_admin` using:
 
     $ gem install postfix_admin
 
-Just execute `postfix_admin` command to generate your config file: `~/.postfix_admin.conf`
+Execute the `postfix_admin` command to generate your config file at `~/.postfix_admin.conf`:
 
     $ postfix_admin
 
@@ -30,40 +36,40 @@ Edit the file for your environment:
 
     $ vi ~/.postfix_admin.conf
 
-You can see domains on your host if the `database` parameter is set properly:
+You can see the domains on your host if the `database` parameter is set properly:
 
     $ postfix_admin show
 
 ## Usage
 
-List the postfix_admin subcommands as:
+List the `postfix_admin` subcommands with:
 
     $ postfix_admin
 
 ```
 Commands:
-  postfix_admin account_passwd user@example.com new_password               # Change password of account
-  postfix_admin add_account user@example.com password                      # Add an account
-  postfix_admin add_admin admin@example.com password                       # Add an admin user
-  postfix_admin add_admin_domain admin@example.com example.com             # Add admin_domain
-  postfix_admin add_alias alias@example.com goto@example.net               # Add an alias
-  postfix_admin add_domain example.com                                     # Add a domain
-  postfix_admin admin_passwd admin@example.com new_password                # Change password of admin
+  postfix_admin account_passwd user@example.com new_password               # Change the password of an account
+  postfix_admin add_account user@example.com password                      # Add a new account
+  postfix_admin add_admin admin@example.com password                       # Add a new admin user
+  postfix_admin add_admin_domain admin@example.com example.com             # Grant an admin user access to a specific domain
+  postfix_admin add_alias alias@example.com goto@example.net               # Add a new alias
+  postfix_admin add_domain example.com                                     # Add a new domain
+  postfix_admin admin_passwd admin@example.com new_password                # Change the password of an admin user
   postfix_admin delete_account user@example.com                            # Delete an account
-  postfix_admin delete_admin admin@example.com                             # Delete an admin
-  postfix_admin delete_admin_domain admin@example.com example.com          # Delete admin_domain
+  postfix_admin delete_admin admin@example.com                             # Delete an admin user
+  postfix_admin delete_admin_domain admin@example.com example.com          # Revoke an admin user's access to a specific domain
   postfix_admin delete_alias alias@example.com                             # Delete an alias
   postfix_admin delete_domain example.com                                  # Delete a domain
   postfix_admin dump                                                       # Dump all data
   postfix_admin edit_account user@example.com                              # Edit an account
   postfix_admin edit_admin admin@example.com                               # Edit an admin user
   postfix_admin edit_alias alias@example.com                               # Edit an alias
-  postfix_admin edit_domain example.com                                    # Edit a domain limitation
+  postfix_admin edit_domain example.com                                    # Edit a domain
   postfix_admin help [COMMAND]                                             # Describe available commands or one specific command
-  postfix_admin log                                                        # Show action logs
+  postfix_admin log                                                        # Display action logs
   postfix_admin schemes                                                    # List all supported password schemes
-  postfix_admin setup example.com password                                 # Setup a domain
-  postfix_admin show [example.com | admin@example.com | user@example.com]  # Show domains or admins or mailboxes
+  postfix_admin setup example.com password                                 # Set up a domain
+  postfix_admin show [example.com | admin@example.com | user@example.com]  # Display details about domains, admins, or accounts
   postfix_admin summary [example.com]                                      # Summarize the usage of PostfixAdmin
   postfix_admin version                                                    # Show postfix_admin version
 ```

data/Rakefile

@@ -1,6 +1,24 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
 require "rspec/core/rake_task"
 
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
+
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: :test
+
+desc "Set up test database"
+task :setup_test_db do
+  create_db_cmd = "mysql -e 'CREATE DATABASE `postfix_test`;'"
+  puts create_db_cmd
+  puts `#{create_db_cmd}`
+
+  import_db_cmd = "mysql postfix_test < docker-db/postfix.v1841.sql"
+  puts import_db_cmd
+  puts `#{import_db_cmd}`
+end

data/bin/console

@@ -1,16 +1,20 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
+Bundler.require(:default, :development)
 require "postfix_admin"
 require "postfix_admin/cli"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-cli = PostfixAdmin::CLI.new
-cli.db_setup
+@cli = PostfixAdmin::CLI.new
+@cli.db_setup
 include PostfixAdmin
 
+include FactoryBot::Syntax::Methods
+FactoryBot.find_definitions
+
 require "pry"
 Pry.start
 

data/docker-admin/config.local.php

@@ -16,6 +16,9 @@ $CONF['password_validation'] = array(
 
 $CONF['encrypt'] = 'dovecot:CRAM-MD5';
 
+$CONF['domain_quota'] = 'NO';
+$CONF['quota'] = 'YES';
+
 // setup_password: 'password'
 $CONF['setup_password'] = '87745eb0269b2f42813b23601be3231a:6e41880f73d97321f2f0b25a5ee30f57f5ab3be8';
 ?>

data/docker-app/Dockerfile

@@ -9,7 +9,7 @@ WORKDIR /app
 COPY Gemfile postfix_admin.gemspec ./
 COPY ./lib/postfix_admin/version.rb ./lib/postfix_admin/version.rb
 
-RUN gem install bundler && bundle install
+RUN gem install bundler -v 2.4.22 && bundle install
 
 COPY spec/postfix_admin.conf /root/.postfix_admin.conf
 COPY docker-app/my.cnf /root/.my.cnf
@@ -18,8 +18,4 @@ COPY docker-app/my.cnf /root/.my.cnf
 RUN curl https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -so /wait-for-it.sh && \
     chmod 755 /wait-for-it.sh
 
-COPY docker-app/docker-entrypoint.sh /docker-entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
-ENTRYPOINT ["/docker-entrypoint.sh"]
-
-CMD ["irb"]
+CMD ["irb"]

data/docker-app/my.cnf

@@ -1,5 +1,5 @@
 [client]
-user = postfix
-password = password
+user = root
+password = ScRgkaMz4YwHN5dyxfQj
 host = db
 database = postfix

data/docker-compose.yml

@@ -1,4 +1,10 @@
-version: '3.8'
+# docker compose up -d
+#
+# Run tests on service app
+# You may need to run tests on Docker because of its requirement of doveadm
+# docker compose exec app bundle exec rake setup_test_db
+# docker compose exec app bundle exec rake test
+# docker compose exec app bundle exec rake spec
 
 services:
   app:
@@ -6,17 +12,10 @@ services:
       context: .
       dockerfile: docker-app/Dockerfile
     tty: true
-    volumes:
-    - .:/app
-    depends_on:
-      - db
-  app2.5:
-    tty: true
-    build:
-      context: .
-      dockerfile: docker-app-2.5/Dockerfile
     volumes:
       - .:/app
+    environment:
+      - DATABASE_URL=mysql2://postfix:password@db/postfix
     depends_on:
       - db
   admin:
@@ -35,12 +34,17 @@ services:
 #      - POSTFIXADMIN_DB_NAME=postfix
   db:
     image: mariadb:10
+    ports:
+      - "13306:3306"
     volumes:
-    - ./docker-db/postfix.v1841.sql:/docker-entrypoint-initdb.d/postfix.sql
-#    - ./docker-db/postfix.v740.sql:/docker-entrypoint-initdb.d/postfix.sql
-#    - ./docker-db/postfix.v352.sql:/docker-entrypoint-initdb.d/postfix.sql
+      - db-data:/var/lib/mysql
+      - ./docker-db/postfix.v1841.sql:/docker-entrypoint-initdb.d/postfix.sql
+#      - ./docker-db/postfix.v740.sql:/docker-entrypoint-initdb.d/postfix.sql
+#      - ./docker-db/postfix.v352.sql:/docker-entrypoint-initdb.d/postfix.sql
     environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
+      - MYSQL_ROOT_PASSWORD=ScRgkaMz4YwHN5dyxfQj
       - MYSQL_USER=postfix
       - MYSQL_PASSWORD=password
       - MYSQL_DATABASE=postfix
+volumes:
+  db-data:

data/lib/postfix_admin/admin.rb

@@ -22,6 +22,11 @@ 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 = if has_superadmin_column?

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?