sugoi-mail 0.1.5 → 0.3.0

data/INSTALL

@@ -19,7 +19,10 @@ My recommendation:
 # wget http://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.5-p12.tar.gz
 # tar zxvf ruby-1.8.5-p12.tar.gz
 # cd ruby-1.8.5-p12
-# ./configure --prefix=/usr/local && make && make check && make install
+# ./configure --prefix=/usr/local
+# make 
+# make check 
+# make install
 # cd /usr/local/src
 # wget http://rubyforge.org/frs/download.php/11289/rubygems-0.9.0.tgz
 # tar zxvf rubygems-0.9.0.tgz
@@ -94,7 +97,7 @@ b) Create a file called "transport" in /etc/postfix/, to assign the domains for
 
 where my.domain.jp can be changed to your liking, and "sugoi" is the name specified in step 2a. This would mean that all mail to xxx@my.domain.jp will be handled by sugoi mail's mailc client. You may add more domains on separate lines in the same format.
 
-c) Postfix reads transport configuration files in binary format, text. This means you need to convert the file you just created into the proper format. Run the following to create 'transport.db', a postfix-readable file:
+c) Postfix reads transport configuration files in binary format, not text. This means you need to convert the file you just created into the proper format. Run the following to create 'transport.db', a postfix-readable file:
 
 "sudo postmap transport"
 

data/app/controllers/commandline_controller.rb

@@ -1,7 +1,10 @@
 require 'highline/import'
 
+class UnknownAction < RuntimeError; end
+
 # Controller for command line thingies
 class CommandlineController < ApplicationController
+
     def perform_action
         if self.class.action_methods.include?(action_name.to_s) || 
            self.class.action_methods.include?('method_missing')
@@ -13,4 +16,17 @@ class CommandlineController < ApplicationController
             raise UnknownAction, "No action responded to #{action_name}", caller
         end
     end
