schleuder 2.2.3 → 2.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c37622657ee9683d0d006af23a4fb74d53c1c697
+  data.tar.gz: 992426df30d2c0de1e97a9d9b611fc5dbc2d1557
+SHA512:
+  metadata.gz: 8a4fa65cbe451d2880ef8f38201565c5672c8f41ebff22f8579f1e2ce3aef44f6aeb043e3d93610a55450e7296341ed8689bcf8bfc96dd40847b5d7ce1e987f5
+  data.tar.gz: 5238664faab3274a9803bc11a9ef0a91f0c46392a825c7cfe2e040efd0cfc1b3ea2d09fa2982ac8ef9419e3ba13a0ec2a6d81bed2f484fa5846a6a5cec7c666d

checksums.yaml.gz.sig

@@ -0,0 +1,3 @@
+k�X
+W
+�5

data/bin/schleuder-migrate-v2.1-to-v2.2

@@ -50,7 +50,7 @@ def member_key(member)
   member
 end
 
-def fix_list_conf(old_config,new_dir)
+def fix_list_conf(old_config,new_dir,new_conf_path)
   if old_config.delete('logging').to_s == 'true' && !old_config['lists_logfile'].nil?
     old_config['log_file'] = old_config.delete('lists_logfile')
   end
@@ -69,7 +69,7 @@ def fix_list_conf(old_config,new_dir)
   end
   old_config['key_fingerprint'] = Schleuder.list.key_fingerprint
 
-  File.open(File.join(new_dir, Schleuder.config.lists_configfile),'w') { |f| f << YAML::dump(old_config.to_hash) }
+  File.open(new_conf_path,'w') { |f| f << YAML::dump(old_config.to_hash) }
   # reload list config
   Schleuder.list = Schleuder::List.new(old_config['myaddr'])
 end
@@ -161,11 +161,20 @@ end
 
 ## run
 
-
 old_config = YAML.load_file(list_config)
-old_config['myname']||=File.basename(File.dirname(list_config))
-Schleuder.list = Schleuder::List.new(File.basename(File.dirname(list_config)))
-old_dir = File.dirname(list_config)
+
+if Schleuder.config.lists_configfile.end_with?('/')
+  # Common configuration for all lists
+  old_name = File.basename(list_config).gsub(/\.conf\Z/, '')
+  common_list_config_dir = true
+else
+  # Configuration in list directory
+  old_name = File.basename(File.dirname(list_config))
+end
+
+old_config['myname'] ||= old_name
+Schleuder.list = Schleuder::List.new(old_name)
+old_dir = File.join(Schleuder.config.lists_dir, old_name)
 
 files = Dir["#{old_dir}/*"].inject({}) do |files, file|
   files[File.basename(file)] = [:uid, :gid, :mode].inject({}) do |hash, sym|
@@ -178,8 +187,19 @@ end
 ENV['GNUPGHOME'] = new_dir = move_listdir(old_dir,old_config)
 ENV.delete('GPG_AGENT_INFO') # might interfer with changing uids
 
+if common_list_config_dir
+  # Move list configuration file to its new location
+  local_part, domain = old_config['myaddr'].split('@')
+  domain_dir = File.join(Schleuder.config.lists_configfile, domain)
+  FileUtils.mkdir_p domain_dir
+  new_conf_path = "#{domain_dir}/#{local_part}.conf"
+  FileUtils.mv list_config, new_conf_path
+else
+  new_conf_path = File.join(new_dir, Schleuder.config.lists_configfile)
+end
+
 change_pubkey(old_config)
-fix_list_conf(old_config, new_dir)
+fix_list_conf(old_config, new_dir, new_conf_path)
 harden_members
 
 # Fix owner/modes if changed

data/bin/schleuder-newlist

@@ -18,6 +18,7 @@ class ListCreator
      -initmember member1@foobar.com -initmemberkey /path/to/initmember_publickey
   Optional options (flags on the same line have to be used together):
      -mailuser mail (The user, which will invoke schleuder from your MTA, if non is supplied, the current user is taken)
+     -mailgroup mail (The group, with which schleuder will be invoked from your MTA, if non is supplied, the current group is taken)
      -privatekeyfile /path/to/privatekey -publickeyfile /path/to/publickey -passphrase key_passphrase
      -nointeractive
 
@@ -53,6 +54,8 @@ class ListCreator
         args[:list_passphrase] = ARGV.shift
       elsif nextarg == '-mailuser'
         args[:mailuser] = ARGV.shift
+      elsif nextarg == '-mailgroup'
+        args[:mailgroup] = ARGV.shift
       elsif nextarg == '-nointeractive'
         interactive = false
       else
@@ -109,6 +112,11 @@ class ListCreator
     else
       mailuser = Process::Sys.getuid
     end
