Skip to content

Commit 1e27c2d

Browse files
committed
Merge branch 'master' of github.com:MISP/misp-modules into new_module
2 parents 48b381d + e981966 commit 1e27c2d

12 files changed

+812
-514
lines changed

.travis.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,22 @@ python:
99
- "3.6"
1010
- "3.6-dev"
1111
- "3.7-dev"
12+
- "3.8-dev"
1213

1314
before_install:
1415
- docker build -t misp-modules --build-arg BUILD_DATE=$(date -u +"%Y-%m-%d") docker/
1516

1617
install:
17-
- sudo apt-get install libzbar0 libzbar-dev libpoppler-cpp-dev tesseract-ocr libfuzzy-dev
18+
- sudo apt-get install libzbar0 libzbar-dev libpoppler-cpp-dev tesseract-ocr libfuzzy-dev libcaca-dev liblua5.3-dev
1819
- pip install pipenv
1920
- pipenv install --dev
21+
# install gtcaca
22+
- git clone git://github.com/stricaud/gtcaca.git
23+
- mkdir -p gtcaca/build
24+
- pushd gtcaca/build
25+
- cmake .. && make
26+
- sudo make install
27+
- popd
2028
# install pyfaup
2129
- git clone https://github.com/stricaud/faup.git
2230
- pushd faup/build

Pipfile.lock

