Merge pull request Nosmoht#7 from djcf/master

Author: Nosmoht

README.md

@@ -12,10 +12,10 @@ Ensure zone is present
 
 ```yaml
 - powerdns_zone:
-    name: zone01.internal.example.com
+    name: zone01.internal.example.com.
     nameservers:
-    - ns-01.example.com
-    - ns-02.example.com
+    - ns-01.example.com.
+    - ns-02.example.com.
     kind: master
     state: present
     pdns_host: powerdns.example.com
@@ -38,37 +38,58 @@ Ensure zone is absent
 Ensure A record
 ```yaml
 - powerdns_record:
-    name: host01
+    name: host01.zone01.internal.example.com.
     zone: zone01.internal.example.com
     type: A
     content: 192.168.1.234
     ttl: 1440
     pdns_host: powerdns.example.com
-    pdns_port: 8081
+    pdns_port: 443
     pdns_api_key: topsecret
+    pdns_prot: https
 ```
 
 Ensure AAAA record
 ```yaml
 - powerdns_record:
-    name: host01
+    name: host01.zone01.internal.example.com.
     zone: zone01.internal.example.com
     type: AAAA
     content: 2001:cdba:0000:0000:0000:0000:3257:9652
     ttl: 1440
     pdns_host: powerdns.example.com
-    pdns_port: 8081
+    pdns_port: 8443
     pdns_api_key: topsecret
+    pdns_prot: https
+```
+
+Do not verify SSL certificate (this is a security risk)
+
+```yaml
+- powerdns_record:
+    name: host01.zone01.internal.example.com.
+    zone: zone01.internal.example.com
+    type: AAAA
+    content: 2001:cdba:0000:0000:0000:0000:3257:9652
+    ttl: 1440
+    pdns_host: powerdns.example.com
+    pdns_port: 8443
+    pdns_api_key: topsecret
+    pdns_prot: https
+    strict_ssl_checking: false
 ```
 
 Ensure CNAME record
 ```yaml
 - powerdns_record:
-    name: database
+    name: database.zone01.internal.example.com.
     zone: zone01.internal.example.com
     type: CNAME
     content: host01.zone01.internal.example.com
     pdns_host: powerdns.example.com
-    pdns_port: 8081
+    pdns_port: 80
     pdns_api_key: topsecret
