Merge branch 'rails_xss' into rails-3-spike

Conflicts:
	Gemfile
	Gemfile.lock
	config/environment.rb
	lib/i18n_fixes.rb

2 files changed, 19 insertions, 1 deletions

diff --git a/spec/models/foi_attachment_spec.rb b/spec/models/foi_attachment_spec.rb
index 9d44957e4..537a3363c 100644
--- a/spec/models/foi_attachment_spec.rb
+++ b/spec/models/foi_attachment_spec.rb
@@ -30,6 +30,17 @@ describe FoiAttachment, " when calculating due date" do
         main.delete_cached_file!
         main = im.get_main_body_text_part
         main.body.should == orig_body
-        
+
     end
 end
+
+describe FoiAttachment, "when ensuring a filename is present" do
+
+    it 'should create a filename for an instance with a blank filename' do
+        attachment = FoiAttachment.new
+        attachment.filename = ''
+        attachment.ensure_filename!
+        attachment.filename.should == 'attachment.bin'
+    end
+
+end
diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb
index e327c2444..781212841 100644
--- a/spec/models/incoming_message_spec.rb
+++ b/spec/models/incoming_message_spec.rb
@@ -148,6 +148,13 @@ describe IncomingMessage, " folding quoted parts of emails" do
         @incoming_message.remove_lotus_quoting(text).should match(/FOLDED_QUOTED_SECTION/)
     end
 
+    it 'should not error when trying to fold lotus notes quoted parts on a request with no user_name' do
+        text = "hello"
+        @incoming_message = IncomingMessage.new()
+        @incoming_message.stub_chain(:info_request, :user_name).and_return(nil)
+        @incoming_message.remove_lotus_quoting(text).should == 'hello'
+    end
+
     it "cope with [ in user names properly" do
         @incoming_message = IncomingMessage.new()
         @incoming_message.stub_chain(:info_request, :user_name).and_return("Sir [ Bobble")