+    unless args[:mailgroup].nil?
+      mailgroup = Etc.getgrnam(args[:mailgroup]).gid
+    else
+      mailgroup = Process::Sys.getuid
+    end
     unless (list_privatekeyfile == 'none') and 
         (list_publickeyfile == 'none') and 
         (list_passphrase == 'none') then
@@ -184,10 +192,11 @@ class ListCreator
     end
 
     # store the config
+    FileUtils.mkdir_p File.dirname(list.configfile)
     Schleuder.log.debug "Store list config..."
     list.config = list.config
     Schleuder.log.debug "Changing ownership..."
-    ListCreator::filepermissions(list, mailuser)
+    ListCreator::filepermissions(list, mailuser, mailgroup)
     Schleuder.log.debug "List successfully created..."
     ListCreator::print_list_infos(list) if interactive
   end
@@ -221,7 +230,7 @@ class ListCreator
     end
     yield(var) if block_given?
     raise NewListError,"Missing mandatory variable: "+question if (var.nil? or var.empty?)
-    var
+    var.to_s
   end
 
   def self.verify_emailvar(var,interactive,question)
@@ -239,7 +248,7 @@ class ListCreator
       var = ask("Filepath for "+question+": ")
     end
     raise NewListError,"Missing mandatory file: "+question if (not var.nil? and not File.exist?(var))
-    var
+    var.to_s
   end
 
   def self.progfunc(hook, what, type, current, total)
@@ -358,22 +367,29 @@ Passphrase: #{pass}
 </GnupgKeyParms>"
   end
 
-  def self.filepermissions(list, mailuser)
+  def self.filepermissions(list, mailuser, mailgroup)
     listdir = list.listdir
-    dirs = [File.dirname(listdir), listdir]
-    FileUtils.chown mailuser, nil, dirs
-    FileUtils.chmod 0700, dirs
+    FileUtils.chown(mailuser, mailgroup, listdir)
+    FileUtils.chmod(0700, listdir)
     Dir.new(listdir).each{ |f|
       unless f =~ /^\./
-        File.chown(mailuser,nil,listdir+"/"+f)
-        File.chmod(0600,listdir+"/"+f)
+        file = File.join(listdir,f)
+        File.chown(mailuser,mailgroup,file)
+        File.chmod(0600,file)
       end
     }
+    FileUtils.chown mailuser, mailgroup, list.configfile
+    FileUtils.chmod 0600, list.configfile
+    # do we have a shared directory?
+    # otherwise it's the listdir itself
+    if Schleuder.config.lists_configfile.end_with?('/')
+      FileUtils.chmod 0750, File.dirname(list.configfile)
+    end
     if list.config.log_file
       log_file = list.config.log_file
       log_file = File.join(listdir, log_file) unless log_file.start_with?('/')
-      FileUtils.chown mailuser, nil, log_file
-      FileUtils.chmod 0600, log_file
+      FileUtils.chown(mailuser, mailgroup, log_file)
+      FileUtils.chmod(0600, log_file)
     end
   end
 

data/contrib/check-expired-keys.rb

@@ -24,7 +24,7 @@ listname = ARGV.first
 Schleuder.list = List.new(listname)
 
 now = Time.now
-checkdate = now + 120960000 # two weeks
+checkdate = now + (60 * 60 * 24 * 14) # two weeks
 crypt = Crypt.new('')
 msg = ''
 unusable = []
@@ -54,7 +54,7 @@ unusable.each do |key,trust|
 end
 
 unless msg.empty?
-  prefix = "Checking the public keys present in the keyring of list #{listname} for usability gave the following result:".fmt
+  prefix = "Checking the public keys present in the keyring of list #{listname} for usability gave the following result:".fmt(72)
   Schleuder.log.notify_admin('keys', prefix + "\n\n" + msg)
 end
 

data/ext/default-list.conf

@@ -88,7 +88,10 @@
 #log_io: false
 #
 # Log to a file? To enable specify a filename, optionally with full path.
-#log_file: false
+# If you specify a directory (ending with '/'), the file will be named
+# "$LISTNAME.log" in that directory.
+# To disable logging to a file set to false.
+#log_file: 'list.log'
 #
 # speaks for itself, no?
 #public_footer:

data/ext/schleuder.conf

@@ -13,7 +13,7 @@
 #gpg_key_type: RSA
 #
 # Set the length of a key we might create for new lists.
-#gpg_key_length: 2048
+#gpg_key_length: 4096
 #
 # Set the type of the subkey of a key we might create
 # for new lists.
@@ -21,9 +21,12 @@
 #
 # Set the length of the subkey of a key we might create
 # for new lists.
-#gpg_subkey_length: 2048
+#gpg_subkey_length: 4096
 #
-# Name of the per list config file.
+# Name of the per list config file. Either:
+#  - a file name that resides in the list data directory,
+#  - a directory, ending with '/' holding list configs as
+#    "$DOMAIN/$LISTNAME.conf".
 #lists_configfile: list.conf
 #
 # Name of the per list file containing all members and their
