Merge pull request #534 from rokernel/custom_certificate_support

Added custom certificate support

Author: 2bithacker

plugins/inventory/nb_inventory.py

@@ -35,6 +35,18 @@
                 - Allows connection when SSL certificates are not valid. Set to C(false) when certificates are not trusted.
             default: True
             type: boolean
+        cert:
+            description:
+                - Certificate path
+            default: False
+        key:
+            description:
+                - Certificate key path
+            default: False
+        ca_path:
+            description:
+                - CA path
+            default: False
         follow_redirects:
             description:
                 - Determine how redirects are followed.
@@ -299,6 +311,9 @@ def _fetch_information(self, url):
                     timeout=self.timeout,
                     validate_certs=self.validate_certs,
                     follow_redirects=self.follow_redirects,
+                    client_cert=self.cert,
+                    client_key=self.key,
+                    ca_path=self.ca_path,
                 )
             except urllib_error.HTTPError as e:
                 """This will return the response body when we encounter an error.
@@ -1623,6 +1638,9 @@ def parse(self, inventory, loader, path, cache=True):
             % (ansible_version, python_version.split(" ")[0]),
             "Content-type": "application/json",
         }
+        self.cert = self.get_option("cert")
+        self.key = self.get_option("key")
+        self.ca_path = self.get_option("ca_path")
         if token:
             self.headers.update({"Authorization": "Token %s" % token})
 

plugins/module_utils/netbox_utils.py

@@ -463,6 +463,7 @@
     state=dict(required=False, default="present", choices=["present", "absent"]),
     query_params=dict(required=False, type="list", elements="str"),
     validate_certs=dict(type="raw", default=True),
+    cert=dict(type="raw", required=False),
 )
 
 
@@ -490,10 +491,11 @@ def __init__(self, module, endpoint, nb_client=None):
         url = self.module.params["netbox_url"]
         token = self.module.params["netbox_token"]
         ssl_verify = self.module.params["validate_certs"]
+        cert = self.module.params["cert"]
 
         # Attempt to initiate connection to Netbox
         if nb_client is None:
-            self.nb = self._connect_netbox_api(url, token, ssl_verify)
+            self.nb = self._connect_netbox_api(url, token, ssl_verify, cert)
         else:
             self.nb = nb_client
             try:
@@ -536,10 +538,11 @@ def _version_check_greater(self, greater, lesser, greater_or_equal=False):
         elif g_major == l_major and g_minor > l_minor:
             return True
 
-    def _connect_netbox_api(self, url, token, ssl_verify):
+    def _connect_netbox_api(self, url, token, ssl_verify, cert):
         try:
             session = requests.Session()
             session.verify = ssl_verify
+            session.cert = tuple(i for i in cert)
             nb = pynetbox.api(url, token=token)
             nb.http_session = session
             try: