Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: michael-hamm/misp-taxonomies
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: MISP/misp-taxonomies
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
Loading
Showing with 37,077 additions and 949 deletions.
  1. +289 −0 .gitchangelog.rc
  2. +41 −0 .github/workflows/codeql.yml
  3. +40 −0 .github/workflows/nosetests.yml
  4. +4 −7 .travis.yml
  5. +2,700 −0 DFRLab-dichotomies-of-disinformation/machinetag.json
  6. +243 −0 GrayZone/machinetag.json
  7. +535 −240 MANIFEST.json
  8. +10 −4 PAP/machinetag.json
  9. +700 −119 README.md
  10. +5 −3 admiralty-scale/machinetag.json
  11. +9 −1 adversary/machinetag.json
  12. +9 −5 ais-marking/machinetag.json
  13. +21 −21 analyst-assessment/machinetag.json
  14. +12,364 −0 artificial-satellites/machinetag.json
  15. +397 −0 aviation/machinetag.json
  16. +2 −1 binary-class/machinetag.json
  17. +43 −2 circl/machinetag.json
  18. +230 −0 cnsd/machinetag.json
  19. +377 −0 coa/machinetag.json
  20. +6 −1 collaborative-intelligence/machinetag.json
  21. +21 −11 copine-scale/machinetag.json
  22. +60 −0 course-of-action/machinetag.json
  23. +309 −0 crowdsec/machinetag.json
  24. +8 −0 cryptocurrency-threat/machinetag.json
  25. +63 −0 csirt-americas/machinetag.json
  26. +37 −5 cssa/machinetag.json
  27. +37 −0 cti/machinetag.json
  28. +43 −0 current-event/machinetag.json
  29. +1 −1 cyber-threat-framework/machinetag.json
  30. +119 −0 cycat/machinetag.json
  31. +31 −0 cytomic-orion/machinetag.json
  32. +510 −0 dark-web/machinetag.json
  33. +4,304 −0 death-possibilities/machinetag.json
  34. +243 −0 deception/machinetag.json
  35. +64 −0 dga/machinetag.json
  36. +31 −0 diamond-model-for-influence-operations/machinetag.json
  37. +2 −2 diamond-model/machinetag.json
  38. +12 −2 domain-abuse/machinetag.json
  39. BIN doping-substances/Misp-logo.png
  40. +44 −0 doping-substances/README.md
  41. +63 −0 doping-substances/gen_taxonomy.py
  42. +1,116 −0 doping-substances/machinetag.json
  43. +41 −21 economical-impact/machinetag.json
  44. +11 −6 estimative-language/machinetag.json
  45. +13 −74 eu-nis-sector-and-subsectors/machinetag.json
  46. +2 −1 euci/machinetag.json
  47. +74 −1 exercise/machinetag.json
  48. +97 −0 extended-event/machinetag.json
  49. +118 −0 failure-mode-in-machine-learning/machinetag.json
  50. +39 −5 false-positive/machinetag.json
  51. +71 −1 file-type/machinetag.json
  52. +200 −0 financial/machinetag.json
  53. +2 −1 flesch-reading-ease/machinetag.json
  54. +27 −31 fr-classif/machinetag.json
  55. +967 −0 gea-nz-activities/machinetag.json
  56. +777 −0 gea-nz-entities/machinetag.json
  57. +660 −0 gea-nz-motivators/machinetag.json
  58. +567 −0 ics/machinetag.json
  59. +239 −0 iep2-policy/machinetag.json
  60. +51 −0 iep2-reference/machinetag.json
  61. +207 −104 ifx-vetting/machinetag.json
  62. +2 −2 incident-disposition/machinetag.json
  63. +39 −8 infoleak/machinetag.json
  64. +25 −0 information-origin/machinetag.json
  65. +153 −0 interactive-cyber-training-audience/machinetag.json
  66. +133 −0 interactive-cyber-training-technical-setup/machinetag.json
  67. +193 −0 interactive-cyber-training-training-environment/machinetag.json
  68. +158 −0 interactive-cyber-training-training-setup/machinetag.json
  69. +26 −0 ioc/machinetag.json
  70. +131 −0 iot/machinetag.json
  71. +3 −3 maec-malware-capabilities/machinetag.json
  72. +5 −1 malware_classification/machinetag.json
  73. +1 −20 mapping/mapping.json
  74. +154 −0 misinformation-website-label/machinetag.json
  75. +94 −0 misp-workflow/machinetag.json
  76. +71 −10 misp/machinetag.json
  77. +457 −0 mwdb/machinetag.json
  78. +3 −2 nato/machinetag.json
  79. +384 −0 nis2/machinetag.json
  80. +1 −1 osint/machinetag.json
  81. +38 −0 pandemic/machinetag.json
  82. +240 −0 phishing/machinetag.json
  83. +476 −0 poison-taxonomy/machinetag.json
  84. +157 −0 political-spectrum/machinetag.json
  85. +1 −1 priority-level/machinetag.json
  86. +395 −0 pyoti/machinetag.json
  87. +46 −0 ransomware-roles/machinetag.json
  88. +140 −19 ransomware/machinetag.json
  89. +67 −0 retention/machinetag.json
  90. +105 −70 rsit/machinetag.json
  91. +2 −1 rt_event_status/machinetag.json
  92. +222 −11 runtime-packer/machinetag.json
  93. +67 −0 scrippsco2-fgc/machinetag.json
  94. +42 −0 scrippsco2-fgi/machinetag.json
  95. +59 −0 scrippsco2-sampling-stations/machinetag.json
  96. +56 −0 sentinel-threattype/machinetag.json
  97. +104 −0 social-engineering-attack-vectors/machinetag.json
  98. +193 −0 srbcert/machinetag.json
  99. +3 −0 state-responsibility/README.md
  100. +61 −0 state-responsibility/machinetag.json
  101. +1,723 −0 summary.md
  102. +13 −12 targeted-threat-index/machinetag.json
  103. +133 −0 thales_group/machinetag.json
  104. +2 −0 threatmatch/README.md
  105. +518 −0 threatmatch/machinetag.json
  106. +129 −0 threats-to-dns/machinetag.json
  107. +30 −13 tlp/machinetag.json
  108. +27 −0 tools/fix.py
  109. +2 −2 tools/gen.sh
  110. +52 −0 tools/gen_manifest.py
  111. +52 −0 tools/gen_markdown.py
  112. +1 −1 tools/generator/misp-galaxy.py
  113. +218 −82 tools/machinetag.py
  114. +5 −2 tools/website-genlist.py
  115. +89 −0 trust/machinetag.json
  116. +113 −0 unified-kill-chain/machinetag.json
  117. +18 −0 validate_all.py
  118. +2 −7 validate_all.sh
  119. +91 −0 vmray/machinetag.json
  120. +12 −6 vocabulaire-des-probabilites-estimatives/machinetag.json
  121. +34 −5 workflow/machinetag.json
