diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 6f15b22..131c639 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -1,7 +1,7 @@ name: Linting on: [push, pull_request] jobs: - lint: + lint: # Run per push for internal contributers. This isn't possible for forked pull requests, # so we'll need to run on PR events for external contributers. # String comparison below is case insensitive. diff --git a/README.md b/README.md index 1fbd0a7..ee3dd4b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Windows Remote Management Publisher: Splunk -Connector Version: 2.3.0 +Connector Version: 2.3.1 Product Vendor: Microsoft Product Name: Windows Remote Management Product Version Supported (regex): ".\*" diff --git a/release_notes/2.3.1.md b/release_notes/2.3.1.md new file mode 100644 index 0000000..4f9a650 --- /dev/null +++ b/release_notes/2.3.1.md @@ -0,0 +1 @@ +* Removed certifi, requests, cryptography and urlib3 dependencies in order to use platform packages [PAPP-31096, PAPP-30822, PAPP-31088, PAPP-33451] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index ebba285..1a47a00 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,5 @@ beautifulsoup4==4.9.1 pykerberos==1.2.4 pywinrm==0.4.3 # Pinned to the current platform version -requests==2.31.0 # Needed to avoid incompatibility with platform packages caused by urllib3 >= 2.0.0 -urllib3==1.26.18 xmltodict==0.13.0 diff --git a/wheels/py3/certifi-2024.2.2-py3-none-any.whl b/wheels/py3/certifi-2024.2.2-py3-none-any.whl deleted file mode 100644 index 450e3bd..0000000 Binary files a/wheels/py3/certifi-2024.2.2-py3-none-any.whl and /dev/null differ 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 deleted file mode 100644 index 17a2dfb..0000000 Binary files a/wheels/py3/charset_normalizer-2.0.12-py3-none-any.whl and /dev/null differ diff --git a/wheels/py3/idna-3.6-py3-none-any.whl b/wheels/py3/idna-3.6-py3-none-any.whl deleted file mode 100644 index fdf65ae..0000000 Binary files a/wheels/py3/idna-3.6-py3-none-any.whl and /dev/null differ diff --git a/wheels/py3/requests-2.31.0-py3-none-any.whl b/wheels/py3/requests-2.31.0-py3-none-any.whl deleted file mode 100644 index bfd5d2e..0000000 Binary files a/wheels/py3/requests-2.31.0-py3-none-any.whl and /dev/null differ diff --git a/wheels/py3/urllib3-2.2.1-py3-none-any.whl b/wheels/py3/urllib3-2.2.1-py3-none-any.whl deleted file mode 100644 index d7cca6a..0000000 Binary files a/wheels/py3/urllib3-2.2.1-py3-none-any.whl and /dev/null differ diff --git a/wheels/py36/cryptography-40.0.2-cp36-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl b/wheels/py36/cryptography-40.0.2-cp36-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl deleted file mode 100644 index a0d4277..0000000 Binary files a/wheels/py36/cryptography-40.0.2-cp36-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl and /dev/null differ diff --git a/wheels/py39/charset_normalizer-3.3.2-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl b/wheels/py39/charset_normalizer-3.3.2-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl deleted file mode 100644 index 3559f21..0000000 Binary files a/wheels/py39/charset_normalizer-3.3.2-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl and /dev/null differ diff --git a/wheels/py39/cryptography-42.0.2-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl b/wheels/py39/cryptography-42.0.2-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl deleted file mode 100644 index c3b5a9c..0000000 Binary files a/wheels/py39/cryptography-42.0.2-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl and /dev/null differ diff --git a/wheels/py39/cryptography-42.0.4-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl b/wheels/py39/cryptography-42.0.4-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl deleted file mode 100644 index 4f3952b..0000000 Binary files a/wheels/py39/cryptography-42.0.4-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl and /dev/null differ 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 deleted file mode 100644 index 807fc61..0000000 Binary files a/wheels/shared/requests-2.27.1-py2.py3-none-any.whl and /dev/null differ 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 deleted file mode 100644 index c7337c7..0000000 Binary files a/wheels/shared/urllib3-1.26.18-py2.py3-none-any.whl and /dev/null differ diff --git a/winrm.json b/winrm.json index 83546a2..e0639cf 100644 --- a/winrm.json +++ b/winrm.json @@ -10,7 +10,7 @@ "product_version_regex": ".*", "publisher": "Splunk", "license": "Copyright (c) 2018-2024 Splunk Inc.", - "app_version": "2.3.0", + "app_version": "2.3.1", "utctime_updated": "2024-02-28T09:53:35.000000Z", "package_name": "phantom_winrm", "main_module": "winrm_connector.py", @@ -3327,26 +3327,10 @@ "module": "beautifulsoup4", "input_file": "wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl" }, - { - "module": "certifi", - "input_file": "wheels/py3/certifi-2024.2.2-py3-none-any.whl" - }, { "module": "cffi", "input_file": "wheels/py39/cffi-1.16.0-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl" }, - { - "module": "charset_normalizer", - "input_file": "wheels/py39/charset_normalizer-3.3.2-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl" - }, - { - "module": "cryptography", - "input_file": "wheels/py39/cryptography-42.0.4-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl" - }, - { - "module": "idna", - "input_file": "wheels/py3/idna-3.6-py3-none-any.whl" - }, { "module": "pycparser", "input_file": "wheels/shared/pycparser-2.21-py2.py3-none-any.whl" @@ -3363,10 +3347,6 @@ "module": "pywinrm", "input_file": "wheels/shared/pywinrm-0.4.3-py2.py3-none-any.whl" }, - { - "module": "requests", - "input_file": "wheels/py3/requests-2.31.0-py3-none-any.whl" - }, { "module": "requests_ntlm", "input_file": "wheels/py3/requests_ntlm-1.2.0-py3-none-any.whl" @@ -3379,10 +3359,6 @@ "module": "soupsieve", "input_file": "wheels/py3/soupsieve-2.5-py3-none-any.whl" }, - { - "module": "urllib3", - "input_file": "wheels/py3/urllib3-2.2.1-py3-none-any.whl" - }, { "module": "xmltodict", "input_file": "wheels/shared/xmltodict-0.13.0-py2.py3-none-any.whl" @@ -3395,26 +3371,10 @@ "module": "beautifulsoup4", "input_file": "wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl" }, - { - "module": "certifi", - "input_file": "wheels/py3/certifi-2024.2.2-py3-none-any.whl" - }, { "module": "cffi", "input_file": "wheels/py36/cffi-1.15.1-cp36-cp36m-manylinux1_x86_64.manylinux_2_5_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-manylinux2014_x86_64.manylinux_2_17_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" @@ -3431,10 +3391,6 @@ "module": "pywinrm", "input_file": "wheels/shared/pywinrm-0.4.3-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" @@ -3447,10 +3403,6 @@ "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.13.0-py2.py3-none-any.whl" diff --git a/winrm_consts.py b/winrm_consts.py index 6987a6b..ab14680 100644 --- a/winrm_consts.py +++ b/winrm_consts.py @@ -115,7 +115,7 @@ WINRM_CONFIG_PROTOCOL = "default_protocol" WINRM_CONFIG_PORT = "default_port" WINRM_CONFIG_USERNAME = "username" -WINRM_CONFIG_PASSWORD = "password" +WINRM_CONFIG_PASSWORD = "password" # pragma: allowlist secret WINRM_CONFIG_TRANSPORT = "transport" WINRM_CONFIG_DOMAIN = "domain" WINRM_CONFIG_CERT_PEM = "cert_pem_path"