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

Merge from Upstream #2

Merged
merged 595 commits into from
Jun 3, 2020
Merged
Changes from 1 commit
Commits
Show all changes
595 commits
Select commit Hold shift + click to select a range
1130eaf
fix: Quick typo & dbl spamhaus test fixes
chrisr3d Oct 4, 2019
6a3c907
fix: DBL spamhaus test
chrisr3d Oct 4, 2019
662e58d
fix: Fixed pattern parsing + made the module hover only
chrisr3d Oct 7, 2019
3fb3bd5
Merge branch 'tests' of github.com:MISP/misp-modules
chrisr3d Oct 7, 2019
bef1cbb
Merge branch 'master' of github.com:MISP/misp-modules into tests
chrisr3d Oct 7, 2019
e1faf64
add: Added tests for the rest of the easily testable expansion modules
chrisr3d Oct 7, 2019
9e49b35
Merge pull request #339 from MISP/tests
chrisr3d Oct 8, 2019
f27031d
Merge branch 'master' of github.com:MISP/misp-modules
chrisr3d Oct 8, 2019
5d4a0bf
fix: Handling cases where there is no result from the query
chrisr3d Oct 8, 2019
2850d6f
fix: Catching exceptions and results properly depending on the cases
chrisr3d Oct 8, 2019
8bcb630
fix: Catching results exceptions properly
chrisr3d Oct 8, 2019
b560347
fix: Considering the case of empty results
chrisr3d Oct 8, 2019
b1ae8de
fix: Handling errors and exceptions for expansion modules tests that …
chrisr3d Oct 8, 2019
6d19549
fix: Grouped two if conditions to avoid issues with variable unassign…
chrisr3d Oct 13, 2019
8aca19b
chg: Taking into consideration if a user agent is specified in the mo…
chrisr3d Oct 15, 2019
bc0c7c7
fix: Catching wikidata errors properly + fixed errors parsing
chrisr3d Oct 15, 2019
1786b23
add: Tests for expansion modules with different input types
chrisr3d Oct 15, 2019
5f7b127
chg: Avoids returning empty values + easier results parsing
chrisr3d Oct 15, 2019
0e6d514
Update test_expansions.py
StefanKelm Oct 16, 2019
a7e523a
add: threatminer module test
chrisr3d Oct 16, 2019
dc8a27e
Merge branch 'master' of github.com:MISP/misp-modules into tests
chrisr3d Oct 17, 2019
9f7f111
fix: Fixed ThreatMiner results parsing
chrisr3d Oct 17, 2019
a228e25
fix: Avoiding empty values + Fixed empty types error + Fixed filename…
chrisr3d Oct 17, 2019
d740abe
fix: Making pep8 happy
chrisr3d Oct 17, 2019
0555cda
Merge branch 'master' of github.com:MISP/misp-modules into tests
chrisr3d Oct 17, 2019
60ef190
fix: Handling issues when the otx api is queried too often in a short…
chrisr3d Oct 17, 2019
7aa7863
add: Tests for all the office, libreoffice, pdf & OCR enrich modules
chrisr3d Oct 17, 2019
93bc178
fix: Removed unused import\
chrisr3d Oct 17, 2019
cf73151
fix: Fixed tesseract python library issues
chrisr3d Oct 17, 2019
6df0072
fix: Using absolute path to open files instead of relative path
chrisr3d Oct 18, 2019
259c3f2
Merge branch 'tests' of github.com:MISP/misp-modules into tests
chrisr3d Oct 18, 2019
63dba29
fix: Fixed module names with - to avoid errors with python paths
chrisr3d Oct 18, 2019
d2b92f8
Merge pull request #342 from MISP/tests
chrisr3d Oct 18, 2019
e1602fd
fix: Updates following the latest CVE-search version
chrisr3d Oct 23, 2019
56e16db
Added apiosintDS module to query OSINT.digitalside.it services
davidonzo Oct 24, 2019
bdc5282
updated to geoip2 to support mmdb format
0xmilkmix Oct 25, 2019
1c85caf
Merge pull request #345 from 0xmilkmix/fix_geoip2
adulau Oct 26, 2019
1b1363f
chg: [pipenv] updated
adulau Oct 27, 2019
3af7d9b
chg: [env] Pipfile updated
adulau Oct 27, 2019
93858e3
fix: Removed unused self param turning the associated functions into …
chrisr3d Oct 27, 2019
f15ab81
add: cve_advanced module test + functions to test attributes and obje…
chrisr3d Oct 27, 2019
7a56174
fix: Fixed Geoip with the supported python library + fixed Geolite db…
chrisr3d Oct 28, 2019
4fe6b0a
fix: Fixed requirements for pymisp and geoip python libraries
chrisr3d Oct 28, 2019
204e5a7
Merge branch 'master' of github.com:MISP/misp-modules
chrisr3d Oct 28, 2019
3b58f80
fix: Updated pipfile.lock with the correct geoip2 library info
chrisr3d Oct 29, 2019
fdbb071
Merge pull request #344 from davidonzo/master
adulau Oct 29, 2019
36d9873
chg: [Pipfile] apiosintDS added as required by new module
adulau Oct 29, 2019
dec2494
chg: [apiosintds] make flake8 happy
adulau Oct 29, 2019
752fbde
chg: [travis] skip E226 as it's more a question of style
adulau Oct 29, 2019
dc7463a
fix: Avoid issues when some config fields are not set
chrisr3d Oct 29, 2019
3e44181
Added EQL export test module
blaverick62 Oct 29, 2019
8ac4b61
Added endgame export to __all__
blaverick62 Oct 29, 2019
c3ccc9c
Attempting to import endgame module
blaverick62 Oct 29, 2019
3142b0a
Fixed type error in JSON parsing
blaverick62 Oct 29, 2019
5802575
Fixed string formatting
blaverick62 Oct 29, 2019
a426ad2
Added EQL enrichment module
blaverick62 Oct 29, 2019
c06ceed
Changed to single attribute EQL
blaverick62 Oct 29, 2019
c1ca936
Fixed syntax error
blaverick62 Oct 29, 2019
d683665
chg: [test expansion] Enhanced results parsing
chrisr3d Oct 29, 2019
2a4c7ff
Added ors for compound queries
blaverick62 Oct 29, 2019
edb6bef
add: [test expansion] New modules tests
chrisr3d Oct 29, 2019
7170ed6
fix: [test expansion] Using CVE with lighter results
chrisr3d Oct 29, 2019
d0ddfb3
fix: [expansion] Better config field handling for various modules
chrisr3d Oct 30, 2019
1563be1
Merge branch 'master' of github.com:MISP/misp-modules into tests
chrisr3d Oct 30, 2019
08fc938
Fixed comments
blaverick62 Oct 30, 2019
62d25b1
Changed file name to mass eql export
blaverick62 Oct 30, 2019
dc4c09f
Fixed python links
blaverick62 Oct 30, 2019
4cabbe6
add: [test expansion] Added various tests for modules with api authen…
chrisr3d Oct 30, 2019
393b33d
fix: Fixed config field parsing for various modules
chrisr3d Oct 30, 2019
d4eb88c
fix: Avoiding various modules to fail with uncritical issues
chrisr3d Oct 30, 2019
b63a0d1
fix: Making urlscan module available in MISP for ip attributes
chrisr3d Oct 30, 2019
717be2b
Removed extraneous comments and unused imports
blaverick62 Oct 30, 2019
c3c6f1a
Merge pull request #346 from blaverick62/master
adulau Oct 30, 2019
3277a23
Merge branch 'master' of github.com:MISP/misp-modules into tests
chrisr3d Oct 31, 2019
969d8b6
add: Added qrcode module test with its test image
chrisr3d Oct 31, 2019
2adba0b
fix: Fixed VT results
chrisr3d Oct 31, 2019
604fac9
add: Added test for vulners module
chrisr3d Oct 31, 2019
4f70011
fix: Fixed config parsing + results parsing
chrisr3d Oct 31, 2019
4411166
fix: Fixed config parsing and the associated error message
chrisr3d Oct 31, 2019
189b469
Updated README with new modules and fixed some links
chrisr3d Oct 31, 2019
86023fb
add: Updated documentation with the latest modules info
chrisr3d Oct 31, 2019
eb4e231
fix: Bumped Pipfile.lock with the latest libraries versions
chrisr3d Oct 31, 2019
1ff695d
Merge branch 'master' of github.com:MISP/misp-modules into tests
chrisr3d Oct 31, 2019
4fb6567
fix: Fixed variable name
chrisr3d Oct 31, 2019
83227ba
fix: Fixed results parsing for various module tests
chrisr3d Oct 31, 2019
69e81b4
fix: Better exceptions handling on the passivetotal module
chrisr3d Oct 31, 2019
bfe227d
fix: More clarity on the exception raised on the securitytrails module
chrisr3d Oct 31, 2019
6b50c77
Merge branch 'master' of github.com:MISP/misp-modules into tests
chrisr3d Oct 31, 2019
c4d333f
Updated README to include EQL modules
blaverick62 Oct 31, 2019
26ab7f6
Added documentation json for new modules
blaverick62 Oct 31, 2019
8135a3c
Merge pull request #347 from MISP/tests
chrisr3d Oct 31, 2019
2b592ce
fix: Avoiding empty config error on passivetotal module
chrisr3d Nov 1, 2019
852018b
fix: Added urlscan & secuirtytrails modules in __init__ list
chrisr3d Nov 4, 2019
0fd3f92
fix: Fixed Xforce Exchange authentication + rework
chrisr3d Nov 5, 2019
9068725
add: Xforce Exchange module tests
chrisr3d Nov 5, 2019
4608bca
Merge branch 'master' of github.com:blaverick62/misp-modules
chrisr3d Nov 7, 2019
204f59d
add: Updated documentation with the EQL export module
chrisr3d Nov 7, 2019
474307a
chg: Using EQL module description from blaverick62
chrisr3d Nov 7, 2019
91d6f1b
fix: Fixed csv file parsing
chrisr3d Nov 7, 2019
4990bce
fix: Avoiding KeyError exception when no result is found
chrisr3d Nov 17, 2019
f08fc6d
chg: Reintroducing the limit to reduce the number of recursive calls …
chrisr3d Nov 18, 2019
58a4cb1
add: New expansion module to submit samples and urls to AssemblyLine
chrisr3d Nov 19, 2019
fb12910
add: Updated python dependencies to include the assemblyline_client l…
chrisr3d Nov 19, 2019
ef6542c
add: Added documentation and description in readme for the AssemblyLi…
chrisr3d Nov 20, 2019
4e98c3e
fix: Added missing AssemblyLine logo
chrisr3d Nov 20, 2019
dc9ea98
fix: Making pep8 happy
chrisr3d Nov 20, 2019
de8737d
fix: Fixed input types list since domain should not be submitted to A…
chrisr3d Nov 20, 2019
6dcba6c
fix: Fixed AssemblyLine input description
chrisr3d Nov 20, 2019
96712da
add: Module to query AssemblyLine and parse the results
chrisr3d Nov 21, 2019
bf1ba16
add: Added documentation for the AssemblyLine query module
chrisr3d Nov 21, 2019
ccf12a2
fix: Making pep8 happy
chrisr3d Nov 21, 2019
e4830cb
Update README.md
aaronkaplan Nov 22, 2019
90ba6db
Merge pull request #352 from aaronkaplan/patch-1
adulau Nov 22, 2019
5350003
initial version of the ransomcoindb expansion module
aaronkaplan Nov 25, 2019
24ec4a0
remove pprint
aaronkaplan Nov 25, 2019
132249a
mention the ransomcoindb in the README file as a new module
aaronkaplan Nov 25, 2019
44130e2
fix url
aaronkaplan Nov 25, 2019
c5924ae
fix url again
aaronkaplan Nov 25, 2019
b82716f
Revert "fix url again"
aaronkaplan Nov 25, 2019
7774838
Revert "fix url"
aaronkaplan Nov 25, 2019
6546905
final url fix
aaronkaplan Nov 25, 2019
d73a9b6
use a helpful user-agent string
aaronkaplan Nov 26, 2019
06025e6
oops , use relative import
aaronkaplan Nov 26, 2019
5d7a829
chg: Use MISPObject in ransomcoindb
Rafiot Nov 26, 2019
7a7b3a0
chg: Bump dependencies
Rafiot Nov 26, 2019
6042619
Merge branch 'aaronkaplan-master'
Rafiot Nov 26, 2019
1df0d91
Merge pull request #341 from StefanKelm/master
Rafiot Nov 26, 2019
9744c1e
Revert "Merge pull request #341 from StefanKelm/master"
Rafiot Nov 26, 2019
f749578
add: Modules to query/import/submit data from/to Lastline
Nov 21, 2019
aa39567
Merge pull request #356 from ostefano/lastline
adulau Dec 3, 2019
2b8a2d0
chg: Bump dependencies
Rafiot Dec 4, 2019
6f95445
chg: Update email import module, support objects
Rafiot Dec 4, 2019
7048f01
chg: deactive emails tests, need update
Rafiot Dec 4, 2019
1e1b18f
chg: Install faup in travis
Rafiot Dec 4, 2019
5d415bb
fix: Missing sudo
Rafiot Dec 4, 2019
5b1ac3d
fix: missing pushd
Rafiot Dec 4, 2019
6fcd9c9
fix: MIssing parameter in skip
Rafiot Dec 4, 2019
b70c32a
fix: Somewhat broken emails needed some love
Rafiot Dec 5, 2019
e880191
chg: Bump dependencies
Rafiot Dec 8, 2019
772822a
fix: OTX tests were failing, new entry.
Rafiot Dec 10, 2019
e063c2a
fix: Properly install pymisp with file object dependencies
Rafiot Dec 17, 2019
adda243
fix: Missing dependency in travis
Rafiot Dec 17, 2019
6849dae
chg: Made circl_passivessl module able to return MISP objects
chrisr3d Dec 17, 2019
9da6a37
chg: Updated documentation following the latest changes on the passiv…
chrisr3d Dec 17, 2019
9c9f01b
fix: Quick variable name fix
chrisr3d Dec 17, 2019
b8d6141
chg: Made circl_passivedns module able to return MISP objects
chrisr3d Dec 17, 2019
fd5e9e0
chg: Updated documentation following the latest changes on the passiv…
chrisr3d Dec 17, 2019
306e9f3
chg: Regenerated the modules documentation following the latest changes
chrisr3d Dec 17, 2019
ae9e6d0
Merge branch 'master' of github.com:MISP/misp-modules into new_module
chrisr3d Dec 17, 2019
5f90ae7
fix: Making pep8 happy
chrisr3d Dec 17, 2019
3f7ee7c
add: Test cases for reworked passive dns and ssl modules
chrisr3d Dec 17, 2019
aa721ac
fix: [tests] Added missing variable
chrisr3d Dec 17, 2019
3007761
fix: Making pep8 happy by having spaces around '+' operators
chrisr3d Dec 17, 2019
2fc9171
fix: [tests] Avoiding issues with btc addresses
chrisr3d Dec 17, 2019
c41545d
fix: [tests] Fixed error catching in passive dns and ssl modules
chrisr3d Dec 17, 2019
fd71147
fix: [tests] Fixed copy paste issue
chrisr3d Dec 17, 2019
6a041bc
Revert "fix: [tests] Fixed copy paste issue"
chrisr3d Dec 17, 2019
0f45540
fix: [tests] With values, tests are always better ...
chrisr3d Dec 18, 2019
2fc0b44
fix: Making pep8 happy with whitespace after ':'
chrisr3d Dec 18, 2019
7945d06
new: Enrichment module for querying APIVoid with domain attributes
chrisr3d Dec 18, 2019
0d3e61d
add: [tests] Test case for the APIVoid module
chrisr3d Dec 18, 2019
9679fed
add: Documentation for the new API Void module
chrisr3d Dec 19, 2019
0d80d5f
fix: [doc] Added APIVoid logo
chrisr3d Dec 19, 2019
cf5ad29
chg: Checking attributes category
chrisr3d Jan 7, 2020
bfcba18
Update ipasn.py
Jan 7, 2020
10b4e78
add vt_graph export module
Jan 9, 2020
9179598
Merge pull request #360 from ec4n6/patch-1
adulau Jan 9, 2020
3207cec
Add vt-graph-api to the requirements
Jan 9, 2020
7c2b001
Merge pull request #361 from VirusTotal/master
chrisr3d Jan 9, 2020
7722e2c
fix: Fixed typo on function import
chrisr3d Jan 9, 2020
70b3079
fix: Fixed pep8 in the new module and related libraries
chrisr3d Jan 9, 2020
f197abd
chg: Bumped pipfile.lock with up-to-date libraries and new vt_graph_a…
chrisr3d Jan 9, 2020
f545205
fix: Fixed vt_graph imports
chrisr3d Jan 10, 2020
35c438e
fix: typo
chrisr3d Jan 10, 2020
b3bc533
chg: Making ipasn module return asn object(s)
chrisr3d Jan 10, 2020
8db9891
fix: Updated ipasn test following the latest changes on the module
chrisr3d Jan 10, 2020
31a74a1
fix: Fixed ipasn test input format + module version updated
chrisr3d Jan 10, 2020
a88f199
new: Updated ipasn and added vt_graph documentation
chrisr3d Jan 10, 2020
610c99c
Fix error message in Public VT module
cudeso Jan 17, 2020
036933e
2nd fix for VT Public module
cudeso Jan 17, 2020
c0bcb5a
Merge pull request #364 from cudeso/master
chrisr3d Jan 21, 2020
66bf650
change: migrate to analysis API when submitting tasks to Lastline
Dec 28, 2019
09cdc72
Merge pull request #365 from ostefano/analysis
adulau Jan 21, 2020
f28aaf0
fix: [tests] Fixed BGP raking module test
chrisr3d Jan 21, 2020
840ada4
Merge branch 'master' of github.com:MISP/misp-modules
chrisr3d Jan 21, 2020
04685ea
joe: (1) allow users to disable PE object import (2) set 'to_ids' to …
georgschoelly Jan 24, 2020
1de6890
Merge pull request #367 from joesecurity/master
chrisr3d Jan 24, 2020
b2c8f79
fix: Making pep8 happy
chrisr3d Jan 24, 2020
8f99402
Lastline verify_ssl option
andurin Jan 27, 2020
b65237a
Merge pull request #368 from andurin/lastline_verifyssl
chrisr3d Feb 6, 2020
acdc4b9
fix: [VT] Disable SHA512 query for VT
JakubOnderka Feb 7, 2020
2a137f1
Merge pull request #370 from JakubOnderka/vt-query-sha512
adulau Feb 8, 2020
4e7192f
Added GeoIP City and GeoIP ASN Info
GlennHD Feb 13, 2020
7a3f9a4
Added GeoIP_City Enrichment module
GlennHD Feb 13, 2020
0b9b6c4
Added GeoIP_ASN Enrichment module
GlennHD Feb 13, 2020
46f0f41
Added geoip_asn and geoip_city to load
GlennHD Feb 13, 2020
bdb4185
Update geoip_city.py
GlennHD Feb 13, 2020
0ed0cea
Update geoip_asn.py
GlennHD Feb 13, 2020
63a2183
Merge pull request #371 from GlennHD/master
chrisr3d Feb 13, 2020
27717c0
fix: Making the module config available so the module works
chrisr3d Feb 13, 2020
df3a698
Rendu projet master2 sécurité par Mathilde OUN et Vincent GINDT // No…
M0un Feb 21, 2020
f5af7fa
Create __init__.py
seanthegeek Feb 23, 2020
42dffa7
Install cmake to build faup
seanthegeek Feb 23, 2020
180985f
Revert change inteded for other patch
seanthegeek Feb 23, 2020
6111f02
Merge pull request #373 from seanthegeek/patch-1
chrisr3d Feb 25, 2020
dea42d3
chg: Catching missing config issue
chrisr3d Feb 25, 2020
f9f3db8
chg: Quick ransomdncoin test just to make sure the module loads
chrisr3d Feb 25, 2020
fc54785
Merge pull request #374 from M0un/projet-m2-oun-gindt
chrisr3d Feb 26, 2020
c9c6f69
fix: Making pep8 happy
chrisr3d Feb 26, 2020
cda5004
fix: Removed unused import
chrisr3d Feb 26, 2020
a32685d
Initial Build of SOPHOSLabs Intelix Product
Mar 3, 2020
277f56e
Updated the README.md for SOPHOSLabs Intelix
Mar 3, 2020
4771a51
Fixed formatting in README.md
Mar 3, 2020
0a8a829
Fixed handler error handling for missing config
Mar 4, 2020
6c00f02
Removed Unused Import
Mar 4, 2020
55664da
Merge pull request #377 from 0xbennyv/master
adulau Mar 5, 2020
0b4d673
fix: Making pep8 happy
chrisr3d Mar 10, 2020
e023f0b
Cytomic Orion MISP Module
cudeso Mar 10, 2020
c86f4a4
Make Travis (a little bit) happy
cudeso Mar 10, 2020
2713d3c
Update __init__
cudeso Mar 10, 2020
d2f0d80
Documentation for Cytomic Orion
cudeso Mar 11, 2020
0e84ea7
Merge pull request #379 from cudeso/master
adulau Mar 11, 2020
fe34023
csvimport: Return error if input is not valid UTF-8
JakubOnderka Mar 12, 2020
b869c41
Merge pull request #380 from JakubOnderka/patch-1
chrisr3d Mar 18, 2020
8ffb702
Merge branch 'master' of github.com:MISP/misp-modules
chrisr3d Mar 18, 2020
422f654
fix: Making pep8 happy with indentation
chrisr3d Mar 18, 2020
824c003
fix: Catching errors in the reponse of the query to URLhaus
chrisr3d Mar 18, 2020
9c0ebfb
chg: Bump dependencies
Rafiot Mar 28, 2020
b79636c
new: usr: Censys Expansion module
lfortemps Apr 3, 2020
500f030
Adding support for more input types, including multi-types
lfortemps Apr 7, 2020
fd3c62c
Fix variable issue in the loop
lfortemps Apr 8, 2020
8e2c519
Merge pull request #388 from Golbark/censys_expansion
cvandeplas Apr 8, 2020
be27869
fix: [doc] corrected filenames for 2 docs
cvandeplas Apr 8, 2020
ebf71a3
Update vmray_submit
vmray-labs Apr 23, 2020
97bcc55
Merge pull request #393 from vmray-labs/update-vmray-module
adulau Apr 24, 2020
c58f131
chg: [travis] Added py3.8
SteveClement Apr 30, 2020
72913c9
fix: [pip] pyfaup required
SteveClement Apr 30, 2020
acee988
chg: [travis] Added gtcaca and liblua to faup
SteveClement Apr 30, 2020
e655905
chg: [doc] in case btc expansion fails, give another hint at why it f…
SteveClement May 1, 2020
9f8a72b
fix: [travis] gtcaca has no build directory
SteveClement May 1, 2020
dbb7d37
chg: [doc] Added details about faup
SteveClement May 1, 2020
3fd6633
fix: [pep] Comply to PEP E261
SteveClement May 1, 2020
e981966
Merge pull request #395 from SteveClement/master
SteveClement May 1, 2020
6f74885
build(deps): bump httplib2 from 0.17.0 to 0.18.0
dependabot[bot] May 20, 2020
9afaeb1
Merge pull request #402 from MISP/dependabot/pip/httplib2-0.18.0
adulau May 20, 2020
31d1505
new: [passivedns, passivessl] Add support for ip-src|port and ip-dst|…
JakubOnderka Jun 3, 2020
6e21893
fix: [circl_passivedns] Return not found error
JakubOnderka Jun 3, 2020
b053e1c
fix: [circl_passivessl] Return not found error
JakubOnderka Jun 3, 2020
4dae11e
Merge pull request #405 from JakubOnderka/patch-2
adulau Jun 3, 2020
ddf51d4
Merge pull request #406 from JakubOnderka/ip-port
adulau Jun 3, 2020
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
Prev Previous commit
Next Next commit
chg: Taking into consideration if a user agent is specified in the mo…
…dule configuration
chrisr3d committed Oct 15, 2019

Verified

This commit was signed with the committer’s verified signature.
chrisr3d Christian Studer
commit 8aca19ba68474a78505c3af5394459f5998ff709
5 changes: 3 additions & 2 deletions misp_modules/modules/expansion/macvendors.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
misperrors = {'error': 'Error'}
mispattributes = {'input': ['mac-address'], 'output': ['text']}
moduleinfo = {'version': '0.1', 'author': 'Aurélien Schwab', 'description': 'Module to access Macvendors API.', 'module-type': ['hover']}
moduleconfig = ['user-agent'] # TODO take this into account in the code
moduleconfig = ['user-agent']

macvendors_api_url = 'https://api.macvendors.com/'
default_user_agent = 'MISP-Module'
@@ -21,7 +21,8 @@ def handler(q=False):
else:
misperrors['error'] = "Unsupported attributes type"
return misperrors
r = requests.get(macvendors_api_url + mac, headers={'user-agent': default_user_agent}) # Real request
user_agent = request['config']['user-agent'] if request.get('config') and request['config'].get('user-agent') else default_user_agent
r = requests.get(macvendors_api_url + mac, headers={'user-agent': user_agent}) # Real request
if r.status_code == 200: # OK (record found)
response = r.text
if response: