Force utf-8 encoding when processing XML

diff --git a/app/services/fetch_remote_account_service.rb b/app/services/fetch_remote_account_service.rb
index 7a65236b69edf4e725e1b3a6c686319a5e828bd8..7cbc9f6ec5b8e81077e9f35e3d6ce2e99abb564b 100644 (file)
--- a/app/services/fetch_remote_account_service.rb
+++ b/app/services/fetch_remote_account_service.rb
@@ -9,7 +9,9 @@ class FetchRemoteAccountService < BaseService
   private
 
   def process_atom(url, body)
-    xml       = Nokogiri::XML(body)
+    xml = Nokogiri::XML(body)
+    xml.encoding = 'utf-8'
+
     url_parts = Addressable::URI.parse(url)
     username  = xml.at_xpath('//xmlns:author/xmlns:name').try(:content)
     domain    = url_parts.host

diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb
index 54ac3006eb432a12774b7211beb7006a4db98411..e4537d61f97d058f43634063084c1409c3838d69 100644 (file)
--- a/app/services/fetch_remote_status_service.rb
+++ b/app/services/fetch_remote_status_service.rb
@@ -11,7 +11,9 @@ class FetchRemoteStatusService < BaseService
   def process_atom(url, body)
     Rails.logger.debug "Processing Atom for remote status at #{url}"
 
-    xml     = Nokogiri::XML(body)
+    xml = Nokogiri::XML(body)
+    xml.encoding = 'utf-8'
+
     account = extract_author(url, xml)
 
     return nil if account.nil?

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 2a9b0a62ff9d8e568766ff3ec7999c067ef0faa8..b671c809dcf92fcced72d9f321329860f77bd6c4 100644 (file)
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -4,6 +4,7 @@ class ProcessFeedService < BaseService
 
   def call(body, account)
     xml = Nokogiri::XML(body)
+    xml.encoding = 'utf-8'
 
     update_author(xml, account)
     process_entries(xml, account)

diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb
index 06c8f66d2161b853f8bed2ab2af0b88b6cd68c8a..be78ebb58b408ef0c7b2228499ffefca3ac0c569 100644 (file)
--- a/app/services/process_interaction_service.rb
+++ b/app/services/process_interaction_service.rb
@@ -6,7 +6,9 @@ class ProcessInteractionService < BaseService
   # @param [Account] target_account Account the Salmon was addressed to
   def call(envelope, target_account)
     body = salmon.unpack(envelope)
-    xml  = Nokogiri::XML(body)
+
+    xml = Nokogiri::XML(body)
+    xml.encoding = 'utf-8'
 
     return unless contains_author?(xml)