Merge pull request #26 from dataiku/feature/add-ntlm-auth

Add ntlm auth

Author: alexbourret

CHANGELOG.md

@@ -1,10 +1,12 @@
 # Changelog
 
 
-## [Version 1.0.7](https://github.com/dataiku/dss-plugin-api-connect/releases/tag/v1.0.7) - Bugfix release - 2022-08-30
+## [Version 1.1.0](https://github.com/dataiku/dss-plugin-api-connect/releases/tag/v1.1.0) - Feature and bugfix release - 2022-09-15
 
 - Handling Offset pagination on APIs returning an array
 - Fix throttling calculation
+- Allow dots in `Key to next request URL`
+- Add NTLM authentication
 
 ## [Version 1.0.6](https://github.com/dataiku/dss-plugin-api-connect/releases/tag/v1.0.6) - Feature and bugfix release - 2022-05-19
 

code-env/python/spec/requirements.txt

@@ -1 +1,2 @@
 jsonpath-ng==1.5.3
+requests_ntlm==1.1.0

parameter-sets/credential/parameter-set.json

@@ -38,6 +38,10 @@
                 {
                     "value": "bearer_token",
                     "label": "Bearer token"
+                },
+                {
+                    "value": "ntlm",
+                    "label": "NTLM"
                 }
             ]
         },
@@ -46,14 +50,14 @@
             "label": "User name",
             "description": "Can be reused as {{username}}",
             "type": "STRING",
-            "visibilityCondition": "model.login_type == 'basic_login'"
+            "visibilityCondition": "['basic_login', 'ntlm'].includes(model.login_type)"
         },
         {
             "name": "password",
             "label": "Password",
             "description": "Can be reused as {{password}}",
             "type": "PASSWORD",
-            "visibilityCondition": "model.login_type == 'basic_login'"
+            "visibilityCondition": "['basic_login', 'ntlm'].includes(model.login_type)"
         },
         {
             "name": "token",

plugin.json

@@ -1,6 +1,6 @@
 {
     "id": "api-connect",
-    "version": "1.0.7",
+    "version": "1.1.0",
     "meta": {
         "label": "API Connect",
         "description": "Retrieve data from any REST API",

python-lib/dku_utils.py

@@ -47,7 +47,7 @@ def parse_keys_for_json(items):
 def get_value_from_path(dictionary, path, default=None, can_raise=True):
     ret = copy.deepcopy(dictionary)
     for key in path:
-        if key in ret and isinstance(ret, dict):
+        if isinstance(ret, dict) and (key in ret):
             ret = ret.get(key)
         else:
             error_message = "The extraction path {} was not found in the incoming data".format(path)

python-lib/rest_api_client.py

@@ -92,10 +92,16 @@ def __init__(self, credential, endpoint, custom_key_values={}):
     def set_login(self, credential):
         login_type = credential.get("login_type", "no_auth")
         if login_type == "basic_login":
-            self.username = credential.get("username", "")
-            self.password = credential.get("password", "")
-            self.auth = (self.username, self.password)
-            self.requests_kwargs.update({"auth": self.auth})
+            username = credential.get("username", "")
+            password = credential.get("password", "")
+            auth = (username, password)
+            self.requests_kwargs.update({"auth": auth})
+        if login_type == "ntlm":
+            from requests_ntlm import HttpNtlmAuth
+            username = credential.get("username", "")
+            password = credential.get("password", "")
+            auth = HttpNtlmAuth(username, password)
+            self.requests_kwargs.update({"auth": auth})
         if login_type == "bearer_token":
             token = credential.get("token", "")
             bearer_template = credential.get("bearer_template", "Bearer {{token}}")

tests/python/integration/test_scenario.py

@@ -33,3 +33,6 @@ def test_run_api_connect_redirection(user_dss_clients):
 
 def test_run_api_connect_check_sc_84465(user_dss_clients):
     dss_scenario.run(user_dss_clients, project_key=TEST_PROJECT_KEY, scenario_id="CHECKSC84465")
+
+def test_run_api_connect_ntlm_authentication(user_dss_clients):
+    dss_scenario.run(user_dss_clients, project_key=TEST_PROJECT_KEY, scenario_id="NTLMAUTHENTICATION")