Skip to content

Commit

Permalink
Merge pull request #37 from splunk-soar-connectors/next
Browse files Browse the repository at this point in the history
Merging next to main for release 2.10.1
  • Loading branch information
ishans-crest authored Aug 17, 2023
2 parents 2caf811 + 08fdab5 commit c86cfdd
Show file tree
Hide file tree
Showing 23 changed files with 37 additions and 119 deletions.
1 change: 1 addition & 0 deletions .github/workflows/generate-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
paths:
- '*.json'
- 'readme.html'
- 'manual_readme_content.md'
tags-ignore:
- '**'
branches-ignore:
Expand Down
15 changes: 0 additions & 15 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@ Copyright (c) 2017-2023 Splunk Inc.

Third-party Software Attributions:

Library: Django
Version: 3.2.12
License: BSD 3
0.9.0 thru 1.2 1991-1995 CWI yes
1.3 thru 1.5.2 1.2 1995-1999 CNRI yes
2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Python Software Foundation;
Copyright 1991-1995 Stichting Mathematisch Centrum Amsterdam
Copyright 2001 Python Software Foundation; All Rights Reserved
Copyright Django Software Foundation and individual contributors

Library: beautifulsoup4
Version: 4.9.1
License: MIT
Expand All @@ -38,11 +28,6 @@ Version: 0.4.18
License: MIT
Copyright 2001-2014 Adam Hupp

Library: requests
Version: 2.25.0
License: Apache 2.0
Kenneth Reitz

Library: simplejson
Version: 3.17.2
License: Academic 2.1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Parser

Publisher: Splunk
Connector Version: 2.10.0
Connector Version: 2.10.1
Product Vendor: Splunk
Product Name: Parser
Product Version Supported (regex): ".\*"
Expand Down
30 changes: 30 additions & 0 deletions manual_readme_content.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[comment]: # " File: README.md"
[comment]: # " Copyright (c) 2017-2023 Splunk Inc."
[comment]: # ""
[comment]: # "Licensed under the Apache License, Version 2.0 (the 'License');"
[comment]: # "you may not use this file except in compliance with the License."
[comment]: # "You may obtain a copy of the License at"
[comment]: # ""
[comment]: # " http://www.apache.org/licenses/LICENSE-2.0"
[comment]: # ""
[comment]: # "Unless required by applicable law or agreed to in writing, software distributed under"
[comment]: # "the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,"
[comment]: # "either express or implied. See the License for the specific language governing permissions"
[comment]: # "and limitations under the License."
[comment]: # ""
This app will ignore the HTTP_PROXY and HTTPS_PROXY environment variables.

## Defusedxml

This app uses the defusedxml module, which is licensed under the Python Software Foundation License
(PSFL), Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam, The Netherlands.



## URL Extraction

The app extracts defanged URL's that start with hxxp/hxxps. The defanged URL with \[.\] is not
considered valid. Therefore it does not get ingested. Hence, the app will not extract URLs defanged
with \[.\]


