diff --git a/CHANGELOG.md b/CHANGELOG.md index da6d2c101..0ba403a13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Fix a bug: missing translations for some error messages - Fix a bug: invalid footprints in invoices fixtures - Fix a bug: unable to export accounting data to ACD +- Fix a bug: report error on invalid encoding in members import - Fix a security issue: updated mkdirp to fix [CVE-2020-7598](https://nvd.nist.gov/vuln/detail/CVE-2020-7598) - Fix a security issue: updated acorn to fix [CVE-2020-7598](https://nvd.nist.gov/vuln/detail/CVE-2020-7598) - Fix a security issue: updated actionview to fix [CVE-2020-5267](https://nvd.nist.gov/vuln/detail/CVE-2020-5267) diff --git a/app/services/members/import_service.rb b/app/services/members/import_service.rb index cc0441a53..305610750 100644 --- a/app/services/members/import_service.rb +++ b/app/services/members/import_service.rb @@ -6,6 +6,7 @@ class Members::ImportService def import(import) require 'csv' log = [] + begin CSV.foreach(import.attachment.url, headers: true, col_sep: ';') do |row| begin password = hide_password(row) @@ -31,6 +32,11 @@ class Members::ImportService puts e.backtrace end end + rescue ArgumentError => e + log << e.to_s + puts e + puts e.backtrace + end log end