Merge pull request #194 from sukiyaki/googledns-semicolon-escapes

Escape unescaped semicolons coming out of Google Cloud DNS

octodns/provider/googlecloud.py

@@ -9,6 +9,7 @@ import shlex
 import time
 from logging import getLogger
 from uuid import uuid4
+import re
 
 from google.cloud import dns
 
@@ -275,12 +276,15 @@ class GoogleCloudProvider(BaseProvider):
 
     _data_for_PTR = _data_for_CNAME
 
+    _fix_semicolons = re.compile(r'(?<!\\);')
+
     def _data_for_SPF(self, gcloud_record):
         if len(gcloud_record.rrdatas) > 1:
             return {
-                'values': gcloud_record.rrdatas}
+                'values': [self._fix_semicolons.sub('\;', rr)
+                           for rr in gcloud_record.rrdatas]}
         return {
-            'value': gcloud_record.rrdatas[0]}
+            'value': self._fix_semicolons.sub('\;', gcloud_record.rrdatas[0])}
 
     def _data_for_SRV(self, gcloud_record):
         return {'values': [{

tests/test_octodns_provider_googlecloud.py

@@ -446,3 +446,13 @@ class TestGoogleCloudProvider(TestCase):
 
         self.assertRegexpMatches(mock_zone.name, '^[a-z][a-z0-9-]*[a-z0-9]$')
         self.assertEqual(len(mock_zone.name), 63)
+
+    def test_semicolon_fixup(self):
+        provider = self._get_provider()
+
+        self.assertEquals({
+            'values': ['abcd\\; ef\\;g', 'hij\\; klm\\;n']
+        }, provider._data_for_TXT(
+            DummyResourceRecordSet(
+                'unit.tests.', 'TXT', 0, ['abcd; ef;g', 'hij\\; klm\\;n'])
+        ))