Merge branch 'next' into update_modules

splunk-soar-connectors · Jan 23, 2024 · d9b74cf · d9b74cf
2 parents 9d8f082 + 0c5260d
commit d9b74cf
Show file tree

Hide file tree

Showing 34 changed files with 145 additions and 170 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/phantomcyber/dev-cicd-tools
-    rev: v1.16
+    rev: v1.17
     hooks:
     -   id: org-hook
     -   id: package-app-dependencies

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2018-2022 Splunk Inc.
+   Copyright (c) 2018-2023 Splunk Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Splunk SOAR Windows Remote Management
-Copyright (c) 2018-2022 Splunk Inc.
+Copyright (c) 2018-2023 Splunk Inc.
 
 Third-party Software Attributions:
 

diff --git a/README.md b/README.md
@@ -2,17 +2,17 @@
 # Windows Remote Management
 
 Publisher: Splunk  
-Connector Version: 2.2.5  
+Connector Version: 2.2.7  
 Product Vendor: Microsoft  
 Product Name: Windows Remote Management  
 Product Version Supported (regex): ".\*"  
-Minimum Product Version: 5.1.0  
+Minimum Product Version: 6.1.1  
 
 This app integrates with the Windows Remote Management service to execute various actions
 
 [comment]: # ""
 [comment]: # "    File: README.md"
-[comment]: # "    Copyright (c) 2018-2022 Splunk Inc."
+[comment]: # "    Copyright (c) 2018-2023 Splunk Inc."
 [comment]: # "    "
 [comment]: # "    Licensed under Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)"
 [comment]: # ""

diff --git a/__init__.py b/__init__.py
@@ -1,6 +1,6 @@
 # File: __init__.py
 #
-# Copyright (c) 2018-2022 Splunk Inc.
+# Copyright (c) 2018-2023 Splunk Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/manual_readme_content.md b/manual_readme_content.md
@@ -1,6 +1,6 @@
 [comment]: # ""
 [comment]: # "    File: README.md"
-[comment]: # "    Copyright (c) 2018-2022 Splunk Inc."
+[comment]: # "    Copyright (c) 2018-2023 Splunk Inc."
 [comment]: # "    "
 [comment]: # "    Licensed under Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt)"
 [comment]: # ""

diff --git a/parse_callbacks.py b/parse_callbacks.py
@@ -1,6 +1,6 @@
 # File: parse_callbacks.py
 #
-# Copyright (c) 2018-2022 Splunk Inc.
+# Copyright (c) 2018-2023 Splunk Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 # in any specific manner
 import base64
 import json
-import tempfile
 from builtins import str
 from collections import OrderedDict
 
@@ -296,11 +295,11 @@ def list_firewall_rules(action_result, response, **kwargs):
 def create_firewall_rule(action_result, response):
     if response.status_code:
         try:
-            msg = response.std_out.splitlines()[1]
+            message = response.std_out.splitlines()[1]
         except:
-            msg = response.std_out
+            message = response.std_out
         return action_result.set_status(
-            phantom.APP_ERROR, "Error running command: {}".format(msg)
+            phantom.APP_ERROR, "Error running command: {}".format(message)
         )
     return phantom.APP_SUCCESS
 
@@ -453,13 +452,7 @@ def decodeb64_add_to_vault(action_result, response, container_id, file_name):
     b64string = response.std_out
 
     try:
