postfix_admin 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59fef8b37f476a21d64574f49a2175c75ea36e36
-  data.tar.gz: 402c21e2842ad6eab990ecfed2bd6ea98c3b4c4a
+SHA256:
+  metadata.gz: 69e3627f6b08953a75386f7c16256f03c2aacc2801c611c297f4a8e8b7249cb5
+  data.tar.gz: 982ceb31f432be52fa7a4960810fac0d84dddc6f7138d02be69d2a8fb7aeda26
 SHA512:
-  metadata.gz: 3e2312e795f876059fe65f7907bc19a2d45c9619e713756a19a3a363cd827bc26c4d31f9207b0c66d8965e70686d718d34ae4a75f4f9bac2297c4ef0aeaa00f8
-  data.tar.gz: eee17cbc79654a56a6fefd9eea01daf7340a62108c60c2b11000527ed6b704608f5546e3bc1ecd53527e3823f095b13fa9b20e182253ae703b65ef83030ff4d1
+  metadata.gz: 878ee894a9cb4b209361167e310569163c2eb6737ebf6a119a039b7ee55518439fe79ed5ed500b48b423c299acc852e6f7ed8d9d6077978fa0a46bacb7090195
+  data.tar.gz: 8abda8f37ac2d31bc38e1ace3ac225c2ee17813e80e7e8be60a3b4abb9539257ae959ea8ab6f3d1cdd4c72cedd2100d9e5f769c92e07ceaa69910de868c6d282

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea
+.vagrant

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.1.4
+ * Add "log" command
+
+## 0.1.3
+ * Support for activation and deactivation of domain, admin and account
+ * Add "edit_admin" command
+
 ## 0.1.2
  * Support password hash by doveadm (external command)
  * Show active status

data/README.md

@@ -43,13 +43,13 @@ Commands:
   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_domain example.com                                    # Edit a domain limitation
   postfix_admin help [COMMAND]                                             # Describe available commands or one specific command
   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 summary [example.com]                                      # Summarize the usage of PostfixAdmin