289 changes: 289 additions & 0 deletions .gitchangelog.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,289 @@
# -*- coding: utf-8; mode: python -*-
##
## Format
##
## ACTION: [AUDIENCE:] COMMIT_MSG [!TAG ...]
##
## Description
##
## ACTION is one of 'chg', 'fix', 'new'
##
## Is WHAT the change is about.
##
## 'chg' is for refactor, small improvement, cosmetic changes...
## 'fix' is for bug fixes
## 'new' is for new features, big improvement
##
## AUDIENCE is optional and one of 'dev', 'usr', 'pkg', 'test', 'doc'|'docs'
##
## Is WHO is concerned by the change.
##
## 'dev' is for developpers (API changes, refactors...)
## 'usr' is for final users (UI changes)
## 'pkg' is for packagers (packaging changes)
## 'test' is for testers (test only related changes)
## 'doc' is for doc guys (doc only changes)
##
## COMMIT_MSG is ... well ... the commit message itself.
##
## TAGs are additionnal adjective as 'refactor' 'minor' 'cosmetic'
##
## They are preceded with a '!' or a '@' (prefer the former, as the
## latter is wrongly interpreted in github.) Commonly used tags are:
##
## 'refactor' is obviously for refactoring code only
## 'minor' is for a very meaningless change (a typo, adding a comment)
## 'cosmetic' is for cosmetic driven change (re-indentation, 80-col...)
## 'wip' is for partial functionality but complete subfunctionality.
##
## Example:
##
## new: usr: support of bazaar implemented
## chg: re-indentend some lines !cosmetic
## new: dev: updated code to be compatible with last version of killer lib.
## fix: pkg: updated year of licence coverage.
## new: test: added a bunch of test around user usability of feature X.
## fix: typo in spelling my name in comment. !minor
##
## Please note that multi-line commit message are supported, and only the
## first line will be considered as the "summary" of the commit message. So
## tags, and other rules only applies to the summary. The body of the commit
## message will be displayed in the changelog without reformatting.