-        if hasattr(Vault, 'create_attachment'):
-            resp = Vault.create_attachment(base64.b64decode(b64string), container_id, file_name=file_name)
-        else:
-            tmp_file = tempfile.NamedTemporaryFile(mode='wb', delete=False, dir='/opt/phantom/vault/tmp')
-            tmp_file.write(base64.b64decode(b64string))
-            tmp_file.close()
-            resp = Vault.add_attachment(tmp_file.name, container_id, file_name=file_name)
+        resp = Vault.create_attachment(base64.b64decode(b64string), container_id, file_name=file_name)
     except Exception as e:
         return action_result.set_status(
             phantom.APP_ERROR, "Error adding file to vault", e

diff --git a/release_notes/2.2.6.md b/release_notes/2.2.6.md
@@ -0,0 +1,5 @@
+* Use the Vault API to create temporary files, instead of manual filesystem access [PAPP-32449]
+* Update `min_phantom_version` to 6.1.1
+* Remove `requests` dependency, using the one built into the platform instead
+* Suppress "progress" output from PowerShell, preventing actions from wrongly being marked as failed
+* Improve Unicode parsing to prevent errors
diff --git a/release_notes/2.2.7.md b/release_notes/2.2.7.md
@@ -0,0 +1,2 @@
+* [PAPP-32933] Kerberos and Certificate authentication support. 
+    * User can now select Certificate and Kerberos as transport methods
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,3 @@
 beautifulsoup4==4.9.1
-ntlm_auth==1.5.0
-pywinrm==0.4.1
-requests_ntlm==1.1.0
-six==1.15.0
-xmltodict==0.12.0
+pywinrm==0.4.3
+xmltodict==0.13.0
diff --git a/wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl b/wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl
diff --git a/wheels/py3/certifi-2023.11.17-py3-none-any.whl b/wheels/py3/certifi-2023.11.17-py3-none-any.whl
diff --git a/wheels/py3/charset_normalizer-2.0.12-py3-none-any.whl b/wheels/py3/charset_normalizer-2.0.12-py3-none-any.whl
diff --git a/wheels/py3/cryptography-41.0.7-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/wheels/py3/cryptography-41.0.7-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/wheels/py3/idna-3.6-py3-none-any.whl b/wheels/py3/idna-3.6-py3-none-any.whl
diff --git a/wheels/py3/requests-2.31.0-py3-none-any.whl b/wheels/py3/requests-2.31.0-py3-none-any.whl
diff --git a/wheels/py3/soupsieve-2.3.2.post1-py3-none-any.whl b/wheels/py3/soupsieve-2.3.2.post1-py3-none-any.whl
diff --git a/wheels/py3/soupsieve-2.5-py3-none-any.whl b/wheels/py3/soupsieve-2.5-py3-none-any.whl
diff --git a/wheels/py3/urllib3-2.1.0-py3-none-any.whl b/wheels/py3/urllib3-2.1.0-py3-none-any.whl
diff --git a/...36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/...36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/wheels/py36/cryptography-40.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/wheels/py36/cryptography-40.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/wheels/py39/cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/wheels/py39/cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/...ls/py39/charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl b/...ls/py39/charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
diff --git a/wheels/shared/ntlm_auth-1.5.0-py2.py3-none-any.whl b/wheels/shared/ntlm_auth-1.5.0-py2.py3-none-any.whl
diff --git a/wheels/shared/pycparser-2.21-py2.py3-none-any.whl b/wheels/shared/pycparser-2.21-py2.py3-none-any.whl
diff --git a/wheels/shared/pywinrm-0.4.1-py2.py3-none-any.whl b/wheels/shared/pywinrm-0.4.1-py2.py3-none-any.whl
diff --git a/wheels/shared/requests-2.27.1-py2.py3-none-any.whl b/wheels/shared/requests-2.27.1-py2.py3-none-any.whl
diff --git a/wheels/shared/requests_ntlm-1.1.0-py2.py3-none-any.whl b/wheels/shared/requests_ntlm-1.1.0-py2.py3-none-any.whl
diff --git a/wheels/shared/six-1.15.0-py2.py3-none-any.whl b/wheels/shared/six-1.15.0-py2.py3-none-any.whl
diff --git a/wheels/shared/urllib3-1.26.18-py2.py3-none-any.whl b/wheels/shared/urllib3-1.26.18-py2.py3-none-any.whl
diff --git a/wheels/shared/xmltodict-0.12.0-py2.py3-none-any.whl b/wheels/shared/xmltodict-0.12.0-py2.py3-none-any.whl
diff --git a/winrm.json b/winrm.json
@@ -9,82 +9,18 @@
     "product_name": "Windows Remote Management",
     "product_version_regex": ".*",
     "publisher": "Splunk",
-    "license": "Copyright (c) 2018-2022 Splunk Inc.",
-    "app_version": "2.2.5",
-    "utctime_updated": "2022-03-03T19:04:41.000000Z",
+    "license": "Copyright (c) 2018-2023 Splunk Inc.",
+    "app_version": "2.2.7",
+    "utctime_updated": "2023-12-05T12:42:47.000000Z",
     "package_name": "phantom_winrm",
     "main_module": "winrm_connector.py",
-    "min_phantom_version": "5.1.0",
+    "min_phantom_version": "6.1.1",
     "fips_compliant": true,
     "python_version": "3",
     "latest_tested_versions": [
         "On-premise, Windows Server 2012 R2 Standard"
     ],
     "app_wizard_version": "1.0.0",
-    "pip_dependencies": {
-        "wheel": [
-            {
-                "module": "beautifulsoup4",
-                "input_file": "wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl"
-            },
-            {
-                "module": "certifi",
-                "input_file": "wheels/py3/certifi-2023.11.17-py3-none-any.whl"
-            },
-            {
-                "module": "cffi",
-                "input_file": "wheels/py36/cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-            },
-            {
-                "module": "charset_normalizer",
-                "input_file": "wheels/py3/charset_normalizer-2.0.12-py3-none-any.whl"
-            },
-            {
-                "module": "cryptography",
-                "input_file": "wheels/py36/cryptography-40.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
-            },
-            {
-                "module": "idna",
-                "input_file": "wheels/py3/idna-3.6-py3-none-any.whl"
-            },
-            {
-                "module": "ntlm_auth",
-                "input_file": "wheels/shared/ntlm_auth-1.5.0-py2.py3-none-any.whl"
-            },
-            {
-                "module": "pycparser",
-                "input_file": "wheels/shared/pycparser-2.21-py2.py3-none-any.whl"
-            },
-            {
-                "module": "pywinrm",
-                "input_file": "wheels/shared/pywinrm-0.4.1-py2.py3-none-any.whl"
-            },
-            {
-                "module": "requests",
-                "input_file": "wheels/shared/requests-2.27.1-py2.py3-none-any.whl"
-            },
-            {
-                "module": "requests_ntlm",
-                "input_file": "wheels/shared/requests_ntlm-1.1.0-py2.py3-none-any.whl"
-            },
-            {
-                "module": "six",
-                "input_file": "wheels/shared/six-1.15.0-py2.py3-none-any.whl"
-            },
-            {
-                "module": "soupsieve",
-                "input_file": "wheels/py3/soupsieve-2.3.2.post1-py3-none-any.whl"
-            },
-            {
-                "module": "urllib3",
-                "input_file": "wheels/shared/urllib3-1.26.18-py2.py3-none-any.whl"
-            },
-            {
-                "module": "xmltodict",
-                "input_file": "wheels/shared/xmltodict-0.12.0-py2.py3-none-any.whl"
-            }
-        ]
-    },
     "configuration": {
         "endpoint": {
             "description": "IP/Hostname (For TEST CONNECTIVITY and default, if not provided in an action)",
@@ -3373,59 +3309,55 @@
             },
             {
                 "module": "certifi",
-                "input_file": "wheels/py3/certifi-2023.11.17-py3-none-any.whl"
+                "input_file": "wheels/py3/certifi-2023.7.22-py3-none-any.whl"
             },
             {
                 "module": "cffi",
                 "input_file": "wheels/py39/cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
                 "module": "charset_normalizer",
-                "input_file": "wheels/py39/charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+                "input_file": "wheels/py39/charset_normalizer-3.3.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
                 "module": "cryptography",
-                "input_file": "wheels/py3/cryptography-41.0.7-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+                "input_file": "wheels/py3/cryptography-41.0.5-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
             },
             {
                 "module": "idna",
-                "input_file": "wheels/py3/idna-3.6-py3-none-any.whl"
-            },
-            {
-                "module": "ntlm_auth",
-                "input_file": "wheels/shared/ntlm_auth-1.5.0-py2.py3-none-any.whl"
+                "input_file": "wheels/py3/idna-3.4-py3-none-any.whl"
             },
             {
                 "module": "pycparser",
                 "input_file": "wheels/shared/pycparser-2.21-py2.py3-none-any.whl"
             },
             {
-                "module": "pywinrm",
-                "input_file": "wheels/shared/pywinrm-0.4.1-py2.py3-none-any.whl"
+                "module": "pyspnego",
+                "input_file": "wheels/py3/pyspnego-0.10.2-py3-none-any.whl"
             },
             {
-                "module": "requests",
-                "input_file": "wheels/py3/requests-2.31.0-py3-none-any.whl"
+                "module": "pywinrm",
+                "input_file": "wheels/shared/pywinrm-0.4.3-py2.py3-none-any.whl"
             },
             {
                 "module": "requests_ntlm",
-                "input_file": "wheels/shared/requests_ntlm-1.1.0-py2.py3-none-any.whl"
+                "input_file": "wheels/py3/requests_ntlm-1.2.0-py3-none-any.whl"
             },
             {
                 "module": "six",
-                "input_file": "wheels/shared/six-1.15.0-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/six-1.16.0-py2.py3-none-any.whl"
             },
             {
                 "module": "soupsieve",
                 "input_file": "wheels/py3/soupsieve-2.5-py3-none-any.whl"
             },
             {
                 "module": "urllib3",
-                "input_file": "wheels/py3/urllib3-2.1.0-py3-none-any.whl"
+                "input_file": "wheels/py3/urllib3-2.0.7-py3-none-any.whl"
             },
             {
                 "module": "xmltodict",
-                "input_file": "wheels/shared/xmltodict-0.12.0-py2.py3-none-any.whl"
+                "input_file": "wheels/shared/xmltodict-0.13.0-py2.py3-none-any.whl"
             }
         ]
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* [PAPP-32933] Kerberos and Certificate authentication support.
		* User can now select Certificate and Kerberos as transport methods