Add valid_encoding checking before inserting into xml object.

lib/gems/pending/util/xml/miq_rexml.rb

@@ -147,8 +147,8 @@ def initialize(first, second = nil, parent = nil)
           @value = Text.unnormalize(second.to_s, nil)
         rescue => err
           if err.class == ::Encoding::CompatibilityError
-            second_utf8 = second.to_s.force_encoding('UTF-8')
-            @value = Text.unnormalize(second_utf8, nil)
+            second_utf8 = second.to_s.force_encoding('UTF-8').encode('UTF-8', :invalid => :replace, :undef => :replace, :replace => '')
+            @value = Text.unnormalize(second_utf8)
           else
             $log.error "Encoding error: #{second_utf8}" if $log
           end
@@ -223,7 +223,7 @@ def to_xml
     def add_element(element, attrs = nil)
       return add_element_orig(element) if element.kind_of?(REXML::Element)
       attrs.delete_if { |_k, v| v.nil? } unless attrs.nil?
-      add_element_orig(element.to_s, XmlHelpers.stringify_keys(attrs))
+      add_element_orig(element.to_s, XmlHelpers.validate_attrs(attrs))
     end
 
     alias_method :add_attribute_orig, :add_attribute

lib/gems/pending/util/xml/xml_utils.rb

@@ -62,13 +62,30 @@ def self.findElementInt(paths, ele)
 end
 
 class XmlHelpers
+  def self.remove_invalid_chars(str)
+    str.chars.reject do |c|
+      case c.ord
+      when *REXML::Text::VALID_CHAR
+      else
+        ''
+      end
+    end.join
+  end
+
+  # Validate attributes before inserting into xml
+  def self.validate_attrs(h)
+    return nil if h.nil?
+    h.each_with_object({}) { |(k, v), h| h[k.to_s] = remove_invalid_chars(v.to_s.encode('UTF-8', :undef => :replace, :invalid => :replace, :replace => '')) }
+  end
+
   def self.stringify_keys(h)
     return nil if h.nil?
     h.inject({}) { |options, (key, value)| options[key.to_s] = value; options }
   end
 end
 
 class Xml2tags
+
   def self.walk(node, parents = "")
     tags = []
 

spec/util/xml/miq_rexml_spec.rb

@@ -27,4 +27,11 @@
     xml = MiqXml.load(doc_text)
     expect(xml.root.elements[1].attributes['attr1']).to eq(attr_string)
   end
+
+  it "add_element with control characters" do
+    attr_hash = { "attr1" => "test\u000Fst\u001Fring" }
+    doc = MiqXml.createDoc(nil)
+    doc.add_element('element_1', attr_hash)
+    expect(doc.elements[1].attributes['attr1']).to eq("teststring")
+  end
 end