From dd0042c6ff9f4b8824f1f46a885339f5893cc0d3 Mon Sep 17 00:00:00 2001
From: Ross McFarland <ross@github.com>
Date: Thu, 8 Jun 2017 17:55:19 -0700
Subject: [PATCH] Escape unescaped semicolons coming out of Route53

---
 octodns/provider/route53.py            |  5 ++++-
 tests/test_octodns_provider_route53.py | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/octodns/provider/route53.py b/octodns/provider/route53.py
index 3849561..4d1b2e9 100644
--- a/octodns/provider/route53.py
+++ b/octodns/provider/route53.py
@@ -253,10 +253,13 @@ class Route53Provider(BaseProvider):
     _data_for_PTR = _data_for_single
     _data_for_CNAME = _data_for_single
 
+    _fix_semicolons = re.compile(r'(?<!\\);')
+
     def _data_for_quoted(self, rrset):
         return {
             'type': rrset['Type'],
-            'values': [rr['Value'][1:-1] for rr in rrset['ResourceRecords']],
+            'values': [self._fix_semicolons.sub('\;', rr['Value'][1:-1])
+                       for rr in rrset['ResourceRecords']],
             'ttl': int(rrset['TTL'])
         }
 
diff --git a/tests/test_octodns_provider_route53.py b/tests/test_octodns_provider_route53.py
index e1a73f8..b05c0fc 100644
--- a/tests/test_octodns_provider_route53.py
+++ b/tests/test_octodns_provider_route53.py
@@ -1217,3 +1217,23 @@ class TestRoute53Provider(TestCase):
         with self.assertRaises(Exception) as ctx:
             provider.apply(plan)
         self.assertTrue('modifications' in ctx.exception.message)
+
+    def test_semicolon_fixup(self):
+        provider = Route53Provider('test', 'abc', '123')
+
+        self.assertEquals({
+            'type': 'TXT',
+            'ttl': 30,
+            'values': [
+                'abcd\\; ef\\;g',
+                'hij\\; klm\\;n',
+            ],
+        }, provider._data_for_quoted({
+            'ResourceRecords': [{
+                'Value': '"abcd; ef;g"',
+            }, {
+                'Value': '"hij\\; klm\\;n"',
+            }],
+            'TTL': 30,
+            'Type': 'TXT',
+        }))