##
## ``ignore_regexps`` is a line of regexps
##
## Any commit having its full commit message matching any regexp listed here
## will be ignored and won't be reported in the changelog.
##
ignore_regexps = [
r'@minor', r'!minor',
r'@cosmetic', r'!cosmetic',
r'@refactor', r'!refactor',
r'@wip', r'!wip',
r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[p|P]kg:',
r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[d|D]ev:',
r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$',
]


## ``section_regexps`` is a list of 2-tuples associating a string label and a
## list of regexp
##
## Commit messages will be classified in sections thanks to this. Section
## titles are the label, and a commit is classified under this section if any
## of the regexps associated is matching.
##
## Please note that ``section_regexps`` will only classify commits and won't
## make any changes to the contents. So you'll probably want to go check
## ``subject_process`` (or ``body_process``) to do some changes to the subject,
## whenever you are tweaking this variable.
##
section_regexps = [
('New', [
r'^[nN]ew\s*:\s*((dev|use?r|pkg|test|doc|docs)\s*:\s*)?([^\n]*)$',
]),
('Changes', [
r'^[cC]hg\s*:\s*((dev|use?r|pkg|test|doc|docs)\s*:\s*)?([^\n]*)$',
]),
('Fix', [
r'^[fF]ix\s*:\s*((dev|use?r|pkg|test|doc|docs)\s*:\s*)?([^\n]*)$',
]),

('Other', None ## Match all lines
),

]


## ``body_process`` is a callable
##
## This callable will be given the original body and result will
## be used in the changelog.
##
## Available constructs are:
##
## - any python callable that take one txt argument and return txt argument.
##
## - ReSub(pattern, replacement): will apply regexp substitution.
##
## - Indent(chars=" "): will indent the text with the prefix
## Please remember that template engines gets also to modify the text and
## will usually indent themselves the text if needed.
##
## - Wrap(regexp=r"\n\n"): re-wrap text in separate paragraph to fill 80-Columns
##
## - noop: do nothing
##
## - ucfirst: ensure the first letter is uppercase.
## (usually used in the ``subject_process`` pipeline)
##
## - final_dot: ensure text finishes with a dot
## (usually used in the ``subject_process`` pipeline)
##
## - strip: remove any spaces before or after the content of the string
##
## - SetIfEmpty(msg="No commit message."): will set the text to
## whatever given ``msg`` if the current text is empty.
##
## Additionally, you can `pipe` the provided filters, for instance:
#body_process = Wrap(regexp=r'\n(?=\w+\s*:)') | Indent(chars=" ")
#body_process = Wrap(regexp=r'\n(?=\w+\s*:)')
#body_process = noop
body_process = ReSub(r'((^|\n)[A-Z]\w+(-\w+)*: .*(\n\s+.*)*)+$', r'') | strip