+424-424
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ For more information: [Extending MISP with Python modules](https://www.misp-proj
2626
* [RansomcoinDB check](misp_modules/modules/expansion/ransomcoindb.py) - An expansion hover module to query the [ransomcoinDB](https://ransomcoindb.concinnity-risks.com): it contains mapping between BTC addresses and malware hashes. Enrich MISP by querying for BTC -> hash or hash -> BTC addresses.
2727
* [BTC scam check](misp_modules/modules/expansion/btc_scam_check.py) - An expansion hover module to instantly check if a BTC address has been abused.
2828
* [BTC transactions](misp_modules/modules/expansion/btc_steroids.py) - An expansion hover module to get a blockchain balance and the transactions from a BTC address in MISP.
29+
* [Censys-enrich](misp_modules/modules/expansion/censys_enrich.py) - An expansion and module to retrieve information from censys.io about a particular IP or certificate.
2930
* [CIRCL Passive DNS](misp_modules/modules/expansion/circl_passivedns.py) - a hover and expansion module to expand hostname and IP addresses with passive DNS information.
3031
* [CIRCL Passive SSL](misp_modules/modules/expansion/circl_passivessl.py) - a hover and expansion module to expand IP addresses with the X.509 certificate(s) seen.
3132
* [countrycode](misp_modules/modules/expansion/countrycode.py) - a hover module to tell you what country a URL belongs to.

REQUIREMENTS

+52-50
Original file line numberDiff line numberDiff line change
@@ -3,107 +3,109 @@
33
-e git+https://github.com/D4-project/BGP-Ranking.git/@fd9c0e03af9b61d4bf0b67ac73c7208a55178a54#egg=pybgpranking&subdirectory=client
44
-e git+https://github.com/D4-project/IPASN-History.git/@fc5e48608afc113e101ca6421bf693b7b9753f9e#egg=pyipasnhistory&subdirectory=client
55
-e git+https://github.com/MISP/PyIntel471.git@0df8d51f1c1425de66714b3a5a45edb69b8cc2fc#egg=pyintel471
6-
-e git+https://github.com/MISP/PyMISP.git@a26a8e450b14d48bb0c8ef46b32bff2f1eadc514#egg=pymisp[fileobjects,openioc,virustotal,pdfexport]
6+
-e git+https://github.com/MISP/PyMISP.git@b5b40ae2c5225a4b349c26294cfc012309a61352#egg=pymisp[fileobjects,openioc,virustotal,pdfexport]
77
-e git+https://github.com/Rafiot/uwhoisd.git@411572840eba4c72dc321c549b36a54ed5cea9de#egg=uwhois&subdirectory=client
88
-e git+https://github.com/cartertemm/ODTReader.git/@49d6938693f6faa3ff09998f86dba551ae3a996b#egg=odtreader
99
-e git+https://github.com/sebdraven/pydnstrails@48c1f740025c51289f43a24863d1845ff12fd21a#egg=pydnstrails
10-
-e git+https://github.com/sebdraven/pyonyphe@cbb0168d5cb28a9f71f7ab3773164a7039ccdb12#egg=pyonyphe
10+
-e git+https://github.com/sebdraven/pyonyphe@1ce15581beebb13e841193a08a2eb6f967855fcb#egg=pyonyphe
11+
-e git+https://github.com/stricaud/faup.git#egg=pyfaup&subdirectory=src/lib/bindings/python
1112
aiohttp==3.4.4
12-
antlr4-python3-runtime==4.7.2 ; python_version >= '3'
13+
antlr4-python3-runtime==4.8 ; python_version >= '3'
1314
apiosintds==1.8.3
1415
argparse==1.4.0
1516
assemblyline-client==3.7.3
1617
async-timeout==3.0.1
1718
attrs==19.3.0
1819
backscatter==0.2.4
19-
beautifulsoup4==4.8.1
20+
beautifulsoup4==4.8.2
2021
blockchain==1.4.4
22+
censys==0.0.8
2123
certifi==2019.11.28
22-
cffi==1.13.2
24+
cffi==1.14.0
2325
chardet==3.0.4
2426
click-plugins==1.1.1
25-
click==7.0
27+
click==7.1.1
2628
colorama==0.4.3
2729
cryptography==2.8
28-
decorator==4.4.1
30+
decorator==4.4.2
2931
deprecated==1.2.7
3032
dnspython==1.16.0
3133
domaintools-api==0.3.3
3234
enum-compat==0.0.3
3335
ez-setup==0.9
3436
ezodf==0.3.2
3537
future==0.18.2
36-
geoip2==2.9.0
37-
httplib2==0.14.0
38+
futures==3.1.1
39+
geoip2==3.0.0
40+
httplib2==0.17.0
3841
idna-ssl==1.1.0 ; python_version < '3.7'
39-
idna==2.8
40-
importlib-metadata==1.3.0 ; python_version < '3.8'
42+
idna==2.9
43+
importlib-metadata==1.6.0 ; python_version < '3.8'
4144
isodate==0.6.0
4245
jbxapi==3.4.0
4346
jsonschema==3.2.0
4447
lief==0.10.1
45-
lxml==4.4.2
48+
lxml==4.5.0
4649
maclookup==1.0.3
47-
maxminddb==1.5.1
48-
more-itertools==8.0.2
49-
multidict==4.7.1
50+
maxminddb==1.5.2
51+
multidict==4.7.5
5052
np==1.0.2
51-
numpy==1.17.4
53+
numpy==1.18.2
5254
oauth2==1.9.0.post1
53-
opencv-python==4.1.2.30
55+
opencv-python==4.2.0.32
5456
pandas-ods-reader==0.0.7
55-
pandas==0.25.3
57+
pandas==1.0.3
5658
passivetotal==1.0.31
57-
pdftotext==2.1.2
58-
pillow==6.2.1
59-
progressbar2==3.47.0
60-
psutil==5.6.7
61-
pycparser==2.19
62-
pycryptodome==3.9.4
63-
pycryptodomex==3.9.4
59+
pdftotext==2.1.4
60+
pillow==7.0.0
61+
progressbar2==3.50.1
62+
psutil==5.7.0
63+
pycparser==2.20
64+
pycryptodome==3.9.7
65+
pycryptodomex==3.9.7
6466
pydeep==0.4
6567
pyeupi==1.0
6668
pygeoip==0.3.2
6769
pyopenssl==19.1.0
68-
pyparsing==2.4.5
69-
pypdns==1.4.1
70+
pyparsing==2.4.6
71+
pypdns==1.5.1
7072
pypssl==2.1
71-
pyrsistent==0.15.6
72-
pytesseract==0.3.0
73+
pyrsistent==0.16.0
74+
pytesseract==0.3.3
7375
python-dateutil==2.8.1
7476
python-docx==0.8.10
7577
python-magic==0.4.15
7678
python-pptx==0.6.18
77-
python-utils==2.3.0
79+
python-utils==2.4.0
7880
pytz==2019.3
79-
pyyaml==5.2
81+
pyyaml==5.3.1
8082
pyzbar==0.1.8
8183
pyzipper==0.3.1 ; python_version >= '3.5'
8284
rdflib==4.2.2
83-
redis==3.3.11
84-
reportlab==3.5.32
85+
redis==3.4.1
86+
reportlab==3.5.42
8587
requests-cache==0.5.2
86-
requests[security]==2.22.0
87-
shodan==1.21.0
88-
sigmatools==0.15.0
89-
six==1.13.0
88+
requests[security]==2.23.0
89+
shodan==1.22.0
90+
sigmatools==0.16.0
91+
six==1.14.0
9092
socketio-client==0.5.6
91-
soupsieve==1.9.5
92-
sparqlwrapper==1.8.4
93-
stix2-patterns==1.2.1
94-
tabulate==0.8.6
95-
tornado==6.0.3
93+
soupsieve==2.0
94+
sparqlwrapper==1.8.5
95+
stix2-patterns==1.3.0
96+
tabulate==0.8.7
97+
tornado==6.0.4
9698
url-normalize==1.4.1
9799
urlarchiver==0.2
98-
urllib3==1.25.7
100+
urllib3==1.25.8
99101
validators==0.14.0
100-
vulners==1.5.4
101-
wand==0.5.8
102-
websocket-client==0.56.0
103-
wrapt==1.11.2
102+
vt-graph-api==1.0.1
103+
vulners==1.5.5
104+
wand==0.5.9
105+
websocket-client==0.57.0
106+
wrapt==1.12.1
104107
xlrd==1.2.0
105-
xlsxwriter==1.2.6
108+
xlsxwriter==1.2.8
106109
yara-python==3.8.1
107110
yarl==1.4.2
108-
zipp==0.6.0
109-
vt-graph-api
111+
zipp==3.1.0

doc/README.md

+17-1
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,22 @@ An expansion hover module to get a blockchain balance from a BTC address in MISP
152152
153153
-----
154154

155+
#### [censys_enrich](https://github.com/MISP/misp-modules/tree/master/misp_modules/modules/expansion/censys_enrich.py)
156+
157+
An expansion module to enrich attributes in MISP by quering the censys.io API
158+
- **features**:
159+
>This module takes an IP, hostname or a certificate fingerprint and attempts to enrich it by querying the Censys API.
160+
- **input**:
161+
>IP, domain or certificate fingerprint (md5, sha1 or sha256)
162+
- **output**:
163+
>MISP objects retrieved from censys, including open ports, ASN, Location of the IP, x509 details
164+
- **references**:
165+
>https://www.censys.io
166+
- **requirements**:
167+
>API credentials to censys.io
168+
169+
-----
170+
155171
#### [circl_passivedns](https://github.com/MISP/misp-modules/tree/master/misp_modules/modules/expansion/circl_passivedns.py)
156172

157173
<img src=logos/passivedns.png height=60>
@@ -295,7 +311,7 @@ An expansion hover module to expand information about CVE id.
295311
296312
-----
297313

298-
#### [cytomic_orion.py](https://github.com/MISP/misp-modules/tree/master/misp_modules/modules/expansion/cytomic_orion.py.py)
314+
#### [cytomic_orion](https://github.com/MISP/misp-modules/tree/master/misp_modules/modules/expansion/cytomic_orion.py)
299315

300316
<img src=logos/cytomic_orion.png height=60>
301317

doc/expansion/censys_enrich.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"description": "An expansion module to enrich attributes in MISP by quering the censys.io API",
3+
"requirements": ["API credentials to censys.io"],
4+
"input": "IP, domain or certificate fingerprint (md5, sha1 or sha256)",
5+
"output": "MISP objects retrieved from censys, including open ports, ASN, Location of the IP, x509 details",
6+
"references": ["https://www.censys.io"],
7+
"features": "This module takes an IP, hostname or a certificate fingerprint and attempts to enrich it by querying the Censys API."
8+
}
File renamed without changes.

docs/install.md

+23-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,28 @@ $SUDO_WWW virtualenv -p python3 /var/www/MISP/venv
2121
# END with virtualenv
2222

2323
cd /usr/local/src/
24-
sudo git clone https://github.com/MISP/misp-modules.git
25-
cd misp-modules
24+
# Ideally you add your user to the staff group and make /usr/local/src group writeable, below follows an example with user misp
25+
sudo adduser misp staff
26+
sudo chmod 2775 /usr/local/src
27+
sudo chown root:staff /usr/local/src
28+
git clone https://github.com/MISP/misp-modules.git
29+
git clone git://github.com/stricaud/faup.git faup
30+
git clone git://github.com/stricaud/gtcaca.git gtcaca
31+
32+
# Install gtcaca/faup
33+
cd gtcaca
34+
mkdir -p build
35+
cd build
36+
cmake .. && make
37+
sudo make install
38+
cd ../../faup
39+
mkdir -p build
40+
cd build
41+
cmake .. && make
42+
sudo make install
43+
sudo ldconfig
44+
45+
cd ../../misp-modules
2646

2747
# BEGIN with virtualenv:
2848
$SUDO_WWW /var/www/MISP/venv/bin/pip install -I -r REQUIREMENTS
@@ -168,4 +188,4 @@ tar xvf misp-module-bundeled.tar.bz2 -C misp-modules-bundle
168188
cd misp-modules-bundle
169189
ls -1|while read line; do sudo pip3 install --force-reinstall --ignore-installed --upgrade --no-index --no-deps ${line};done
170190
~~~
171-
Next you can follow standard install procedure.
191+
Next you can follow standard install procedure.

misp_modules/modules/expansion/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
'ods_enrich', 'odt_enrich', 'joesandbox_submit', 'joesandbox_query', 'urlhaus',
1717
'virustotal_public', 'apiosintds', 'urlscan', 'securitytrails', 'apivoid',
1818
'assemblyline_submit', 'assemblyline_query', 'ransomcoindb', 'malwarebazaar',
19-
'lastline_query', 'lastline_submit', 'sophoslabs_intelix', 'cytomic_orion']
19+
'lastline_query', 'lastline_submit', 'sophoslabs_intelix', 'cytomic_orion', 'censys_enrich']

0 commit comments

Comments
 (0)