aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/models/incoming_message.rb3
-rw-r--r--app/models/info_request.rb62
-rw-r--r--app/models/request_mailer.rb21
-rw-r--r--app/views/admin_request/show.rhtml1
-rw-r--r--app/views/request/_correspondence.rhtml2
5 files changed, 65 insertions, 24 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 430cb0423..a45062c60 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -19,7 +19,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: incoming_message.rb,v 1.22 2008-01-02 16:04:53 francis Exp $
+# $Id: incoming_message.rb,v 1.23 2008-01-03 18:21:30 francis Exp $
class IncomingMessage < ActiveRecord::Base
belongs_to :info_request
@@ -132,6 +132,7 @@ class IncomingMessage < ActiveRecord::Base
text = text.gsub(self.info_request.public_body.complaint_email, "[" + self.info_request.public_body.short_name + " complaint email]")
end
text = text.gsub(self.info_request.incoming_email, "[FOI #" + self.info_request.id.to_s + " email]")
+ text = text.gsub(self.info_request.envelope_email, "[FOI #" + self.info_request.id.to_s + " bounce email]")
text = text.gsub(MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost'), "[GovernmentSpy contact email]")
# Remove all other emails
text = IncomingMessage.remove_email_addresses(text)
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 8447dcbc4..242d7d2a8 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -17,7 +17,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: info_request.rb,v 1.22 2008-01-02 20:13:01 francis Exp $
+# $Id: info_request.rb,v 1.23 2008-01-03 18:21:30 francis Exp $
require 'digest/sha1'
@@ -34,16 +34,18 @@ class InfoRequest < ActiveRecord::Base
has_many :incoming_messages
has_many :info_request_events
+public
# Email which public body should use to respond to request. This is in
# the format PREFIXrequest-ID-HASH@DOMAIN. Here ID is the id of the
# FOI request, and HASH is a signature for that id.
def incoming_email
- raise "id required to make incoming_email" if not self.id
- incoming_email = MySociety::Config.get("INCOMING_EMAIL_PREFIX", "")
- incoming_email += "request-" + self.id.to_s
- incoming_email += "-" + Digest::SHA1.hexdigest(self.id.to_s + MySociety::Config.get("INCOMING_EMAIL_SECRET", 'dummysecret'))[0,8]
- incoming_email += "@" + MySociety::Config.get("INCOMING_EMAIL_DOMAIN", "localhost")
- return incoming_email
+ return self.magic_email("request-")
+ end
+
+ # Modified version of incoming_email to use in the envelope from, for
+ # bounce messages.
+ def envelope_email
+ return self.magic_email("request-bounce-")
end
# Return info request corresponding to an incoming email address, or nil if
@@ -54,21 +56,24 @@ class InfoRequest < ActiveRecord::Base
id = $1.to_i
hash = $2
- expected_hash = Digest::SHA1.hexdigest(id.to_s + MySociety::Config.get("INCOMING_EMAIL_SECRET", 'dummysecret'))[0,8]
- #print "expected: " + expected_hash + "\nhash: " + hash + "\n"
- if hash != expected_hash
- return nil
- else
- return self.find(id)
- end
+ return self.find_by_magic_email(id, hash)
+ end
+
+ def self.find_by_envelope_email(incoming_email)
+ incoming_email =~ /request-bounce-(\d+)-([a-z0-9]+)/
+ id = $1.to_i
+ hash = $2
+
+ return self.find_by_magic_email(id, hash)
end
# A new incoming email to this request
- def receive(email, raw_email)
+ def receive(email, raw_email, is_bounce)
incoming_message = IncomingMessage.new
incoming_message.raw_data = raw_email
+ incoming_message.is_bounce = is_bounce
incoming_message.info_request = self
- incoming_message.save
+ incoming_message.save!
RequestMailer.deliver_new_response(self, incoming_message)
end
@@ -153,6 +158,31 @@ class InfoRequest < ActiveRecord::Base
excerpt.sub!(/Dear .+,/, "")
return excerpt
end
+
+ protected
+
+ # Called by incoming_email and envelope_email
+ def magic_email(prefix_part)
+ raise "id required to make magic" if not self.id
+ magic_email = MySociety::Config.get("INCOMING_EMAIL_PREFIX", "")
+ magic_email += prefix_part + self.id.to_s
+ magic_email += "-" + Digest::SHA1.hexdigest(self.id.to_s + MySociety::Config.get("INCOMING_EMAIL_SECRET", 'dummysecret'))[0,8]
+ magic_email += "@" + MySociety::Config.get("INCOMING_EMAIL_DOMAIN", "localhost")
+ return magic_email
+ end
+
+ # Called by find_by_incoming_email and find_by_envelope_email
+ def self.find_by_magic_email(id, hash)
+ expected_hash = Digest::SHA1.hexdigest(id.to_s + MySociety::Config.get("INCOMING_EMAIL_SECRET", 'dummysecret'))[0,8]
+ #print "expected: " + expected_hash + "\nhash: " + hash + "\n"
+ if hash != expected_hash
+ return nil
+ else
+ return self.find(id)
+ end
+ end
+
+
end
diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb
index 5c5e33065..13bb5fdab 100644
--- a/app/models/request_mailer.rb
+++ b/app/models/request_mailer.rb
@@ -4,12 +4,13 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: request_mailer.rb,v 1.13 2008-01-02 15:45:00 francis Exp $
+# $Id: request_mailer.rb,v 1.14 2008-01-03 18:21:30 francis Exp $
class RequestMailer < ActionMailer::Base
def initial_request(info_request, outgoing_message)
@from = info_request.incoming_email
+ headers 'Sender' => info_request.envelope_email
@recipients = info_request.recipient_email
@subject = 'Freedom of Information Request - ' + info_request.title
@body = {:info_request => info_request, :outgoing_message => outgoing_message,
@@ -48,20 +49,26 @@ class RequestMailer < ActionMailer::Base
def receive(email, raw_email)
# Find which info requests the email is for
- info_requests = []
+ reply_info_requests = []
+ bounce_info_requests = []
for address in (email.to || []) + (email.cc || [])
- info_request = InfoRequest.find_by_incoming_email(address)
- info_requests.push(info_request) if info_request
+ reply_info_request = InfoRequest.find_by_incoming_email(address)
+ reply_info_requests.push(reply_info_request) if reply_info_request
+ bounce_info_request = InfoRequest.find_by_envelope_email(address)
+ bounce_info_requests.push(bounce_info_request) if bounce_info_request
end
# Nothing found
- if info_requests.size == 0
+ if reply_info_requests.size == 0 && bounce_info_requests.size == 0
RequestMailer.deliver_bounced_message(email)
end
# Send the message to each request
- for info_request in info_requests
- info_request.receive(email, raw_email)
+ for reply_info_request in reply_info_requests
+ reply_info_request.receive(email, raw_email, false)
+ end
+ for bounce_info_request in bounce_info_requests
+ bounce_info_request.receive(email, raw_email, true)
end
end
diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml
index ddf2191b5..b3ad12083 100644
--- a/app/views/admin_request/show.rhtml
+++ b/app/views/admin_request/show.rhtml
@@ -9,6 +9,7 @@
<% end %>
<strong>Public body:</strong> <%=h @info_request.public_body.name %> <br>
<strong>Incoming email address:</strong> <%=h @info_request.incoming_email %> <br>
+<strong>Envelope email address:</strong> <%=h @info_request.envelope_email %> <br>
</p>
<%= link_to 'Public page', main_url(request_url(@info_request)) %>
diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml
index 50cf39d86..f3f39be7a 100644
--- a/app/views/request/_correspondence.rhtml
+++ b/app/views/request/_correspondence.rhtml
@@ -13,6 +13,8 @@
<%= public_body_link(@info_request.public_body) %>
<% if incoming_message.contains_information %>
sent some <strong>useful information</strong>
+ <% elsif incoming_message.is_bounce %>
+ replied automatically
<% else %>
replied
<% end %>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-29 22:01:43 +0000