Merge pull request #527 from netscaler/removeBasicAuth

Removing Basic auth in ansible collections netscaler adc

Author: shivashankar-vaddepally

galaxy.yml

@@ -13,25 +13,25 @@ readme: README.md
 # A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
 # @nicks:irc/im.site#channel'
 authors:
-- Sumanth Lingappa <sumanth.lingappa@cloud.com>
-- Shiva Shankar Vaddepally <shivashankar.vaddepally@cloud.com>
+  - Sumanth Lingappa <sumanth.lingappa@cloud.com>
+  - Shiva Shankar Vaddepally <shivashankar.vaddepally@cloud.com>
 ### OPTIONAL but strongly recommended
 # A short summary description of the collection
 description: Ansible Collection Modules for NetScaler ADC
 # Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only
 # accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file'
 license:
-- MIT
+  - MIT
 # The path to the license file for the collection. This path is relative to the root of the collection. This key is
 # mutually exclusive with 'license'
 # license_file: '' # TODO
 
 # A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character
 # requirements as 'namespace' and 'name'
 tags:
-- netscaler
-- adc
-- networking
+  - netscaler
+  - adc
+  - networking
 # Collections that this collection requires to be installed for it to be usable. The key of the dict is the
 # collection label 'namespace.name'. The value is a version range
 # L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
@@ -50,18 +50,18 @@ issues: https://github.com/netscaler/ansible-collection-netscaleradc/issues
 # uses 'fnmatch' to match the files or directories. Some directories and files like 'galaxy.yml', '*.pyc', '*.retry',
 # and '.git' are always filtered. Mutually exclusive with 'manifest'
 build_ignore:
-# https://docs.ansible.com/ansible/latest/dev_guide/developing_collections_distributing.html#ignoring-files-and-folders
-- "_built_docs*"
-- ".github*"
-- ".vscode*"
-- "assets*"
-- .DS_Store
-- docs
-- examples
-- tools
-- issues
-- "**/netscaler-adc-*.tar.gz"
-- Makefile
+  # https://docs.ansible.com/ansible/latest/dev_guide/developing_collections_distributing.html#ignoring-files-and-folders
+  - "_built_docs*"
+  - ".github*"
+  - ".vscode*"
+  - "assets*"
+  - ".DS_Store"
+  - "docs"
+  - "examples"
+  - "tools"
+  - "issues"
+  - "**/netscaler-adc-*.tar.gz"
+  - "Makefile"
 
 # A dict controlling use of manifest directives used in building the collection artifact. The key 'directives' is a
 # list of MANIFEST.in style

plugins/module_utils/module_executor.py

@@ -138,6 +138,37 @@ def __init__(self, resource_name, supports_check_mode=True):
             self.module.params["api_path"] = "nitro/v2/config"
 
         self.client = NitroAPIClient(self.module, self.resource_name)
+        have_userpass = all([
+            self.module.params.get("nitro_user"),
+            self.module.params.get("nitro_pass")
+        ])
+        if have_userpass and not self.module.check_mode:
+            self.client._headers.pop("X-NITRO-USER", None)
+            self.client._headers.pop("X-NITRO-PASS", None)
+            self.client._headers.pop("Cookie", None)
+            ok, response = adc_login(
+                self.client,
+                self.module.params["nitro_user"],
+                self.module.params["nitro_pass"],
+            )
+            if not ok:
+                self.client._headers["Cookie"] = ""
+                self.return_failure("ERROR: Login failed: %s" % response)
+
+            else:
+                if self.netscaler_console_as_proxy_server:
+                    self.module.params["nitro_auth_token"] = response["login"][0].get("sessionid", None)
+                else:
+                    self.module.params["nitro_auth_token"] = response.get("sessionid", None)
+
+                if not self.module.params["nitro_auth_token"]:
+                    self.return_failure("ERROR: Login failed. No sessionid returned from the NetScaler ADC")
+                log("INFO: Login successful. Session ID: %s" % self.module.params["nitro_auth_token"])
+
+                self.client._headers["Cookie"] = (
+                    "NITRO_AUTH_TOKEN=%s" % self.module.params["nitro_auth_token"]
+                )
+
         self.ns_major_version, self.ns_minor_version = get_netscaler_version(
             self.client
         )
@@ -181,6 +212,13 @@ def return_success(self):
             # }
         if self.resource_name == "login":
             self.module_result["sessionid"] = self.sessionid
+        if self.client._headers.get("Cookie", None) not in (None, "") and not self.module.check_mode:
+            ok, response = adc_logout(self.client)
+            if not ok:
+                log("ERROR: Logout failed: %s" % response)
+            else:
+                log("INFO: Logout successful")
+                self.client._headers["Cookie"] = ""
         self.module.exit_json(**self.module_result)
 
     @trace
@@ -204,6 +242,13 @@ def update_diff_list(self, existing=None, desired=None, delete=False, **kwargs):
 
     @trace
     def return_failure(self, msg):
+        if self.client._headers["Cookie"] != "" and not self.module.check_mode:
+            ok, response = adc_logout(self.client)
+            if not ok:
+                log("ERROR: Logout failed: %s" % response)
+            else:
+                log("INFO: Logout successful")
+                self.client._headers["Cookie"] = ""
         self.module.fail_json(msg=msg, **self.module_result)
 
     @trace