@@ -38,7 +41,8 @@
 # Location of the various schleuderlists' directory.
 #lists_dir: /var/schleuderlists
 #
-# Location of the global logfile.
+# Location of the global logfile. Specify "syslog" to log through
+# the syslog(3) facility.
 #log_file: /var/log/schleuder/schleuder.log
 #
 # Global schleuder log level, might change after the list config
@@ -48,7 +52,9 @@
 #
 # Location of schleuder plugins. Note: the following notion
 # isn't valid. You have to provide a fully qualified path.
-#plugins_dir = schleuder_base + '/plugins'
+# Multiple plugins directory are supported.
+#plugins_dir:
+#-schleuder_base + '/plugins'
 #
 # The super administrator of this schleuder installation. This
 # address will receive all notices which can'tbe delivered to a certain list

data/lib/schleuder/crypt.rb

@@ -91,7 +91,7 @@ module Schleuder
         # TODO: return mailadresses or keys instead of signature-objects?
         [output, in_encrypted, in_signed]
       rescue GPGME::Error::General => exc
-        Schleuder.log.warn = "gpgme returned a general error. Most likely this is due to unexpected input, but as you never know here's the input and the exception:\ninput:\n#{str.inspect}\n#{exc.to_s}\n#{exc.backtrace[0..9].join("\n")}"
+        Schleuder.log.warn "gpgme returned a general error. Most likely this is due to unexpected input, but as you never know here's the input and the exception:\ninput:\n#{str.inspect}\n#{exc.to_s}\n#{exc.backtrace[0..9].join("\n")}"
         [str, nil, nil]
       end
       

data/lib/schleuder/list.rb

@@ -88,10 +88,27 @@ module Schleuder
       else
         @config = ListConfig.new(data)
       end
-      _write(YAML::dump(@config.to_hash), File.join(listdir, Schleuder.config.lists_configfile))
+      _write(YAML::dump(@config.to_hash), configfile)
       @config
     end
-    
+
+    # Returns path to the list configuration file
+    def configfile
+      # If `lists_configfile` ends with a '/', assume its pointing to a
+      # directory where configuration files are named "$DOMAIN/$LISTNAME.conf".
+      if Schleuder.config.lists_configfile.end_with?('/')
+        local_part, domain = listname.split('@')
+        if domain.nil?
+          # pre 2.2 style
+          File.join(Schleuder.config.lists_configfile, "#{local_part}.conf")
+        else
+          File.join(Schleuder.config.lists_configfile, domain, "#{local_part}.conf")
+        end
+      else
+        File.join(@listdir, Schleuder.config.lists_configfile)
+      end
+    end
+
     # Builds the bounce-address for the list
     def bounce_addr
       @bounce_addr ||= self.config.myaddr.gsub(/^(.*)@(.*)$/, '\1-bounce@\2')
@@ -146,7 +163,7 @@ module Schleuder
     # Loads the configuration
     def _load_config
         Schleuder.log.debug("reading list-config for: #{@listname}") unless Schleuder.log.nil?
-        @config = ListConfig.new(File.join(listdir, Schleuder.config.lists_configfile))
+        @config = ListConfig.new(configfile)
     end
 
     def find_by_key(ary, key)

data/lib/schleuder/log/listlogger.rb

@@ -18,6 +18,7 @@ module Schleuder
         require 'log4r/outputter/fileoutputter'
         filename = config.log_file
         filename = File.join(listdir, filename) unless filename[0..0].eql?('/')
