Open Build Service

config.yml Changed

@@ -3,3 +3,60 @@
 bind_port: 10031
 log: syslog
 log_level: info
+
+defaults: &defaults
+  h_max_addresses: 5
+  h_activity_threshold: 14400
+  h_interval: 1800
+  h_interval_count: 50
+  h_grace_threshold: 1296000
+  
+policies:
+  - name:        '128'
+    <<: *defaults
+    description: '128 mail/h'
+    interval:     3600
+    heuristics:   true
+    count:        128
+    recipients:   null
+    volume:       null
+  - name:        '512'
+    <<: *defaults
+    description: '512 mail/h'
+    interval:     3600
+    heuristics:   true
+    count:        512
+    recipients:   null
+    volume:       null
+  - name:        '1k'
+    <<: *defaults
+    description: '1k mail/h'
+    interval:     3600
+    heuristics:   true
+    count:        1024
+    recipients:   null
+    volume:       null
+  - name:        '4k'
+    <<: *defaults
+    description: '4k mail/h'
+    interval:     3600
+    heuristics:   true
+    count:        4096
+    recipients:   null
+    volume:       null
+  - name:        '12k'
+    <<: *defaults
+    description: '12k mail/h'
+    interval:     3600
+    heuristics:   true
+    count:        12228
+    recipients:   null
+    volume:       null
+  - name:        'trusted'
+    <<: *defaults
+    description: 'Trusted email senders'
+    interval:     3600
+    heuristics:   true
+    count:        null
+    recipients:   null
+    volume:       null

postfix-rate-policyd-0.0.1.gem/checksums.yaml.gz Changed

postfix-rate-policyd-0.0.1.gem/data/Makefile Added

postfix-rate-policyd-0.0.1.gem/data/config.yml Added

@@ -0,0 +1,62 @@
+database_url: mysql2://username:passwword@host:port/database
+bind_address: '::'
+bind_port: 10031
+log: syslog
+log_level: info
+
+defaults: &defaults
+  h_max_addresses: 5
+  h_activity_threshold: 14400
+  h_interval: 1800
+  h_interval_count: 50
+  h_grace_threshold: 1296000
+  
+policies:
+  - name:        '128'
+    <<: *defaults
+    description: '128 mail/h'
+    interval:     3600
+    heuristics:   true
+    count:        128
+    recipients:   null
+    volume:       null
+  - name:        '512'
+    <<: *defaults
+    description: '512 mail/h'
+    interval:     3600
+    heuristics:   true
+    count:        512
+    recipients:   null
+    volume:       null
+  - name:        '1k'
+    <<: *defaults
+    description: '1k mail/h'
+    interval:     3600
+    heuristics:   true
+    count:        1024
+    recipients:   null
+    volume:       null
+  - name:        '4k'
+    <<: *defaults
+    description: '4k mail/h'
+    interval:     3600
+    heuristics:   true
+    count:        4096
+    recipients:   null
+    volume:       null
+  - name:        '12k'
+    <<: *defaults
+    description: '12k mail/h'
+    interval:     3600
+    heuristics:   true
+    count:        12228
+    recipients:   null
+    volume:       null
+  - name:        'trusted'
+    <<: *defaults
+    description: 'Trusted email senders'
+    interval:     3600
+    heuristics:   true
+    count:        null
+    recipients:   null
+    volume:       null

postfix-rate-policyd-0.0.1.gem/data/lib/postfix/rate/models.rb Added

postfix-rate-policyd-0.0.1.gem/data/lib/postfix/rate/models/authenticated_identity.rb Changed

postfix-rate-policyd-0.0.1.gem/data/lib/postfix/rate/models/client_address.rb Changed

postfix-rate-policyd-0.0.1.gem/data/lib/postfix/rate/models/network_address.rb Changed

postfix-rate-policyd-0.0.1.gem/data/lib/postfix/rate/models/policy.rb Changed

@@ -2,13 +2,11 @@
   class Policy < Sequel::Model
     plugin :validation_helpers
 
-
     def validate
       super
       validates_presence :name, :description
     end
 
-
     def count_tracker?
       count && count > 0
     end
@@ -20,36 +18,5 @@
     def volume_tracker?
       volume && volume > 0
     end
-
-
-    def self.initialize_table
-      if db.table_exists?(table_name)
-        Policy.find_or_create(name:        'default',
-               description: 'Default Policy',
-               interval:     3600,
-               heuristics:   true,
-               count:        10,
-               recipients:   nil,
-               volume:       nil)
-
-        Policy.find_or_create(name:        'default_for_addresses',
-               description: 'Default Policy for unauthenticated addresses',
-               interval:     86400,
-               heuristics:   true,
-               count:        200,
-               recipients:   nil,
-               volume:       nil)
-
-        Policy.find_or_create(name:        'default_for_identities',
-               description: 'Default Policy for authenticated identities',
-               interval:     86400,
-               heuristics:   true,
-               count:        500,
-               recipients:   nil,
-               volume:       nil)
-      else
-        true
-      end
-    end
   end
 end
