spamchronic 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/spamchronic

@@ -2,8 +2,10 @@
 require "rubygems"
 require "bundler/setup"
 require 'mailpot'
+require 'socket'
+
  Mailpot::Configuration.config do
-  parameter :smtp_ip, :smtp_port, :verbose, :daemon, :key_file, :banner
+  parameter :smtp_ip, :smtp_port, :verbose, :daemon, :key_file, :banner, :domain
  end
  
  Mailpot::Configuration.config do
@@ -13,6 +15,7 @@ require 'mailpot'
   daemon  true
   key_file  '/etc/mailpot/keys.yml'
   banner '{host} ESMTP'
+  domain Socket.gethostbyname(Socket.gethostname).first
  end
  
  

data/lib/mailpot/mail.rb

@@ -60,8 +60,13 @@ module_function
  end
  
  def forward_probe(msg)
+  r = Regexp.new(/\b[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+?\.[a-zA-Z.]*\b/)
+  sender = msg[:sender]
+  sender = sender.scan(r)
+  recipient = msg[:recipients].to_s
+  recipient = recipient.scan(r)
   Net::SMTP.start('localhost') do | smtp|
-   smtp.send_message msg[:source], msg[:sender], msg[:recipients]
+   smtp.send_message msg[:source], sender, recipient
   end
  end
  

data/lib/mailpot/models.rb

@@ -0,0 +1,33 @@
+require 'bundler/setup'
+require 'rubygems'
+require 'active_record'
+
+class Email < ActiveRecord::Base
+ belongs_to :sender
+ has_one :body
+ has_and_belongs_to_many :recipient
+ has_many :link, :through => :body
+end
+
+class Recipient < ActiveRecord::Base
+ has_and_belongs_to_many :email
+end
+
+class Sender < ActiveRecord::Base
+ has_many :email
+end
+
+class Body < ActiveRecord::Base
+ belongs_to :email
+ has_and_belongs_to_many :link
+ has_many :part
+end
+
+class Link < ActiveRecord::Base
+ has_and_belongs_to_many :body
+end
+
+class Part < ActiveRecord::Base
+  belongs_to :body
+end
+

data/lib/mailpot/smtp.rb

@@ -23,11 +23,7 @@ class Mailpot::Smtp < EventMachine::Protocols::SmtpServer
  end
  
  def get_server_domain
-  begin
-   Socket.gethostbyname(Socket.gethostname).first
-  rescue Exception => e
-   puts e.inspect
-  end
+  Mailpot::Configuration.domain
  end
  
  def receive_sender(sender)

data/lib/mailpot.rb

@@ -19,7 +19,6 @@ module_function
     EventMachine.start_server Mailpot::Configuration.smtp_ip, Mailpot::Configuration.smtp_port, Smtp
     puts "==> smtp://#{Mailpot::Configuration.smtp_ip}:#{Mailpot::Configuration.smtp_port}"
    end
-   puts "Daemon #{Mailpot::Configuration.daemon}"
    if Mailpot::Configuration.daemon === true
     EventMachine.next_tick do
      puts "*** Mailpot now runs as a daemon by default"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spamchronic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-02-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &69586700 !ruby/object:Gem::Requirement
+  requirement: &68980260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *69586700
+  version_requirements: *68980260
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &69577390 !ruby/object:Gem::Requirement
+  requirement: &68979620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.12'
   type: :runtime
   prerelease: false
-  version_requirements: *69577390
+  version_requirements: *68979620
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &69576990 !ruby/object:Gem::Requirement
+  requirement: &68979040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69576990
+  version_requirements: *68979040
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &69576160 !ruby/object:Gem::Requirement
+  requirement: &68978340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69576160
+  version_requirements: *68978340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &69575690 !ruby/object:Gem::Requirement
+  requirement: &68977700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69575690
+  version_requirements: *68977700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &69575180 !ruby/object:Gem::Requirement
+  requirement: &68961510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69575180
+  version_requirements: *68961510
 description: ! "  MailPot is a simple SMTP server honeypot that will catch emails
   and store\n  them in S3 and then pop a message into SQS for later processing\n"
 email: mjezorek@gmail.com
@@ -92,6 +92,7 @@ files:
 - VERSION
 - bin/spamchronic
 - lib/mailpot.rb
+- lib/mailpot/models.rb
 - lib/mailpot/events.rb
 - lib/mailpot/mail.rb
 - lib/mailpot/smtp.rb