+    pdns_prot: http
 ```
+
+Note the trailing '.' following most records, if not present will result in the error "Domain record is not canonical".

powerdns_record.py

@@ -58,6 +58,10 @@
   pdns_api_key:
     description:
     - API Key to authenticate through PowerDNS API
+  strict_ssl_checking:
+    description:
+    - Disables strict certificate checking
+    default: false
 author: "Thomas Krahn (@nosmoht)"
 '''
 
@@ -86,16 +90,22 @@ def __init__(self, url, status_code, message):
 
 
 class PowerDNSClient:
-    def __init__(self, host, port, prot, api_key):
-        self.url = '{prot}://{host}:{port}'.format(prot=prot, host=host, port=port)
+    def __init__(self, host, port, prot, api_key, verify):
+        self.url = '{prot}://{host}:{port}/api/v1'.format(prot=prot, host=host, port=port)
         self.headers = {'X-API-Key': api_key,
                         'content-type': 'application/json',
                         'accept': 'application/json'
                         }
+        self.verify = verify
 
     def _handle_request(self, req):
         if req.status_code in [200, 201, 204]:
-            return json.loads(req.text)
+            if req.text:
+                try:
+                    return json.loads(req.text)
+                except Exception as e:
+                    print(e) # same as yield
+            return dict()
         elif req.status_code == 404:
             error_message = 'Not found'
         else:
@@ -122,7 +132,7 @@ def _get_zone_url(self, server, name):
         return '{url}/{name}'.format(url=self._get_zones_url(server), name=name)
 
     def get_zone(self, server, name):
-        req = requests.get(url=self._get_zone_url(server, name), headers=self.headers)
+        req = requests.get(url=self._get_zone_url(server, name), headers=self.headers, verify=self.verify)
         if req.status_code == 422:  # zone does not exist
             return None
         return self._handle_request(req)
@@ -144,14 +154,14 @@ def create_record(self, server, zone, name, rtype, content, disabled, ttl):
         url = self._get_zone_url(server=server, name=zone)
         data = self._get_request_data(changetype='REPLACE', server=server, zone=zone, name=name, rtype=rtype,
                                       content=content, disabled=disabled, ttl=ttl)
-        req = requests.patch(url=url, data=json.dumps(data), headers=self.headers)
+        req = requests.patch(url=url, data=json.dumps(data), headers=self.headers, verify=self.verify)
         return self._handle_request(req)
 
     def delete_record(self, server, zone, name, rtype):
         url = self._get_zone_url(server=server, name=zone)
         data = self._get_request_data(changetype='DELETE', server=server, zone=zone, name=name, rtype=rtype)
         # module.fail_json(msg=json.dumps(data))
-        req = requests.patch(url=url, data=json.dumps(data), headers=self.headers)
+        req = requests.patch(url=url, data=json.dumps(data), headers=self.headers, verify=self.verify)
         return self._handle_request(req)
 
 
@@ -230,14 +240,16 @@ def main():
                     pdns_port=dict(type='int', default=8081),
                     pdns_prot=dict(type='str', default='http', choices=['http', 'https']),
                     pdns_api_key=dict(type='str', required=False),
+                    strict_ssl_checking=dict(type='boolean', default=True),
             ),
             supports_check_mode=True,
     )
 
     pdns_client = PowerDNSClient(host=module.params['pdns_host'],
                                  port=module.params['pdns_port'],
                                  prot=module.params['pdns_prot'],
-                                 api_key=module.params['pdns_api_key'])
+                                 api_key=module.params['pdns_api_key'],
+                                 verify=module.params['strict_ssl_checking'])
 
     try:
         changed, record = ensure(module, pdns_client)

powerdns_zone.py

@@ -42,6 +42,10 @@
   pdns_api_key:
     description:
     - API Key to authenticate through PowerDNS API
+  strict_ssl_checking:
+    description:
+    - Disables strict certificate checking
+    default: false
 author: "Thomas Krahn (@nosmoht)"
 '''
 
@@ -79,17 +83,21 @@ def __init__(self, url, status_code, message):
 
 
 class PowerDNSClient:
-    def __init__(self, host, port, prot, api_key):
-        self.url = '{prot}://{host}:{port}'.format(prot=prot, host=host, port=port)
+    def __init__(self, host, port, prot, api_key, verify):
+        self.url = '{prot}://{host}:{port}/api/v1'.format(prot=prot, host=host, port=port)
         self.headers = {'X-API-Key': api_key,
                         'content-type': 'application/json',
                         'accept': 'application/json'
                         }
+        self.verify = verify
 
     def _handle_request(self, req):
         if req.status_code in [200, 201, 204]:
             if req.text:
-                return json.loads(req.text)
+                try:
+                    return json.loads(req.text)
+                except Exception as e:
+                    print(e) # same as yield
             return dict()
         elif req.status_code == 404:
             error_message = 'Not found'
@@ -117,22 +125,22 @@ def _get_zone_url(self, server, name):
         return '{url}/{name}'.format(url=self._get_zones_url(server), name=name)
 
     def get_zone(self, server, name):
-        req = requests.get(url=self._get_zone_url(server, name), headers=self.headers)
+        req = requests.get(url=self._get_zone_url(server, name), headers=self.headers, verify=self.verify)
         if req.status_code == 422:  # zone does not exist
             return None
         return self._handle_request(req)
 
     def create_zone(self, server, data):
-        req = requests.post(url=self._get_zones_url(server, ), data=json.dumps(data), headers=self.headers)
+        req = requests.post(url=self._get_zones_url(server, ), data=json.dumps(data), headers=self.headers, verify=self.verify)
         return self._handle_request(req)
 
     def delete_zone(self, server, name):
-        req = requests.delete(url=self._get_zone_url(server, name), headers=self.headers)
+        req = requests.delete(url=self._get_zone_url(server, name), headers=self.headers, verify=self.verify)
         return self._handle_request(req)
 
     def update_zone(self, server, zone):
         req = requests.patch(url=self._get_zone_url(server=server, name=zone.get('name')), data=zone,
-                             headers=self.headers)
+                             headers=self.headers, verify=self.verify)
         return self._handle_request(req)
 
 
@@ -206,14 +214,16 @@ def main():
             pdns_port=dict(type='int', default=8081),
             pdns_prot=dict(type='str', default='http', choices=['http', 'https']),
             pdns_api_key=dict(type='str', required=False),
+            strict_ssl_checking=dict(type='boolean', default=True),
         ),
         supports_check_mode=True,
     )
 
     pdns_client = PowerDNSClient(host=module.params['pdns_host'],
                                  port=module.params['pdns_port'],
                                  prot=module.params['pdns_prot'],
-                                 api_key=module.params['pdns_api_key'])
+                                 api_key=module.params['pdns_api_key'],
+                                 verify=module.params['strict_ssl_checking'])
 
     try:
         changed, zone = ensure(module, pdns_client)