\ No newline at end of file

postfix-rate-policyd-0.0.1.gem/data/lib/postfix/rate/models/tracker.rb Changed

postfix-rate-policyd-0.0.1.gem/data/lib/postfix/rate/policyd/agent.rb Changed

postfix-rate-policyd-0.0.1.gem/data/lib/postfix/rate/policyd/configuration.rb Changed

@@ -5,6 +5,7 @@
 
   DEFAULT_CORE_CONFIGURATION = {
     'config_file'  =>  '/etc/postfix-rate/policyd.yml',
+    'trackers_file' =>  '/etc/postfix-rate/trackers.yml',
     'database_url' => nil,
     'daemonize'    => true,
     'bind_address' => '::',
@@ -18,7 +19,7 @@
     'chdir'        => Dir.getwd,
   }.freeze
 
-  DEFAULT_COMMANDS =  'start', 'stop', 'restart', 'reload' .freeze
+  DEFAULT_COMMANDS =  'start', 'setup' .freeze
 
   class Configuration
 
@@ -27,6 +28,7 @@
     def initialize(argv)
 
       config_file = DEFAULT_CORE_CONFIGURATION'config_file'
+      trackers_file = DEFAULT_CORE_CONFIGURATION'trackers_file'
       options = {}
       @data = DEFAULT_CORE_CONFIGURATION.dup
 
@@ -38,6 +40,10 @@
           options'config_file' = config_file = file
         end
 
+        opts.on("-t", "--trackers FILE", "Initialize trackers from file") do |file|
+          options'trackers_file' = trackers_file = file
+        end
+
         opts.on("-l", "--log-level LEVEL", "Specify the log level (fatal, error, warn, info, debug).") do |level|
           options'log_level' = level.to_sym
         end
@@ -74,7 +80,12 @@
       puts "= reading configuration from '#{config_file}'."
 
       raw_config = File.exists?(config_file) ? (YAML.load_file(config_file) || {}) : {}
+      trackers = File.exists?(trackers_file) ? (YAML.load_file(trackers_file) || {}) : nil
+
       data.merge!(raw_config).merge!(options)
+      if trackers
+        data.merge!(trackers: trackers)
+      end
 
       data'command' = argv.shift if argv
       data'argument' = argv
@@ -142,11 +153,19 @@
       data'debug'
     end
 
+    def policies
+      data'policies' || {}
+    end
+
+    def trackers
+      data'trackers' || {}
+    end
+
     def usage
       u =  '-'*80 + "\n"
       u << "= postfix-rate-policyd: a postfix filter implementing rate policies\n\n"
       u << "usage:\n"
-      u << "postfix-rate-policyd params (start|stop|restart|reload)\n"
+      u << "postfix-rate-policyd params (start|setup)\n"
       u << '-'*80 + "\n"
 
     end

postfix-rate-policyd-0.0.1.gem/data/lib/postfix/rate/policyd/models.rb Changed

@@ -1,24 +1,17 @@
 
 module Postfix::Rate::Models
 
-  def self.init
+  def self.init(config = nil)
     create_policies_schema
     create_trackers_schema
     create_authenticated_identities_schema
     create_client_addresses_schema
     create_network_addresses_schema
 
-    require "postfix/rate/models/policy"
-    require "postfix/rate/models/tracking"
-    require "postfix/rate/models/tracker"
+    require "postfix/rate/models"
 
-    require "postfix/rate/models/authenticated_identity"
-    require "postfix/rate/models/client_address"
-    require "postfix/rate/models/network_address"
-
-     Policy, Tracker, AuthenticatedIdentity, ClientAddress, NetworkAddress.each do | m |
-      m.initialize_table
-    end
+    initialize_policies(config)
+    initialize_trackers(config)
   end
 
   def self.create_authenticated_identities_schema
@@ -123,4 +116,78 @@
       true
     end
   end