## ``subject_process`` is a callable
##
## This callable will be given the original subject and result will
## be used in the changelog.
##
## Available constructs are those listed in ``body_process`` doc.
subject_process = (strip |
ReSub(r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*((dev|use?r|pkg|test|doc|docs)\s*:\s*)?([^\n@]*)(@[a-z]+\s+)*$', r'\4') |
SetIfEmpty("No commit message.") | ucfirst | final_dot)


## ``tag_filter_regexp`` is a regexp
##
## Tags that will be used for the changelog must match this regexp.
##
tag_filter_regexp = r'^v[0-9]+\.[0-9]+\.[0-9]+$'



## ``unreleased_version_label`` is a string or a callable that outputs a string
##
## This label will be used as the changelog Title of the last set of changes
## between last valid tag and HEAD if any.
unreleased_version_label = "%%version%% (unreleased)"


## ``output_engine`` is a callable
##
## This will change the output format of the generated changelog file
##
## Available choices are:
##
## - rest_py
##
## Legacy pure python engine, outputs ReSTructured text.
## This is the default.
##
## - mustache(<template_name>)
##
## Template name could be any of the available templates in
## ``templates/mustache/*.tpl``.
## Requires python package ``pystache``.
## Examples:
## - mustache("markdown")
## - mustache("restructuredtext")
##
## - makotemplate(<template_name>)
##
## Template name could be any of the available templates in
## ``templates/mako/*.tpl``.
## Requires python package ``mako``.
## Examples:
## - makotemplate("restructuredtext")
##
#output_engine = rest_py
#output_engine = mustache("restructuredtext")
output_engine = mustache("markdown")
#output_engine = makotemplate("restructuredtext")


## ``include_merge`` is a boolean
##
## This option tells git-log whether to include merge commits in the log.
## The default is to include them.
include_merge = True


## ``log_encoding`` is a string identifier
##
## This option tells gitchangelog what encoding is outputed by ``git log``.
## The default is to be clever about it: it checks ``git config`` for
## ``i18n.logOutputEncoding``, and if not found will default to git's own
## default: ``utf-8``.
#log_encoding = 'utf-8'


## ``publish`` is a callable
##
## Sets what ``gitchangelog`` should do with the output generated by
## the output engine. ``publish`` is a callable taking one argument
## that is an interator on lines from the output engine.
##
## Some helper callable are provided:
##
## Available choices are:
##
## - stdout
##
## Outputs directly to standard output
## (This is the default)
##
## - FileInsertAtFirstRegexMatch(file, pattern, idx=lamda m: m.start())
##
## Creates a callable that will parse given file for the given
## regex pattern and will insert the output in the file.
## ``idx`` is a callable that receive the matching object and
## must return a integer index point where to insert the
## the output in the file. Default is to return the position of
## the start of the matched string.
##
## - FileRegexSubst(file, pattern, replace, flags)
##
## Apply a replace inplace in the given file. Your regex pattern must
## take care of everything and might be more complex. Check the README
## for a complete copy-pastable example.
##
# publish = FileInsertIntoFirstRegexMatch(
# "CHANGELOG.rst",
# r'/(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n/',
# idx=lambda m: m.start(1)
# )
#publish = stdout


## ``revs`` is a list of callable or a list of string
##
## callable will be called to resolve as strings and allow dynamical
## computation of these. The result will be used as revisions for
## gitchangelog (as if directly stated on the command line). This allows
## to filter exaclty which commits will be read by gitchangelog.
##
## To get a full documentation on the format of these strings, please
## refer to the ``git rev-list`` arguments. There are many examples.
##
## Using callables is especially useful, for instance, if you
## are using gitchangelog to generate incrementally your changelog.
##
## Some helpers are provided, you can use them::
##
## - FileFirstRegexMatch(file, pattern): will return a callable that will
## return the first string match for the given pattern in the given file.
## If you use named sub-patterns in your regex pattern, it'll output only
## the string matching the regex pattern named "rev".
##
## - Caret(rev): will return the rev prefixed by a "^", which is a
## way to remove the given revision and all its ancestor.
##
## Please note that if you provide a rev-list on the command line, it'll
## replace this value (which will then be ignored).
##
## If empty, then ``gitchangelog`` will act as it had to generate a full
## changelog.
##
## The default is to use all commits to make the changelog.
#revs = ["^1.0.3", ]
#revs = [
# Caret(
# FileFirstRegexMatch(
# "CHANGELOG.rst",
# r"(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n")),
# "HEAD"
#]
revs = []
41 changes: 41 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: "CodeQL"

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
schedule:
- cron: "50 22 * * 5"

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ python ]

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
queries: +security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{ matrix.language }}"
40 changes: 40 additions & 0 deletions .github/workflows/nosetests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Python application

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8, 3.9, '3.10']

steps:

- uses: actions/checkout@v2

- name: Set up Python ${{matrix.python-version}}
uses: actions/setup-python@v2
with:
python-version: ${{matrix.python-version}}

- name: Initialize submodules
run: git submodule update --init --recursive

- name: Install system dependencies
run: |
sudo apt install jq moreutils
- name: Install Python dependencies
run: |
python -m pip install --upgrade jsonschema pytaxonomies
- name: Test
run: |
./validate_all.sh
pytaxonomies -l MANIFEST.json -a
11 changes: 4 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,18 +2,15 @@ language: python

cache: pip

sudo: required

python:
- "3.6"
- "3.6-dev"
- "nightly"
- "3.8"
- "3.8-dev"

install:
- sudo apt-get update -qq
- sudo apt-get install -y -qq jq moreutils
- pip install jsonschema
- pip install git+https://github.com/MISP/PyTaxonomies.git
- pip3 install jsonschema
- pip3 install pytaxonomies

script:
- ./validate_all.sh
Loading