received 0.2.0 → 0.3.0

data/bin/received

@@ -46,6 +46,7 @@ if options.delete(:daemon)
   # Drop privileges if started as superuser
   params.merge!({:user => options[:user] || 'nobody', :group => options[:group] || 'nobody'}) if Process.uid == 0
   Daemons.daemonize(params)
+  File.umask(0007)
 end
 
 server = Received::Server.new(options)

data/lib/received/backend/mongodb.rb

@@ -18,8 +18,9 @@ module Received
       # Store mail in MongoDB
       #
       # @param [Hash] mail
+      # @return [ObjectId] object_id
       def store(mail)
-        @coll.save(mail.merge({:ts => Time.now.to_i}), :safe => true)
+        @coll.insert(mail.merge({:ts => Time.now.to_i}), :safe => {:fsync => true})
       end
     end
   end

data/lib/received/connection.rb

@@ -34,12 +34,19 @@ module Received
     #
     # @param [Hash] mail
     # @see Received::Backend::Base#store
+    # @return [Boolean] saving succeeded
     def mail_received(mail)
       begin
-        @backend.store(mail)
-        logger.info "stored mail from: #{mail[:from]}"
+        if insert_id = @backend.store(mail)
+          logger.info "stored mail from: #{mail[:from]} (#{insert_id})"
+          return true
+        else
+          logger.error "saving of mail from #{mail[:from]} failed"
+        end
+        false
       rescue Exception => e
-        logger.error "saving failed with: #{e.message}"
+        logger.error "saving of mail from #{mail[:from]} failed with: #{e.message}"
+        false
       end
     end
 

data/lib/received/lmtp.rb

@@ -71,9 +71,12 @@ module Received
         end
       when :data
         if ev == ".\r\n"
-          @rcpt.size.times {ok}
           mail = {:from => @from, :rcpt => @rcpt, :body => @body.join}
-          @conn.mail_received(mail)
+          if @conn.mail_received(mail)
+            @rcpt.size.times {ok}
+          else
+            @rcpt.size.times {error_in_processing}
+          end
           :data_received
         else
           @body << ev
@@ -123,6 +126,10 @@ module Received
       emit "500 command unrecognized"
     end
 
+    def error_in_processing
+      emit "451 Requested action aborted: local error in processing"
+    end
+
     def emit(str)
       @conn.send_data "#{str}\r\n"
       # return nil, so there won't be implicit state transition

data/lib/received/version.rb

@@ -1,3 +1,3 @@
 module Received
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/lmtp_spec.rb

@@ -5,33 +5,55 @@ describe Received::LMTP do
   before :each do
     @mock = mock 'conn'
     @mock.should_receive(:send_data).with("220 localhost LMTP server ready\r\n")
-    @mock.stub!(:logger).and_return(Logger.new($stderr))
+    logger = Logger.new($stderr)
+    @mock.stub!(:logger).and_return(logger)
     @mock.logger.debug "*** Starting test ***"
     @proto = Received::LMTP.new(@mock)
     @proto.start!
   end
 
-  it "does full receive flow" do
-    @mock.should_receive(:send_data).with("250-localhost\r\n")
-    @mock.should_receive(:send_data).with("250-8BITMIME\r\n250 PIPELINING\r\n")
-    @mock.should_receive(:send_data).with("250 OK\r\n").exactly(3).times
-    @mock.should_receive(:send_data).with("354 End data with <CR><LF>.<CR><LF>\r\n")
-    @mock.should_receive(:send_data).with("250 OK\r\n").exactly(2).times
-    @mock.should_receive(:send_data).with("221 Bye\r\n")
-    body = "Subject: spec\r\nspec\r\n"
-    @mock.should_receive(:mail_received).with({
-      :from => 'spec1@example.com',
-      :rcpt => ['spec2@example.com', 'spec3@example.com'],
-      :body => body
-    })
-    @mock.should_receive(:close_connection_after_writing)
-
-    ["LHLO", "MAIL FROM:<spec1@example.com>", "RCPT TO:<spec2@example.com>",
-      "RCPT TO:<spec3@example.com>", "DATA", "#{body}.", "QUIT"].each do |line|
-      @mock.logger.debug "client: #{line}"
-      @proto.on_data(line + "\r\n")
+  describe "Full flow" do
+    let(:body) { "Subject: spec\r\nspec\r\n" }
+
+    def begin_flow!
+      ["LHLO", "MAIL FROM:<spec1@example.com>", "RCPT TO:<spec2@example.com>",
+        "RCPT TO:<spec3@example.com>", "DATA", "#{body}.", "QUIT"].each do |line|
+        @mock.logger.debug "client: #{line}"
+        @proto.on_data(line + "\r\n")
+      end
     end
 
+    def common_expectations!
+      @mock.should_receive(:send_data).with("250-localhost\r\n")
+      @mock.should_receive(:send_data).with("250-8BITMIME\r\n250 PIPELINING\r\n")
+      @mock.should_receive(:send_data).with("250 OK\r\n").exactly(3).times
+      @mock.should_receive(:send_data).with("354 End data with <CR><LF>.<CR><LF>\r\n")
+    end
+
+    it "receives mail" do
+      common_expectations!
+      @mock.should_receive(:send_data).with("250 OK\r\n").exactly(2).times
+      @mock.should_receive(:send_data).with("221 Bye\r\n")
+      @mock.should_receive(:mail_received).with({
+        :from => 'spec1@example.com',
+        :rcpt => ['spec2@example.com', 'spec3@example.com'],
+        :body => body
+      }).and_return(true)
+      @mock.should_receive(:close_connection_after_writing)
+
+      begin_flow!
+    end
+
+
+    it "returns error when it cannot save email" do
+      common_expectations!
+      @mock.should_receive(:mail_received).once.and_return(false)
+      @mock.should_receive(:send_data).with(/451/).exactly(2).times
+      @mock.should_receive(:send_data).with("221 Bye\r\n")
+      @mock.should_receive(:close_connection_after_writing)
+
+      begin_flow!
+    end
   end
 
   it "parses multiline" do

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: received
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors: 
 - Roman Shterenzon
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 +03:00
-default_executable: 
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: daemons
@@ -25,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -51,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id003
@@ -66,10 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id004
@@ -100,7 +83,6 @@ files:
 - received.gemspec
 - spec/lmtp_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -114,21 +96,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Receive mail from Postfix and store it somewhere