+        filename = File.join(filename, "#{listname}.log") if filename.end_with?('/')
         add Log4r::FileOutputter.new("file",
                                        { :level => @level,
                                          :filename => filename,
@@ -27,10 +28,10 @@ module Schleuder
 
       if config.log_syslog
         require 'log4r/outputter/syslogoutputter'
-        syslogfmtr = Log4r::PatternFormatter.new(:pattern => "#{listname}\t%M")
+        syslogfmtr = Log4r::PatternFormatter.new(:pattern => "#{listname}: %M")
         add Log4r::SyslogOutputter.new("syslog",
                                          { :level => @level,
-                                           :ident => 'Schleuder',
+                                           :ident => 'schleuder',
                                            :facility => "LOG_MAIL",
                                            :formatter => syslogfmtr }
                                       )

data/lib/schleuder/log/outputter/emailoutputter.rb

@@ -6,6 +6,8 @@ module Schleuder
               :from => Schleuder.config.myaddr,
               :'error-to' => Schleuder.config.superadminaddr,
               :subject => 'Error',
+              :server => Schleuder.config.smtp_host,
+              :port => Schleuder.config.smtp_port,
               :immediate_at => 'ERROR, FATAL',
               :formatter => formatter,
               :domain => 'schleuder', # necessary for log4r from debian "stable"

data/lib/schleuder/log/schleuderlogger.rb

@@ -8,13 +8,24 @@ module Schleuder
       super 'log4r'
       # The initial log_level is inherited by all outputters.
       @level = eval("Log4r::#{Schleuder.config.log_level.upcase}")
-      pattern = "%d Schleuder %l\t%M"
-      formatter = Log4r::PatternFormatter.new(:pattern => pattern)
-      add Log4r::FileOutputter.new('file',
-                                   { :level => @level,
-                                     :filename => Schleuder.config.log_file,
-                                     :formatter => formatter }
-                                  )
+      if Schleuder.config.log_file == 'syslog'
+        formatter = Log4r::PatternFormatter.new(:pattern => "%M")
+        require 'log4r/outputter/syslogoutputter'
+        add Log4r::SyslogOutputter.new('syslog',
+                                       { :level => @level,
+                                         :ident => 'schleuder',
+                                         :facility => "LOG_MAIL",
+                                         :formatter => formatter }
+                                      )
+      else
+        pattern = "%d Schleuder %l\t%M"
+        formatter = Log4r::PatternFormatter.new(:pattern => pattern)
+        add Log4r::FileOutputter.new('file',
+                                     { :level => @level,
+                                       :filename => Schleuder.config.log_file,
+                                       :formatter => formatter }
+                                    )
+      end
       add MetaEmailOutputter.new('email',
                                  {:to => Schleuder.config.superadminaddr,
                                   :immediate_at => 'ERROR, FATAL'})

data/lib/schleuder/mail.rb

@@ -326,7 +326,7 @@ module Schleuder
       new = Mail.new
       new.crypt = crypt
       # add some headers we want to keep
-      new.content_type = self['content-type'].to_s if self['content-type']
+      new.content_type = self['content-type'].to_s if self['content-type'] && !self['content-type'].illegal?
       new.disposition = self._disposition
       new.encoding = self.encoding.to_s
       new.subject = _quote_if_necessary(self.subject.to_s,'UTF-8')
@@ -349,8 +349,9 @@ module Schleuder
 
     def individualize_member(recv)
       new = self.individualize(recv)
-      _message_ids(new) if Schleuder.list.config.keep_msgid
-      _list_headers(new) if Schleuder.list.config.include_list_headers
+      new = _message_ids(new) if Schleuder.list.config.keep_msgid
+      new = _list_headers(new) if Schleuder.list.config.include_list_headers
+      new
     end
 
     # Strips keywords from self and stores them in @+keywords+
@@ -366,7 +367,7 @@ module Schleuder
         a = b.body.split("\n")
 
         a.map! do |line|
-          if line.match(/^X-.*/)
+          if line.match(/^X-.*/i)
             Schleuder.log.debug "found keyword-line: #{line.chomp}"
             key, val = $&.split(/:|: | /, 2)
             keyword = key.slice(2..-1).strip
@@ -377,7 +378,7 @@ module Schleuder
               line
             else
               # Split values to catch multiple values separated by comma or the like (deprecated).
-              values = val.to_s.strip.split(/[ ,;]+/)
+              values = val.to_s.strip.split(/[,;]+/)
               values << ' ' if values.empty?
               values.each do |v|
                 Schleuder.log.info "Storing keyword #{keyword} with value #{v.inspect}"
@@ -426,73 +427,77 @@ module Schleuder
     def process_plugins!
       if self.keywords.empty?
         Schleuder.log.info 'No keywords present, skipping plugins'
-      elsif File.directory? Schleuder.config.plugins_dir
-        replymsg = ""
-        # We might want to replace the object later, which we can't do with self.
-        mail = self
-        plugins = {:request => [], :list => []}
-        ptype = (self.request? ? :request : :list)
-        used_keywords = []
-        Plugin.signing_key(self)
-        Dir[Schleuder.config.plugins_dir + '/*_plugin.rb'].each do |plugfile|
-          Schleuder.log.debug "Instanciating #{plugfile} as plugin"
-          require plugfile
-          # interpreting class name from file name
-          classname = File.basename(plugfile, '.rb').split('_').collect { |p| p.capitalize }.join
-          plugin = instance_eval(classname).new
-          Schleuder.log.debug "Storing plugin in plugin-list '#{plugin.plugin_type}'"
-          plugins[plugin.plugin_type] << plugin
-        end
-        # This is neither elegant nor fast, but it's got to live only until the rewrite.
-        Schleuder.log.debug "Processing #{ptype}-plugins"
-        self.keywords.each do |kwhash|
-          keyword = kwhash.keys.first
-          value = kwhash.values.first
-          Schleuder.log.debug "Looping for keyword #{keyword}"
-          plugins[ptype].each do |plugin|
-            command = keyword.downcase.gsub(/-/, '_')
-            Schleuder.log.debug "Does #{plugin.class}.respond_to? '#{command}'"
-            if plugin.respond_to?(command)
-              Schleuder.log.debug "Yes it does, executing #{plugin.class}.#{command}"
-              used_keywords << keyword
-              foo = plugin.send(command, mail, value)
-              case foo
-              when String
-                Schleuder.log.debug "Method returned a string, saving it for reply to sender."
-                replymsg << foo << "\n\n\n"
-              when Mail
-                Schleuder.log.debug "Method returned a Mail-object, replacing myself by it."
-                mail = foo
-              else
-                Schleuder.log.debug "Method returned '#{foo.inspect}', don't know how to handle, skipping."
+      else
+        Schleuder.config.plugins_dir.each do |plugins_dir|
+          if File.directory?(plugins_dir)
+            replymsg = ""
+            # We might want to replace the object later, which we can't do with self.
+            mail = self
+            plugins = {:request => [], :list => []}
+            ptype = (self.request? ? :request : :list)
+            used_keywords = []
+            Plugin.signing_key(self)
+            Dir[plugins_dir + '/*_plugin.rb'].each do |plugfile|
+              Schleuder.log.debug "Instanciating #{plugfile} as plugin"
+              require plugfile
+              # interpreting class name from file name
+              classname = File.basename(plugfile, '.rb').split('_').collect { |p| p.capitalize }.join
+              plugin = instance_eval(classname).new
+              Schleuder.log.debug "Storing plugin in plugin-list '#{plugin.plugin_type}'"
+              plugins[plugin.plugin_type] << plugin
+            end
+            # This is neither elegant nor fast, but it's got to live only until the rewrite.
+            Schleuder.log.debug "Processing #{ptype}-plugins"
+            self.keywords.each do |kwhash|
+              keyword = kwhash.keys.first
+              value = kwhash.values.first
+              Schleuder.log.debug "Looping for keyword #{keyword}"
+              plugins[ptype].each do |plugin|
+                command = keyword.downcase.gsub(/-/, '_')
+                Schleuder.log.debug "Does #{plugin.class}.respond_to? '#{command}'"
+                if plugin.respond_to?(command)
+                  Schleuder.log.debug "Yes it does, executing #{plugin.class}.#{command}"
+                  used_keywords << keyword
+                  foo = plugin.send(command, mail, value)
+                  case foo
+                  when String
+                    Schleuder.log.debug "Method returned a string, saving it for reply to sender."
+                    replymsg << foo << "\n\n\n"
+                  when Mail
+                    Schleuder.log.debug "Method returned a Mail-object, replacing myself by it."
+                    mail = foo
+                  else
+                    Schleuder.log.debug "Method returned '#{foo.inspect}', don't know how to handle, skipping."
+                  end
+                  next
+                else
+                  Schleuder.log.debug "No it doesn't."
+                end
+              end
+              # Generate error-message if no plugin was executed
+              unless used_keywords.include?(keyword)
+                msg = "No #{ptype}-plugin responded to keyword #{keyword}"
+                Schleuder.log.debug msg
+                if mail.request?
+                  replymsg << "Error: #{msg}.\n\n"
+                else
+                  mail.metadata[:error] << msg
+                end
               end
-              next
-            else
-              Schleuder.log.debug "No it doesn't."
             end
-          end
-          # Generate error-message if no plugin was executed
-          unless used_keywords.include?(keyword)
-            msg = "No #{ptype}-plugin responded to keyword #{keyword}"
-            Schleuder.log.debug msg
+            # Decide how to go on: reply or list?
             if mail.request?
-              replymsg << "Error: #{msg}.\n\n"
-            else
-              mail.metadata[:error] << msg
+              Schleuder.log.debug "Message is a request, sending plugins-output back to sender."
+              if replymsg.empty?
+                replymsg = 'The keywords you sent did not produce any output. If you feel this is an error please contact the adminisrators of this list.'.fmt
+              end
+              # This exits.
+              Plugin.reply(mail, replymsg, used_keywords)
             end
+          else
+            Schleuder.log.error "#{plugins_dir} does not exist or is not readable!"
           end
         end
-        # Decide how to go on: reply or list?
-        if mail.request?
-          Schleuder.log.debug "Message is a request, sending plugins-output back to sender."
-          if replymsg.empty?
-            replymsg = 'The keywords you sent did not produce any output. If you feel this is an error please contact the adminisrators of this list.'.fmt
-          end
-          # This exits.
-          Plugin.reply(mail, replymsg, used_keywords)
-        end
-      else
-        Schleuder.log.error "#{Schleuder.config.plugins_dir} does not exist or is not readable!"
       end
     end
 

data/lib/schleuder/processor.rb

@@ -39,7 +39,7 @@ module Schleuder
 
   class Processor
     def self.run(listname, message)
-      Schleuder.listname listname
+      Schleuder.listname(listname)
       Schleuder.origmsg = message
       Schleuder.log.debug "Testing if list-dir exists"
       unless File.directory?(List.listdir(listname))
@@ -127,7 +127,7 @@ module Schleuder
       end
 
       if Schleuder.list.config.receive_authenticated_only && !(mail.from_member || mail.from_admin)
-        self.bounce_or_drop "not authenticated", "This address accepts only messages validly signed by a list-member's key.", mail
+        self.bounce_or_drop "not authenticated", "This address requires properly signed emails by its list-members. Either the signature can't be verified or is missing.", mail
       end
 
       if Schleuder.list.config.receive_from_member_emailaddresses_only && !(mail.from_member_address?||mail.from_admin_address?)
@@ -135,7 +135,7 @@ module Schleuder
       end
 
       if Schleuder.list.config.receive_admin_only && !mail.from_admin
-        self.bounce_or_drop "not authenticated as admin", "This address accepts only messages validly signed by a list-admin's key.", mail
+        self.bounce_or_drop "not authenticated as admin", "This address requires properly signed emails by its list-admins. Either the signature can't be verified or is missing.", mail
       end
 
       if mail.to.to_a.include?(Schleuder.list.request_addr)
@@ -337,7 +337,7 @@ module Schleuder
 
       # if we're still alive: bounce message
       Schleuder.log.info "bouncing mail to sender"
-      self.bounce_notify_admin status
+      self.bounce_notify_admin("#{status}. - #{bounce_msg}")
       $stdout.puts bounce_msg
       exit 100
     end

data/lib/schleuder/schleuder_config.rb

@@ -47,13 +47,13 @@ module Schleuder
     schleuder_attr :gpg_key_type, 'RSA'
 
     # GPG-Key length.
-    schleuder_attr :gpg_key_length, 2048
+    schleuder_attr :gpg_key_length, 4096
 
     # GPG-Sub-Key type.
     schleuder_attr :gpg_subkey_type, 'RSA'
 
     # GPG-Sub-Key length.
-    schleuder_attr :gpg_subkey_length, 2048
+    schleuder_attr :gpg_subkey_length, 4096
 
     ### END OF CONFIG OPTIONS
 
@@ -67,6 +67,9 @@ module Schleuder
 
       # overload with config
       super(config)
+
+      # turn @plugins_dir into an array if needed
+      @plugins_dir = [@plugins_dir] unless @plugins_dir.class == Array
     end
   end
 end

data/lib/schleuder/version.rb

@@ -1,3 +1,3 @@
 module Schleuder
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
 end

data/man/schleuder-newlist.8

@@ -34,6 +34,9 @@
 \~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~[\-mailuser \fIschleuder\fR]
 .
 .br
+\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~[\-mailgroup \fIschleuder\fR]
+.
+.br
 \~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~[\-nointeractive]
 .
 .SH "DESCRIPTION"
@@ -89,6 +92,10 @@ Specify the passphrase needed to access the private key specified in \fB\-privat
 Specify the system user account under which \fBschleuder\fR(8) will be executed (when run as root, this defaults to \fBschleuder\fR)\.
 .
 .TP
+\fB\-mailgroup\fR \fIschleuder\fR
+Specify the system group under which \fBschleuder\fR(8) will be executed (when run as root, this defaults to \fBschleuder\fR)\.
+.
+.TP
 \fB\-nointeractive\fR
 When specified, no questions will be asked to complete missing information\.
 .

data/plugins/manage_members_plugin.rb

@@ -79,22 +79,26 @@ module Schleuder
       email, mime = string.split(' ')
       mem = Member.new({:email => email})
       mem.mime = mime if mime
-      # TODO: test if address already subscribed
-      Schleuder.list.members = Schleuder.list.members << mem
-      msg = "#{mem}\n--> Member saved.\n\n"
-      if key
-        mail.crypt.add_key(key).imports.each do |i|
-          msg << "#{mail.crypt.key_descr(mail.crypt.get_key(i.fpr))}\n"
-          if i.status.eql? 1
-            msg << "--> Key imported.\n\n"
-          else
-            msg << "--> Key *not* imported (no error, maybe already present?).\n\n"
+      if Schleuder.list.members.any?{|m| m.email == mem.email }
+        msg = "--> Member is already part of the list. Nothing changed!"
+        msg << "\nExisting members-list:"
+      else
+        Schleuder.list.members = Schleuder.list.members << mem
+        msg = "#{mem}\n--> Member saved.\n\n"
+        if key
+          mail.crypt.add_key(key).imports.each do |i|
+            msg << "#{mail.crypt.key_descr(mail.crypt.get_key(i.fpr))}\n"
+            if i.status.eql? 1
+              msg << "--> Key imported.\n\n"
+            else
+              msg << "--> Key *not* imported (no error, maybe already present?).\n\n"
+            end
           end
+          msg << "\n"
         end
-        msg << "\n"
+        msg << "Updated members-list:"
       end
-      msg << "Updated members-list:\n\n#{_list_members(mail)}"
-      msg
+      msg << "\n\n#{_list_members(Schleuder.list.members)}"
     end
 
     def deletemember(mail, string)
@@ -110,7 +114,7 @@ module Schleuder
           msg = "Something failed. Please ask the maintainer of this list to figure out what\nhappened (e.g. by mailing to #{Schleuder.list.owner_addr}).\n"
         end
       end
-      msg << "\nUpdated members-list:\n\n#{_list_members(mail)}\n"
+      msg << "\nUpdated members-list:\n\n#{_list_members(Schleuder.list.members)}\n"
       msg
     end
 

data/plugins/sign_this_plugin.rb

@@ -0,0 +1,14 @@
+# Clearsigns the incoming body and sends the signed text back.
+# Useful if the public key of a list is widely known: Let schleuder sign e.g.
+# the fingerprints of your email servers certificates, and publish them online.
+module Schleuder
+  class SignThisPlugin < Plugin
+    def initialize
+      @plugin_type = :request
+    end
+
+    def sign_this(mail)
+      mail.crypt.clearsign(mail.body)
+    end
+  end
+end

metadata

@@ -1,49 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: schleuder
 version: !ruby/object:Gem::Version
-  version: 2.2.3
-  prerelease: 
+  version: 2.2.4
 platform: ruby
 authors:
+- lunar
 - paz
 - ng
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROakNDQWg2Z0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJCTVJNd0VRWURWUVFEREFwelky
-  aHMKWlhWa1pYSXlNUlV3RXdZS0NaSW1pWlB5TEdRQkdSWUZibUZrYVhJeEV6
-  QVJCZ29Ka2lhSmsvSXNaQUVaRmdOdgpjbWN3SGhjTk1USXdOakEyTVRreE5E
-  STBXaGNOTVRNd05qQTJNVGt4TkRJMFdqQkJNUk13RVFZRFZRUUREQXB6Clky
-  aHNaWFZrWlhJeU1SVXdFd1lLQ1pJbWlaUHlMR1FCR1JZRmJtRmthWEl4RXpB
-  UkJnb0praWFKay9Jc1pBRVoKRmdOdmNtY3dnZ0VpTUEwR0NTcUdTSWIzRFFF
-  QkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDaEdydW9ObnEzSXI3ZApGZCtrdEcw
-  dE1abG0yWlNPa3VITzVRUnJnWUxnYkJocFRFZjhpNkFqem9WTDBBSUMrdU1N
-  Vlk5aUU2ZnphS1VECkI3U3ZOdGNjSHNrWDZ6SFVWVnRTcUY5VnBiUW9tV3Bj
-  azBpQnF3UUl3NHZFTGUyaVorL1pVTEtJSkkvQlk0M3kKdFg3T3JhOGl6U3lQ
-  R2N1NkUxZnI1UEpJNmlnRm5sRWdzL2pDalAvSllIZi9mNDlmbkl6QUpnTzBR
-  N1lOTkpWcgpSMFpxbTFIYllFMnQrUnRvbVQyamdDakJ0RjQyaFg4K2dCNHlW
-  NW5lZGZIS3laZkQ2emQ3ZG9QRS9wZHRwbjgwCkJyUlFiSFhsRVBEQ2FkSEgw
-  MTNqN29MN0I1ZkpsSGVqWDZQRmZQdGVwcTNhZERRL08zbEZ2emZIdUpVR2pF
-  TzUKUVhwN2w1K2ZBZ01CQUFHak9UQTNNQWtHQTFVZEV3UUNNQUF3SFFZRFZS
-  ME9CQllFRklHMUc1UHhBMWxOL0JVWQprb212bHRzT1dDVGVNQXNHQTFVZER3
-  UUVBd0lFc0RBTkJna3Foa2lHOXcwQkFRVUZBQU9DQVFFQWtrTDRWWVhPCmlI
-  YzQ5bHFrMU9FL2IzWFZYWGdiQlZ1aHhvTkpYZC9oSjRlTmVxbVpydWMrZDlX
-  bEJIYTlVVFRGZ3JmUkxOcmsKSkRaSnc5Y3E5NmI0TmxsaG54Q2xpZ21SZXQ0
-  RkpmYWVtYS9naTZZN0lWRmZMUG5nVVhDUGN1SUNGOXBKd05HcwpLSUVndEE1
-  TmNVMitJZFpLekowRnBoV3pIRlRpVytMd1Uyb0lTTEhwTXhXZVhZSXNLTW9x
-  MjM4U3k3Y1l3emQ3CnZhZEhrZHMzNTRsbU4vajNhYW1kTXJyeHUyOTlvdTh1
-  am9IbGcxK3IxNjlsa2J1VHdXbEI2RlVXT1J3emhvMWIKOFlJWWRpT29jUHdm
-  Zi9BZ3l3UVdGZDRGV2VNV0xQeXRkK1VndzZCSmZSSXY2VC9OTVJKWWRIUDJW
-  M1RTUVJyTApSYXNUTTVlUzIrK3EwQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
-  LS0tLS0K
-date: 2012-07-04 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRMwEQYDVQQDDApzY2hs
+  ZXVkZXIyMRUwEwYKCZImiZPyLGQBGRYFbmFkaXIxEzARBgoJkiaJk/IsZAEZFgNv
+  cmcwHhcNMTMwOTI5MjAwNzQxWhcNMTQwOTI5MjAwNzQxWjBBMRMwEQYDVQQDDApz
+  Y2hsZXVkZXIyMRUwEwYKCZImiZPyLGQBGRYFbmFkaXIxEzARBgoJkiaJk/IsZAEZ
+  FgNvcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChGruoNnq3Ir7d
+  Fd+ktG0tMZlm2ZSOkuHO5QRrgYLgbBhpTEf8i6AjzoVL0AIC+uMMVY9iE6fzaKUD
+  B7SvNtccHskX6zHUVVtSqF9VpbQomWpck0iBqwQIw4vELe2iZ+/ZULKIJI/BY43y
+  tX7Ora8izSyPGcu6E1fr5PJI6igFnlEgs/jCjP/JYHf/f49fnIzAJgO0Q7YNNJVr
+  R0Zqm1HbYE2t+RtomT2jgCjBtF42hX8+gB4yV5nedfHKyZfD6zd7doPE/pdtpn80
+  BrRQbHXlEPDCadHH013j7oL7B5fJlHejX6PFfPtepq3adDQ/O3lFvzfHuJUGjEO5
+  QXp7l5+fAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBSBtRuT8QNZTfwVGJKJr5bbDlgk3jAfBgNVHREEGDAWgRRzY2hsZXVkZXIyQG5h
+  ZGlyLm9yZzAfBgNVHRIEGDAWgRRzY2hsZXVkZXIyQG5hZGlyLm9yZzANBgkqhkiG
+  9w0BAQUFAAOCAQEAOW1oNWquxZegMjQDZF3yTDsXbDAs4JYsLEbjnD2z32nMGvat
+  wDxKD0g3XIPHEoEi28/3n6C4Py2J+P7gUObr+wWF8G67nwg2tDjarOia93RcpxqW
+  n4NKeyRmvEzQ+yU+X9xiwJ005mc2ME2j3QF+sjDxgd+uCN0ZT77qz2Kk4iuCGOrM
+  cuTmrcZdTiHkGhK7UtDn7nk3ShgwrtyC0SqPna+PUMYkPr5FQLVwsOHGExOtVHZX
+  +VhPezxtXTAQ0pIYXF5NssxnhcngHV8fPs0g4gbU0RRKar9egfgZ8cVITgVauVPt
+  HdW17U59V5gWNuJBqqwiV2PJubSZekUq/YMdtg==
+  -----END CERTIFICATE-----
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gpgme
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -51,7 +44,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -59,59 +51,49 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: ruby-filemagic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.2
-description: ! 'Schleuder is a group''s gateway: subscribers can communicate encrypted
-  (and pseudonymously) among themselves, receive emails from non-subscribers and send
-  emails to non-subscribers via the list.
+description: |-
+  Schleuder is a group's gateway: subscribers can communicate encrypted (and pseudonymously) among themselves, receive emails from non-subscribers and send emails to non-subscribers via the list.
 
-
-  Schleuder takes care of all decryption and encryption, stripping of headers, formatting
-  conversions, etc. Schleuder can also send out its own public key upon request and
-  process administrative commands by email.'
+  Schleuder takes care of all decryption and encryption, stripping of headers, formatting conversions, etc. Schleuder can also send out its own public key upon request and process administrative commands by email.
 email: schleuder2@nadir.org
 executables:
 - schleuder
@@ -154,6 +136,7 @@ files:
 - plugins/manage_members_plugin.rb
 - plugins/manage_self_plugin.rb
 - plugins/resend_plugin.rb
+- plugins/sign_this_plugin.rb
 - plugins/version_plugin.rb
 - README
 - LICENSE
@@ -165,29 +148,33 @@ files:
 - bin/schleuder-init-setup
 - bin/schleuder-migrate-v2.1-to-v2.2
 homepage: http://schleuder2.nadir.org
-licenses: []
-post_install_message: ! "\n\n    Note: There's still one dependency missing, which
-  we can't install in\n    this run of rubygems.  Please execute schleuder-fix-gem-dependencies
-  to\n    complete the installation!\n\n"
+licenses:
+- GPL-2
+metadata: {}
+post_install_message: |2+
+
+
+      Note: There's still one dependency missing, which we can't install in
+      this run of rubygems.  Please execute schleuder-fix-gem-dependencies to
+      complete the installation!
+
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ! '[none]'
-rubygems_version: 1.8.24
+rubyforge_project: '[none]'
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: ! 'Schleuder is a group''s gateway: a gpg-enabled mailinglist with remailing-capabilities.'
+specification_version: 4
+summary: 'Schleuder is a group''s gateway: a gpg-enabled mailinglist with remailing-capabilities.'
 test_files: []