MISP
/
misp-taxonomies
mirror of https://github.com/MISP/misp-taxonomies
2
0
Fork 0
Code Issues Releases Wiki Activity
1,036 Commits
6 Branches
32 Tags
6.6 MiB
Commit Graph

1036 Commits (dfeabc16be2b718bdb8b0906178b908b8d803f5f)

Author SHA1 Message Date
Alexandre Dulaunoy a6eb5137de
Merge pull request #201 from CyCat-project/main 
Updates from Freddy
 2021-01-30 22:55:27 +01:00
Freddy Dezeure fbac5325ca
Update machinetag.json 2021-01-30 06:56:18 +01:00
Freddy Dezeure 4b82598056
Update machinetag.json 2021-01-30 06:51:09 +01:00
Alexandre Dulaunoy 998c8007cc
Merge pull request #200 from CyCat-project/main 
Policy added
 2021-01-23 14:47:20 +01:00
Alexandre Dulaunoy 1563642c4b
Policy added 2021-01-23 14:44:30 +01:00
Alexandre Dulaunoy 14c60342d2
Merge pull request #198 from CyCat-project/main 
Better wording
 2021-01-15 11:45:37 +01:00
Saad Kadhi f6e0b7b929
Better wording 2021-01-15 11:20:17 +01:00
Alexandre Dulaunoy ec5d069133
Merge pull request #196 from CyCat-project/main 
Updates
 2021-01-03 16:18:11 +01:00
Freddy Dezeure d59e020dae
Update machinetag.json 2021-01-03 16:13:03 +01:00
Freddy Dezeure 25b1db3f6f
Update machinetag.json 2021-01-03 16:10:07 +01:00
Alexandre Dulaunoy bc3adf6c0a
chg: [MANIFEST] updated 2021-01-03 11:24:54 +01:00
Alexandre Dulaunoy 90d7abf6ef
new: [cycat] Taxonomy used by cycat (Universal Cybersecurity Catalogue) to categorize namespace available in their cybersecurity catalogue. 
(DRAFT version)
 2021-01-03 11:24:19 +01:00
Alexandre Dulaunoy 27c1624bc1
chg: [copyright] we are in 2021 2021-01-03 10:47:33 +01:00
Alexandre Dulaunoy 3326603516
chg: [adversary] sinkholed action added 2020-12-28 08:12:28 +01:00
Alexandre Dulaunoy 3cc315fe1f
Merge branch 'master' of github.com:MISP/misp-taxonomies into main 2020-12-20 16:18:28 +01:00
Alexandre Dulaunoy ac013f76e6
Merge pull request #195 from Vasileios-Mavroeidis/patch-1 
Update machinetag.json
 2020-12-20 16:15:33 +01:00
Vasileios Mavroeidis 19f002bc5e
Update machinetag.json 
Updated Taxonomy for Sectors and Digital Services based on the EU NIS Directive. https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=CELEX:32016L1148&from=EN#ntr17-L_2016194EN.01000101-E0017

Removed entity types that have been misclassified as sub-sectors. If we wanted to include entity types we should have done the same for all subsectors and not selectively for the sectors that do not define subsectors. If this is something that we desire, instead of removing what I have suggested we need to include all the ones that haven't initially.

Second, the digital service providers in the NIS Directive should not be classified as sectors but as digital services. Normally this would require a new taxonomy of three entities only. I can go both ways.
 2020-12-20 14:38:20 +01:00
