diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 510a469..6e65048 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -17,7 +17,7 @@ jobs: steps: - run: | - sudo apt-get install libfuzzy-dev libpoppler-cpp-dev libzbar0 tesseract-ocr + sudo apt-get install libpoppler-cpp-dev libzbar0 tesseract-ocr - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 diff --git a/Pipfile b/Pipfile index bdf2c98..b7ec209 100644 --- a/Pipfile +++ b/Pipfile @@ -26,7 +26,9 @@ beautifulsoup4 = "*" oauth2 = "*" yara-python = "==3.8.1" sigmatools = "*" +stix2 = "*" stix2-patterns = "*" +taxii2-client = "*" maclookup = "*" vulners = "*" blockchain = "*" diff --git a/REQUIREMENTS b/REQUIREMENTS index 5d4e50e..4a22e45 100644 --- a/REQUIREMENTS +++ b/REQUIREMENTS @@ -27,28 +27,28 @@ censys==2.1.2 certifi==2021.10.8 cffi==1.15.0 chardet==4.0.0 -charset-normalizer==2.0.11; python_version >= '3' +charset-normalizer==2.0.12; python_version >= '3' clamd==1.0.2 click-plugins==1.1.1 -click==8.0.3; python_version >= '3.6' +click==8.0.4; python_version >= '3.6' colorama==0.4.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' colorclass==2.2.2; python_version >= '2.6' commonmark==0.9.1 compressed-rtf==1.0.6 configparser==5.2.0; python_version >= '3.6' -crowdstrike-falconpy==1.0.0 +crowdstrike-falconpy==1.0.5 cryptography==36.0.1; python_version >= '3.6' decorator==5.1.1; python_version >= '3.5' deprecated==1.2.13; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -dnsdb2==1.1.3 +dnsdb2==1.1.4 dnspython==2.2.0 domaintools-api==0.6.1 easygui==0.98.2 ebcdic==1.1.1 enum-compat==0.0.3 -extract-msg==0.28.7 +extract-msg==0.30.8 ezodf==0.3.2 -filelock==3.4.2; python_version >= '3.7' +filelock==3.6.0; python_version >= '3.7' frozenlist==1.3.0; python_version >= '3.7' future==0.18.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' geoip2==4.5.0 @@ -62,25 +62,26 @@ git+https://github.com/sebdraven/pyonyphe@aed008ee5a27e3a5e4afbb3e5cbfc471701084 httplib2==0.20.4; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' idna-ssl==1.1.0; python_version < '3.7' idna==3.3; python_version >= '3' -imapclient==2.1.0 -importlib-metadata==4.10.1; python_version < '3.8' +imapclient==2.2.0 +importlib-metadata==4.11.2; python_version < '3.8' +importlib-resources==5.4.0; python_version < '3.9' isodate==0.6.1 -itsdangerous==2.0.1; python_version >= '3.6' +itsdangerous==2.1.0; python_version >= '3.7' jbxapi==3.17.2 jeepney==0.7.1; sys_platform == 'linux' json-log-formatter==0.5.1 -jsonschema==3.2.0 +jsonschema==4.4.0; python_version >= '3.7' keyring==23.5.0; python_version >= '3.7' lark-parser==0.12.0 lief==0.11.5 -lxml==4.7.1 +lxml==4.8.0 maclookup==1.0.3 markdownify==0.5.3 maxminddb==2.2.0; python_version >= '3.6' more-itertools==8.12.0; python_version >= '3.5' msoffcrypto-tool==5.0.0; python_version >= '3' and platform_python_implementation != 'PyPy' or (platform_system != 'Windows' and platform_system != 'Darwin') multidict==6.0.2; python_version >= '3.7' -mwdblib==4.0.0 +mwdblib==4.1.0 ndjson==0.3.1 np==1.0.2 numpy==1.21.5; python_version < '3.10' and platform_machine != 'aarch64' and platform_machine != 'arm64' @@ -98,26 +99,26 @@ pillow==9.0.1 progressbar2==4.0.0; python_version >= '3.7' psutil==5.9.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' pycparser==2.21 -pycryptodome==3.14.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -pycryptodomex==3.14.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' -pydeep==0.4 +pycryptodome==3.14.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +pycryptodomex==3.14.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' +pydeep2==0.5.1 pyeupi==1.1 pyfaup==1.2 pygeoip==0.3.2 pygments==2.11.2; python_version >= '3.5' -pymisp[email,fileobjects,openioc,pdfexport,url]==2.4.152 +pymisp[email,fileobjects,openioc,pdfexport,url]==2.4.155.1 pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' pypdns==1.5.2 pypssl==2.2 pyrsistent==0.18.1; python_version >= '3.7' -pytesseract==0.3.8 +pytesseract==0.3.9 python-baseconv==1.2.2 python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' python-docx==0.8.11 python-engineio==4.3.1; python_version >= '3.6' python-magic==0.4.25 python-pptx==0.6.21 -python-socketio[client]==5.5.1; python_version >= '3.6' +python-socketio[client]==5.5.2; python_version >= '3.6' python-utils==3.1.0; python_version >= '3.7' pytz-deprecation-shim==0.1.0.post0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' pytz==2019.3 @@ -125,46 +126,48 @@ pyyaml==6.0; python_version >= '3.6' pyzbar==0.1.8 pyzipper==0.3.5; python_version >= '3.5' rdflib==6.1.1; python_version >= '3.7' -redis==4.1.2; python_version >= '3.6' -reportlab==3.6.6 +redis==4.1.4; python_version >= '3.6' +reportlab==3.6.8 requests-cache==0.6.4; python_version >= '3.6' requests-file==1.5.1 -requests[security]==2.27.1 -rich==11.1.0; python_full_version >= '3.6.2' and python_full_version < '4.0.0' +requests==2.27.1 +rich==11.2.0; python_version < '4.0' and python_full_version >= '3.6.2' rtfde==0.0.2 secretstorage==3.3.1; sys_platform == 'linux' -setuptools==60.7.1; python_version >= '3.7' -shodan==1.26.1 +setuptools==60.9.3; python_version >= '3.7' +shodan==1.27.0 sigmatools==0.19.1 +simplejson==3.17.6; python_version >= '2.5' and python_version not in '3.0, 3.1, 3.2, 3.3' six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' socialscan==1.4.2 socketio-client==0.5.7.4 soupsieve==2.3.1; python_version >= '3.6' sparqlwrapper==1.8.5 -stix2==3.0.1 stix2-patterns==1.3.2 +stix2==3.0.1 tabulate==0.8.9 -tau-clients==0.1.9 +tau-clients==0.2.1 taxii2-client==2.3.0 -tldextract==3.1.2; python_version >= '3.6' +tldextract==3.2.0; python_version >= '3.7' tornado==6.1; python_version >= '3.5' -tqdm==4.62.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -typing-extensions==4.0.1; python_version < '3.8' +tqdm==4.63.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +typing-extensions==4.1.1; python_version < '3.8' tzdata==2021.5; python_version >= '3.6' tzlocal==4.1; python_version >= '3.6' unicodecsv==0.14.1 url-normalize==1.4.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' urlarchiver==0.2 -urllib3==1.26.8; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0' +urllib3==1.26.8; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0' validators==0.14.0 vt-graph-api==1.1.3 vt-py==0.13.1 -vulners==2.0.0 +vulners==2.0.2 wand==0.6.7 -websocket-client==1.2.3; python_version >= '3.6' +websocket-client==1.3.1; python_version >= '3.6' wrapt==1.13.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' xlrd==2.0.1 -xlsxwriter==3.0.2; python_version >= '3.4' +xlsxwriter==3.0.3; python_version >= '3.4' yara-python==3.8.1 yarl==1.7.2; python_version >= '3.6' zipp==3.7.0; python_version >= '3.7' + diff --git a/misp_modules/modules/expansion/wiki.py b/misp_modules/modules/expansion/wiki.py index 90dd547..110e8f8 100755 --- a/misp_modules/modules/expansion/wiki.py +++ b/misp_modules/modules/expansion/wiki.py @@ -17,7 +17,7 @@ def handler(q=False): misperrors['error'] = 'Query text missing' return misperrors - sparql = SPARQLWrapper(wiki_api_url) + sparql = SPARQLWrapper(wiki_api_url, agent='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36') query_string = \ "SELECT ?item \n" \ "WHERE { \n" \ @@ -26,7 +26,6 @@ def handler(q=False): sparql.setQuery(query_string) sparql.setReturnFormat(JSON) results = sparql.query().convert() - summary = '' try: result = results["results"]["bindings"] summary = result[0]["item"]["value"] if result else 'No additional data found on Wikidata'