From 70fcdb424efd0478a384ef856775faec84cc2598 Mon Sep 17 00:00:00 2001 From: Michel Etienne Date: Mon, 17 Jun 2013 11:43:57 +0200 Subject: protect import/export view from invalid log messages --- app/models/export_log_message.rb | 7 ++++++- app/models/import_log_message.rb | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/models/export_log_message.rb b/app/models/export_log_message.rb index 8d6a09a6b..4bb9d3cc7 100644 --- a/app/models/export_log_message.rb +++ b/app/models/export_log_message.rb @@ -32,6 +32,11 @@ class ExportLogMessage < ActiveRecord::Base def full_message last_key=key.rpartition("|").last - I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "export_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + begin + I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "export_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + rescue => e + Rails.logger.error "missing arguments for message "+last_key + I18n.translate "WRONG_DATA",{"0"=>last_key}.symbolize_keys.merge(:scope => "export_log_messages.messages").merge(:default => :undefined).merge(:key => "WRONG_DATA") + end end end diff --git a/app/models/import_log_message.rb b/app/models/import_log_message.rb index ae331eb20..4b56f03bd 100644 --- a/app/models/import_log_message.rb +++ b/app/models/import_log_message.rb @@ -31,7 +31,12 @@ class ImportLogMessage < ActiveRecord::Base def full_message last_key=key.rpartition("|").last - I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "import_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + begin + I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "import_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + rescue => e + Rails.logger.error "missing arguments for message "+last_key + I18n.translate "WRONG_DATA",{"0"=>last_key}.symbolize_keys.merge(:scope => "import_log_messages.messages").merge(:default => :undefined).merge(:key => "WRONG_DATA") + end end end -- cgit v1.2.3