Alexandre Dulaunoy 98f8f6035d
chg: [doc] Travis is dead, GH Action is alive! 2020-11-30 15:53:12 +01:00
Raphaël Vinot 11f6dfb478 chg: Add PR to GH actions 2020-11-30 14:11:02 +01:00
Jens Thom 6a7047336f add VMRay taxonomies 2020-11-30 12:10:28 +01:00
Raphaël Vinot 0f2ffbc166 new: GH workflow 2020-11-24 18:35:04 +01:00
Raphaël Vinot 44357ecea9 chg: master -> main everywhere 2020-09-08 11:42:38 +02:00
Raphaël Vinot 430a34e40c fix: Update URL in MANIFEST 2020-09-08 11:39:45 +02:00
paulingega-sa 8f26a434fd update threatmatch taxonomies into a single taxonomy 2020-08-24 14:50:30 +01:00
Alexandre Dulaunoy b2aeefcab1
chg: [threat-match] fixed all the namespaces 2020-08-20 14:11:04 +02:00
Alexandre Dulaunoy b2bd9f7e99
Merge branch 'paulingega-sa-main' into main 2020-08-20 13:46:21 +02:00
Alexandre Dulaunoy eb18a1309c
chg: [MANIFEST] regenerated 2020-08-20 13:46:02 +02:00
Alexandre Dulaunoy 92f1f72c3e
chg: [threatmatch*] jq all the things 2020-08-20 13:45:23 +02:00
paulingega-sa 5a3e3c1c11 adding ThreatMatch taxonomies 2020-08-20 11:46:07 +01:00
paulingega-sa 4991db0bbd adding ThreatMatch taxonomies 2020-08-20 11:43:05 +01:00
Alexandre Dulaunoy a6ce68a4bf
chg: [information-website-label] fixed 2020-06-12 21:40:22 +02:00
Alexandre Dulaunoy 1063b65479
chg: [misinformation-website-label] version is an integer 2020-06-12 21:31:47 +02:00
Alexandre Dulaunoy c23a1ba4bc
chg: [misinformation-website-label] updated 2020-06-12 21:26:07 +02:00
Alexandre Dulaunoy 94cc6a2f86
chg: [manifest] updated 2020-06-12 21:23:02 +02:00
Alexandre Dulaunoy c458c046bd
Merge branch 'C00kie--master' 2020-06-12 21:22:34 +02:00
Alexandre Dulaunoy d58dd79e57
chg: [misinformation-website-labels] updated 2020-06-12 21:21:01 +02:00
Alexandre Dulaunoy 024fc38488
Merge branch 'master' of https://github.com/C00kie-/misp-taxonomies into C00kie--master 2020-06-12 21:18:55 +02:00
Cookie fc42e36545 new:[misinformation-website-labels] first proposal 2020-06-12 20:22:01 +02:00
Raphaël Vinot a0b0035982 fix: Incorrect merge 2020-06-03 12:04:55 +02:00
Raphaël Vinot 6dfff0812f Merge branch 'master' of github.com:MISP/misp-taxonomies 2020-06-03 12:00:59 +02:00
Alexandre Dulaunoy 35e561697a
chg: [extended-event] description typo fixed 2020-05-26 16:12:38 +02:00
Alexandre Dulaunoy 1c4dd1a424
Merge branch 'C00kie--master' 2020-05-26 16:10:14 +02:00
Alexandre Dulaunoy a29f19e4b9
chg: [extended-event] updated to please our strict rules 2020-05-26 16:09:44 +02:00
Cookie 2350f8213b complete version before merge 2020-05-26 16:04:44 +02:00
Cookie 113e5959d5 update to predicate 2020-05-20 17:21:12 +02:00
Cookie 031287c19d new: [extended-event] first proposal 2020-05-19 18:59:39 +02:00
Alexandre Dulaunoy 43ee8e9492
chg: [exercise] a new generic predicate added for comcheck without name 2020-05-18 10:52:34 +02:00
Alexandre Dulaunoy 8c4e2a8e8b
chg: [pandemic] geostrategy added 2020-04-24 14:00:07 +02:00
Alexandre Dulaunoy 25469f1a29
Merge pull request #189 from stricaud/trust 
Trust Taxonomy
 2020-04-14 08:29:54 +02:00
Sebastien Tricaud 9dbd12eccb After running ./jq_all_the_things.sh 2020-04-13 18:30:06 -07:00