XML entity encoding for carriage return and line feed

Author: John Viegas

core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlWriter.java

@@ -193,6 +193,8 @@ private String escapeXmlEntities(String s) {
             s = s.replace("'", "'");
             s = s.replace("&lt;", "<");
             s = s.replace("&gt;", ">");
+            s = s.replace("&#x0D;", "\r");
+            s = s.replace("&#x0A;", "\n");
             // Ampersands should always be the last to unescape
             s = s.replace("&amp;", "&");
         }
@@ -202,6 +204,8 @@ private String escapeXmlEntities(String s) {
         s = s.replace("'", "&apos;");
         s = s.replace("<", "&lt;");
         s = s.replace(">", "&gt;");
+        s = s.replace("\r", "&#x0D;");
+        s = s.replace("\n", "&#x0A;");
         return s;
     }
 

test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-xml-input.json

@@ -38,6 +38,26 @@
       }
     }
   },
+  {
+    "description": "Escape Characters are marshalled correctly as XML in the payload",
+    "given": {
+
+      "input": {
+        "stringMember": "\"'<\r\nNormalCharacters\"'>\r\n"
+      }
+    },
+    "when": {
+      "action": "marshall",
+      "operation": "AllTypes"
+    },
+    "then": {
+      "serializedAs": {
+        "body": {
+          "xmlEquals": "<AllTypesRequest xmlns=\"https://restxml/\"><stringMember>&quot;&apos;&lt;&#x0D;&#x0A;NormalCharacters&quot;&apos;&gt;&#x0D;&#x0A;</stringMember></AllTypesRequest>"
+        }
+      }
+    }
+  },
   {
     "description": "Boolean member with value true is marshalled correctly as XML",
     "given": {