-  postfix_admin super_admin admin@example.com                              # Enable super admin flag of an admin
   postfix_admin version                                                    # Show postfix_admin version
 ```
 

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/lib/postfix_admin/cli.rb

@@ -283,10 +283,27 @@ module PostfixAdmin
       mailbox.active = options[:active] unless options[:active].nil?
       mailbox.save or raise "Could not save Mailbox"
 
+      if options[:goto]
+        mail_alias = Alias.find(address)
+        mail_alias.goto = options[:goto]
+        mail_alias.save or raise "Could not save Alias"
+      end
+
       puts "Successfully updated #{address}"
       show_account_details(address)
     end
 
+    def edit_alias(address, options)
+      alias_check(address)
+      mail_alias = Alias.find(address)
+      mail_alias.goto = options[:goto] if options[:goto]
+      mail_alias.active = options[:active] unless options[:active].nil?
+      mail_alias.save or raise "Could not save Alias"
+
+      puts "Successfully updated #{address}"
+      show_alias_details(address)
+    end
+
     def delete_alias(address)
       @base.delete_alias(address)
       puts_deleted(address)
@@ -302,6 +319,13 @@ module PostfixAdmin
       puts_deleted(address)
     end
 
+    def log
+      Log.all.each do |l|
+        time = l.timestamp.strftime("%Y-%m-%d %X %Z")
+        puts "#{time}  #{l.username}  #{l.domain_name}  #{l.action}  #{l.data}"
+      end
+    end
+
     def dump
       puts "Admins"
       puts "User Name,Password,Super Admin,Active"

data/lib/postfix_admin/models.rb

@@ -197,4 +197,17 @@ module PostfixAdmin
       Mailbox.exist?(address)
     end
   end
+
+  class Log
+    include ::DataMapper::Resource
+    property :timestamp, DateTime, key: true, default: DateTime.now
+    property :username, String, length: 0..255
+    property :domain_name, String, field: 'domain', length: 0..255
+    property :action, String, length: 0..255
+    property :data, Text
+
+    belongs_to :domain, :model => 'Domain', :child_key => :domain_name
+
+    storage_names[:default] = 'log'
+  end
 end

data/lib/postfix_admin/runner.rb

@@ -96,7 +96,8 @@ module PostfixAdmin
     end
 
     desc "edit_account user@example.com", "Edit an account"
-    method_option :quota, :type => :numeric, :aliases => "-q", :desc => "quota limitation"
+    method_option :goto,  :type => :string,  :aliases => "-g", :desc => "mailboxes, addresses e-mails are delivered to"
+    method_option :quota, :type => :numeric, :aliases => "-q", :desc => "quota limitation (MB)"
     method_option :name,  :type => :string,  :aliases => "-n", :desc => "full name"
     method_option :active, type: :boolean, desc: "Update active status"
     def edit_account(address)
@@ -153,6 +154,20 @@ module PostfixAdmin
       runner{ @cli.delete_admin_domain(user_name, domain_name) }
     end
 
+    desc "edit_alias alias@example.com", "Edit an alias"
+    method_option :goto,  :type => :string,  :aliases => "-g",
+                  :desc => "mailboxes, addresses e-mails are delivered to"
+    method_option :active, type: :boolean, desc: "Update active status"
+    def edit_alias(address)
+      runner do
+        if options.size == 0
+          warn "Use one or more options."
+          help('edit_alias')
+        else
+          @cli.edit_alias(address, options)
+        end
+      end
+    end
 
     desc "add_alias alias@example.com goto@example.net", "Add an alias"
     def add_alias(address, goto)
@@ -164,6 +179,11 @@ module PostfixAdmin
       runner{ @cli.delete_alias(address) }
     end
 
+    desc "log", "Show action logs"
+    def log
+      runner{ @cli.log }
+    end
+
     desc "dump", "Dump all data"
     def dump
       runner{ @cli.dump }

data/lib/postfix_admin/version.rb

@@ -1,3 +1,3 @@
 module PostfixAdmin
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/runner_spec.rb

@@ -110,6 +110,20 @@ describe PostfixAdmin::Runner do
     end
   end
 
+  describe "edit_alias" do
+    it "can update active status" do
+      output = capture(:stdout){ Runner.start(['edit_alias', 'alias@example.com', '--no-active']) }
+      expect(output).to match EX_UPDATED
+      expect(output).to match /Active.+NO/
+    end
+
+    it "can update goto" do
+      output = capture(:stdout){ Runner.start(['edit_alias', 'alias@example.com', '-g', 'goto@example.com,user@example.com']) }
+      expect(output).to match EX_UPDATED
+      Alias.find('alias@example.com').goto.should == 'goto@example.com,user@example.com'
+    end
+  end
+
   describe "add_admin" do
     before do
       @args = ['add_admin', 'admin@example.jp', 'password']
@@ -238,6 +252,11 @@ describe PostfixAdmin::Runner do
     it "-n option require an argument" do
       exit_capture{ Runner.start(@args + ['-n'])}.should_not == ""
     end
+
+    it "can update goto" do
+      capture(:stdout){ Runner.start(@args + ['-g', 'user@example.com,forward@example.com'])}.should =~ EX_UPDATED
+      Alias.find('user@example.com').goto.should == 'user@example.com,forward@example.com'
+    end
   end
 
   it "add_admin_domain" do
@@ -331,6 +350,12 @@ describe PostfixAdmin::Runner do
     lambda { Runner.start(['delete_domain', 'example.net']) }.should_not raise_error
   end
 
+  describe "log" do
+    it "does not raise error" do
+      exit_capture{ Runner.start(['log']) }.should == ""
+    end
+  end
+
   describe "dump" do
     it "does not raise error" do
       exit_capture{ Runner.start(['dump']) }.should == ""

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postfix_admin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Hitoshi Kurokawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2019-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -121,6 +121,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - Thorfile
 - bin/postfix_admin
 - lib/postfix_admin.rb
@@ -159,8 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Command Line Tools of PostfixAdmin
@@ -174,4 +174,3 @@ test_files:
 - spec/runner_spec.rb
 - spec/spec_helper.rb
 - spec/tmp/.gitkeep
-has_rdoc: