Commit Graph

73 Commits

Author SHA1 Message Date
Stephen Campbell
87cdbde844 Add URLs to markdown pages for incidents 2024-05-18 09:29:22 -04:00
Stephen H. Campbell
68e2674421
Merge pull request #23 from cvandeplas/main
Generates DISARM as MISP Galaxy + a few fixes
2024-05-17 14:07:25 -04:00
adam-disarm
f606bb0e1a
Merge pull request #28 from DISARMFoundation/march24update
Update DISARM.json for Version 1.4 of Red Framework
2024-03-14 19:29:51 +00:00
Stephen Campbell
0c64d07516 Update DISARM.json for Version 1.4 of Red Framework 2024-03-14 12:43:01 -04:00
adam-disarm
69453da88d
Merge pull request #27 from DISARMFoundation/march24update
New Version 1.4 of Red Framework: Some of the Requests from EEAS and VIGINUM
2024-03-14 10:52:29 +00:00
Stephen Campbell
f1ac3b04ee New Version 1.4 of Red Framework: Some of the Requests from EEAS and VIGINUM 2024-03-13 15:07:55 -04:00
adam-disarm
82b1f8f295
Merge pull request #25 from DISARMFoundation/scampb06-companion-guide
Add Companion Guide to the Blue workshop output
2024-02-19 17:24:15 +00:00
adam-disarm
614a52af12
Merge pull request #26 from DISARMFoundation/scampb06-caution-blue
Update DISARMframeworks page with caution about Blue
2024-02-19 14:35:38 +00:00
Stephen H. Campbell
8dfb703b83
Update DISARMframeworks page with caution about Blue
Add a cautionary note about the Blue workshop output from 2019 with reference to the Companion Guide and where to find it
2024-02-16 14:13:13 -05:00
Stephen H. Campbell
3bf59f1f96
Add Companion Guide to the Blue workshop output
The Companion Guide provides ethical considerations for those in democracies using the Blue workshop output from 2019, since this was not designed as a prescriptive framework but rather as a way to track all observed and potential responses to disinformation campaigns, including responses from authoritarian regimes (such as censorship).
2024-02-16 14:03:42 -05:00
Christophe Vandeplas
352e5411ec
fix: [code] MISP Galaxy skips duplicate values 2023-12-21 09:16:38 +01:00
Christophe Vandeplas
197dcd3aea
new: [code] MISP Galaxy supports relations 2023-12-20 16:18:39 +01:00
Christophe Vandeplas
8b8100611c
new: [code] MISP Galaxy supports most models 2023-12-20 11:29:33 +01:00
Christophe Vandeplas
f12df578ab
fix: [code] Fix MISP Galaxy value without ID 2023-12-19 15:57:20 +01:00
Christophe Vandeplas
d2ca8fbcc7
new: [code] Generate DISARM as MISP Galaxy fixes #22 2023-12-02 18:08:26 +01:00
Christophe Vandeplas
cc38695dae
fix: fixes resource_counters_string wrong variable 2023-12-02 09:14:58 +01:00
Christophe Vandeplas
3b9f356530
fix: [code] make panda happy 2023-12-02 09:09:21 +01:00
adam-disarm
54fb3933be
Merge pull request #21 from DISARMFoundation/Sep13update
Corrected summary for T0139.001 (Discourage)
2023-10-02 09:35:10 +01:00
Stephen Campbell
7eedbe027a Corrected summary for T0139.001 (Discourage) 2023-09-28 17:38:48 -04:00
adam-disarm
59230710e9
Merge pull request #20 from DISARMFoundation/Sep13update
Run generate_DISARM_pages for T0135.001 and T0140.001
2023-09-27 11:51:26 +01:00
Stephen Campbell
1e84e5f9de Run generate_DISARM_pages for T0135.001 and T0140.001 2023-09-26 12:28:55 -04:00
adam-disarm
5569ebff2e
Merge pull request #19 from DISARMFoundation/Sep13update
Update descriptions for T0104.003, T0123.004, T0135.001, T0140.001 and files for STIX Bundle
2023-09-26 09:08:46 +01:00
Stephen Campbell
a604c155cf Update descriptions for T0104.003, T0123.004, T0135.001, T0140.001 and files for STIX Bundle 2023-09-25 12:46:26 -04:00
adam-disarm
439601e214
Merge pull request #18 from DISARMFoundation/Sep13update
New V1.3: Community Requests Plus Major Enhancements to TA01 and TA02
2023-09-14 09:52:40 +01:00
Stephen Campbell
62680c33d5 New Version 1.3 of Red Framework: EEAS Requests Plus Major Enhancements to TA01 and TA02 2023-09-13 18:16:14 -04:00
adam-disarm
29792a7406
Merge pull request #17 from DISARMFoundation/Aug10update
Aug10update
2023-08-14 10:31:23 +01:00
Stephen Campbell
7a65c376bb Convert Excel master to British English and metatechnique names to title case 2023-08-10 14:51:53 -04:00
Stephen Campbell
382df9325a Convert Excel master to British English and metatechnique names to title case 2023-08-10 14:12:44 -04:00
adam-disarm
60d09b1cae
Merge pull request #15 from DISARMFoundation/demo
Amended technique names to MLA Title Case in following sheets: techni…
2023-05-26 13:38:03 +01:00
Stephen Campbell
c39577572d Amended technique names to MLA Title Case in following sheets: techniques, detections and countermeasures 2023-05-25 15:57:53 -04:00
Stephen H. Campbell
b6d2e627a0
Merge pull request #13 from DISARMFoundation/demo
testing a quick spelling change on master excel file
2023-03-25 12:30:30 -04:00
Stephen Campbell
c4275fe3f8 testing a quick spelling change on master excel file 2023-03-25 12:09:08 -04:00
adam-disarm
3688542eb5 Update Summary for T0101.002 2023-03-13 15:30:15 +00:00
VVX7
cae9cbc55e update stix for opencti compatability 2022-07-03 19:59:09 -04:00
VVX7
fd84d4c13d update stix generator for OpenCTI compatability 2022-07-03 19:09:05 -04:00
VVX7
aebab66a11
Merge pull request #11 from DISARMFoundation/subtechnique-description-updates
subtechnique description updates
2022-07-02 13:01:46 -07:00
VVX7
ba1ccf25a2 update stix descriptions 2022-07-02 16:01:17 -04:00
Mike Klein
c888a7d6f4 subtechnique description updates
Updated subtechniques so that now all have a description. Also made slight name changes to a few techniques and subtechniques but retained the disarm_id and overall nature of all of them
2022-07-02 15:40:09 -04:00
VVX7
1da43f79e0
Merge pull request #10 from DISARMFoundation/subtechnique_merge
add subtechniques markdown
2022-07-02 11:09:55 -07:00
VVX7
81a5359b55 add subtechniques markdown 2022-07-02 14:09:24 -04:00
VVX7
f726faba10
Merge pull request #9 from DISARMFoundation/subtechnique_merge
add subtechniques to stix2 generator. update STIX bundles.  use subte…
2022-07-02 10:30:00 -07:00
VVX7
c7b5d59876 add subtechniques to stix2 generator. update STIX bundles. use subtechnique dot notation name convention in DISARM_FRAMEWORKS_MASTER.xlsx 2022-07-02 13:29:40 -04:00
VVX7
fc124b877c
Merge pull request #4 from DISARMFoundation/subtechniques
Subtechniques
2022-07-01 21:30:43 -07:00
VVX7
f1d7a8ac3d add subtechniques to stix2 generator. update STIX bundles. use subtechnique dot notation name convention in DISARM_FRAMEWORKS_MASTER.xlsx 2022-07-02 00:28:52 -04:00
VVX7
8937d50328 add subtechniques to stix2 generator 2022-07-02 00:06:46 -04:00
VVX7
0549123900
Merge pull request #3 from DISARMFoundation/DISARM-MK
Updated technique descriptions and subtechnique mapping
2022-07-01 12:01:30 -07:00
Mike Klein
1450b8e5ff Updated technique descriptions and subtechnique mapping 2022-07-01 13:32:09 -04:00
Sara-Jayne Terp
14dc0cf8bb apply generated_pages_fudge to all the object markdown pages 2022-07-01 17:24:47 +01:00
Sara-Jayne Terp
5575210da1 last ungodly hack for generate_pages repeat 2022-07-01 17:18:26 +01:00
Sara-Jayne Terp
9c0a1f8845 attempt2 at generated_pages repeat fix. Ungodly hack 2022-07-01 17:16:39 +01:00