Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PAPP-31096, PAPP-30822, PAPP-33451, PAPP-31088 : Updated requests, certifi, urllib3 and cryptography modules #35

Merged
merged 6 commits into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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): ".\*"
Expand Down
1 change: 1 addition & 0 deletions release_notes/unreleased.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
**Unreleased**
* Removed certifi, requests, cryptography and urlib3 dependencies in order to use platform packages [PAPP-31096, PAPP-30822, PAPP-31088, PAPP-33451]
2 changes: 0 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file removed wheels/py3/certifi-2024.2.2-py3-none-any.whl
Binary file not shown.
Binary file not shown.
Binary file removed wheels/py3/idna-3.6-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/py3/requests-2.31.0-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/py3/urllib3-2.2.1-py3-none-any.whl
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed wheels/shared/requests-2.27.1-py2.py3-none-any.whl
Binary file not shown.
Binary file removed wheels/shared/urllib3-1.26.18-py2.py3-none-any.whl
Binary file not shown.
50 changes: 1 addition & 49 deletions winrm.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion winrm_consts.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down