76 changes: 4 additions & 72 deletions parser.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"product_name": "Parser",
"product_version_regex": ".*",
"publisher": "Splunk",
"app_version": "2.10.0",
"app_version": "2.10.1",
"fips_compliant": true,
"license": "Copyright (c) 2017-2023 Splunk Inc.",
"utctime_updated": "2022-03-15T18:28:49.000000Z",
Expand All @@ -23,29 +23,17 @@
"app_wizard_version": "1.0.0",
"pip_dependencies": {
"wheel": [
{
"module": "Django",
"input_file": "wheels/py3/Django-3.2.18-py3-none-any.whl"
},
{
"module": "asgiref",
"input_file": "wheels/py3/asgiref-3.4.1-py3-none-any.whl"
},
{
"module": "beautifulsoup4",
"input_file": "wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl"
},
{
"module": "certifi",
"input_file": "wheels/py3/certifi-2022.12.7-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": "chardet",
"input_file": "wheels/shared/chardet-3.0.4-py2.py3-none-any.whl"
"input_file": "wheels/py3/chardet-5.0.0-py3-none-any.whl"
},
{
"module": "cryptography",
Expand All @@ -55,10 +43,6 @@
"module": "defusedxml",
"input_file": "wheels/shared/defusedxml-0.7.1-py2.py3-none-any.whl"
},
{
"module": "idna",
"input_file": "wheels/shared/idna-2.10-py2.py3-none-any.whl"
},
{
"module": "pdfminer.six",
"input_file": "wheels/py3/pdfminer.six-20211012-py3-none-any.whl"
Expand All @@ -75,33 +59,13 @@
"module": "python_magic",
"input_file": "wheels/shared/python_magic-0.4.18-py2.py3-none-any.whl"
},
{
"module": "pytz",
"input_file": "wheels/shared/pytz-2023.3-py2.py3-none-any.whl"
},
{
"module": "requests",
"input_file": "wheels/shared/requests-2.25.0-py2.py3-none-any.whl"
},
{
"module": "simplejson",
"input_file": "wheels/py36/simplejson-3.17.2-cp36-cp36m-manylinux2010_x86_64.manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
},
{
"module": "soupsieve",
"input_file": "wheels/py3/soupsieve-2.3.2.post1-py3-none-any.whl"
},
{
"module": "sqlparse",
"input_file": "wheels/py3/sqlparse-0.4.3-py3-none-any.whl"
},
{
"module": "typing_extensions",
"input_file": "wheels/py3/typing_extensions-4.1.1-py3-none-any.whl"
},
{
"module": "urllib3",
"input_file": "wheels/shared/urllib3-1.26.15-py2.py3-none-any.whl"
}
]
},
Expand Down Expand Up @@ -676,29 +640,17 @@
],
"pip39_dependencies": {
"wheel": [
{
"module": "Django",
"input_file": "wheels/py3/Django-3.2.18-py3-none-any.whl"
},
{
"module": "asgiref",
"input_file": "wheels/py3/asgiref-3.6.0-py3-none-any.whl"
},
{
"module": "beautifulsoup4",
"input_file": "wheels/py3/beautifulsoup4-4.9.1-py3-none-any.whl"
},
{
"module": "certifi",
"input_file": "wheels/py3/certifi-2022.12.7-py3-none-any.whl"
},
{
"module": "cffi",
"input_file": "wheels/py39/cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
},
{
"module": "chardet",
"input_file": "wheels/shared/chardet-3.0.4-py2.py3-none-any.whl"
"input_file": "wheels/py3/chardet-5.1.0-py3-none-any.whl"
},
{
"module": "cryptography",
Expand All @@ -708,10 +660,6 @@
"module": "defusedxml",
"input_file": "wheels/shared/defusedxml-0.7.1-py2.py3-none-any.whl"
},
{
"module": "idna",
"input_file": "wheels/shared/idna-2.10-py2.py3-none-any.whl"
},
{
"module": "pdfminer.six",
"input_file": "wheels/py3/pdfminer.six-20211012-py3-none-any.whl"
Expand All @@ -728,29 +676,13 @@
"module": "python_magic",
"input_file": "wheels/shared/python_magic-0.4.18-py2.py3-none-any.whl"
},
{
"module": "pytz",
"input_file": "wheels/shared/pytz-2023.3-py2.py3-none-any.whl"
},
{
"module": "requests",
"input_file": "wheels/shared/requests-2.25.0-py2.py3-none-any.whl"
},
{
"module": "simplejson",
"input_file": "wheels/py39/simplejson-3.17.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
},
{
"module": "soupsieve",
"input_file": "wheels/py3/soupsieve-2.4-py3-none-any.whl"
},
{
"module": "sqlparse",
"input_file": "wheels/py3/sqlparse-0.4.3-py3-none-any.whl"
},
{
"module": "urllib3",
"input_file": "wheels/shared/urllib3-1.26.15-py2.py3-none-any.whl"
"input_file": "wheels/py3/soupsieve-2.4.1-py3-none-any.whl"
}
]
}
Expand Down
29 changes: 0 additions & 29 deletions readme.html

This file was deleted.

1 change: 1 addition & 0 deletions release_notes/2.10.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Removed django and requests dependencies in order to use platform packages [PAPP-31087, PAPP-31082, PAPP-31088, PAPP-31096, PAPP-30822]
2 changes: 0 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
beautifulsoup4==4.9.1
defusedxml==0.7.1
Django==3.2.18
git+https://github.com/phantomcyber/pdfminer.six.git@20211012-fips
pyOpenSSL==23.0.0
python-magic==0.4.18
requests==2.25.0
simplejson==3.17.2
Binary file removed wheels/py3/Django-3.2.18-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/py3/asgiref-3.4.1-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/py3/asgiref-3.6.0-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/py3/certifi-2022.12.7-py3-none-any.whl
Binary file not shown.
Binary file added wheels/py3/chardet-5.0.0-py3-none-any.whl
Binary file not shown.
Binary file added wheels/py3/chardet-5.1.0-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/py3/soupsieve-2.4-py3-none-any.whl
Binary file not shown.
Binary file added wheels/py3/soupsieve-2.4.1-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/py3/sqlparse-0.4.3-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/py3/typing_extensions-4.1.1-py3-none-any.whl
Binary file not shown.
Binary file removed wheels/shared/chardet-3.0.4-py2.py3-none-any.whl
Binary file not shown.
Binary file removed wheels/shared/idna-2.10-py2.py3-none-any.whl
Binary file not shown.
Binary file removed wheels/shared/pytz-2023.3-py2.py3-none-any.whl
Binary file not shown.
Binary file removed wheels/shared/requests-2.25.0-py2.py3-none-any.whl
Binary file not shown.
Binary file removed wheels/shared/urllib3-1.26.15-py2.py3-none-any.whl
Binary file not shown.

0 comments on commit c86cfdd

Please sign in to comment.