+
+  def self.initialize_policies(config = nil)
+    Policy.find_or_create(
+      name:        'default',
+      description: 'Default Policy',
+      interval:     3600,
+      heuristics:   true,
+      count:        10,
+      recipients:   nil,
+      volume:       nil)
+
+    Policy.find_or_create(
+      name:        'default_for_addresses',
+      description: 'Default Policy for unauthenticated addresses',
+      interval:     86400,
+      heuristics:   true,
+      count:        200,
+      recipients:   nil,
+      volume:       nil)
+
+    Policy.find_or_create(
+      name:        'default_for_identities',
+      description: 'Default Policy for authenticated identities',
+      interval:     86400,
+      heuristics:   true,
+      count:        500,
+      recipients:   nil,
+      volume:       nil)
+
+    # Bulk IP Senders 128 	45 	Bulk Anon Senders 128 	no
+    # Bulk Senders 512/IP 	45 	Bulk Senders 512/IP 	no
+    # Bulk Anon Senders 1k 	45 	Bulk Anon Senders 1k 	no
+    # Bulk IP Senders 4k 	45 	Bulk Anon Senders 4k 	no
+    # Bulk Senders 12k/IP 	45 	IP Addesses authorized to send 12kM/h 	no
+
+    if config && config.policies.any?
+      config.policies.each do | pol |
+        policy = Policy.find(name: pol'name')
+        policy ||= Policy.new
+        pol.each do | k, v |
+          policy.send("#{k}=", v)
+        end
+        policy.save
+      end
+    end
+  end
+
+  def self.initialize_trackers(config = nil)
+    if config && config.trackers
+      if config.trackers'identities'
+        config.trackers'identities'.each do | id |
+          authid = AuthenticatedIdentity.find(identity: id'identity')
+          authid ||= AuthenticatedIdentity.new
+          authid.identity = id'identity'
+          authid.notes = id'notes'
+          authid.policy = Policy.find(name: id'policy')
+          raise StandardError.new("Policy #{id'policy'} not found") unless authid.policy
+          authid.save
+        end
+      end
+
+      if config.trackers'addresses'
+        config.trackers'addresses'.each do | add |
+          cladd = ClientAddress.find(address: add'address')
+          cladd ||= ClientAddress.new
+          cladd.address = add'address'
+          cladd.notes = add'notes'
+          cladd.policy = Policy.find(name: add'policy')
+          raise StandardError.new("Policy #{add'policy'} not found") unless cladd.policy
+          cladd.save
+        end
+      end
+    end
+  end
 end
\ No newline at end of file

postfix-rate-policyd-0.0.1.gem/data/lib/wm/syslog/logger.rb Changed

postfix-rate-policyd-0.0.1.gem/data/postfix-rate-policyd.service Added

postfix-rate-policyd-0.0.1.gem/data/postfix-rate-policyd.spec.in Added

@@ -0,0 +1,69 @@
+%define mod_name postfix-rate-policyd
+%define mod_full_name %{mod_name}-%{version}
+Name:           rubygem-postfix-rate-policyd
+Version:        VERSION
+Release:        0
+Summary:        Intercom mail policyd rubygem
+License:        Apache-2.0
+Group:          Development/Languages/Ruby
+URL:            https://rubygems.org/gems/postfix-rate-policyd
+Source:         %{mod_full_name}.gem
+Source1:        config.yml
+Source2:        postfix-rate-policyd.service
+BuildRequires:  %{ruby >= 1.9}
+BuildRequires:  %{rubygem gem2rpm}
+BuildRequires:  ruby-macros >= 5
+
+%description
+Intercom mail policyd rubygem
+
+%package -n postfix-rate-policyd
+Summary:  Intercom mail policyd
+Group:    System/Daemons
+Requires: rubygem(%{mod_name}) = %{version}
+
+%description -n postfix-rate-policyd
+Intercom mail policyd daemon
+
+%prep
+
+%build
+
+%install
+%gem_install \
+  --symlink-binaries \
+  --doc-files="README.md" \
+  -f
+install -d %{buildroot}%{_sysconfdir}/postfix-rate
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/postfix-rate/policyd.yml
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/postfix-rate-policyd.service
+install -d -m 0644 %{buildroot}%{_localstatedir}/lib/postfix-rate-policyd
+
+%gem_packages
+
+%files -n postfix-rate-policyd
+%dir %{_sysconfdir}/postfix-rate
+%config(noreplace) %{_sysconfdir}/postfix-rate/policyd.yml
+%{_unitdir}/postfix-rate-policyd.service
+%attr(0700, itmpolicyd, itmpolicyd) %dir %{_localstatedir}/lib/postfix-rate-policyd
+
+%pre -n postfix-rate-policyd
+%{_bindir}/getent group  itmpolicyd >/dev/null || %{_sbindir}/groupadd -r itmpolicyd
+%{_bindir}/getent passwd itmpolicyd >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/postfix-rate-policyd -s /bin/false -c "intercom mail policyd" -g itmpolicyd itmpolicyd
+%service_add_pre postfix-rate-policyd.service
+exit 0
+
+%preun -n postfix-rate-policyd
+%service_del_preun postfix-rate-policyd.service
+exit 0
+
+%post -n postfix-rate-policyd
+%tmpfiles_create %_tmpfilesdir/mailserver_agent.conf
+%service_add_post postfix-rate-policyd.service
+exit 0
+
+%postun -n postfix-rate-policyd
+%service_del_postun postfix-rate-policyd.service
+exit 0
+
+%changelog

postfix-rate-policyd-0.0.1.gem/metadata.gz Changed

postfix-rate-policyd.service Changed

Changes of Revision 7