+
+    def method_missing(meth, *params)
+        possibles=action_methods.grep(/^#{meth}/)
+        case possibles.length
+        when 0
+            raise UnknownAction, "No action responded to #{action_name}", caller
+        when 1
+            self.action_name = possibles[0]
+            send(possibles[0], *params)
+        else
+            raise UnknownAction, "More than one command starts with #{meth}"
+        end
+    end
 end

data/app/controllers/root_admin_controller.rb

@@ -4,7 +4,7 @@ class RootAdminController < MailserviceController
     
     end
 
-# Returns true if the user is an administrator and false otherwise
+    # Returns true if the user is an administrator and false otherwise
     def is_admin
         user_admin? rescue false
     end
@@ -70,277 +70,4 @@ class RootAdminController < MailserviceController
         render :controller => 'mailservice', :action => 'admin_mailinglists_all'
     end
 
-
-
-
-
-
-
-
-
-#    model :mailinglist
-
-#    private
-#    def get_password
-#        password = ask "Password: " do |q| q.echo = false end
-#        confirmation = ask "Confirm: " do |q| q.echo = false end
-#        
-#        return [ password, confirmation ]
-#    end
-#
-#    def format_errors errors
-#        errors.map do |facility, text|
-#            "    #{facility}: #{text}\n"
-#        end
-#    end
-#
-#    def error(error_text)
-#        callername = caller[0].gsub(/.*\`(\w+)\'.*/, '\1')
-#        @error = "#{callername}: #{error_text}"
-#        nil
-#    end
-#
-#    def message(message_text)
-#        callername = caller[0].gsub(/.*\`(\w+)\'.*/, '\1')
-#        @messages ||= []
-#        @messages << "#{callername}: #{message_text}"
-#    end
-#
-#    def ask_description(thing)
-#        description = ask "Description for #{thing}: "
-#        if description == "" then description = nil end
-#        description
-#    end
-#
-#    public
-#
-#    def init
-#        @alreadythere = []
-#        [ MailinglistClass, AdminMessage, SysConfig, Help ].each do |table|
-#            fixture = YAML.load(File.read(File.join(RAILS_ROOT,
-#                                                    "test",
-#                                                    "fixtures",
-#                                                    table.name.tableize + 
-#                                                        ".yml")))
-#            fixture.values.sort_by do |values| values["id"].to_i end . 
-#                each do |values|
-#                begin
-#                    table.find values["id"]
-#                    @alreadythere << "%s[%s]" % [ table.name, values["id"] ]
-#                rescue ActiveRecord::RecordNotFound
-#                    configvar = table.new values
-#                    configvar.id = values["id"].to_i # hohoho
-#                    configvar.save
-#                end
-#            end
-#        end
-#    end
-#
-#    def show_config(var_name=nil)
-#        unless var_name
-#            @config_vars = SysConfig.find_all
-#        else
-#            @config_vars = SysConfig.find_all_by_name(var_name)
-#        end
-#    end
-#
-#    def set_config(var_name, new_value)
-#        @config_var = SysConfig.find_by_name(var_name)
-#        @config_var.value = new_value
-#        @config_var.save
-#    end
-#
-#    def list_domains
-#        @domains = Domain.find_all
-#    end
-#
-#    def list_mailinglists#(domain_name)
-#        flash[:notice] = "List of Mailing Lists"
-##        domain = Domain.find_by_name(domain_name)
-##        if domain then
-##            @mailinglists = domain.mailinglists
-##        else
-##            error "#{domain_name}: not found"
-##        end
-#    end
-#
-#    def list_addresses#(mailinglist_address)
-##        @mailinglist = Mailinglist.find_by_address(mailinglist_address)
-##        if @mailinglist then 
-##            @mailinglist=@mailinglist[0]
-##            @addresses = @mailinglist.addresses
-##        else
-##            error "#{mailinglist_address}: not found"
-##        end
-#    end
-#
-#    def add_user #domain_name, username, 
-##                    email_address = nil, 
-##                    description = nil
-##        domain = Domain.find_by_name domain_name
-##        if domain then
-##            password, password_confirmation = get_password
-##
-##            if email_address == nil then
-##                email_address = ask "Address to forward #{username}'s email to: "
-##                if email_address == "" then email_address = nil end
-##            end
-##
-##            description ||= ask_description(username)
-##
-##            user = User.new
-##            user.domain = domain
-##            user.login = username
-##            user.password = password
-##            user.password_confirmation = password_confirmation
-##            user.description = description
-##            user.domainadmin = false
-##            user.mailadmin = false
-##            
-##            if user.save then
-##                message "User \"#{username}@#{domain_name}\" created successfully"
-##                if email_address then
-##                    addr=Address.find_or_create_by_address(email_address)
-##                    user.addresses << addr
-##                end
-##            else
-##                error "User \"#{username}@#{domain_name}\" was not created:\n" + 
-##                    format_errors(user.errors).join("\n")
-##            end
-##        else
-##            error "Domain \"#{domain_name}\" does not exist."
-##        end
-#    end
-#
-#    def list_users# domain_name
-#        flash[:notice] = "List of users"
-##        domain = Domain.find_by_name domain_name
-##        if domain then
-##            @users = User.find_all_by_domain_id domain.id
-##        else
-##            error "Domain \"#{domain_name}\" does not exist."
-##        end
-#    end
-#
-#    def list_mailinglist_classes
-#        @mailinglist_classes = MailinglistClass.find :all, :order => :id
-#    end
-#
-#    def list_mlclasses
-#        list_mailinglist_classes
-#        render "sugoi_admin/list_mailinglist_classes"
-#    end
-#    
-#    def remove_user
-#    end
-#    
-#    def unsubscribe_self
-#    end
-#    
-#    def unsubscribe_user
-#    end
-#    
-#    def edit_user_list
-#    end
-#    
-#    def change_user_password
-#    end
-#    
-#    def remove_mailinglist
-#    end
-#    
-#    def edit_mailinglist
-#    end
-#    
-#    def add_address
-#    end
-#    
-#    def remove_address
-#    end
-#    
-#    def edit_address
-#    end
-#    
-#    def show_address
-#    end
-#    
-#    def show_mailinglist
-#    end
-#    
-#    def show_user
-#    end
-#    
-#    def add_mailinglist mailinglist_name, 
-        #domain_name, user_name, description = nil, mailinglist_class_id = 2
-#
-#        mlclass = begin 
-#                      MailinglistClass.find mailinglist_class_id.to_i
-#                  rescue ActiveRecord::RecordNotFound
-#                      nil
-#                  end
-#        unless mlclass
-#            return error("Invalid mailing list class: #{mailinglist_class_id}")
-#        end
-#
-#        domain = Domain.find_by_name domain_name 
-#        unless domain
-#            return error("Domain \"#{domain_name}\" not found.")
-#        end
-#
-#        user = User.find_by_login_and_domain_id user_name, domain.id 
-#        unless user
-#            return error("User \"#{user_name}\" not found "+
-#                         "in domain \"#{domain_name}\".")
-#        end
-#
-#        ml=Mailinglist.new
-#        ml.user = user
-#        ml.description = description
-#        ml.mailinglist_class = mlclass
-#        ml.name = mailinglist_name
-#
-#        if ml.save then
-#            message "Mailing list \"#{ml.address}\" created successfully."
-#        end
-#    end
-#
-#    def subscribe(mailinglist_address, new_address)
-#       address=Address.find_or_create_by_address new_address
-#       ml=Mailinglist.find_by_address(mailinglist_address)
-#       unless ml
-#           return error("Mailing list \"#{mailinglist_address}\" not found.")
-#       end
-#       ml=ml[0]
-#       ml.addresses << address
-#       message "Subscribed \"#{new_address}\" to \"#{mailinglist_address}\"" 
-#    end
-#
-#    def unsubscribe(mailinglist_address, address_to_remove)
-#        address = Address.find_by_address address_to_remove
-#        unless address
-#            return error("Address \"#{address_to_remove}\" unknown.")
-#        end
-#
-#        mailinglist = Mailinglist.find_by_address mailinglist_address
-#        unless mailinglist
-#            return error("Mailing list \"#{mailinglist_address}\" unknown.")
-#        end
-#
-#        @mailinglist = mailinglist[0]
-#
-#        unless @mailinglist.addresses.member? address
-#            return error("Address \"#{address}\" not in " + "
-#                mailing list \"#{mailinglist_address}\"")
-#        end
-#
-#        @removed_addresses=@mailinglist.remove_addresses address
-#    end
-#
-#    def help(command=nil)
-#        if command
-#            @help = Help.find_by_facility_and_command self.class.name, command
-#        else
-#            @help = Help.find_all_by_facility self.class.name
-#        end
-#    end
 end

data/app/controllers/sugoi_admin_controller.rb

@@ -144,7 +144,7 @@ class SugoiAdminController < CommandlineController
                 message "User \"#{username}@#{domain_name}\" created successfully"
                 if email_address then
                     addr=Address.find_or_create_by_address(email_address)
-                    user.addresses << addr
+                    user.mailinglist.subscribe(addr)
                 end
             else
                 error "User \"#{username}@#{domain_name}\" was not created:\n" + 

data/app/models/mailinglist.rb

@@ -34,11 +34,12 @@
 #                               subscriber when she unsubscribes from the
 #                               mailing list.
 
+class ForwardingAlreadySubscribedError < Exception; end
 class AlreadySubscribedError < Exception; end
 
 class Mailinglist < ActiveRecord::Base
     belongs_to :user
-    has_and_belongs_to_many :addresses, :before_add => :validate_unique_address
+    has_and_belongs_to_many :addresses, :before_add => [ :validate_unique_address, :validate_no_duplicate_forwarding ]
     has_many :messages
     has_many :proxy_links
     validates_each :name, :on => :create do |record, attr, value|
@@ -55,7 +56,15 @@ class Mailinglist < ActiveRecord::Base
     end
 
     def validate_unique_address address
-        raise AlreadySubscribedError if addresses.member? address
+        if addresses.member? address
+            raise AlreadySubscribedError 
+        end
+    end
+
+    def validate_no_duplicate_forwarding address
+        if Address.proxyaddress(address.address) and mailinglist_class.id == 1 #XXX MAGIC CONSTANT XXX
+            raise ForwardingAlreadySubscribedError 
+        end
     end
 
     validates_associated :user, :on => :create
@@ -148,6 +157,10 @@ class Mailinglist < ActiveRecord::Base
         # "#{name}-request@#{user.domain.name}"  # XXX MAGIC CONSTANT XXX
     end
 
+
+    #NOTE: THIS RETURNS AN ARRAY!!!!
+    # the ML object is the [0]'th index of the array
+
     def self.find_by_address addr
         if ml = find_by_basic_address(addr) then
             return [ml,:mail]
@@ -201,6 +214,24 @@ class Mailinglist < ActiveRecord::Base
         end
     end
 
+    #this function is for the GUI's search
+    def addresses_by_searchstring_and_filter(searchstring, filter)
+        addresses_filtered = addresses.find(:all, :conditions => ['address like ?', searchstring+'%'])
+        case filter
+        when 'confirmed'
+            addresses_filtered.each do |addr|
+                if addr.confirmed? then addr end
+            end    
+        when 'unconfirmed'
+            addresses_filtered.each do |addr|
+                if not addr.confirmed? then addr end
+            end
+        else
+            #assume 'all'
+            addresses_filtered
+        end
+    end
+
     def confirmed_addresses
         addresses.find_all { |addr| confirmed? addr }
     end
@@ -239,8 +270,13 @@ class Mailinglist < ActiveRecord::Base
     end
 
     def subscribe(address,confirmationcode = nil)
-        addr=Address.find_or_create_by_address(address) unless Address === address
-        if confirmation? #used to be confirmation? but that method doesn't appear to exist!
+        if Address === address then
+            addr = address
+        else
+            addr = Address.find_or_create_by_address(address)
+        end
+
+        if confirmation? 
             if confirmed_addresses.member? addr
                 true
             else
@@ -252,6 +288,9 @@ class Mailinglist < ActiveRecord::Base
                         send_welcome_message(addr)
                     rescue AlreadySubscribedError
                         true
+                    rescue ForwardingAlreadySubscribedError
+                        errors.add "address", "already has a forwarding address"
+                        false
                     end
                 end
             end
@@ -260,6 +299,9 @@ class Mailinglist < ActiveRecord::Base
                 addresses << addr
             rescue AlreadySubscribedError
                 true
+            rescue ForwardingAlreadySubscribedError
+                errors.add "address", "already has a forwarding address"
+                false
             end
         end
     end

data/app/models/message.rb

@@ -2,7 +2,6 @@ require "date"
 require "gurgitate/mailmessage"
 require "net/smtp"
 require "socket"
-# require "pp"
 
 # The Message class is one of the most important classes in
 # sugoi-mail--mainly because it *does* so much.  But anyway.  Herewith a
@@ -12,10 +11,14 @@ require "socket"
 # behaves.  It makes considerable use of gurgitate-mail's mail-parsing
 # library, so it might not be a bad idea to familiarize yourself with
 # that if trying to work on this.
+
+class UnregisteredUserException < Exception; end
+
 class Message < ActiveRecord::Base
     belongs_to :mailinglist
     belongs_to :address
     acts_as_tree :order => "timestamp"
+    serialize :envelope_to, Array
     # has_and_belongs_to_many :mailinglists
 
     class << self
@@ -86,13 +89,15 @@ class Message < ActiveRecord::Base
                         t
                     end
                 end
-
                 message.address.save if message.address.new_record?
 
                 ml, type = Mailinglist.find_by_address(message.envelope_to[0])
-
-                if type == :mail and ml then
-                    message.mailinglist = ml
+                
+                if ml then    
+                    if type == :mail then
+                        message.mailinglist = ml
+                        message.save
+                    end
                 end
 
                 return message
@@ -106,7 +111,6 @@ class Message < ActiveRecord::Base
     end
 
     private
-
     # Extracts the bare email addresses from a header, without the extra
     # commentary like the real names.
     def pull_out_addresses header
@@ -146,7 +150,8 @@ class Message < ActiveRecord::Base
         # special-case closed mail to mailing lists owned by virtual users
         if mailinglist
             if mailinglist.closed?
-                if Mailinglist.find_by_address(envelope_to)[0].user.
+                if envelope_to[0] then
+                if Mailinglist.find_by_address(envelope_to[0])[0].user.
                     mailinglist.has_address? envelope_from then
                     if  mailinglist.user.description then
                         @mess.headers["From"] = "=?UTF-8?B?" + 
@@ -157,6 +162,7 @@ class Message < ActiveRecord::Base
                     end
                 # @mess.headers.instance_variable_set("@headers_changed",true)
                 end
+                end
             end
         end
     end
@@ -186,8 +192,7 @@ class Message < ActiveRecord::Base
                         @mess.headers[header_name] = newhdr
                     end
 
-                    if newhdr = proxified_plain_addr(@mess.headers[header_name],
-                                                     addr)
+                    if newhdr = proxified_plain_addr(@mess.headers[header_name],addr)
                         @mess.headers[header_name] = newhdr
                     end
                 end
@@ -195,7 +200,6 @@ class Message < ActiveRecord::Base
         end
     end
 
-
     # Rewrites the From:, To: and Cc: headers in the current message
     # to reflect mail proxy addresses instead of "real" addresses.
     def proxify_addresses
@@ -208,6 +212,38 @@ class Message < ActiveRecord::Base
         @mess.to_s
     end
 
+    def generate_envelope_data
+        if self.envelope_to and self.envelope_from then
+            matches = self.envelope_to[0].match(/(.*?)#(.*?)@(.*)/)
+ 
+            if matches then
+                localpart, destdomain, domain = matches[1..3]
+                to_address = "#{localpart}@#{destdomain}"
+                proxy_address=Address.proxyaddress(self.envelope_from)
+                if proxy_address
+                    #the 'funky' address rewriting 'thingy' is found
+                    self.envelope_to = [ to_address ]
+                    self.envelope_from = proxy_address
+                    return
+                else
+                    #the sender of the email does not have an LTMA
+                    raise UnregisteredUserException
+                    return
+                end
+            end
+        end           
+      
+        #if no envelope data is found, or 'To:' doesn need rewriting..
+        #default to the standard mailinglist mode     
+        if mailinglist.confirmation?
+            self.envelope_to = mailinglist.confirmed_addresses.map { |a| a.address }
+        else
+            self.envelope_to = mailinglist.expand_addresses.map { |a| a.address }
+        end
+        self.envelope_from = mailinglist.name + SysConfig.address_separator + SysConfig.bounce_suffix + "@" + mailinglist.user.domain.name
+
+    end
+
     public
 
     # Returns the text of the message that would be sent out by the
@@ -218,11 +254,10 @@ class Message < ActiveRecord::Base
             return smtpdetails[:custom_message]
         end
 
-        if mailinglist and 
-            ( mailinglist.canonical_address? or mailinglist.closed? ) then
+        if mailinglist.canonical_address? or mailinglist.closed? then
             proxify_addresses
         else
-            to_s
+            @mess.to_s
         end
     end
 
@@ -230,27 +265,17 @@ class Message < ActiveRecord::Base
     #
     # 
     def deliver(*smtpdetails)
+
         if Hash === smtpdetails[0] then
             smtpdetails = smtpdetails[0]
         else
             smtpdetails = {}
         end
 
-        if mailinglist.closed?
-            if mailinglist.user.mailinglist.has_address? envelope_from or
-               mailinglist.user.address == envelope_from then
-            end
-            unless mailinglist.user.mailinglist.has_address? self.envelope_from
-                return bounce
-            end
-        end
-
-        if mailinglist.confirmation?
-            addresses = mailinglist.confirmed_addresses.map { |a| a.address }
-        else
-            addresses = mailinglist.expand_addresses.map { |a| a.address }
-        end
-
+                # Hm, not sure why this is *here* instead of somewhere
+        # else.  Fix later.
+        #
+        # (This should actually be in the database somewhere, I'm thinking.)
         smtpserver = SysConfig.smtpserver
         smtpport   = SysConfig.smtpport
         mysmtpname = SysConfig.mysmtpname
@@ -262,10 +287,23 @@ class Message < ActiveRecord::Base
             smtpport = smtpdetails[:smtpport] || 25
         end
 
-        fromaddress = mailinglist.name + SysConfig.address_separator +
-            SysConfig.bounce_suffix + "@" + mailinglist.user.domain.name
+        if mailinglist.closed?
+            unless mailinglist.user.mailinglist.has_address? self.envelope_from or mailinglist.user.address == self.envelope_from then
+                return bounce
+            end
+        end
+
+        begin
+            generate_envelope_data        
+        rescue UnregisteredUserException
+            return bounce
+        end
+
+        #Good debugging thingy:
+        #pp self
+
         Net::SMTP.start(smtpserver, smtpport, mysmtpname) do |smtp|
-            smtp.send_message messagetext(smtpdetails), fromaddress, addresses
+            smtp.send_message messagetext(smtpdetails), self.envelope_from, self.envelope_to
         end
     end