Release 0.19

Fixes issue #1351

.github/workflows/pypi-publish.yml

@@ -0,0 +1,27 @@
+# This workflows will upload a Python Package using Twine when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+
+name: Upload Sigmatools Package to PyPI
+on:
+  release:
+    types: [created]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools wheel twine
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: |
+        make upload

.github/workflows/sigma-test.yml

@@ -0,0 +1,31 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Sigma Tools and Rule Tests
+
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test-sigma:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r tools/requirements.txt -r tools/requirements-devel.txt
+    - name: Test Sigma Tools and Rules
+      run: |
+        make test
+    - name: Test SQL(ite) Backend
+      run: |
+        make test-backend-sql

.gitignore

@@ -94,3 +94,7 @@ settings.json
 
 # VisualStudio
 .vs/
+.vscode/launch.json
+
+# sigma2attack
+heatmap.json

.travis.yml

@@ -1,25 +0,0 @@
-language: python
-dist: xenial
-python:
-    # - 3.5  # Deactivated because Travis CI tests failed randomly (Travis's problem)
-    - 3.6
-    - 3.7
-sudo: true
-services:
-    - elasticsearch
-cache: pip
-before_install:
-    - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.4.deb && sudo dpkg -i --force-confnew elasticsearch-6.2.4.deb && sudo service elasticsearch restart
-install:
-    - pip install -r tools/requirements-devel.txt
-    - pip install -r tests/requirements-test.txt 
-script:
-    - make test
-    - make test-backend-es-qs
-notifications:
-    email:
-        recipients:
-            - venom14@gmail.com
-            - thomas@patzke.org
-        on_success: change
-        on_failure: always

CHANGELOG.md

@@ -6,6 +6,95 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 from version 0.14.0.
 
+## 0.19 - 2021-02-23
+
+### Added
+
+* New parameters for Elastic backends
+* Various field mappings
+* FireEye Helix backend
+* Generic log source image_load
+* Kibana NDJSON backend
+* uberAgent ESA backend
+* SumoLogic CSE backend
+
+### Changed
+
+* Updated mdatp backend fields
+* QRadar query generation optimized
+* MDATP: case insensitive search
+
+### Fixed
+
+* Fixing Qradar implementation for create valid AQL queries
+* Nested conditions
+* Various minor bug fixes
+
+## 0.18.1 - 2020-08-25
+
+Release created for technical reasons (issues with extended README and PyPI), no real changes done.
+
+## 0.18.0 - 2020-08-25
+
+### Added
+
+* C# backend
+* STIX backend
+* Options to xpack-watcher backend (action_throttle_period, mail_from acaw, mail_profile and other)
+* More generic log sources
+* Windows Defender log sources
+* Generic DNS query log source
+* AppLocker log source
+
+### Changed
+
+* Improved backend and configuration descriptions
+* Microsoft Defender ATP mapping updated
+* Improved handling of wildcards in Elastic backends
+
+### Fixed
+
+* Powershell backend: key name was incorrectly added into regular expression
+* Grouping issue in Carbon Black backend
+* Handling of default field mapping in case field is referenced multiple from a rule
+* Code cleanup and various fixes
+* Log source mappings in configurations
+* Handling of conditional field mappings by Elastic backends
+
+## 0.17.0 - 2020-06-12
+
+### Added
+
+* LOGIQ Backend (logiq)
+* CarbonBlack backend (carbonblack) and field mappings
+* Elasticsearch detection rule backend (es-rule)
+* ee-outliers backend
+* CrowdStrike backend (crowdstrike)
+* Humio backend (humio)
+* Aggregations in SQL backend
+* SQLite backend (sqlite)
+* AWS Cloudtrail ECS mappings
+* Overrides
+* Zeek configurations for various backends
+* Case-insensitive matching for Elasticsearch
+* ECS proxy mappings
+* RuleName field mapping for Winlogbeat
+* sigma2attack tool
+
+### Changed
+
+* Improved usage of keyword fields for Elasticsearch-based backends
+* Splunk XML backend rule titles from sigma rule instead of file name
+* Moved backend option list to --help-backend
+* Microsoft Defender ATP schema improvements
+
+### Fixed
+
+* Splunx XML rule name is now set to rule title
+* Backend list deduplicated
+* Wrong escaping of wildcard at end of value when startswith modifier is used.
+* Direct execution of tools on Windows systems by addition of script entry points
+
 ## 0.16.0 - 2020-02-25
 
 ### Added
@@ -83,7 +172,7 @@ from version 0.14.0.
 ### Added
 
 * Index mappings for Sumologic
-* Malicious cmdlets in wdatp
+* Malicious cmdlets in mdatp
 * QRadar support for keyword searches
 * QRadar mapping improvements
 * QRadar field selection

LICENSE.Detection.Rules.md

@@ -0,0 +1,13 @@
+# Detection Rule License (DRL) 1.0
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this rule set and associated documentation files (the "Rules"), to deal in the Rules without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Rules, and to permit persons to whom the Rules are furnished to do so, subject to the following conditions:
+
+If you share the Rules (including in modified form), you must retain the following if it is supplied within the Rules:
+
+1. identification of the authors(s) ("author" field) of the Rule and any others designated to receive attribution, in any reasonable manner requested by the Rule author (including by pseudonym if designated).
+
+2. a URI or hyperlink to the Rule set or explicit Rule to the extent reasonably practicable
+
+3. indicate the Rules are licensed under this Detection Rule License, and include the text of, or the URI or hyperlink to, this Detection Rule License to the extent reasonably practicable
+
+THE RULES ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE RULES OR THE USE OR OTHER DEALINGS IN THE RULES.

LICENSE.GPL.txt

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Makefile

@@ -1,106 +1,134 @@
 .PHONY: test test-rules test-sigmac test-sigma2attack
 TMPOUT = $(shell tempfile||mktemp)
 COVSCOPE = tools/sigma/*.py,tools/sigma/backends/*.py,tools/sigmac,tools/merge_sigma,tools/sigma2attack
+export COVERAGE = coverage
 test: clearcov test-rules test-sigmac test-merge test-sigma2attack build finish
 
 clearcov:
 	rm -f .coverage
 
 finish:
-	coverage report --fail-under=90
+	$(COVERAGE) report --fail-under=80
 	rm -f $(TMPOUT)
 
 test-rules:
 	yamllint rules
 	tests/test_rules.py
-	tools/sigma-uuid -Ver rules/
+	tools/sigma_uuid -Ver rules/
 
 test-sigmac:
-	coverage run -a --include=$(COVSCOPE) tools/sigmac
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -h
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -l
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -rvd -t es-qs rules/ > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-qs rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-qs --shoot-yourself-in-the-foot rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c winlogbeat tests/test-modifiers.yml > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -O rulecomment -rvdI -c tools/config/winlogbeat.yml -t es-qs rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t kibana -c tools/config/winlogbeat.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t graylog rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t xpack-watcher -O email,index,webhook -c tools/config/winlogbeat.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t elastalert -c tools/config/winlogbeat.yml -O alert_methods=http_post,email -O emails=test@test.invalid -O http_post_url=http://test.invalid rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t elastalert-dsl -c tools/config/winlogbeat.yml -O alert_methods=http_post,email -O emails=test@test.invalid -O http_post_url=http://test.invalid rules/ > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunkxml -c tools/config/splunk-windows.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t logpoint -c tools/config/logpoint-windows.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t wdatp rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t ala rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t ala-rule rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t ala --backend-config tests/backend_config.yml rules/windows/process_creation/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-dsl -c tools/config/winlogbeat.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-rule -c tools/config/winlogbeat.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t powershell -c tools/config/powershell.yml -Ocsv rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t arcsight -c tools/config/arcsight.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t arcsight-esm -c tools/config/arcsight.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t qradar -c tools/config/qradar.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t limacharlie -c tools/config/limacharlie.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t carbonblack -c tools/config/carbon-black.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t qualys -c tools/config/qualys.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t netwitness -c tools/config/netwitness.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t sumologic -O rulecomment -c tools/config/sumologic.yml rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t sql -c sysmon rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'level>=high,level<=critical,status=stable,logsource=windows,tag=attack.execution' rules/ > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'level>=high,level<=critical,status=xstable,logsource=windows' rules/ > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'level>=high,level<=xcritical,status=stable,logsource=windows' rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'level=critical' rules/ > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'level=xcritical' rules/ > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'foo=bar' rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-windows.yml -t es-qs rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c ecs-proxy -t es-qs rules/proxy > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c sysmon -c logstash-windows -t es-qs rules/ > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c sysmon -c logstash-windows -t splunk rules/ > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-windows.yml -c tools/config/generic/sysmon.yml -t es-qs rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-linux.yml -t es-qs rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-windows.yml -t kibana rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-windows.yml -Ooutput=curl -t kibana rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-linux.yml -t kibana rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-linux.yml -Ooutput=curl -t kibana rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-windows.yml -t xpack-watcher rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-linux.yml -t xpack-watcher rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/filebeat-defaultindex.yml -t xpack-watcher rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/splunk-windows.yml -t splunk rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/generic/sysmon.yml -c tools/config/splunk-windows.yml -t splunk rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t grep rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t fieldlist rules/ > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -t xpack-watcher -c tools/config/winlogbeat.yml -O output=plain -O es=es -O foobar rules/windows/builtin/win_susp_failed_logons_single_source.yml > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -t kibana -c tests/config-multiple_mapping.yml -c tests/config-multiple_mapping-2.yml tests/mapping-conditional-multi.yml > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -t xpack-watcher -c tools/config/winlogbeat.yml -O output=json -O es=es -O foobar rules/windows/builtin/win_susp_failed_logons_single_source.yml > /dev/null
-	coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml -o $(TMPOUT) - < tests/collection_repeat.yml > /dev/null
-	! coverage run -a --include=$(COVSCOPE)  tools/sigmac -t xpack-watcher -c tools/config/winlogbeat.yml -O output=foobar -O es=es -O foobar rules/windows/builtin/win_susp_failed_logons_single_source.yml > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/not_existing.yml > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_yaml.yml > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_sigma-no_identifiers.yml > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_sigma-no_condition.yml > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_sigma-invalid_identifier_reference.yml > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_sigma-invalid_aggregation.yml > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_sigma-wrong_identifier_definition.yml > /dev/null
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml rules/windows/builtin/win_susp_failed_logons_single_source.yml
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml -o /not_possible rules/windows/sysmon/sysmon_mimikatz_detection_lsass.yml
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c not_existing rules/windows/sysmon/sysmon_mimikatz_detection_lsass.yml
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tests/invalid_yaml.yml rules/windows/sysmon/sysmon_mimikatz_detection_lsass.yml
-	! coverage run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tests/invalid_config.yml rules/windows/sysmon/sysmon_mimikatz_detection_lsass.yml
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -h
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -l
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac --backend-help es-qs
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvd -t es-qs rules/ > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-qs rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-qs --shoot-yourself-in-the-foot rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c winlogbeat tests/test-modifiers.yml > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -O rulecomment -rvdI -c tools/config/winlogbeat.yml -t es-qs rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t kibana -c tools/config/winlogbeat.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t graylog rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t xpack-watcher -O email,index,webhook -c tools/config/winlogbeat.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t elastalert -c tools/config/winlogbeat.yml -O alert_methods=http_post,email -O emails=test@test.invalid -O http_post_url=http://test.invalid rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t elastalert-dsl -c tools/config/winlogbeat.yml -O alert_methods=http_post,email -O emails=test@test.invalid -O http_post_url=http://test.invalid rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t ee-outliers -c tools/config/winlogbeat.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-qs -c sysmon -c winlogbeat -O case_insensitive_whitelist=* rules/windows/process_creation > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-qs -c tools/config/ecs-cloudtrail.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-rule -c tools/config/ecs-cloudtrail.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t kibana -c tools/config/ecs-cloudtrail.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t xpack-watcher  -c tools/config/ecs-cloudtrail.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t elastalert  -c tools/config/ecs-cloudtrail.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-qs  -c tools/config/ecs-suricata.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-rule  -c tools/config/ecs-suricata.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t kibana  -c tools/config/ecs-suricata.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t xpack-watcher  -c tools/config/ecs-suricata.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t elastalert  -c tools/config/ecs-suricata.yml rules/ > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunkxml -c tools/config/splunk-windows.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t logpoint -c tools/config/logpoint-windows.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t mdatp rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t ala rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t ala-rule rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t ala --backend-config tests/backend_config.yml rules/windows/process_creation/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-dsl -c tools/config/winlogbeat.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t es-rule -c tools/config/winlogbeat.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t powershell -c tools/config/powershell.yml -Ocsv rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t arcsight -c tools/config/arcsight.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t arcsight-esm -c tools/config/arcsight.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t qradar -c tools/config/qradar.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t stix -c tools/config/stix.yml -c tools/config/stix-qradar.yml -c tools/config/stix-windows.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t limacharlie -c tools/config/limacharlie.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t carbonblack -c tools/config/carbon-black.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t qualys -c tools/config/qualys.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t netwitness -c tools/config/netwitness.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t netwitness-epl -c netwitness-epl rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t sumologic -O rulecomment -c tools/config/sumologic.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t sumologic-cse -O rulecomment -c tools/config/sumologic-cse.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t humio -O rulecomment -c tools/config/humio.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t crowdstrike -O rulecomment -c tools/config/crowdstrike.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t sql -c sysmon rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t sqlite -c sysmon rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t csharp -c sysmon rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t logiq -c sysmon rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t fireeye-helix -c tools/config/fireeye-helix.yml rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t sysmon -c sysmon -rvd rules/windows/driver_load rules/windows/file_event rules/windows/image_load rules/windows/network_connection rules/windows/process_access rules/windows/process_creation rules/windows/registry_event rules/windows/sysmon > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'level>=high,level<=critical,status=stable,logsource=windows,tag=attack.execution' rules/ > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'level>=high,level<=critical,status=xstable,logsource=windows' rules/ > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'level>=high,level<=xcritical,status=stable,logsource=windows' rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'level=critical' rules/ > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'level=xcritical' rules/ > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t splunk -c tools/config/splunk-windows-index.yml -f 'foo=bar' rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-windows.yml -t es-qs rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c ecs-proxy -t es-qs rules/proxy > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c sysmon -c logstash-windows -t es-qs rules/ > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c sysmon -c logstash-windows -t splunk rules/ > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-windows.yml -c tools/config/generic/sysmon.yml -t es-qs rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-linux.yml -t es-qs rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-windows.yml -t kibana rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-windows.yml -Ooutput=curl -t kibana rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-linux.yml -t kibana rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-linux.yml -Ooutput=curl -t kibana rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-windows.yml -t xpack-watcher rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/logstash-linux.yml -t xpack-watcher rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/filebeat-defaultindex.yml -t xpack-watcher rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/splunk-windows.yml -t splunk rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -c tools/config/generic/sysmon.yml -c tools/config/splunk-windows.yml -t splunk rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t grep rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -rvdI -t fieldlist rules/ > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t xpack-watcher -c tools/config/winlogbeat.yml -O output=plain -O es=es -O foobar rules/windows/builtin/win_susp_failed_logons_single_source.yml > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t kibana -c tests/config-multiple_mapping.yml -c tests/config-multiple_mapping-2.yml tests/mapping-conditional-multi.yml > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t xpack-watcher -c tools/config/winlogbeat.yml -O output=json -O es=es -O foobar rules/windows/builtin/win_susp_failed_logons_single_source.yml > /dev/null
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml -o $(TMPOUT) - < tests/collection_repeat.yml > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE)  tools/sigmac -t xpack-watcher -c tools/config/winlogbeat.yml -O output=foobar -O es=es -O foobar rules/windows/builtin/win_susp_failed_logons_single_source.yml > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/not_existing.yml > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_yaml.yml > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_sigma-no_identifiers.yml > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_sigma-no_condition.yml > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_sigma-invalid_identifier_reference.yml > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_sigma-invalid_aggregation.yml > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml tests/invalid_sigma-wrong_identifier_definition.yml > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml rules/windows/builtin/win_susp_failed_logons_single_source.yml
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tools/config/winlogbeat.yml -o /not_possible rules/windows/sysmon/sysmon_mimikatz_detection_lsass.yml
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c not_existing rules/windows/sysmon/sysmon_mimikatz_detection_lsass.yml
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tests/invalid_yaml.yml rules/windows/sysmon/sysmon_mimikatz_detection_lsass.yml
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/sigmac -t es-qs -c tests/invalid_config.yml rules/windows/sysmon/sysmon_mimikatz_detection_lsass.yml
 
 test-merge:
 	tests/test-merge.sh
-	! coverage run -a --include=$(COVSCOPE) tools/merge_sigma tests/not_existing.yml > /dev/null
+	! $(COVERAGE) run -a --include=$(COVSCOPE) tools/merge_sigma tests/not_existing.yml > /dev/null
 
 test-backend-es-qs:
 	tests/test-backend-es-qs.py
 
-test-sigma2attack:
-	coverage run -a --include=$(COVSCOPE) tools/sigma2attack
+test-backend-sql:
+	cd tools && python3 setup.py install
+	cd tools && $(COVERAGE) run -m pytest tests/test_backend_sql.py tests/test_backend_sqlite.py
 
-build: tools/sigmac tools/merge_sigma tools/sigma/*.py tools/setup.py tools/setup.cfg
+test-sigma2attack:
+	$(COVERAGE) run -a --include=$(COVSCOPE) tools/sigma2attack
+
+build: tools/sigma/*.py tools/setup.py tools/setup.cfg
 	cd tools && python3 setup.py bdist_wheel sdist
 
 upload-test: build

Pipfile

@@ -4,16 +4,19 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
+coverage = "~=5.0"
+yamllint = "~=1.21"
+elasticsearch = "~=7.6"
+elasticsearch-async = "~=6.2"
+pytest = "~=5.4"
+colorama = "*"
 
 [packages]
-coverage = ">=4.4.1"
-yamllint = ">=1.10.0"
-elasticsearch = "*"
-elasticsearch-async = "*"
-pymisp = "*"
-PyYAML = ">=3.11"
-progressbar2 = "*"
-colorama = "*"
+requests = "~=2.23"
+urllib3 = "~=1.25"
+progressbar2 = "~=3.47"
+pymisp = "~=2.4.123"
+PyYAML = "~=5.1"
 
 [requires]
 python_version = "3.6"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "c553c014d5959f8c30ffdb23d4648ff872dbffd5f6f982d8c029a5b4533a959d"
+            "sha256": "588c969e3c9cf945190a258f9607bbcc53ee9715d34e538b130a852459e4848a"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -16,6 +16,147 @@
         ]
     },
     "default": {
+        "attrs": {
+            "hashes": [
+                "sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c",
+                "sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"
+            ],
+            "version": "==19.3.0"
+        },
+        "certifi": {
+            "hashes": [
+                "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3",
+                "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"
+            ],
+            "version": "==2019.11.28"
+        },
+        "chardet": {
+            "hashes": [
+                "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
+                "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+            ],
+            "version": "==3.0.4"
+        },
+        "deprecated": {
+            "hashes": [
+                "sha256:408038ab5fdeca67554e8f6742d1521cd3cd0ee0ff9d47f29318a4f4da31c308",
+                "sha256:8b6a5aa50e482d8244a62e5582b96c372e87e3a28e8b49c316e46b95c76a611d"
+            ],
+            "version": "==1.2.7"
+        },
+        "idna": {
+            "hashes": [
+                "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb",
+                "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"
+            ],
+            "version": "==2.9"
+        },
+        "importlib-metadata": {
+            "hashes": [
+                "sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f",
+                "sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e"
+            ],
+            "markers": "python_version < '3.8'",
+            "version": "==1.6.0"
+        },
+        "jsonschema": {
+            "hashes": [
+                "sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163",
+                "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"
+            ],
+            "version": "==3.2.0"
+        },
+        "progressbar2": {
+            "hashes": [
+                "sha256:2c21c14482016162852c8265da03886c2b4dea6f84e5a817ad9b39f6bd82a772",
+                "sha256:7849b84c01a39e4eddd2b369a129fed5e24dfb78d484ae63f9e08e58277a2928"
+            ],
+            "index": "pypi",
+            "version": "==3.50.1"
+        },
+        "pymisp": {
+            "hashes": [
+                "sha256:1d27bc81ed492b5e6e216d099dcadf943d5c0c09457d6464ed33db8da39d0fdd",
+                "sha256:318cb9cee371ce3918b3216e2c1a61938747203f89f9d42d4e4a51b40066f9b3"
+            ],
+            "index": "pypi",
+            "version": "==2.4.123"
+        },
+        "pyrsistent": {
+            "hashes": [
+                "sha256:28669905fe725965daa16184933676547c5bb40a5153055a8dee2a4bd7933ad3"
+            ],
+            "version": "==0.16.0"
+        },
+        "python-dateutil": {
+            "hashes": [
+                "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c",
+                "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"
+            ],
+            "version": "==2.8.1"
+        },
+        "python-utils": {
+            "hashes": [
+                "sha256:ebaadab29d0cb9dca0a82eab9c405f5be5125dbbff35b8f32cc433fa498dbaa7",
+                "sha256:f21fc09ff58ea5ebd1fd2e8ef7f63e39d456336900f26bdc9334a03a3f7d8089"
+            ],
+            "version": "==2.4.0"
+        },
+        "pyyaml": {
+            "hashes": [
+                "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c",
+                "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95",
+                "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2",
+                "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4",
+                "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad",
+                "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba",
+                "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1",
+                "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e",
+                "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673",
+                "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13",
+                "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19"
+            ],
+            "index": "pypi",
+            "version": "==5.1"
+        },
+        "requests": {
+            "hashes": [
+                "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee",
+                "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"
+            ],
+            "index": "pypi",
+            "version": "==2.23.0"
+        },
+        "six": {
+            "hashes": [
+                "sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a",
+                "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c"
+            ],
+            "version": "==1.14.0"
+        },
+        "urllib3": {
+            "hashes": [
+                "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc",
+                "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc"
+            ],
+            "index": "pypi",
+            "version": "==1.25.8"
+        },
+        "wrapt": {
+            "hashes": [
+                "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"
+            ],
+            "version": "==1.12.1"
+        },
+        "zipp": {
+            "hashes": [
+                "sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b",
+                "sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96"
+            ],
+            "version": "==3.1.0"
+        }
+    },
+    "develop": {
         "aiohttp": {
             "hashes": [
                 "sha256:1e984191d1ec186881ffaed4581092ba04f7c61582a177b187d3a2f07ed9719e",
@@ -47,13 +188,6 @@
             ],
             "version": "==19.3.0"
         },
-        "certifi": {
-            "hashes": [
-                "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3",
-                "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"
-            ],
-            "version": "==2019.11.28"
-        },
         "chardet": {
             "hashes": [
                 "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
@@ -71,55 +205,48 @@
         },
         "coverage": {
             "hashes": [
-                "sha256:15cf13a6896048d6d947bf7d222f36e4809ab926894beb748fc9caa14605d9c3",
-                "sha256:1daa3eceed220f9fdb80d5ff950dd95112cd27f70d004c7918ca6dfc6c47054c",
-                "sha256:1e44a022500d944d42f94df76727ba3fc0a5c0b672c358b61067abb88caee7a0",
-                "sha256:25dbf1110d70bab68a74b4b9d74f30e99b177cde3388e07cc7272f2168bd1477",
-                "sha256:3230d1003eec018ad4a472d254991e34241e0bbd513e97a29727c7c2f637bd2a",
-                "sha256:3dbb72eaeea5763676a1a1efd9b427a048c97c39ed92e13336e726117d0b72bf",
-                "sha256:5012d3b8d5a500834783689a5d2292fe06ec75dc86ee1ccdad04b6f5bf231691",
-                "sha256:51bc7710b13a2ae0c726f69756cf7ffd4362f4ac36546e243136187cfcc8aa73",
-                "sha256:527b4f316e6bf7755082a783726da20671a0cc388b786a64417780b90565b987",
-                "sha256:722e4557c8039aad9592c6a4213db75da08c2cd9945320220634f637251c3894",
-                "sha256:76e2057e8ffba5472fd28a3a010431fd9e928885ff480cb278877c6e9943cc2e",
-                "sha256:77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef",
-                "sha256:7afad9835e7a651d3551eab18cbc0fdb888f0a6136169fbef0662d9cdc9987cf",
-                "sha256:9bea19ac2f08672636350f203db89382121c9c2ade85d945953ef3c8cf9d2a68",
-                "sha256:a8b8ac7876bc3598e43e2603f772d2353d9931709345ad6c1149009fd1bc81b8",
-                "sha256:b0840b45187699affd4c6588286d429cd79a99d509fe3de0f209594669bb0954",
-                "sha256:b26aaf69713e5674efbde4d728fb7124e429c9466aeaf5f4a7e9e699b12c9fe2",
-                "sha256:b63dd43f455ba878e5e9f80ba4f748c0a2156dde6e0e6e690310e24d6e8caf40",
-                "sha256:be18f4ae5a9e46edae3f329de2191747966a34a3d93046dbdf897319923923bc",
-                "sha256:c312e57847db2526bc92b9bfa78266bfbaabac3fdcd751df4d062cd4c23e46dc",
-                "sha256:c60097190fe9dc2b329a0eb03393e2e0829156a589bd732e70794c0dd804258e",
-                "sha256:c62a2143e1313944bf4a5ab34fd3b4be15367a02e9478b0ce800cb510e3bbb9d",
-                "sha256:cc1109f54a14d940b8512ee9f1c3975c181bbb200306c6d8b87d93376538782f",
-                "sha256:cd60f507c125ac0ad83f05803063bed27e50fa903b9c2cfee3f8a6867ca600fc",
-                "sha256:d513cc3db248e566e07a0da99c230aca3556d9b09ed02f420664e2da97eac301",
-                "sha256:d649dc0bcace6fcdb446ae02b98798a856593b19b637c1b9af8edadf2b150bea",
-                "sha256:d7008a6796095a79544f4da1ee49418901961c97ca9e9d44904205ff7d6aa8cb",
-                "sha256:da93027835164b8223e8e5af2cf902a4c80ed93cb0909417234f4a9df3bcd9af",
-                "sha256:e69215621707119c6baf99bda014a45b999d37602cb7043d943c76a59b05bf52",
-                "sha256:ea9525e0fef2de9208250d6c5aeeee0138921057cd67fcef90fbed49c4d62d37",
-                "sha256:fca1669d464f0c9831fd10be2eef6b86f5ebd76c724d1e0706ebdff86bb4adf0"
+                "sha256:03f630aba2b9b0d69871c2e8d23a69b7fe94a1e2f5f10df5049c0df99db639a0",
+                "sha256:046a1a742e66d065d16fb564a26c2a15867f17695e7f3d358d7b1ad8a61bca30",
+                "sha256:0a907199566269e1cfa304325cc3b45c72ae341fbb3253ddde19fa820ded7a8b",
+                "sha256:165a48268bfb5a77e2d9dbb80de7ea917332a79c7adb747bd005b3a07ff8caf0",
+                "sha256:1b60a95fc995649464e0cd48cecc8288bac5f4198f21d04b8229dc4097d76823",
+                "sha256:1f66cf263ec77af5b8fe14ef14c5e46e2eb4a795ac495ad7c03adc72ae43fafe",
+                "sha256:2e08c32cbede4a29e2a701822291ae2bc9b5220a971bba9d1e7615312efd3037",
+                "sha256:3844c3dab800ca8536f75ae89f3cf566848a3eb2af4d9f7b1103b4f4f7a5dad6",
+                "sha256:408ce64078398b2ee2ec08199ea3fcf382828d2f8a19c5a5ba2946fe5ddc6c31",
+                "sha256:443be7602c790960b9514567917af538cac7807a7c0c0727c4d2bbd4014920fd",
+                "sha256:4482f69e0701139d0f2c44f3c395d1d1d37abd81bfafbf9b6efbe2542679d892",
+                "sha256:4a8a259bf990044351baf69d3b23e575699dd60b18460c71e81dc565f5819ac1",
+                "sha256:513e6526e0082c59a984448f4104c9bf346c2da9961779ede1fc458e8e8a1f78",
+                "sha256:5f587dfd83cb669933186661a351ad6fc7166273bc3e3a1531ec5c783d997aac",
+                "sha256:62061e87071497951155cbccee487980524d7abea647a1b2a6eb6b9647df9006",
+                "sha256:641e329e7f2c01531c45c687efcec8aeca2a78a4ff26d49184dce3d53fc35014",
+                "sha256:65a7e00c00472cd0f59ae09d2fb8a8aaae7f4a0cf54b2b74f3138d9f9ceb9cb2",
+                "sha256:6ad6ca45e9e92c05295f638e78cd42bfaaf8ee07878c9ed73e93190b26c125f7",
+                "sha256:73aa6e86034dad9f00f4bbf5a666a889d17d79db73bc5af04abd6c20a014d9c8",
+                "sha256:7c9762f80a25d8d0e4ab3cb1af5d9dffbddb3ee5d21c43e3474c84bf5ff941f7",
+                "sha256:85596aa5d9aac1bf39fe39d9fa1051b0f00823982a1de5766e35d495b4a36ca9",
+                "sha256:86a0ea78fd851b313b2e712266f663e13b6bc78c2fb260b079e8b67d970474b1",
+                "sha256:8a620767b8209f3446197c0e29ba895d75a1e272a36af0786ec70fe7834e4307",
+                "sha256:922fb9ef2c67c3ab20e22948dcfd783397e4c043a5c5fa5ff5e9df5529074b0a",
+                "sha256:9fad78c13e71546a76c2f8789623eec8e499f8d2d799f4b4547162ce0a4df435",
+                "sha256:a37c6233b28e5bc340054cf6170e7090a4e85069513320275a4dc929144dccf0",
+                "sha256:c3fc325ce4cbf902d05a80daa47b645d07e796a80682c1c5800d6ac5045193e5",
+                "sha256:cda33311cb9fb9323958a69499a667bd728a39a7aa4718d7622597a44c4f1441",
+                "sha256:db1d4e38c9b15be1521722e946ee24f6db95b189d1447fa9ff18dd16ba89f732",
+                "sha256:eda55e6e9ea258f5e4add23bcf33dc53b2c319e70806e180aecbff8d90ea24de",
+                "sha256:f372cdbb240e09ee855735b9d85e7f50730dcfb6296b74b95a3e5dea0615c4c1"
             ],
             "index": "pypi",
-            "version": "==5.0.3"
-        },
-        "deprecated": {
-            "hashes": [
-                "sha256:408038ab5fdeca67554e8f6742d1521cd3cd0ee0ff9d47f29318a4f4da31c308",
-                "sha256:8b6a5aa50e482d8244a62e5582b96c372e87e3a28e8b49c316e46b95c76a611d"
-            ],
-            "version": "==1.2.7"
+            "version": "==5.0.4"
         },
         "elasticsearch": {
             "hashes": [
-                "sha256:1815ee1377e7d3cf32770738a70785fe4ab1f05be28336a330ed71cb295a7c6c",
-                "sha256:2a0ca516378ae9b87ac840e7bb529ec508f3010360dd9feed605dff2a898aff5"
+                "sha256:d228b2d37ac0865f7631335268172dbdaa426adec1da3ed006dddf05134f89c8",
+                "sha256:f4bb05cfe55cf369bdcb4d86d0129d39d66a91fd9517b13cd4e4231fbfcf5c81"
             ],
             "index": "pypi",
-            "version": "==7.5.1"
+            "version": "==7.6.0"
         },
         "elasticsearch-async": {
             "hashes": [
@@ -131,10 +258,10 @@
         },
         "idna": {
             "hashes": [
-                "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
-                "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
+                "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb",
+                "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"
             ],
-            "version": "==2.8"
+            "version": "==2.9"
         },
         "idna-ssl": {
             "hashes": [
@@ -145,40 +272,47 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302",
-                "sha256:b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b"
+                "sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f",
+                "sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e"
             ],
             "markers": "python_version < '3.8'",
-            "version": "==1.5.0"
+            "version": "==1.6.0"
         },
-        "jsonschema": {
+        "more-itertools": {
             "hashes": [
-                "sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163",
-                "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"
+                "sha256:5dd8bcf33e5f9513ffa06d5ad33d78f31e1931ac9a18f33d37e77a180d393a7c",
+                "sha256:b1ddb932186d8a6ac451e1d95844b382f55e12686d51ca0c68b6f61f2ab7a507"
             ],
-            "version": "==3.2.0"
+            "version": "==8.2.0"
         },
         "multidict": {
             "hashes": [
-                "sha256:13f3ebdb5693944f52faa7b2065b751cb7e578b8dd0a5bb8e4ab05ad0188b85e",
-                "sha256:26502cefa86d79b86752e96639352c7247846515c864d7c2eb85d036752b643c",
-                "sha256:4fba5204d32d5c52439f88437d33ad14b5f228e25072a192453f658bddfe45a7",
-                "sha256:527124ef435f39a37b279653ad0238ff606b58328ca7989a6df372fd75d7fe26",
-                "sha256:5414f388ffd78c57e77bd253cf829373721f450613de53dc85a08e34d806e8eb",
-                "sha256:5eee66f882ab35674944dfa0d28b57fa51e160b4dce0ce19e47f495fdae70703",
-                "sha256:63810343ea07f5cd86ba66ab66706243a6f5af075eea50c01e39b4ad6bc3c57a",
-                "sha256:6bd10adf9f0d6a98ccc792ab6f83d18674775986ba9bacd376b643fe35633357",
-                "sha256:83c6ddf0add57c6b8a7de0bc7e2d656be3eefeff7c922af9a9aae7e49f225625",
-                "sha256:93166e0f5379cf6cd29746989f8a594fa7204dcae2e9335ddba39c870a287e1c",
-                "sha256:9a7b115ee0b9b92d10ebc246811d8f55d0c57e82dbb6a26b23c9a9a6ad40ce0c",
-                "sha256:a38baa3046cce174a07a59952c9f876ae8875ef3559709639c17fdf21f7b30dd",
-                "sha256:a6d219f49821f4b2c85c6d426346a5d84dab6daa6f85ca3da6c00ed05b54022d",
-                "sha256:a8ed33e8f9b67e3b592c56567135bb42e7e0e97417a4b6a771e60898dfd5182b",
-                "sha256:d7d428488c67b09b26928950a395e41cc72bb9c3d5abfe9f0521940ee4f796d4",
-                "sha256:dcfed56aa085b89d644af17442cdc2debaa73388feba4b8026446d168ca8dad7",
-                "sha256:f29b885e4903bd57a7789f09fe9d60b6475a6c1a4c0eca874d8558f00f9d4b51"
+                "sha256:317f96bc0950d249e96d8d29ab556d01dd38888fbe68324f46fd834b430169f1",
+                "sha256:42f56542166040b4474c0c608ed051732033cd821126493cf25b6c276df7dd35",
+                "sha256:4b7df040fb5fe826d689204f9b544af469593fb3ff3a069a6ad3409f742f5928",
+                "sha256:544fae9261232a97102e27a926019100a9db75bec7b37feedd74b3aa82f29969",
+                "sha256:620b37c3fea181dab09267cd5a84b0f23fa043beb8bc50d8474dd9694de1fa6e",
+                "sha256:6e6fef114741c4d7ca46da8449038ec8b1e880bbe68674c01ceeb1ac8a648e78",
+                "sha256:7774e9f6c9af3f12f296131453f7b81dabb7ebdb948483362f5afcaac8a826f1",
+                "sha256:85cb26c38c96f76b7ff38b86c9d560dea10cf3459bb5f4caf72fc1bb932c7136",
+                "sha256:a326f4240123a2ac66bb163eeba99578e9d63a8654a59f4688a79198f9aa10f8",
+                "sha256:ae402f43604e3b2bc41e8ea8b8526c7fa7139ed76b0d64fc48e28125925275b2",
+                "sha256:aee283c49601fa4c13adc64c09c978838a7e812f85377ae130a24d7198c0331e",
+                "sha256:b51249fdd2923739cd3efc95a3d6c363b67bbf779208e9f37fd5e68540d1a4d4",
+                "sha256:bb519becc46275c594410c6c28a8a0adc66fe24fef154a9addea54c1adb006f5",
+                "sha256:c2c37185fb0af79d5c117b8d2764f4321eeb12ba8c141a95d0aa8c2c1d0a11dd",
+                "sha256:dc561313279f9d05a3d0ffa89cd15ae477528ea37aa9795c4654588a3287a9ab",
+                "sha256:e439c9a10a95cb32abd708bb8be83b2134fa93790a4fb0535ca36db3dda94d20",
+                "sha256:fc3b4adc2ee8474cb3cd2a155305d5f8eda0a9c91320f83e55748e1fcb68f8e3"
             ],
-            "version": "==4.7.4"
+            "version": "==4.7.5"
+        },
+        "packaging": {
+            "hashes": [
+                "sha256:3c292b474fda1671ec57d46d739d072bfd495a4f51ad01a055121d81e952b7a3",
+                "sha256:82f77b9bee21c1bafbf35a84905d604d5d1223801d639cf3ed140bd651c08752"
+            ],
+            "version": "==20.3"
         },
         "pathspec": {
             "hashes": [
@@ -187,65 +321,51 @@
             ],
             "version": "==0.7.0"
         },
-        "progressbar2": {
+        "pluggy": {
             "hashes": [
-                "sha256:7538d02045a1fd3aa2b2834bfda463da8755bd3ff050edc6c5ddff3bc616215f",
-                "sha256:eb774d1e0d03ea4730f381c13c2c6ae7abb5ddfb14d8321d7a58a61aa708f0d0"
+                "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0",
+                "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"
+            ],
+            "version": "==0.13.1"
+        },
+        "py": {
+            "hashes": [
+                "sha256:5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa",
+                "sha256:c20fdd83a5dbc0af9efd622bee9a5564e278f6380fffcacc43ba6f43db2813b0"
+            ],
+            "version": "==1.8.1"
+        },
+        "pyparsing": {
+            "hashes": [
+                "sha256:4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f",
+                "sha256:c342dccb5250c08d45fd6f8b4a559613ca603b57498511740e65cd11a2e7dcec"
+            ],
+            "version": "==2.4.6"
+        },
+        "pytest": {
+            "hashes": [
+                "sha256:0e5b30f5cb04e887b91b1ee519fa3d89049595f428c1db76e73bd7f17b09b172",
+                "sha256:84dde37075b8805f3d1f392cc47e38a0e59518fb46a431cfdaf7cf1ce805f970"
             ],
             "index": "pypi",
-            "version": "==3.47.0"
-        },
-        "pymisp": {
-            "hashes": [
-                "sha256:4359953881c70d8c851ba847ebd41fe636ecc155ee92a6b653dcae2d241a6fef",
-                "sha256:be4c2a2d311ba1aaeb73e1124e8a97ac4eec52a871e02d373c455936095aac72"
-            ],
-            "index": "pypi",
-            "version": "==2.4.120"
-        },
-        "pyrsistent": {
-            "hashes": [
-                "sha256:cdc7b5e3ed77bed61270a47d35434a30617b9becdf2478af76ad2c6ade307280"
-            ],
-            "version": "==0.15.7"
-        },
-        "python-dateutil": {
-            "hashes": [
-                "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c",
-                "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"
-            ],
-            "version": "==2.8.1"
-        },
-        "python-utils": {
-            "hashes": [
-                "sha256:34aaf26b39b0b86628008f2ae0ac001b30e7986a8d303b61e1357dfcdad4f6d3",
-                "sha256:e25f840564554eaded56eaa395bca507b0b9e9f0ae5ecb13a8cb785305c56d25"
-            ],
-            "version": "==2.3.0"
+            "version": "==5.4.1"
         },
         "pyyaml": {
             "hashes": [
-                "sha256:059b2ee3194d718896c0ad077dd8c043e5e909d9180f387ce42012662a4946d6",
-                "sha256:1cf708e2ac57f3aabc87405f04b86354f66799c8e62c28c5fc5f88b5521b2dbf",
-                "sha256:24521fa2890642614558b492b473bee0ac1f8057a7263156b02e8b14c88ce6f5",
-                "sha256:4fee71aa5bc6ed9d5f116327c04273e25ae31a3020386916905767ec4fc5317e",
-                "sha256:70024e02197337533eef7b85b068212420f950319cc8c580261963aefc75f811",
-                "sha256:74782fbd4d4f87ff04159e986886931456a1894c61229be9eaf4de6f6e44b99e",
-                "sha256:940532b111b1952befd7db542c370887a8611660d2b9becff75d39355303d82d",
-                "sha256:cb1f2f5e426dc9f07a7681419fe39cee823bb74f723f36f70399123f439e9b20",
-                "sha256:dbbb2379c19ed6042e8f11f2a2c66d39cceb8aeace421bfc29d085d93eda3689",
-                "sha256:e3a057b7a64f1222b56e47bcff5e4b94c4f61faac04c7c4ecb1985e18caa3994",
-                "sha256:e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615"
+                "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c",
+                "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95",
+                "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2",
+                "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4",
+                "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad",
+                "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba",
+                "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1",
+                "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e",
+                "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673",
+                "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13",
+                "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19"
             ],
             "index": "pypi",
-            "version": "==5.3"
-        },
-        "requests": {
-            "hashes": [
-                "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4",
-                "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"
-            ],
-            "version": "==2.22.0"
+            "version": "==5.1"
         },
         "six": {
             "hashes": [
@@ -268,21 +388,23 @@
                 "sha256:2f3db8b19923a873b3e5256dc9c2dedfa883e33d87c690d9c7913e1f40673cdc",
                 "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc"
             ],
+            "index": "pypi",
             "version": "==1.25.8"
         },
-        "wrapt": {
+        "wcwidth": {
             "hashes": [
-                "sha256:565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1"
+                "sha256:cafe2186b3c009a04067022ce1dcd79cb38d8d65ee4f4791b8888d6599d1bbe1",
+                "sha256:ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1"
             ],
-            "version": "==1.11.2"
+            "version": "==0.1.9"
         },
         "yamllint": {
             "hashes": [
-                "sha256:7318e189027951983c3cb4d6bcaa1e75deef7c752320ca3ce84e407f2551e8ce",
-                "sha256:76912b6262fd7e0815d7b14c4c2bb2642c754d0aa38f2d3e4b4e21c77872a3bf"
+                "sha256:09d554bafc57beb22b01619c94e1ba0e8fbb016fa9c1b35ddc68d7bfc16d177f",
+                "sha256:7e1e698b3d344b64bc46cbe8c4df7dfdfe7c00ed1a8d1c851ecd5b552d93d193"
             ],
             "index": "pypi",
-            "version": "==1.20.0"
+            "version": "==1.21.0"
         },
         "yarl": {
             "hashes": [
@@ -308,11 +430,10 @@
         },
         "zipp": {
             "hashes": [
-                "sha256:ccc94ed0909b58ffe34430ea5451f07bc0c76467d7081619a454bf5c98b89e28",
-                "sha256:feae2f18633c32fc71f2de629bfb3bd3c9325cd4419642b1f1da42ee488d9b98"
+                "sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b",
+                "sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96"
             ],
-            "version": "==2.1.0"
+            "version": "==3.1.0"
         }
-    },
-    "develop": {}
+    }
 }

README.md

@@ -8,7 +8,7 @@ Generic Signature Format for SIEM Systems
 
 # What is Sigma
 
-Sigma is a generic and open signature format that allows you to describe relevant log events in a straight forward manner. The rule format is very flexible, easy to write and applicable to any type of log file. The main purpose of this project is to provide a structured form in which researchers or analysts can describe their once developed detection methods and make them shareable with others.
+Sigma is a generic and open signature format that allows you to describe relevant log events in a straightforward manner. The rule format is very flexible, easy to write and applicable to any type of log file. The main purpose of this project is to provide a structured form in which researchers or analysts can describe their once developed detection methods and make them shareable with others.
 
 Sigma is for log files what [Snort](https://www.snort.org/) is for network traffic and [YARA](https://github.com/VirusTotal/yara) is for files.
 
@@ -24,11 +24,11 @@ This repository contains:
 
 [![Sigma - Generic Signatures for Log Events](https://preview.ibb.co/cMCigR/Screen_Shot_2017_10_18_at_15_47_15.png)](https://www.youtube.com/watch?v=OheVuE9Ifhs "Sigma - Generic Signatures for Log Events")
 
-## SANS Webcast on MITRE ATT&CK and Sigma
+## SANS Webcast on MITRE ATT&CK® and Sigma
 
 The SANS webcast on Sigma contains a very good 20 min introduction to the project by John Hubbart from minute 39 onward. (SANS account required; registration is free)
 
-[MITRE ATT&CK and Sigma Alerting Webcast Recording](https://www.sans.org/webcasts/mitre-att-ck-sigma-alerting-110010 "MITRE ATT&CK and Sigma Alerting")
+[MITRE ATT&CK® and Sigma Alerting Webcast Recording](https://www.sans.org/webcasts/mitre-att-ck-sigma-alerting-110010 "MITRE ATT&CK® and Sigma Alerting")
 
 # Use Cases
 
@@ -71,6 +71,12 @@ Florian wrote a short [rule creation tutorial](https://www.nextron-systems.com/2
 5. Convert a whole rule directory with `python sigmac -t splunk -r ../rules/proxy/`
 6. Check the `./tools/config` folder and the [wiki](https://github.com/Neo23x0/sigma/wiki/Converter-Tool-Sigmac) if you need custom field or log source mappings in your environment
 
+## Troubles / Troubleshooting / Help
+
+If you need help for a specific supported backend you can use e.g. `sigmac --backend-help elastalert-dsl`. More details on the usage of `sigmac` can be found in the dedicated [README.md](https://github.com/Neo23x0/sigma/blob/master/tools/README.md).
+
+Be sure to checkout the [guidance on backend specific settings](https://github.com/Neo23x0/sigma/blob/master/tools/README.md#choosing-the-right-sigmac) for `sigmac`.
+
 # Examples
 
 Windows 'Security' Eventlog: Access to LSASS Process with Certain Access Mask / Object Type (experimental)
@@ -88,9 +94,9 @@ Sysmon: Web Shell Detection
 Windows 'Security' Eventlog: Suspicious Number of Failed Logons from a Single Source Workstation
 ![sigma_rule example5](./images/Sigma_rule_example5.png)
 
-# Sigma Tools 
+# Sigma Tools
 
-## Sigmac 
+## Sigmac
 
 Sigmac converts sigma rules into queries or inputs of the supported targets listed below. It acts as a frontend to the
 Sigma library that may be used to integrate Sigma support in other projects. Further, there's `merge_sigma.py` which
@@ -98,9 +104,9 @@ merges multiple YAML documents of a Sigma rule collection into simple Sigma rule
 
 ### Usage
 
-```
+```bash
 usage: sigmac [-h] [--recurse] [--filter FILTER]
-              [--target {arcsight,es-qs,es-dsl,kibana,xpack-watcher,elastalert,graylog,limacharlie,logpoint,grep,netwitness,powershell,qradar,qualys,splunk,splunkxml,sumologic,fieldlist,wdatp}]
+              [--target {arcsight,es-qs,es-dsl,kibana,xpack-watcher,elastalert,graylog,limacharlie,logpoint,grep,netwitness,powershell,qradar,qualys,splunk,splunkxml,sumologic,fieldlist,mdatp,ee-outliers}]
               [--target-list] [--config CONFIG] [--output OUTPUT]
               [--backend-option BACKEND_OPTION] [--defer-abort]
               [--ignore-backend-errors] [--verbose] [--debug]
@@ -125,7 +131,7 @@ optional arguments:
                         tag that must appear in the rules tag list, case-
                         insensitive matching. Multiple log source
                         specifications are AND linked.
-  --target {arcsight,es-qs,es-dsl,kibana,xpack-watcher,elastalert,graylog,limacharlie,logpoint,grep,netwitness,powershell,qradar,qualys,splunk,splunkxml,sumologic,fieldlist,wdatp}, -t {arcsight,es-qs,es-dsl,kibana,xpack-watcher,elastalert,graylog,limacharlie,logpoint,grep,netwitness,powershell,qradar,qualys,splunk,splunkxml,sumologic,fieldlist,wdatp}
+  --target {arcsight,es-qs,es-dsl,kibana,xpack-watcher,elastalert,graylog,limacharlie,logpoint,grep,netwitness,powershell,qradar,qualys,splunk,splunkxml,sumologic,fieldlist,mdatp}, -t {arcsight,es-qs,es-dsl,kibana,xpack-watcher,elastalert,graylog,limacharlie,logpoint,grep,netwitness,powershell,qradar,qualys,splunk,splunkxml,sumologic,fieldlist,mdatp}
                         Output target format
   --target-list, -l     List available output target formats
   --config CONFIG, -c CONFIG
@@ -191,7 +197,7 @@ tools/sigmac -t splunk -c ~/my-splunk-mapping.yml -c tools/config/generic/window
 * [Kibana](https://www.elastic.co/de/products/kibana)
 * [Elastic X-Pack Watcher](https://www.elastic.co/guide/en/x-pack/current/xpack-alerting.html)
 * [Logpoint](https://www.logpoint.com)
-* [Windows Defender Advanced Threat Protection (WDATP)](https://www.microsoft.com/en-us/windowsforbusiness/windows-atp)
+* [Microsoft Defender Advanced Threat Protection (MDATP)](https://www.microsoft.com/en-us/microsoft-365/windows/microsoft-defender-atp)
 * [Azure Sentinel / Azure Log Analytics](https://azure.microsoft.com/en-us/services/azure-sentinel/)
 * [Sumologic](https://www.sumologic.com/)
 * [ArcSight](https://software.microfocus.com/en-us/products/siem-security-information-event-management/overview)
@@ -201,11 +207,14 @@ tools/sigmac -t splunk -c ~/my-splunk-mapping.yml -c tools/config/generic/window
 * [PowerShell](https://docs.microsoft.com/en-us/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-6)
 * [Grep](https://www.gnu.org/software/grep/manual/grep.html) with Perl-compatible regular expression support
 * [LimaCharlie](https://limacharlie.io)
+* [ee-outliers](https://github.com/NVISO-BE/ee-outliers)
+* [Structured Threat Information Expression (STIX)](https://oasis-open.github.io/cti-documentation/stix/intro.html)
+* [uberAgent ESA](https://uberagent.com/)
 
 Current work-in-progress
 * [Splunk Data Models](https://docs.splunk.com/Documentation/Splunk/7.1.0/Knowledge/Aboutdatamodels)
 
-New targets are continuously developed. You can get a list of supported targets with `sigmac --target-list` or `sigmac -l`.
+New targets are continuously developed. You can get a list of supported targets with `sigmac --lists` or `sigmac -l`.
 
 ### Requirements
 
@@ -261,7 +270,7 @@ sigma2misp @misp.conf --same-event --info "Test Event" -r sigma_rules/
 
 ## Sigma2attack
 
-Generates a [MITRE ATT&CK Navigator](https://github.com/mitre/attack-navigator/) heatmap from a directory containing sigma rules.
+Generates a [MITRE ATT&CK® Navigator](https://github.com/mitre/attack-navigator/) heatmap from a directory containing sigma rules.
 
 Requirements:
 - Sigma rules tagged with a `attack.tXXXX` tag (e.g.: `attack.t1086`)
@@ -276,10 +285,16 @@ Usage samples:
 ./tools/sigma2attack --rules-directory ~/hunting/rules
 ```
 
-Result once imported in the MITRE ATT&CK Navigator ([online version](https://mitre-attack.github.io/attack-navigator/enterprise/)):
+Result once imported in the MITRE ATT&CK® Navigator ([online version](https://mitre-attack.github.io/attack-navigator/enterprise/)):
 
 ![Sigma2attack result](./images/sigma2attack.png)
 
+## S2AN
+
+Similar to **Sigma2attack**, [S2AN](https://github.com/3CORESec/S2AN) is a pre-compiled binary for both Windows and GNU/Linux that generates [MITRE ATT&CK® Navigator](https://github.com/mitre/attack-navigator/) layers from a directory of Sigma rules. 
+
+S2AN was developed to be used as a standalone tool or as part of a CI/CD pipeline where it can be quickly downloaded and executed without external dependencies.
+
 ## Contributed Scripts
 
 The directory `contrib` contains scripts that were contributed by the community:
@@ -291,7 +306,7 @@ These tools are not part of the main toolchain and maintained separately by thei
 
 # Next Steps
 
-* Integration of MITRE ATT&CK framework identifier to the rule set
+* Integration of MITRE ATT&CK® framework identifier to the rule set
 * Integration into Threat Intel Exchanges
 * Attempts to convince others to use the rule format in their reports, threat feeds, blog posts, threat sharing platforms
 
@@ -306,6 +321,11 @@ These tools are not part of the main toolchain and maintained separately by thei
 * [RANK VASA](https://globenewswire.com/news-release/2019/03/04/1745907/0/en/RANK-Software-to-Help-MSSPs-Scale-Cybersecurity-Offerings.html)
 * [TA-Sigma-Searches](https://github.com/dstaulcu/TA-Sigma-Searches) (Splunk App)
 * [TimeSketch](https://github.com/google/timesketch/commit/0c6c4b65a6c0f2051d074e87bbb2da2424fa6c35)
+* [SIΣGMA](https://github.com/3CORESec/SIEGMA) - SIEM consumable generator that utilizes Sigma for query conversion 
+
+Sigma is available in some Linux distribution repositories:
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/sigma.svg)](https://repology.org/project/sigma/versions)
 
 # Contribution
 
@@ -337,7 +357,7 @@ The content of this repository is released under the following licenses:
 
 * The toolchain (everything under `tools/`) is licensed under the [GNU Lesser General Public License](https://www.gnu.org/licenses/lgpl-3.0.en.html).
 * The [Sigma specification](https://github.com/Neo23x0/sigma/wiki) is public domain.
-* Everything else, especially the rules contained in the `rules/` directory is released under the [GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.en.html).
+* Everything else, especially the rules contained in the `rules/` directory is released under the [Detection Rule License (DRL) 1.0](https://github.com/Neo23x0/sigma/blob/master/LICENSE.Detection.Rules.md).
 
 # Credits
 
@@ -345,4 +365,8 @@ This is a private project mainly developed by Florian Roth and Thomas Patzke wit
 
 # Info Graphic
 
+## Overview
 ![sigmac_info_graphic](./images/sigma_infographic_lq.png)
+
+## Coverage Illustration
+![sigmac_coverage](./images/Sigma_Coverage.png)

contrib/filter-uuid-patch

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 # Remove all hunks from a patch that don't add the id attribute to minimize the impact (removed
-# comments etc.) of sigma-uuid script.
+# comments etc.) of sigma_uuid script.
 #
 # Usually used as follows:
 # 1. Add UUIDs to rules:
-# tools/sigma-uuid -er rules
+# tools/sigma_uuid -er rules
 # 2. Generate and filter patch
 # git diff | contrib/filter-uuid-patch > rule-uuid.diff
 # 3. Reset to previous state

contrib/sigma2sumologic.py

@@ -124,7 +124,7 @@ def get_rule_as_sumologic(file):
     return "".join(output)
 
 if args.help:
-    parser_print_help()
+    parser.print_help()
 
 if args.conf:
     with open(args.conf, 'r') as ymlfile:

other/godmode_sigma_rule.yml

@@ -0,0 +1,150 @@
+#    _____        __  __  ___        __      
+#   / ___/__  ___/ / /  |/  /__  ___/ /__    
+#  / (_ / _ \/ _  / / /|_/ / _ \/ _  / -_)   
+#  \___/\___/\_,_/ /_/  /_/\___/\_,_/\__/_   
+#    / __(_)__ ___ _  ___ _  / _ \__ __/ /__ 
+#   _\ \/ / _ `/  ' \/ _ `/ / , _/ // / / -_)
+#  /___/_/\_, /_/_/_/\_,_/ /_/|_|\_,_/_/\__/ 
+#        /___/ IDDQD                              
+#
+#  Florian Roth
+#  May 2020
+#  v0.3
+#
+#  A Proof-of-Concept with the most effective search queries
+
+title: Godmode Sigma Rule
+id: def6caac-a999-4fc9-8800-cfeff700ba98
+description: 'PoC rule to detect malicious activity - following the principle: if you had only one shot, what would you look for?'
+status: experimental
+author: Florian Roth
+date: 2019/12/22
+modified: 2020/05/18
+level: high
+action: global
+---
+logsource:
+    category: process_creation
+    product: windows
+detection:
+    # Different suspicious or malicious command line parameters
+    selection_plain:
+        CommandLine|contains:
+            - ' -NoP '  # Often used in malicious PowerShell commands
+            - ' -W Hidden '  # Often used in malicious PowerShell commands
+            - ' -decode '  # Used with certutil
+            - ' /decode '  # Used with certutil 
+            - ' -e* JAB'  # PowerShell encoded commands
+            - ' -e* SUVYI'  # PowerShell encoded commands
+            - ' -e* SQBFAFgA'  # PowerShell encoded commands
+            - ' -e* aWV4I'  # PowerShell encoded commands
+            - ' -e* IAB'  # PowerShell encoded commands
+            - ' -e* PAA'  # PowerShell encoded commands
+            - ' -e* aQBlAHgA'  # PowerShell encoded commands
+            - 'vssadmin delete shadows'  # Ransomware
+            - 'reg SAVE HKLM\SAM'  # save registry SAM - syskey extraction
+            - ' -ma '  # ProcDump
+            - 'Microsoft\Windows\CurrentVersion\Run'  # Run key in command line - often in combination with REG ADD
+            - '.downloadstring('  # PowerShell download command
+            - '.downloadfile('  # PowerShell download command
+            - ' /ticket:'  # Rubeus
+            - ' sekurlsa'  # Mimikatz
+            - ' p::d '  # Mimikatz 
+            - ';iex('  # PowerShell IEX
+            - 'schtasks* /create *AppData'  # Scheduled task creation pointing to AppData
+            - ' comsvcs.dll,MiniDump'  # Process dumping method apart from procdump
+            - ' comsvcs.dll,#24'  # Process dumping method apart from procdump
+    selection_parent_child:
+        ParentImage|contains:
+            # Office Dropper Detection
+            - '\WINWORD.EXE'
+            - '\EXCEL.EXE'
+            - '\POWERPNT.exe'
+            - '\MSPUB.exe'
+            - '\VISIO.exe'
+            - '\OUTLOOK.EXE'
+        Image|contains:
+            - '\cmd.exe'
+            - '\powershell.exe'
+            - '\wscript.exe'
+            - '\cscript.exe'
+            - '\schtasks.exe'
+            - '*\scrcons.exe'
+            - '\regsvr32.exe'
+            - '\hh.exe'
+            - '\wmic.exe'
+            - '\mshta.exe'
+            - '\msiexec.exe'
+            - '\forfiles.exe'
+            - '\AppData\'
+    selection_webshells:
+        Image|contains:
+            - '\apache*'
+            - '\tomcat*'
+            - '\w3wp.exe'
+            - '\php-cgi.exe'
+            - '\nginx.exe'
+            - '\httpd.exe'
+        CommandLine|contains:
+            - 'whoami'
+            - 'net user '
+            - 'ping -n '
+            - 'systeminfo'
+            - '&cd&echo'
+            - 'cd /d '  # https://www.computerhope.com/cdhlp.htm
+    # Running whoami as LOCAL_SYSTEM (usually after privilege escalation)
+    selection_whoami:
+        Image|contains: '\whoami.exe'
+        User: 'NT AUTHORITY\SYSTEM' 
+    condition: 1 of them
+---
+logsource:
+    product: windows
+    service: sysmon
+detection:
+    selection_file_creation:
+        EventID: 11
+        TargetFilename|contains: 
+            - '.dmp'  # dump process memory
+            - 'Desktop\how'  # Ransomware
+            - 'Desktop\decrypt'  # Ransomware
+    selection_registry_modifications:
+        EventID:
+            - 12
+            - 13
+        TargetObject|contains: 
+            - 'UserInitMprLogonScript'  # persistence
+            - '\CurrentVersion\Image File Execution Options\'  # persistence
+    selection_registry_run:
+        EventID:
+            - 12
+            - 13
+        TargetObject|contains: 
+            - '\Microsoft\Windows\CurrentVersion\Run\'  # persistence
+            - '\Microsoft\Windows\CurrentVersion\RunOnce\'   # persistence
+        Details|contains:
+            - 'AppData'
+            - '\Users\Public\'
+            - '\Temp\'
+            - 'powershell'
+            - 'wscript'
+            - 'cscript'
+    condition: 1 of them
+---
+logsource:
+    product: windows
+    service: system
+detection:
+    # Malicious service installs
+    selection:
+        EventID: 7045
+        ServiceName|contains: 
+            - 'WCESERVICE'
+            - 'WCE SERVICE'
+            - 'winexesvc'
+            - 'DumpSvc'
+            - 'pwdump'
+            - 'gsecdump'
+            - 'cachedump'
+    condition:
+        1 of them

rules-unsupported/sysmon_process_reimaging.yml

@@ -5,7 +5,7 @@ description: Detects process reimaging defense evasion technique
 # where
 #             selection1: ImageFileName != selection1: OriginalFileName
 #             selection1: ParentProcessGuid = selection2: ProcessGuid
-#             selection1: Image = selection2: TargetFileName
+#             selection1: Image = selection2: TargetFilename
 # and new field ImageFileName is coming from enrichment
 #             selection1: Image = ^.+\\<ImageFileName>$
 # Rule must trigger if selection1 and selection2 both occurs in timeframe of 120 sec.
@@ -45,4 +45,4 @@ detection:
         EventID: 11
 fields:
     - ProcessGuid
-    - TargetFileName
+    - TargetFilename

rules/application/app_python_sql_exceptions.yml

@@ -1,8 +1,10 @@
 title: Python SQL Exceptions
 id: 19aefed0-ffd4-47dc-a7fc-f8b1425e84f9
+status: stable
 description: Generic rule for SQL exceptions in Python according to PEP 249
 author: Thomas Patzke
 date: 2017/08/12
+modified: 2020/09/01
 references:
     - https://www.python.org/dev/peps/pep-0249/#exceptions
 logsource:
@@ -19,3 +21,6 @@ falsepositives:
     - Application bugs
     - Penetration testing
 level: medium
+tags:
+    - attack.initial_access
+    - attack.t1190

rules/application/app_sqlinjection_errors.yml

@@ -4,6 +4,7 @@ status: experimental
 description: Detects SQL error messages that indicate probing for an injection attack
 author: Bjoern Kimminich
 date: 2017/11/27
+modified: 2020/09/01
 references:
     - http://www.sqlinjection.net/errors
 logsource:
@@ -24,3 +25,6 @@ detection:
 falsepositives:
     - Application bugs
 level: high
+tags:
+    - attack.initial_access
+    - attack.t1190

rules/application/appframework_django_exceptions.yml

@@ -1,8 +1,10 @@
 title: Django Framework Exceptions
 id: fd435618-981e-4a7c-81f8-f78ce480d616
+status: stable
 description: Detects suspicious Django web application framework exceptions that could indicate exploitation attempts
 author: Thomas Patzke
 date: 2017/08/05
+modified: 2020/09/01
 references:
     - https://docs.djangoproject.com/en/1.11/ref/exceptions/
     - https://docs.djangoproject.com/en/1.11/topics/logging/#django-security
@@ -30,3 +32,6 @@ falsepositives:
     - Application bugs
     - Penetration testing
 level: medium
+tags:
+    - attack.initial_access
+    - attack.t1190

rules/application/appframework_ruby_on_rails_exceptions.yml

@@ -1,8 +1,10 @@
 title: Ruby on Rails Framework Exceptions
 id: 0d2c3d4c-4b48-4ac3-8f23-ea845746bb1a
+status: stable
 description: Detects suspicious Ruby on Rails exceptions that could indicate exploitation attempts
 author: Thomas Patzke
 date: 2017/08/06
+modified: 2020/09/01
 references:
     - http://edgeguides.rubyonrails.org/security.html
     - http://guides.rubyonrails.org/action_controller_overview.html
@@ -23,3 +25,6 @@ falsepositives:
     - Application bugs
     - Penetration testing
 level: medium
+tags:
+    - attack.initial_access
+    - attack.t1190

rules/application/appframework_spring_exceptions.yml

@@ -1,8 +1,10 @@
 title: Spring Framework Exceptions
 id: ae48ab93-45f7-4051-9dfe-5d30a3f78e33
+status: stable
 description: Detects suspicious Spring framework exceptions that could indicate exploitation attempts
 author: Thomas Patzke
 date: 2017/08/06
+modified: 2020/09/01
 references:
     - https://docs.spring.io/spring-security/site/docs/current/apidocs/overview-tree.html
 logsource:
@@ -22,3 +24,6 @@ falsepositives:
     - Application bugs
     - Penetration testing
 level: medium
+tags:
+    - attack.initial_access
+    - attack.t1190

rules/apt/apt_silence_downloader_v3.yml

@@ -4,10 +4,7 @@ status: experimental
 description: Detects Silence downloader. These commands are hardcoded into the binary.
 author: Alina Stepchenkova, Roman Rezvukhin, Group-IB, oscd.community
 date: 2019/11/01
-modified: 2019/11/22
-tags:
-    - attack.persistence
-    - attack.g0091
+modified: 2020/09/01
 logsource:
     category: process_creation
     product: windows
@@ -31,3 +28,13 @@ fields:
 falsepositives:
     - Unknown
 level: high
+tags:
+    - attack.persistence
+    - attack.t1547.001
+    - attack.t1060  # an old one
+    - attack.discovery
+    - attack.t1057
+    - attack.t1082
+    - attack.t1016
+    - attack.t1033
+    - attack.g0091

rules/apt/apt_silence_eda.yml

@@ -4,10 +4,7 @@ status: experimental
 description: Detects Silence empireDNSagent
 author: Alina Stepchenkova, Group-IB, oscd.community
 date: 2019/11/01
-modified: 2019/11/20
-tags:
-    - attack.g0091
-    - attack.s0363
+modified: 2020/09/01
 logsource:
     product: windows
     service: powershell
@@ -32,3 +29,15 @@ detection:
 falsepositives:
     - Unknown
 level: critical
+tags:
+    - attack.execution
+    - attack.t1059.001
+    - attack.t1086  # an old one
+    - attack.command_and_control
+    - attack.t1071.004
+    - attack.t1071  # an old one
+    - attack.t1572
+    - attack.impact
+    - attack.t1529
+    - attack.g0091
+    - attack.s0363

rules/cloud/aws_cloudtrail_disable_logging.yml

@@ -1,24 +1,26 @@
 title: AWS CloudTrail Important Change
 id: 4db60cc0-36fb-42b7-9b58-a5b53019fb74
 status: experimental
+description: Detects disabling, deleting and updating of a Trail
 author: vitaliy0x1
 date: 2020/01/21
-description: Detects disabling, deleting and updating of a Trail
 references:
-  - https://docs.aws.amazon.com/awscloudtrail/latest/userguide/best-practices-security.html
+    - https://docs.aws.amazon.com/awscloudtrail/latest/userguide/best-practices-security.html
 logsource:
-  service: cloudtrail
+    service: cloudtrail
 detection:
-  selection_source:
-    - eventSource: cloudtrail.amazonaws.com
-  events:
-    - eventName:
-        - StopLogging
-        - UpdateTrail
-        - DeleteTrail
-  condition: selection_source AND events
-level: medium
+    selection_source:
+        - eventSource: cloudtrail.amazonaws.com
+    events:
+        - eventName:
+            - StopLogging
+            - UpdateTrail
+            - DeleteTrail
+    condition: selection_source AND events
 falsepositives:
     - Valid change in a Trail
+level: medium
 tags:
-  - attack.t1089
+    - attack.defense_evasion
+    - attack.t1562.001
+    - attack.t1089  # an old one

rules/cloud/aws_config_disable_recording.yml

@@ -1,21 +1,23 @@
 title: AWS Config Disabling Channel/Recorder
 id: 07330162-dba1-4746-8121-a9647d49d297
 status: experimental
+description: Detects AWS Config Service disabling
 author: vitaliy0x1
 date: 2020/01/21
-description: Detects AWS Config Service disabling
 logsource:
-  service: cloudtrail
+    service: cloudtrail
 detection:
-  selection_source:
-    - eventSource: config.amazonaws.com
-  events:
-    - eventName:
-        - DeleteDeliveryChannel
-        - StopConfigurationRecorder
-  condition: selection_source AND events
-level: high
+    selection_source:
+        - eventSource: config.amazonaws.com
+    events:
+        - eventName:
+            - DeleteDeliveryChannel
+            - StopConfigurationRecorder
+    condition: selection_source AND events
 falsepositives:
     - Valid change in AWS Config Service
+level: high
 tags:
-  - attack.t1089
+    - attack.defense_evasion
+    - attack.t1562.001
+    - attack.t1089  # an old one

rules/cloud/aws_ec2_download_userdata.yml

@@ -1,9 +1,10 @@
 title: AWS EC2 Download Userdata
 id: 26ff4080-194e-47e7-9889-ef7602efed0c
 status: experimental
+description: Detects bulk downloading of User Data associated with AWS EC2 instances. Instance User Data may include installation scripts and hard-coded secrets for deployment.
 author: faloker
 date: 2020/02/11
-description: Detects bulk downloading of User Data associated with AWS EC2 instances. Instance User Data may include installation scripts and hard-coded secrets for deployment.
+modified: 2020/09/01
 references:
     - https://github.com/RhinoSecurityLabs/pacu/blob/master/modules/ec2__download_userdata/main.py#L24
 logsource:
@@ -17,8 +18,9 @@ detection:
         - eventName: DescribeInstanceAttribute
     timeframe: 30m
     condition: all of them | count() > 10
-level: medium
 falsepositives:
     - Assets management software like device42
+level: medium
 tags:
+    - attack.exfiltration 
     - attack.t1020

rules/cloud/aws_ec2_startup_script_change.yml

@@ -1,9 +1,10 @@
 title: AWS EC2 Startup Shell Script Change
 id: 1ab3c5ed-5baf-417b-bb6b-78ca33f6c3df
 status: experimental
+description: Detects changes to the EC2 instance startup script. The shell script will be executed as root/SYSTEM everytime the specific instances are booted up.
 author: faloker
 date: 2020/02/12
-description: Detects changes to the EC2 instance startup script. The shell script will be executed as root/SYSTEM everytime the specific instances are booted up.
+modified: 2020/09/01
 references:
     - https://github.com/RhinoSecurityLabs/pacu/blob/master/modules/ec2__startup_shell_script/main.py#L9
 logsource:
@@ -16,8 +17,14 @@ detection:
     selection_eventname:
         - eventName: ModifyInstanceAttribute
     condition: all of them
-level: high
 falsepositives:
     - Valid changes to the startup script
+level: high
 tags:
-    - attack.t1064
+    - attack.execution
+    - attack.t1059.001
+    - attack.t1086  # an old one
+    - attack.t1059.003
+    - attack.t1059.004
+    - attack.t1059  # an old one
+    - attack.t1064  # an old one

rules/cloud/aws_ec2_vm_export_failure.yml

@@ -0,0 +1,29 @@
+title: AWS EC2 VM Export Failure
+id: 54b9a76a-3c71-4673-b4b3-2edb4566ea7b
+status: experimental
+description: An attempt to export an AWS EC2 instance has been detected. A VM Export might indicate an attempt to extract information from an instance.     
+author: Diogo Braz
+date: 2020/04/16
+references: 
+  - https://docs.aws.amazon.com/vm-import/latest/userguide/vmexport.html#export-instance
+logsource:
+  service: cloudtrail
+detection:
+  selection:           
+    eventName: 'CreateInstanceExportTask'
+    eventSource: 'ec2.amazonaws.com'
+  filter1:
+    errorMessage: '*'
+  filter2:
+    errorCode: '*'
+  filter3:
+    eventName: 'ConsoleLogin'
+    responseElements: '*Failure*'
+  condition: selection and (filter1 or filter2 or filter3)
+level: low
+tags:
+- attack.collection    
+- attack.t1005      
+- attack.exfiltration
+- attack.t1537
+

rules/cloud/aws_enum_listing.yml

@@ -0,0 +1,21 @@
+title: Account Enumeration on AWS
+id: e9c14b23-47e2-4a8b-8a63-d36618e33d70 
+status: experimental
+description: Detects enumeration of accounts configuration via api call to list different instances and services within a short period of time.  
+author: toffeebr33k
+date: 2020/11/21
+logsource:
+    service: cloudtrail
+detection:
+    selection_eventname:
+        - eventName: list*
+    timeframe: 10m
+    condition: all of them | count() > 50
+fields:
+    - userIdentity.arn
+falsepositives:
+    - AWS Config or other configuration scanning activities
+level: low
+tags:
+    - attack.discovery
+    - attack.t1592

rules/cloud/aws_guardduty_disruption.yml

@@ -1,9 +1,9 @@
 title: AWS GuardDuty Important Change
 id: 6e61ee20-ce00-4f8d-8aee-bedd8216f7e3
 status: experimental
+description: Detects updates of the GuardDuty list of trusted IPs, perhaps to disable security alerts against malicious IPs.
 author: faloker
 date: 2020/02/11
-description: Detects updates of the GuardDuty list of trusted IPs, perhaps to disable security alerts against malicious IPs.
 references:
     - https://github.com/RhinoSecurityLabs/pacu/blob/master/modules/guardduty__whitelist_ip/main.py#L9
 logsource:
@@ -14,8 +14,10 @@ detection:
     selection_eventName:
         - eventName: CreateIPSet
     condition: all of them
-level: high
 falsepositives:
     - Valid change in the GuardDuty (e.g. to ignore internal scanners)
+level: high
 tags:
-    - attack.t1089
+    - attack.defense_evasion
+    - attack.t1562.001
+    - attack.t1089  # an old one

rules/cloud/aws_iam_backdoor_users_keys.yml

@@ -1,9 +1,10 @@
 title: AWS IAM Backdoor Users Keys
 id: 0a5177f4-6ca9-44c2-aacf-d3f3d8b6e4d2
 status: experimental
+description: Detects AWS API key creation for a user by another user. Backdoored users can be used to obtain persistence in the AWS environment. Also with this alert, you can detect a flow of AWS keys in your org.
 author: faloker
 date: 2020/02/12
-description: Detects AWS API key creation for a user by another user. Backdoored users can be used to obtain persistence in the AWS environment. Also with this alert, you can detect a flow of AWS keys in your org.
+modified: 2020/09/01
 references:
     - https://github.com/RhinoSecurityLabs/pacu/blob/master/modules/iam__backdoor_users_keys/main.py#L6
 logsource:
@@ -21,9 +22,10 @@ fields:
     - responseElements.accessKey.userName
     - errorCode
     - errorMessage
-level: medium
 falsepositives:
     - Adding user keys to their own accounts (the filter cannot cover all possible variants of user naming)
     - AWS API keys legitimate exchange workflows
+level: medium
 tags:
+    - attack.persistence
     - attack.t1098

rules/cloud/aws_rds_change_master_password.yml

@@ -1,9 +1,10 @@
 title: AWS RDS Master Password Change
 id: 8a63cdd4-6207-414a-85bc-7e032bd3c1a2
 status: experimental
+description: Detects the change of database master password. It may be a part of data exfiltration.
 author: faloker
 date: 2020/02/12
-description: Detects the change of database master password. It may be a part of data exfiltration.
+modified: 2020/09/01
 references:
     - https://github.com/RhinoSecurityLabs/pacu/blob/master/modules/rds__explore_snapshots/main.py#L10
 logsource:
@@ -16,8 +17,9 @@ detection:
     selection_eventname:
         - eventName: ModifyDBInstance
     condition: all of them
-level: medium
 falsepositives:
     - Benign changes to a db instance
+level: medium
 tags:
+    - attack.exfiltration
     - attack.t1020

rules/cloud/aws_rds_public_db_restore.yml

@@ -1,9 +1,10 @@
 title: Restore Public AWS RDS Instance
 id: c3f265c7-ff03-4056-8ab2-d486227b4599
 status: experimental
+description: Detects the recovery of a new public database instance from a snapshot. It may be a part of data exfiltration.
 author: faloker
 date: 2020/02/12
-description: Detects the recovery of a new public database instance from a snapshot. It may be a part of data exfiltration.
+modified: 2020/09/01
 references:
     - https://github.com/RhinoSecurityLabs/pacu/blob/master/modules/rds__explore_snapshots/main.py#L10
 logsource:
@@ -16,8 +17,9 @@ detection:
     selection_eventname:
         - eventName: RestoreDBInstanceFromDBSnapshot
     condition: all of them
-level: high
 falsepositives:
     - unknown
+level: high
 tags:
+    - attack.exfiltration
     - attack.t1020

rules/cloud/aws_root_account_usage.yml

@@ -1,9 +1,10 @@
 title: AWS Root Credentials
 id: 8ad1600d-e9dc-4251-b0ee-a65268f29add
 status: experimental
+description: Detects AWS root account usage
 author: vitaliy0x1
 date: 2020/01/21
-description: Detects AWS root account usage
+modified: 2020/09/01
 references:
   - https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-user.html
 logsource:
@@ -14,8 +15,10 @@ detection:
   selection_eventtype:
     - eventType: AwsServiceEvent
   condition: selection_usertype AND NOT selection_eventtype
-level: medium
 falsepositives:
-    - AWS Tasks That Require AWS Account Root User Credentials https://docs.aws.amazon.com/general/latest/gr/aws_tasks-that-require-root.html
+  - AWS Tasks That Require AWS Account Root User Credentials https://docs.aws.amazon.com/general/latest/gr/aws_tasks-that-require-root.html
+level: medium
 tags:
-  - attack.t1078
+  - attack.privilege_escalation
+  - attack.t1078.004
+  - attack.t1078  # an old one

rules/cloud/aws_update_login_profile.yml

@@ -0,0 +1,29 @@
+title: AWS User Login Profile Was Modified
+id: 055fb148-60f8-462d-ad16-26926ce050f1 
+status: experimental
+description: An attacker with the iam:UpdateLoginProfile permission on other users can change the password used to login to the AWS console on any user that already has a login profile setup. With this alert, it is used to detect anyone is changing password on behalf of other users.
+author: toffeebr33k
+date: 2020/11/21
+references:
+    - https://github.com/RhinoSecurityLabs/AWS-IAM-Privilege-Escalation
+logsource:
+    service: cloudtrail
+detection:
+    selection_source:
+        - eventSource: iam.amazonaws.com
+    selection_eventname:
+        - eventName: UpdateLoginProfile
+    filter:
+        userIdentity.arn|contains: responseElements.accessKey.userName
+    condition: all of selection* and not filter
+fields:
+    - userIdentity.arn
+    - responseElements.accessKey.userName
+    - errorCode
+    - errorMessage
+falsepositives:
+    - Legit User Account Administration 
+level: high
+tags:
+    - attack.persistence
+    - attack.t1098

rules/compliance/cleartext_protocols.yml

@@ -1,15 +1,15 @@
 action: global
 title: Cleartext Protocol Usage
 id: 7e4bfe58-4a47-4709-828d-d86c78b7cc1f
+status: stable
 description: Ensure that all account usernames and authentication credentials are transmitted across networks using encrypted channels. Ensure that an encryption
     is used for all sensitive information in transit. Ensure that an encrypted channels is used  for all administrative account access.
+author: Alexandr Yampolskyi, SOC Prime
+date: 2019/03/26
 references:
     - https://www.cisecurity.org/controls/cis-controls-list/
     - https://www.pcisecuritystandards.org/documents/PCI_DSS_v3-2-1.pdf
     - https://nvlpubs.nist.gov/nistpubs/CSWP/NIST.CSWP.04162018.pdf
-author: Alexandr Yampolskyi, SOC Prime
-status: stable
-date: 2019/03/26
 falsepositives:
     - unknown
 level: low
@@ -30,8 +30,6 @@ tags:
     - NIST CSF 1.1 PR.AC-7
     - NIST CSF 1.1 PR.DS-1
     - NIST CSF 1.1 PR.DS-2
-    - NIST CSF 1.1 PR.PT-3
-    - NIST CSF 1.1 PR.PT-3
     - ISO 27002-2013 A.9.2.1
     - ISO 27002-2013 A.9.2.2
     - ISO 27002-2013 A.9.2.3

rules/compliance/default_credentials_usage.yml

@@ -1,9 +1,9 @@
 title: Default Credentials Usage
 id: 1a395cbc-a84a-463a-9086-ed8a70e573c7
+status: stable
 description: Before deploying any new asset, change all default passwords to have values consistent with administrative level accounts. Sigma detects default credentials
     usage. Sigma for Qualys vulnerability scanner. Scan type - Vulnerability Management.
 author: Alexandr Yampolskyi, SOC Prime
-status: stable
 references:
     - https://www.cisecurity.org/controls/cis-controls-list/
     - https://www.pcisecuritystandards.org/documents/PCI_DSS_v3-2-1.pdf

rules/compliance/group_modification_logging.yml

@@ -1,11 +1,12 @@
 title: Group Modification Logging
 id: 9cf01b6c-e723-4841-a868-6d7f8245ca6e
+status: stable
 description: "Configure systems to issue a log entry and alert when an account is added to or removed from any group assigned administrative privileges. Sigma detects\
     \ Event ID 4728 indicates a \u2018Member is added to a Security Group\u2019. Event ID 4729 indicates a \u2018Member is removed from a Security enabled-group\u2019\
     . Event ID 4730 indicates a\u2018Security Group is deleted\u2019. The case is not applicable for Unix OS. Supported OS - Windows 2008 R2 and 7, Windows 2012 R2\
     \ and 8.1, Windows 2016 and 10 Windows Server 2019, Windows Server 2000, Windows 2003 and XP."
 author: Alexandr Yampolskyi, SOC Prime
-status: stable
+date: 2019/03/26
 references:
     - https://www.cisecurity.org/controls/cis-controls-list/
     - https://www.pcisecuritystandards.org/documents/PCI_DSS_v3-2-1.pdf
@@ -16,7 +17,6 @@ references:
     - https://www.ultimatewindowssecurity.com/securitylog/encyclopedia/event.aspx?eventID=633
     - https://www.ultimatewindowssecurity.com/securitylog/encyclopedia/event.aspx?eventID=632
     - https://www.ultimatewindowssecurity.com/securitylog/encyclopedia/event.aspx?eventID=634
-date: 2019/03/26
 logsource:
     product: windows
     service: security

rules/compliance/host_without_firewall.yml

@@ -1,14 +1,13 @@
 title: Host Without Firewall
 id: 6b2066c8-3dc7-4db7-9db0-6cc1d7b0dde9
+status: stable
 description: Host Without Firewall. Alert means not complied. Sigma for Qualys vulnerability scanner. Scan type - Vulnerability Management.
 author: Alexandr Yampolskyi, SOC Prime
+date: 2019/03/19
 references:
     - https://www.cisecurity.org/controls/cis-controls-list/
     - https://www.pcisecuritystandards.org/documents/PCI_DSS_v3-2-1.pdf
     - https://nvlpubs.nist.gov/nistpubs/CSWP/NIST.CSWP.04162018.pdf
-date: 2019/03/19
-status: stable
-level: low
 logsource:
     product: Qualys
 detection:
@@ -16,6 +15,7 @@ detection:
         event.category: Security Policy
         host.scan.vuln_name: Firewall Product Not Detected*
     condition: selection
+level: low
 tags:
     - CSC9
     - CSC9.4

rules/compliance/workstation_was_locked.yml

@@ -1,15 +1,15 @@
 title: Locked Workstation
 id: 411742ad-89b0-49cb-a7b0-3971b5c1e0a4
+status: stable
 description: Automatically lock workstation sessions after a standard period of inactivity. The case is not applicable for Unix OS. Supported OS - Windows 2008 R2
     and 7, Windows 2012 R2 and 8.1, Windows 2016 and 10 Windows Server 2019.
 author: Alexandr Yampolskyi, SOC Prime
-status: stable
+date: 2019/03/26
 references:
     - https://www.cisecurity.org/controls/cis-controls-list/
     - https://www.pcisecuritystandards.org/documents/PCI_DSS_v3-2-1.pdf
     - https://nvlpubs.nist.gov/nistpubs/CSWP/NIST.CSWP.04162018.pdf
     - https://www.ultimatewindowssecurity.com/securitylog/encyclopedia/event.aspx?eventID=4800
-date: 2019/03/26
 logsource:
     product: windows
     service: security

rules/generic/generic_brute_force.yml

@@ -1,11 +1,10 @@
 title: Brute Force
 id: 53c7cca0-2901-493a-95db-d00d6fcf0a37
+status: experimental
 description: Detects many authentication failures from one source to one destination which is may indicate Brute Force activity
-tags:
-    - attack.t1110
 author: Aleksandr Akhremchik, oscd.community
 date: 2019/10/25
-status: experimental
+modified: 2020/09/01
 logsource:
     category: authentication
 detection:
@@ -23,3 +22,6 @@ falsepositives:
     - Vulnerability scanner
     - Legitimate application
 level: medium
+tags:
+    - attack.credential_access
+    - attack.t1110

rules/linux/auditd/lnx_auditd_alter_bash_profile.yml

@@ -2,14 +2,10 @@ title: Edit of .bash_profile and .bashrc
 id: e74e15cc-c4b6-4c80-b7eb-dfe49feb7fe9
 status: experimental
 description: Detects change of user environment. Adversaries can insert code into these files to gain persistence each time a user logs in or opens a new shell.
+author: Peter Matkovski
+date: 2019/05/12
 references:
     - 'MITRE Attack technique T1156; .bash_profile and .bashrc. '
-date: 2019/05/12
-tags:
-    - attack.s0003
-    - attack.t1156
-    - attack.persistence
-author: Peter Matkovski
 logsource:
     product: linux
     service: auditd
@@ -29,3 +25,8 @@ detection:
 falsepositives:
     - Admin or User activity
 level: medium
+tags:
+    - attack.s0003
+    - attack.t1156    # an old one
+    - attack.persistence
+    - attack.t1546.004

rules/linux/auditd/lnx_auditd_auditing_config_change.yml

@@ -1,19 +1,16 @@
 title: Auditing Configuration Changes on Linux Host
 id: 977ef627-4539-4875-adf4-ed8f780c4922
+status: experimental
 description: Detect changes in auditd configuration files
     # Example config for this one (place it at the top of audit.rules)
     # -w /etc/audit/ -p wa -k etc_modify_auditconfig
     # -w /etc/libaudit.conf -p wa -k etc_modify_libauditconfig
     # -w /etc/audisp/ -p wa -k etc_modify_audispconfig
+author: Mikhail Larin, oscd.community
+date: 2019/10/25
 references:
     - https://github.com/Neo23x0/auditd/blob/master/audit.rules
     - self experience
-tags:
-    - attack.defense_evasion
-    - attack.t1054
-author: Mikhail Larin, oscd.community
-status: experimental
-date: 2019/10/25
 logsource:
     product: linux
     service: auditd
@@ -32,3 +29,7 @@ fields:
 falsepositives:
     - Legitimate administrative activity
 level: high
+tags:
+    - attack.defense_evasion
+    - attack.t1054    # an old one
+    - attack.t1562.006

rules/linux/auditd/lnx_auditd_create_account.yml

@@ -0,0 +1,23 @@
+title: Creation Of An User Account
+id: 759d0d51-bc99-4b5e-9add-8f5b2c8e7512
+status: experimental
+description: Detects the creation of a new user account. Such accounts may be used for persistence that do not require persistent remote access tools to be deployed on the system.
+author: Marie Euler
+date: 2020/05/18
+references:
+    - 'MITRE Attack technique T1136; Create Account '
+logsource:
+    product: linux
+    service: auditd
+detection:
+    selection:
+        type: 'SYSCALL'
+        exe: '*/useradd'
+    condition: selection
+falsepositives:
+    - Admin activity
+level: medium
+tags:
+    - attack.t1136    # an old one
+    - attack.t1136.001
+    - attack.persistence

rules/linux/auditd/lnx_auditd_cve_2021_3156_sudo_buffer_overflow.yml

@@ -0,0 +1,50 @@
+action: global
+title: CVE-2021-3156 Exploitation Attempt
+id: 5ee37487-4eb8-4ac2-9be1-d7d14cdc559f
+status: experimental
+description: Detects exploitation attempt of vulnerability described in CVE-2021-3156. |
+             Alternative approach might be to look for flooding of auditd logs due to bruteforcing |
+             required to trigger the heap-based buffer overflow.
+author: Bhabesh Raj
+date: 2021/02/01
+references:
+    - https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-3156
+    - https://blog.qualys.com/vulnerabilities-research/2021/01/26/cve-2021-3156-heap-based-buffer-overflow-in-sudo-baron-samedit
+falsepositives:
+    - Unknown
+level: critical
+tags:
+    - attack.privilege_escalation
+    - attack.t1068
+    - cve.2021-3156
+logsource:
+    product: linux
+    service: auditd
+---
+detection:
+    selection:
+        type: 'EXECVE'
+        a0: '/usr/bin/sudoedit'
+    cmd1:
+        a1: '-s'
+    cmd2:
+        a2: '-s'
+    cmd3:
+        a3: '-s'
+    cmd4:
+        a4: '-s'
+    cmd5:
+        a1: '\'
+    cmd6:
+        a2: '\'
+    cmd7:
+        a3: '\'
+    cmd8:
+        a4: '\'
+    condition: selection and (cmd1 or cmd2 or cmd3 or cmd4) and (cmd5 or cmd6 or cmd7 or cmd8) | count() by host > 50
+---
+detection:
+    selection:
+        type: 'SYSCALL'
+        exe: '/usr/bin/sudoedit'
+    condition: selection | count() by host > 50

rules/linux/auditd/lnx_auditd_ld_so_preload_mod.yml

@@ -1,16 +1,13 @@
 title: Modification of ld.so.preload
 id: 4b3cb710-5e83-4715-8c45-8b2b5b3e5751
-description: Identifies modification of ld.so.preload for shared object injection. This technique is used by attackers to load arbitrary code into processes.
 status: experimental
+description: Identifies modification of ld.so.preload for shared object injection. This technique is used by attackers to load arbitrary code into processes.
 author: E.M. Anhaus (orignally from Atomic Blue Detections, Tony Lambert), oscd.community
 date: 2019/10/24
 modified: 2019/11/11
 references:
-    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1055/T1055.yaml
+    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1574.006/T1574.006.yaml
     - https://eqllib.readthedocs.io/en/latest/analytics/fd9b987a-1101-4ed3-bda6-a70300eaf57e.html
-tags:
-    - attack.defense_evasion
-    - attack.t1055
 logsource:
     product: linux
     service: auditd
@@ -22,3 +19,6 @@ detection:
 falsepositives:
     - Unknown
 level: high
+tags:
+    - attack.defense_evasion
+    - attack.t1574.006

rules/linux/auditd/lnx_auditd_logging_config_change.yml

@@ -1,18 +1,15 @@
 title: Logging Configuration Changes on Linux Host
 id: c830f15d-6f6e-430f-8074-6f73d6807841
+status: experimental
 description: Detect changes of syslog daemons configuration files
     # Example config for this one (place it at the top of audit.rules)
     # -w /etc/syslog.conf -p wa -k etc_modify_syslogconfig
     # -w /etc/rsyslog.conf -p wa -k etc_modify_rsyslogconfig
     # -w /etc/syslog-ng/syslog-ng.conf -p wa -k etc_modify_syslogngconfig
+author: Mikhail Larin, oscd.community
+date: 2019/10/25
 references:
     - self experience
-tags:
-    - attack.defense_evasion
-    - attack.t1054
-author: Mikhail Larin, oscd.community
-status: experimental
-date: 2019/10/25
 logsource:
     product: linux
     service: auditd
@@ -31,3 +28,7 @@ fields:
 falsepositives:
     - Legitimate administrative activity
 level: high
+tags:
+    - attack.defense_evasion
+    - attack.t1054    # an old one
+    - attack.t1562.006

rules/linux/auditd/lnx_auditd_masquerading_crond.yml

@@ -6,7 +6,7 @@ description: Masquerading occurs when the name or location of an executable, leg
 author: Timur Zinniatullin, oscd.community
 date: 2019/10/21
 references:
-    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1036/T1036.yaml
+    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1036.003/T1036.003.yaml
 logsource:
     product: linux
     service: auditd
@@ -21,4 +21,4 @@ detection:
 level: medium
 tags:
     - attack.defense_evasion
-    - attack.t1036
+    - attack.t1036.003

rules/linux/auditd/lnx_auditd_susp_C2_commands.yml

@@ -0,0 +1,21 @@
+title: Suspicious C2 Activities
+id: f7158a64-6204-4d6d-868a-6e6378b467e0
+status: experimental
+description: Detects suspicious activities as declared by Florian Roth in its 'Best Practice Auditd Configuration'. This includes the detection of the following commands; wget, curl, base64, nc, netcat, ncat, ssh, socat, wireshark, rawshark, rdesktop, nmap. These commands match a few techniques from the tactics "Command and Control", including not exhaustively the following; Application Layer Protocol (T1071), Non-Application Layer Protocol (T1095), Data Encoding (T1132)
+author: Marie Euler
+references:
+    - 'https://github.com/Neo23x0/auditd'
+date: 2020/05/18
+logsource:
+    product: linux
+    service: auditd
+detection:
+    selection:
+        key:
+            - 'susp_activity'
+    condition: selection
+falsepositives:
+    - Admin or User activity
+level: medium
+tags:
+    - attack.command_and_control

rules/linux/auditd/lnx_auditd_susp_cmds.yml

@@ -2,10 +2,10 @@ title: Suspicious Commands Linux
 id: 1543ae20-cbdf-4ec1-8d12-7664d667a825
 status: experimental
 description: Detects relevant commands often related to malware or hacking activity
+author: Florian Roth
+date: 2017/12/12
 references:
     - Internal Research - mostly derived from exploit code including code in MSF
-date: 2017/12/12
-author: Florian Roth
 logsource:
     product: linux
     service: auditd
@@ -30,3 +30,6 @@ detection:
 falsepositives:
     - Admin activity
 level: medium
+tags:
+    - attack.execution
+    - attack.t1059.004

rules/linux/auditd/lnx_auditd_susp_exe_folders.yml

@@ -2,10 +2,10 @@ title: Program Executions in Suspicious Folders
 id: a39d7fa7-3fbd-4dc2-97e1-d87f546b1bbc
 status: experimental
 description: Detects program executions in suspicious non-program folders related to malware or hacking activity
+author: Florian Roth
+date: 2018/01/23
 references:
     - Internal Research
-date: 2018/01/23
-author: Florian Roth
 logsource:
     product: linux
     service: auditd

rules/linux/auditd/lnx_auditd_web_rce.yml

@@ -2,14 +2,12 @@ title: Webshell Remote Command Execution
 id: c0d3734d-330f-4a03-aae2-65dacc6a8222
 status: experimental
 description: Detects posible command execution by web application/web shell
-tags:
-    - attack.persistence
-    - attack.t1100
-references:
-    - personal experience
 author: Ilyas Ochkov, Beyu Denis, oscd.community
 date: 2019/10/12
 modified: 2019/11/04
+references:
+    - personal experience
+
 logsource:
     product: linux
     service: auditd
@@ -23,3 +21,6 @@ falsepositives:
     - Admin activity
     - Crazy web applications
 level: critical
+tags:
+    - attack.persistence
+    - attack.t1505.003

rules/linux/auditd/lnx_data_compressed.yml

@@ -1,13 +1,12 @@
 title: Data Compressed
 id: a3b5e3e9-1b49-4119-8b8e-0344a01f21ee
 status: experimental
-description: An adversary may compress data (e.g., sensitive documents) that is collected prior to exfiltration in order to make it portable and minimize the amount
-    of data sent over the network
+description: An adversary may compress data (e.g., sensitive documents) that is collected prior to exfiltration in order to make it portable and minimize the amount of data sent over the network
 author: Timur Zinniatullin, oscd.community
 date: 2019/10/21
 modified: 2019/11/04
 references:
-    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1002/T1002.yaml
+    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1560.001/T1560.001.yaml
 logsource:
     product: linux
     service: auditd
@@ -29,4 +28,4 @@ falsepositives:
 level: low
 tags:
     - attack.exfiltration
-    - attack.t1002
+    - attack.t1560.001

rules/linux/lnx_apt_equationgroup_lnx.yml

@@ -1,14 +1,11 @@
 title: Equation Group Indicators
 id: 41e5c73d-9983-4b69-bd03-e13b67e9623c
+status: experimental
 description: Detects suspicious shell commands used in various Equation Group scripts and tools
-references:
-    - https://medium.com/@shadowbrokerss/dont-forget-your-base-867d304a94b1
-tags:
-    - attack.execution
-    - attack.g0020
-    - attack.t1059
 author: Florian Roth
 date: 2017/04/09
+references:
+    - https://medium.com/@shadowbrokerss/dont-forget-your-base-867d304a94b1
 logsource:
     product: linux
 detection:
@@ -78,3 +75,7 @@ detection:
 falsepositives:
     - Unknown
 level: high
+tags:
+    - attack.execution
+    - attack.g0020
+    - attack.t1059.004

rules/linux/lnx_buffer_overflows.yml

@@ -1,5 +1,6 @@
 title: Buffer Overflow Attempts
 id: 18b042f0-2ecd-4b6e-9f8d-aa7a7e7de781
+status: stable
 description: Detects buffer overflow attempts in Unix system log files
 author: Florian Roth
 date: 2017/03/01

rules/linux/lnx_chattr_immutable_removal.yml

@@ -1,12 +1,11 @@
 title: Remove Immutable File Attribute
 id: a5b977d6-8a81-4475-91b9-49dbfcd941f7
-description: Detects removing immutable file attribute
 status: experimental
-tags:
-    - attack.defense_evasion
-    - attack.t1222
+description: Detects removing immutable file attribute
 author: Jakob Weinzettl, oscd.community
 date: 2019/09/23
+references:
+    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1222.002/T1222.002.yaml
 logsource:
     product: linux
     service: auditd
@@ -19,5 +18,6 @@ detection:
 falsepositives:
     - Administrator interacting with immutable files (for instance backups)
 level: medium
-references:
-    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1222/T1222.yaml
+tags:
+    - attack.defense_evasion
+    - attack.t1222.002

rules/linux/lnx_clamav.yml

@@ -1,5 +1,6 @@
 title: Relevant ClamAV Message
 id: 36aa86ca-fd9d-4456-814e-d3b1b8e1e0bb
+status: stable
 description: Detects relevant ClamAV messages
 author: Florian Roth
 date: 2017/03/01

rules/linux/lnx_dd_delete_file.yml

@@ -1,11 +1,11 @@
 title: Overwriting the File with Dev Zero or Null
 id: 37222991-11e9-4b6d-8bdf-60fbe48f753e
-date: 2019/10/23
+status: stable
 description: Detects overwriting (effectively wiping/deleting) the file
 author: Jakob Weinzettl, oscd.community
-tags:
-    - attack.impact
-    - attack.t1485
+date: 2019/10/23
+references:
+    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1485/T1485.yaml
 logsource:
     product: linux
     service: auditd
@@ -21,5 +21,7 @@ falsepositives:
     - Appending null bytes to files
     - Legitimate overwrite of files
 level: low
-references:
-    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1485/T1485.yaml
+
+tags:
+    - attack.impact
+    - attack.t1485

rules/linux/lnx_file_copy.yml

@@ -0,0 +1,28 @@
+title: Remote File Copy
+id: 7a14080d-a048-4de8-ae58-604ce58a795b
+status: stable
+description: Detects the use of tools that copy files from or to remote systems
+author: Ömer Günal
+date: 2020/06/18
+references:
+    - https://attack.mitre.org/techniques/T1105/
+logsource:
+    product: linux
+detection:
+    keywords:
+        - Scp|contains:
+          - 'scp * *@*:*'
+          - 'scp *@*:* *'
+        - Rsync|contains:
+          - 'rsync -r *@*:* *'
+          - 'rsync -r * *@*:*'
+        - Sftp|contains:
+          - 'sftp *@*:* *'
+    condition: keywords
+falsepositives:
+    - Legitimate administration activities
+level: low
+tags:
+    - attack.command_and_control
+    - attack.lateral_movement
+    - attack.t1105

rules/linux/lnx_file_or_folder_permissions.yml

@@ -1,12 +1,11 @@
 title: File or Folder Permissions Change
-description: Detects 
 id: 74c01ace-0152-4094-8ae2-6fd776dd43e5
 status: experimental
-tags:
-    - attack.defense_evasion
-    - attack.t1222
+description: Detects file and folder permission changes
 author: Jakob Weinzettl, oscd.community
 date: 2019/09/23
+references:
+    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1222.002/T1222.002.yaml
 logsource:
     product: linux
     service: auditd
@@ -20,5 +19,6 @@ detection:
 falsepositives:
     - User interracting with files permissions (normal/daily behaviour)
 level: low
-references:
-    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1222/T1222.yaml
+tags:
+    - attack.defense_evasion
+    - attack.t1222.002

rules/linux/lnx_pers_systemd_reload.yml

@@ -1,12 +1,12 @@
 title: Systemd Service Reload or Start
 id: 2625cc59-0634-40d0-821e-cb67382a3dd7
-description: Detects a reload or a start of a service
 status: experimental
-tags:
-    - attack.persistence
-    - attack.t1501
+description: Detects a reload or a start of a service
 author: Jakob Weinzettl, oscd.community
 date: 2019/09/23
+references:
+    - https://attack.mitre.org/techniques/T1543/002/
+    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1543.002/T1543.002.yaml
 logsource:
     product: linux
     service: auditd
@@ -22,6 +22,6 @@ falsepositives:
     - Installation of legitimate service
     - Legitimate reconfiguration of service
 level: low
-references:
-    - https://attack.mitre.org/techniques/T1501/
-    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1501/T1501.yaml
+tags:
+    - attack.persistence
+    - attack.t1543.002

rules/linux/lnx_proxy_connection.yml

@@ -0,0 +1,20 @@
+title: Connection Proxy
+id: 72f4ab3f-787d-495d-a55d-68c2ff46cf4c
+status: experimental
+description: Detects setting proxy
+author: Ömer Günal
+date: 2020/06/17
+references:
+    - https://attack.mitre.org/techniques/T1090/
+logsource:
+    product: linux
+detection:
+    keyword:
+        - 'http_proxy=*'
+        - 'https_proxy=*'
+    condition: keyword
+falsepositives:
+    - Legitimate administration activities
+level: low
+tags:
+    - attack.defense_evasion

rules/linux/lnx_security_tools_disabling.yml

@@ -0,0 +1,34 @@
+title: Disabling Security Tools
+id: e3a8a052-111f-4606-9aee-f28ebeb76776
+status: experimental
+description: Detects disabling security tools
+author: Ömer Günal
+date: 2020/06/17
+references:
+    - https://attack.mitre.org/techniques/T1089/
+    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1089/T1089.md
+logsource:
+    product: linux
+detection:
+    keywords:
+        - Command|contains:
+          - 'service iptables stop'
+          - 'chkconfig off iptables'
+          - 'service ip6tables stop'
+          - 'chkconfig off ip6tables'
+        - CarbonBlack|contains:
+          - 'service cbdaemon stop'
+          - 'chkconfig off cbdaemon'
+          - 'systemctl stop cbdaemon'
+          - 'systemctl disable cbdaemon'
+        - SELinux:
+          - 'setenforce 0'
+        - Crowdstrike|contains:
+          - 'systemctl stop falcon-sensor.service'
+          - 'systemctl disable falcon-sensor.service'
+    condition: keywords
+falsepositives:
+    - Legitimate administration activities
+level: medium
+tags:
+    - attack.defense_evasion

rules/linux/lnx_setgid_setuid.yml

@@ -0,0 +1,24 @@
+title: Setuid and Setgid
+id: c21c4eaa-ba2e-419a-92b2-8371703cbe21
+status: experimental
+description: Detects suspicious change of file privileges with chown and chmod commands
+author: Ömer Günal
+date: 2020/06/16
+references:
+    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1166/T1166.md
+    - https://attack.mitre.org/techniques/T1166/
+logsource:
+    product: linux
+detection:
+    selection1:
+        - '*chown root*'    
+    selection2:
+        - '* chmod u+s*'
+    selection3:
+        - '* chmod g+s*'
+    condition: (selection1 and selection2) or (selection1 and selection3)
+falsepositives:
+    - Legitimate administration activities
+level: low
+tags:
+    - attack.persistence

rules/linux/lnx_shell_clear_cmd_history.yml

@@ -2,19 +2,27 @@ title: Clear Command History
 id: fdc88d25-96fb-4b7c-9633-c0e417fdbd4e
 status: experimental
 description: Clear command history in linux which is used for defense evasion.
-references:
-    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1146/T1146.yaml
-    - https://attack.mitre.org/techniques/T1146/
-    - https://www.hackers-arise.com/single-post/2016/06/20/Covering-your-BASH-Shell-Tracks-AntiForensics
+    # Example config for this one (place it in .bash_profile):
+    # (is_empty=false; inotifywait -m .bash_history | while read file; do if [ $(wc -l <.bash_history) -lt 1  ]; then if  [ "$is_empty" = false ]; then logger -i -p local5.info -t empty_bash_history "$USER : ~/.bash_history is empty "; is_empty=true; fi; else is_empty=false;  fi;  done ) &
+    # It monitors the size of .bash_history and log the words "empty_bash_history" whenever a previously not empty bash_history becomes empty
+    # We define an empty file as a document with 0 or 1 lines (it can be a line with only one space character for example)
+    # It has two advantages over the version suggested by Patrick Bareiss  :
+    #   - it is not relative to the exact command used to clear .bash_history : for instance Caldera uses "> .bash_history" to clear the history and this is not one the commands listed here. We can't be exhaustive for all the possibilities !
+    #   - the method suggested by Patrick Bareiss logs all the commands entered directly in a bash shell. therefore it may miss some events (for instance it doesn't log the commands launched from a Caldera agent). Here if .bash_history is cleared, it will always be detected
 author: Patrick Bareiss
 date: 2019/03/24
+modified: 2020/07/13
+references:
+    - https://github.com/redcanaryco/atomic-red-team/blob/master/atomics/T1070.003/T1070.003.yaml
+    - https://attack.mitre.org/techniques/T1070/003/
+    - https://www.hackers-arise.com/single-post/2016/06/20/Covering-your-BASH-Shell-Tracks-AntiForensics
 logsource:
     product: linux
 detection:
     keywords:
         - 'rm *bash_history'
         - 'echo "" > *bash_history'
-        - 'cat /dev/null > *bash_history' 
+        - 'cat /dev/null > *bash_history'
         - 'ln -sf /dev/null *bash_history'
         - 'truncate -s0 *bash_history'
         # - 'unset HISTFILE'  # prone to false positives
@@ -22,10 +30,11 @@ detection:
         - 'history -c'
         - 'history -w'
         - 'shred *bash_history'
+        - 'empty_bash_history'
     condition: keywords
 falsepositives:
     - Unknown
 level: high
 tags:
     - attack.defense_evasion
-    - attack.t1146
+    - attack.t1070.003

rules/linux/lnx_shell_priv_esc_prep.yml

@@ -2,15 +2,11 @@ title: Privilege Escalation Preparation
 id: 444ade84-c362-4260-b1f3-e45e20e1a905
 status: experimental
 description: Detects suspicious shell commands indicating the information gathering phase as preparation for the Privilege Escalation.
+author: Patrick Bareiss
+date: 2019/04/05
 references:
     - https://blog.g0tmi1k.com/2011/08/basic-linux-privilege-escalation/
     - https://patrick-bareiss.com/detect-privilege-escalation-preparation-in-linux-with-sigma/
-author: Patrick Bareiss
-date: 2019/04/05
-tags:
-    - attack.privilege_escalation
-    - attack.t1068
-level: medium
 logsource:
     product: linux
 detection:
@@ -68,3 +64,7 @@ detection:
     condition: keywords | count() by host > 6
 falsepositives:
     - Troubleshooting on Linux Machines
+level: medium
+tags:
+    - attack.execution
+    - attack.t1059.004

rules/linux/lnx_shell_susp_commands.yml

@@ -1,14 +1,15 @@
 title: Suspicious Activity in Shell Commands
 id: 2aa1440c-9ae9-4d92-84a7-a9e5f5e31695
+status: experimental
 description: Detects suspicious shell commands used in various exploit codes (see references)
+author: Florian Roth
+date: 2017/08/21
+modified: 2019/02/05
 references:
     - http://www.threatgeek.com/2017/03/widespread-exploitation-attempts-using-cve-2017-5638.html
     - https://github.com/rapid7/metasploit-framework/blob/master/modules/exploits/multi/http/struts_code_exec_exception_delegator.rb#L121
     - http://pastebin.com/FtygZ1cg
     - https://artkond.com/2017/03/23/pivoting-guide/
-author: Florian Roth
-date: 2017/08/21
-modified: 2019/02/05
 logsource:
     product: linux
 detection:
@@ -24,11 +25,11 @@ detection:
         - 'socat -O /tmp/*'
         - 'socat tcp-connect*'
         - '*echo binary >>*'
-        # Malware 
+        # Malware
         - '*wget *; chmod +x*'
         - '*wget *; chmod 777 *'
         - '*cd /tmp || cd /var/run || cd /mnt*'
-        # Apache Struts in-the-wild exploit codes  
+        # Apache Struts in-the-wild exploit codes
         - '*stop;service iptables stop;*'
         - '*stop;SuSEfirewall2 stop;*'
         - 'chmod 777 2020*'
@@ -53,3 +54,6 @@ detection:
 falsepositives:
     - Unknown
 level: high
+tags:
+    - attack.execution
+    - attack.t1059.004

rules/linux/lnx_shell_susp_log_entries.yml

@@ -1,5 +1,6 @@
 title: Suspicious Log Entries
 id: f64b6e9a-5d9d-48a5-8289-e1dd2b3876e1
+status: experimental
 description: Detects suspicious log entries in Linux log files
 author: Florian Roth
 date: 2017/03/25

rules/linux/lnx_shell_susp_rev_shells.yml

@@ -2,10 +2,10 @@ title: Suspicious Reverse Shell Command Line
 id: 738d9bcf-6999-4fdb-b4ac-3033037db8ab
 status: experimental
 description: Detects suspicious shell commands or program code that may be exected or used in command line to establish a reverse shell
-references:
-    - https://alamot.github.io/reverse_shells/
 author: Florian Roth
 date: 2019/04/02
+references:
+    - https://alamot.github.io/reverse_shells/
 logsource:
     product: linux
 detection:
@@ -39,3 +39,6 @@ detection:
 falsepositives:
     - Unknown
 level: high
+tags:
+    - attack.execution
+    - attack.t1059.004

rules/linux/lnx_shellshock.yml

@@ -1,8 +1,9 @@
 title: Shellshock Expression
 id: c67e0c98-4d39-46ee-8f6b-437ebf6b950e
+status: experimental
 description: Detects shellshock expressions in log files
-date: 2017/03/14
 author: Florian Roth
+date: 2017/03/14
 references:
     - http://rubular.com/r/zxBfjWfFYs
 logsource:

rules/linux/lnx_space_after_filename_.yml

@@ -0,0 +1,21 @@
+title: Space After Filename
+id: 879c3015-c88b-4782-93d7-07adf92dbcb7 
+status: experimental
+description: Detects space after filename
+author: Ömer Günal
+date: 2020/06/17
+references:
+    - https://attack.mitre.org/techniques/T1064
+level: low
+logsource:
+    product: linux
+detection:
+    selection1:
+        - 'echo "*" > * && chmod +x *'
+    selection2:
+        - 'mv * "* "'
+    condition: selection1 and selection2 
+falsepositives:
+    - Typos
+tags:
+    - attack.execution

rules/linux/lnx_ssh_cve_2018_15473.yml

@@ -1,10 +1,11 @@
 title: SSHD Error Message CVE-2018-15473
 id: 4c9d903d-4939-4094-ade0-3cb748f4d7da
+status: experimental
 description: Detects exploitation attempt using public exploit code for CVE-2018-15473
-references:
-    - https://github.com/Rhynorater/CVE-2018-15473-Exploit
 author: Florian Roth
 date: 2017/08/24
+references:
+    - https://github.com/Rhynorater/CVE-2018-15473-Exploit
 logsource:
     product: linux
     service: sshd

rules/linux/lnx_sudo_cve_2019_14287.yml

@@ -3,22 +3,22 @@ title: Sudo Privilege Escalation CVE-2019-14287
 id: f74107df-b6c6-4e80-bf00-4170b658162b
 status: experimental
 description: Detects users trying to exploit sudo vulnerability reported in CVE-2019-14287
+author: Florian Roth
+date: 2019/10/15
+modified: 2019/10/20
 references:
     - https://www.openwall.com/lists/oss-security/2019/10/14/1
     - https://access.redhat.com/security/cve/cve-2019-14287
     - https://twitter.com/matthieugarin/status/1183970598210412546
-author: Florian Roth
-date: 2019/10/15
-modified: 2019/10/20
-tags:
-    - attack.privilege_escalation
-    - attack.t1068
-    - attack.t1169
 logsource:
     product: linux
 falsepositives:
     - Unlikely
 level: critical
+tags:
+    - attack.privilege_escalation
+    - attack.t1068
+    - attack.t1169
 ---
 detection:
     selection_keywords:

rules/linux/lnx_susp_failed_logons_single_source.yml

@@ -1,8 +1,9 @@
 title: Failed Logins with Different Accounts from Single Source System
 id: fc947f8e-ea81-4b14-9a7b-13f888f94e18
+status: experimental
+description: Detects suspicious failed logins with different user accounts from a single source system
 author: Florian Roth
 date: 2017/02/16
-description: Detects suspicious failed logins with different user accounts from a single source system
 logsource:
     product: linux
     service: auth

rules/linux/lnx_susp_guacamole.yml

@@ -0,0 +1,19 @@
+title: Guacamole Two Users Sharing Session Anomaly
+id: 1edd77db-0669-4fef-9598-165bda82826d
+status: experimental
+description: Detects suspicious session with two users present
+author: Florian Roth
+date: 2020/07/03
+references:
+    - https://research.checkpoint.com/2020/apache-guacamole-rce/
+logsource:
+    product: linux
+    service: guacamole
+detection:
+    selection:
+        - '(2 users now present)'
+    condition: selection
+falsepositives:
+    - Unknown
+level: high
+

rules/linux/lnx_susp_jexboss.yml

@@ -1,14 +1,14 @@
 title: JexBoss Command Sequence
 id: 8ec2c8b4-557a-4121-b87c-5dfb3a602fae
 description: Detects suspicious command sequence that JexBoss
-references:
-    - https://www.us-cert.gov/ncas/analysis-reports/AR18-312A
 author: Florian Roth
 date: 2017/08/24
+references:
+    - https://www.us-cert.gov/ncas/analysis-reports/AR18-312A
 logsource:
     product: linux
 detection:
-    selection1: 
+    selection1:
         - 'bash -c /bin/bash'
     selection2:
         - '&/dev/tcp/'
@@ -16,3 +16,6 @@ detection:
 falsepositives:
     - Unknown
 level: high
+tags:
+    - attack.execution
+    - attack.t1059.004

rules/linux/lnx_susp_named.yml

@@ -2,10 +2,10 @@ title: Suspicious Named Error
 id: c8e35e96-19ce-4f16-aeb6-fd5588dc5365
 status: experimental
 description: Detects suspicious DNS error messages that indicate a fatal or suspicious error that could be caused by exploiting attempts
-references:
-    - https://github.com/ossec/ossec-hids/blob/master/etc/rules/named_rules.xml
 author: Florian Roth
 date: 2018/02/20
+references:
+    - https://github.com/ossec/ossec-hids/blob/master/etc/rules/named_rules.xml
 logsource:
     product: linux
     service: syslog
@@ -18,4 +18,6 @@ detection:
 falsepositives:
     - Unknown
 level: high
-
+tags:
+    - attack.initial_access
+    - attack.t1190

rules/linux/lnx_susp_ssh.yml

@@ -1,11 +1,13 @@
-title: Suspicious SSHD Error
+title: Suspicious OpenSSH Daemon Error
 id: e76b413a-83d0-4b94-8e4c-85db4a5b8bdc
+status: experimental
 description: Detects suspicious SSH / SSHD error messages that indicate a fatal or suspicious error that could be caused by exploiting attempts
+author: Florian Roth
+date: 2017/06/30
+modified: 2020/05/15
 references:
     - https://github.com/openssh/openssh-portable/blob/master/ssherr.c
     - https://github.com/ossec/ossec-hids/blob/master/etc/rules/sshd_rules.xml
-author: Florian Roth
-date: 2017/06/30
 logsource:
     product: linux
     service: sshd
@@ -26,4 +28,6 @@ detection:
 falsepositives:
     - Unknown
 level: medium
-
+tags:
+    - attack.initial_access
+    - attack.t1190

rules/linux/lnx_susp_vsftp.yml

@@ -1,10 +1,11 @@
 title: Suspicious VSFTPD Error Messages
 id: 377f33a1-4b36-4ee1-acee-1dbe4b43cfbe
+status: experimental
 description: Detects suspicious VSFTPD error messages that indicate a fatal or suspicious error that could be caused by exploiting attempts
-references:
-    - https://github.com/dagwieers/vsftpd/
 author: Florian Roth
 date: 2017/07/05
+references:
+    - https://github.com/dagwieers/vsftpd/
 logsource:
     product: linux
     service: vsftpd
@@ -31,3 +32,6 @@ detection:
 falsepositives:
     - Unknown
 level: medium
+tags:
+    - attack.initial_access
+    - attack.t1190

rules/linux/modsecurity/modsec_mulitple_blocks.yml

@@ -1,8 +1,9 @@
 title: Multiple Modsecurity Blocks
 id: a06eea10-d932-4aa6-8ba9-186df72c8d23
+status: stable
 description: Detects multiple blocks by the mod_security module (Web Application Firewall)
-date: 2017/02/28
 author: Florian Roth
+date: 2017/02/28
 logsource:
     product: linux
     service: modsecurity

rules/network/cisco/aaa/cisco_cli_clear_logs.yml

@@ -1,31 +1,29 @@
-title: Cisco Clear Logs
-id: ceb407f6-8277-439b-951f-e4210e3ed956
-status: experimental
-description: Clear command history in network OS which is used for defense evasion.
-references:
-    - https://attack.mitre.org/techniques/T1146/
-    - https://attack.mitre.org/techniques/T1070/
-author: Austin Clark
-date: 2019/08/12
-tags:
-    - attack.defense_evasion
-    - attack.t1146
-    - attack.t1070
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - src
-    - CmdSet
-    - User
-    - Privilege_Level
-    - Remote_Address
-detection:
-    keywords:
-        - 'clear logging'
-        - 'clear archive'
-    condition: keywords
-falsepositives:
-    - Legitimate administrators may run these commands.
-level: high
+title: Cisco Clear Logs
+id: ceb407f6-8277-439b-951f-e4210e3ed956
+status: experimental
+description: Clear command history in network OS which is used for defense evasion
+author: Austin Clark
+date: 2019/08/12
+modified: 2020/09/02
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - src
+    - CmdSet
+    - User
+    - Privilege_Level
+    - Remote_Address
+detection:
+    keywords:
+        - 'clear logging'
+        - 'clear archive'
+    condition: keywords
+falsepositives:
+    - Legitimate administrators may run these commands
+level: high
+tags:
+    - attack.defense_evasion
+    - attack.t1146          # an old one
+    - attack.t1070.003

rules/network/cisco/aaa/cisco_cli_collect_data.yml

@@ -1,39 +1,37 @@
-title: Cisco Collect Data
-id: cd072b25-a418-4f98-8ebc-5093fb38fe1a
-status: experimental
-description: Collect pertinent data from the configuration files
-references:
-    - https://attack.mitre.org/techniques/T1087/
-    - https://attack.mitre.org/techniques/T1003/
-    - https://attack.mitre.org/techniques/T1081/
-    - https://attack.mitre.org/techniques/T1005/
-author: Austin Clark
-date: 2019/08/11
-tags:
-    - attack.discovery
-    - attack.credential_access
-    - attack.collection
-    - attack.t1087
-    - attack.t1003
-    - attack.t1081
-    - attack.t1005
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - src
-    - CmdSet
-    - User
-    - Privilege_Level
-    - Remote_Address
-detection:
-    keywords:
-        - 'show running-config'
-        - 'show startup-config'
-        - 'show archive config'
-        - 'more'
-    condition: keywords
-falsepositives:
-    - Commonly run by administrators.
-level: low
+title: Cisco Collect Data
+id: cd072b25-a418-4f98-8ebc-5093fb38fe1a
+status: experimental
+description: Collect pertinent data from the configuration files
+author: Austin Clark
+date: 2019/08/11
+modified: 2020/09/02
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - src
+    - CmdSet
+    - User
+    - Privilege_Level
+    - Remote_Address
+detection:
+    keywords:
+        - 'show running-config'
+        - 'show startup-config'
+        - 'show archive config'
+        - 'more'
+    condition: keywords
+falsepositives:
+    - Commonly run by administrators
+level: low
+tags:
+    - attack.discovery
+    - attack.credential_access
+    - attack.collection
+    - attack.t1087           # an old one
+    - attack.t1087.001
+    - attack.t1003           # an old one
+    - attack.t1081           # an old one
+    - attack.t1552.001
+    - attack.t1005

rules/network/cisco/aaa/cisco_cli_crypto_actions.yml

@@ -1,33 +1,32 @@
-title: Cisco Crypto Commands
-id: 1f978c6a-4415-47fb-aca5-736a44d7ca3d
-status: experimental
-description: Show when private keys are being exported from the device, or when new certificates are installed.
-references:
-    - https://attack.mitre.org/techniques/T1145/
-    - https://attack.mitre.org/techniques/T1130/
-author: Austin Clark
-date: 2019/08/12
-tags:
-    - attack.credential_access
-    - attack.defense_evasion
-    - attack.t1130
-    - attack.t1145
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - src
-    - CmdSet
-    - User
-    - Privilege_Level
-    - Remote_Address
-detection:
-    keywords:
-        - 'crypto pki export'
-        - 'crypto pki import'
-        - 'crypto pki trustpoint'
-    condition: keywords
-falsepositives:
-    - Not commonly run by administrators.  Also whitelist your known good certificates.
-level: high
+title: Cisco Crypto Commands
+id: 1f978c6a-4415-47fb-aca5-736a44d7ca3d
+status: experimental
+description: Show when private keys are being exported from the device, or when new certificates are installed
+author: Austin Clark
+date: 2019/08/12
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - src
+    - CmdSet
+    - User
+    - Privilege_Level
+    - Remote_Address
+detection:
+    keywords:
+        - 'crypto pki export'
+        - 'crypto pki import'
+        - 'crypto pki trustpoint'
+    condition: keywords
+falsepositives:
+    - Not commonly run by administrators. Also whitelist your known good certificates
+level: high
+tags:
+    - attack.credential_access
+    - attack.defense_evasion
+    - attack.t1130          # an old one
+    - attack.t1553.004
+    - attack.t1145          # an old one
+    - attack.t1552.004

rules/network/cisco/aaa/cisco_cli_disable_logging.yml

@@ -1,29 +1,28 @@
-title: Cisco Disabling Logging
-id: 9e8f6035-88bf-4a63-96b6-b17c0508257e
-status: experimental
-description: Turn off logging locally or remote
-references:
-    - https://attack.mitre.org/techniques/T1089
-author: Austin Clark
-date: 2019/08/11
-tags:
-    - attack.defense_evasion
-    - attack.t1089
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - src
-    - CmdSet
-    - User
-    - Privilege_Level
-    - Remote_Address
-detection:
-    keywords:
-        - 'no logging'
-        - 'no aaa new-model'
-    condition: keywords
-falsepositives:
-    - Unknown
-level: high
+title: Cisco Disabling Logging
+id: 9e8f6035-88bf-4a63-96b6-b17c0508257e
+status: experimental
+description: Turn off logging locally or remote
+author: Austin Clark
+date: 2019/08/11
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - src
+    - CmdSet
+    - User
+    - Privilege_Level
+    - Remote_Address
+detection:
+    keywords:
+        - 'no logging'
+        - 'no aaa new-model'
+    condition: keywords
+falsepositives:
+    - Unknown
+level: high
+tags:
+    - attack.defense_evasion
+    - attack.t1089          # an old one
+    - attack.t1562.001

rules/network/cisco/aaa/cisco_cli_discovery.yml

@@ -1,46 +1,44 @@
-title: Cisco Discovery
-id: 9705a6a1-6db6-4a16-a987-15b7151e299b
-status: experimental
-description: Find information about network devices that are not stored in config files.
-references:
-    - https://attack.mitre.org/tactics/TA0007/
-author: Austin Clark
-date: 2019/08/12
-tags:
-    - attack.discovery
-    - attack.t1083
-    - attack.t1201
-    - attack.t1057
-    - attack.t1018
-    - attack.t1082
-    - attack.t1016
-    - attack.t1049
-    - attack.t1033
-    - attack.t1124
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - src
-    - CmdSet
-    - User
-    - Privilege_Level
-    - Remote_Address
-detection:
-    keywords:
-        - 'dir'
-        - 'show processes'
-        - 'show arp'
-        - 'show cdp'
-        - 'show version'
-        - 'show ip route'
-        - 'show ip interface'
-        - 'show ip sockets'
-        - 'show users'
-        - 'show ssh'
-        - 'show clock'
-    condition: keywords
-falsepositives:
-    - Commonly used by administrators for troubleshooting
-level: low
+title: Cisco Discovery
+id: 9705a6a1-6db6-4a16-a987-15b7151e299b
+status: experimental
+description: Find information about network devices that is not stored in config files
+author: Austin Clark
+date: 2019/08/12
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - src
+    - CmdSet
+    - User
+    - Privilege_Level
+    - Remote_Address
+detection:
+    keywords:
+        - 'dir'
+        - 'show processes'
+        - 'show arp'
+        - 'show cdp'
+        - 'show version'
+        - 'show ip route'
+        - 'show ip interface'
+        - 'show ip sockets'
+        - 'show users'
+        - 'show ssh'
+        - 'show clock'
+    condition: keywords
+falsepositives:
+    - Commonly used by administrators for troubleshooting
+level: low
+tags:
+    - attack.discovery
+    - attack.t1083
+    - attack.t1201
+    - attack.t1057
+    - attack.t1018
+    - attack.t1082
+    - attack.t1016
+    - attack.t1049
+    - attack.t1033
+    - attack.t1124

rules/network/cisco/aaa/cisco_cli_dos.yml

@@ -1,28 +1,28 @@
-title: Cisco Denial of Service
-id: d94a35f0-7a29-45f6-90a0-80df6159967c
-status: experimental
-description: Detect a system being shutdown or put into different boot mode
-references:
-    - https://attack.mitre.org/techniques/T1499/
-    - https://attack.mitre.org/techniques/T1495/
-author: Austin Clark
-date: 2019/08/15
-tags:
-    - attack.impact
-    - attack.t1499
-    - attack.t1495
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - CmdSet
-detection:
-    keywords:
-        - 'shutdown'
-        - 'config-register 0x2100'
-        - 'config-register 0x2142'
-    condition: keywords
-falsepositives:
-    - Legitimate administrators may run these commands, though rarely.
-level: medium
+title: Cisco Denial of Service
+id: d94a35f0-7a29-45f6-90a0-80df6159967c
+status: experimental
+description: Detect a system being shutdown or put into different boot mode
+author: Austin Clark
+date: 2019/08/15
+modified: 2020/09/02
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - CmdSet
+detection:
+    keywords:
+        - 'shutdown'
+        - 'config-register 0x2100'
+        - 'config-register 0x2142'
+    condition: keywords
+falsepositives:
+    - Legitimate administrators may run these commands, though rarely.
+level: medium
+tags:
+    - attack.impact
+    - attack.t1495
+    - attack.t1529
+    - attack.t1492          # an old one
+    - attack.t1565.001

rules/network/cisco/aaa/cisco_cli_file_deletion.yml

@@ -1,31 +1,30 @@
-title: Cisco Show Commands Input
-id: 71d65515-c436-43c0-841b-236b1f32c21e
-status: experimental
-description: See what files are being deleted from flash file systems
-references:
-    - https://attack.mitre.org/techniques/T1107/
-    - https://attack.mitre.org/techniques/T1488/
-    - https://attack.mitre.org/techniques/T1487/
-author: Austin Clark
-date: 2019/08/12
-tags:
-    - attack.defense_evasion
-    - attack.impact
-    - attack.t1107
-    - attack.t1488
-    - attack.t1487
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - CmdSet
-detection:
-    keywords:
-        - 'erase'
-        - 'delete'
-        - 'format'
-    condition: keywords
-falsepositives:
-    - Will be used sometimes by admins to clean up local flash space.
-level: medium
+title: Cisco File Deletion
+id: 71d65515-c436-43c0-841b-236b1f32c21e
+status: experimental
+description: See what files are being deleted from flash file systems
+author: Austin Clark
+date: 2019/08/12
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - CmdSet
+detection:
+    keywords:
+        - 'erase'
+        - 'delete'
+        - 'format'
+    condition: keywords
+falsepositives:
+    - Will be used sometimes by admins to clean up local flash space
+level: medium
+tags:
+    - attack.defense_evasion
+    - attack.impact
+    - attack.t1107          # an old one
+    - attack.t1070.004
+    - attack.t1488          # an old one
+    - attack.t1561.001
+    - attack.t1487          # an old one
+    - attack.t1561.002

rules/network/cisco/aaa/cisco_cli_input_capture.yml

@@ -1,29 +1,27 @@
-title: Cisco Show Commands Input
-id: b094d9fb-b1ad-4650-9f1a-fb7be9f1d34b
-status: experimental
-description: See what commands are being input into the device by other people, full credentials can be in the history
-references:
-    - https://attack.mitre.org/techniques/T1056/
-    - https://attack.mitre.org/techniques/T1139/
-author: Austin Clark
-date: 2019/08/11
-tags:
-    - attack.collection
-    - attack.credential_access
-    - attack.t1139
-    - attack.t1056
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - CmdSet
-detection:
-    keywords:
-        - 'show history'
-        - 'show history all'
-        - 'show logging'
-    condition: keywords
-falsepositives:
-    - Not commonly run by administrators, especially if remote logging is configured.
-level: medium
+title: Cisco Show Commands Input
+id: b094d9fb-b1ad-4650-9f1a-fb7be9f1d34b
+status: experimental
+description: See what commands are being input into the device by other people, full credentials can be in the history
+author: Austin Clark
+date: 2019/08/11
+modified: 2020/09/02
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - CmdSet
+detection:
+    keywords:
+        - 'show history'
+        - 'show history all'
+        - 'show logging'
+    condition: keywords
+falsepositives:
+    - Not commonly run by administrators, especially if remote logging is configured
+level: medium
+tags:
+    - attack.credential_access
+    - attack.t1139          # an old one
+    - attack.t1552.003
+    

rules/network/cisco/aaa/cisco_cli_local_accounts.yml

@@ -1,27 +1,26 @@
-title: Cisco Local Accounts
-id: 6d844f0f-1c18-41af-8f19-33e7654edfc3
-status: experimental
-description: Find local accounts being created or modified as well as remote authentication configurations
-references:
-    - https://attack.mitre.org/techniques/T1098/
-    - https://attack.mitre.org/techniques/T1136/
-author: Austin Clark
-date: 2019/08/12
-tags:
-    - attack.persistence
-    - attack.t1136
-    - attack.t1098
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - CmdSet
-detection:
-    keywords:
-        - 'username'
-        - 'aaa'
-    condition: keywords
-falsepositives:
-    - When remote authentication is in place, this should not change often.
-level: high
+title: Cisco Local Accounts
+id: 6d844f0f-1c18-41af-8f19-33e7654edfc3
+status: experimental
+description: Find local accounts being created or modified as well as remote authentication configurations
+author: Austin Clark
+date: 2019/08/12
+modified: 2020/09/02
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - CmdSet
+detection:
+    keywords:
+        - 'username'
+        - 'aaa'
+    condition: keywords
+falsepositives:
+    - When remote authentication is in place, this should not change often
+level: high
+tags:
+    - attack.persistence
+    - attack.t1136          # an old one
+    - attack.t1136.001
+    - attack.t1098

rules/network/cisco/aaa/cisco_cli_modify_config.yml

@@ -1,38 +1,36 @@
-title: Cisco Modify Configuration
-id: 671ffc77-50a7-464f-9e3d-9ea2b493b26b
-status: experimental
-description: Modifications to a config that will serve an adversary's impacts or persistence
-references:
-    - https://attack.mitre.org/techniques/T1100/
-    - https://attack.mitre.org/techniques/T1168/
-    - https://attack.mitre.org/techniques/T1493/
-author: Austin Clark
-date: 2019/08/12
-tags:
-    - attack.persistence
-    - attack.privilege_escalation
-    - attack.impact
-    - attack.t1493
-    - attack.t1100
-    - attack.t1168
-    - attack.t1490
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - CmdSet
-detection:
-    keywords:
-        - 'ip http server'
-        - 'ip https server'
-        - 'kron policy-list'
-        - 'kron occurrence'
-        - 'policy-list'
-        - 'access-list'
-        - 'ip access-group'
-        - 'archive maximum'
-    condition: keywords
-falsepositives:
-    - Legitimate administrators may run these commands.
-level: medium
+title: Cisco Modify Configuration
+id: 671ffc77-50a7-464f-9e3d-9ea2b493b26b
+status: experimental
+description: Modifications to a config that will serve an adversary's impacts or persistence
+author: Austin Clark
+date: 2019/08/12
+modified: 2020/09/02
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - CmdSet
+detection:
+    keywords:
+        - 'ip http server'
+        - 'ip https server'
+        - 'kron policy-list'
+        - 'kron occurrence'
+        - 'policy-list'
+        - 'access-list'
+        - 'ip access-group'
+        - 'archive maximum'
+    condition: keywords
+falsepositives:
+    - Legitimate administrators may run these commands
+level: medium
+tags:
+    - attack.persistence
+    - attack.impact
+    - attack.t1490
+    - attack.t1505
+    - attack.t1493          # an old one
+    - attack.t1565.002
+    - attack.t1168          # an old one
+    - attack.t1053

rules/network/cisco/aaa/cisco_cli_moving_data.yml

@@ -1,39 +1,34 @@
-title: Cisco Stage Data
-id: 5e51acb2-bcbe-435b-99c6-0e3cd5e2aa59
-status: experimental
-description: Various protocols maybe used to put data on the device for exfil or infil
-references:
-    - https://attack.mitre.org/techniques/T1074/
-    - https://attack.mitre.org/techniques/T1105/
-    - https://attack.mitre.org/techniques/T1498/
-    - https://attack.mitre.org/techniques/T1002/
-author: Austin Clark
-date: 2019/08/12
-tags:
-    - attack.collection
-    - attack.lateral_movement
-    - attack.command_and_control
-    - attack.exfiltration
-    - attack.impact
-    - attack.t1074
-    - attack.t1105
-    - attack.t1492
-    - attack.t1002
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - CmdSet
-detection:
-    keywords:
-        - 'tftp'
-        - 'rcp'
-        - 'puts'
-        - 'copy'
-        - 'configure replace'
-        - 'archive tar'
-    condition: keywords
-falsepositives:
-    - Generally used to copy configs or IOS images.
-level: low
+title: Cisco Stage Data
+id: 5e51acb2-bcbe-435b-99c6-0e3cd5e2aa59
+status: experimental
+description: Various protocols maybe used to put data on the device for exfil or infil
+author: Austin Clark
+date: 2019/08/12
+modified: 2020/09/02
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - CmdSet
+detection:
+    keywords:
+        - 'tftp'
+        - 'rcp'
+        - 'puts'
+        - 'copy'
+        - 'configure replace'
+        - 'archive tar'
+    condition: keywords
+falsepositives:
+    - Generally used to copy configs or IOS images
+level: low
+tags:
+    - attack.collection
+    - attack.lateral_movement
+    - attack.command_and_control
+    - attack.exfiltration
+    - attack.t1074
+    - attack.t1105
+    - attack.t1002          # an old one
+    - attack.t1560.001

rules/network/cisco/aaa/cisco_cli_net_sniff.yml

@@ -1,27 +1,25 @@
-title: Cisco Sniffing
-id: b9e1f193-d236-4451-aaae-2f3d2102120d
-status: experimental
-description: Show when a monitor or a span/rspan is setup or modified
-references:
-    - https://attack.mitre.org/techniques/T1040
-author: Austin Clark
-date: 2019/08/11
-tags:
-    - attack.credential_access
-    - attack.discovery
-    - attack.t1040
-logsource:
-    product: cisco
-    service: aaa
-    category: accounting
-fields:
-    - CmdSet
-detection:
-    keywords:
-        - 'monitor capture point'
-        - 'set span'
-        - 'set rspan'
-    condition: keywords
-falsepositives:
-    - Admins may setup new or modify old spans, or use a monitor for troubleshooting.
-level: medium
+title: Cisco Sniffing
+id: b9e1f193-d236-4451-aaae-2f3d2102120d
+status: experimental
+description: Show when a monitor or a span/rspan is setup or modified
+author: Austin Clark
+date: 2019/08/11
+logsource:
+    product: cisco
+    service: aaa
+    category: accounting
+fields:
+    - CmdSet
+detection:
+    keywords:
+        - 'monitor capture point'
+        - 'set span'
+        - 'set rspan'
+    condition: keywords
+falsepositives:
+    - Admins may setup new or modify old spans, or use a monitor for troubleshooting
+level: medium
+tags:
+    - attack.credential_access
+    - attack.discovery
+    - attack.t1040

rules/network/net_apt_equationgroup_c2.yml

@@ -1,14 +1,11 @@
 title: Equation Group C2 Communication
 id: 881834a4-6659-4773-821e-1c151789d873
 description: Detects communication to C2 servers mentioned in the operational notes of the ShadowBroker leak of EquationGroup C2 tools
+author: Florian Roth
+date: 2017/04/15
 references:
     - https://steemit.com/shadowbrokers/@theshadowbrokers/lost-in-translation
     - https://medium.com/@msuiche/the-nsa-compromised-swift-network-50ec3000b195
-tags:
-    - attack.command_and_control
-    - attack.g0020
-author: Florian Roth
-date: 2017/04/15
 logsource:
     category: firewall
 detection:
@@ -24,3 +21,6 @@ detection:
 falsepositives:
     - Unknown
 level: high
+tags:
+    - attack.command_and_control
+    - attack.g0020

rules/network/net_dns_c2_detection.yml

@@ -3,11 +3,12 @@ id: 1ec4b281-aa65-46a2-bdae-5fd830ed914e
 status: experimental
 description: Normally, DNS logs contain a limited amount of different dns queries for a single domain. This rule detects a high amount of queries for a single domain,
     which can be an indicator that DNS is used to transfer data.
+author: Patrick Bareiss
+date: 2019/04/07
+modified: 2020/08/27
 references:
     - https://zeltser.com/c2-dns-tunneling/
     - https://patrick-bareiss.com/detect-c2-traffic-over-dns-using-sigma/
-author: Patrick Bareiss
-date: 2019/04/07
 logsource:
     category: dns
 detection:
@@ -18,5 +19,9 @@ falsepositives:
     - Valid software, which uses dns for transferring data
 level: high
 tags:
-    - attack.t1048
+    - attack.command_and_control
+    - attack.t1071 # an old one
+    - attack.t1071.004
     - attack.exfiltration
+    - attack.t1048 # an old one
+    - attack.t1048.003

rules/network/net_high_dns_bytes_out.yml

@@ -1,16 +1,18 @@
 action: global
 title: High DNS Bytes Out
 id: 0f6c1bf5-70a5-4963-aef9-aab1eefb50bd
-description: High DNS queries bytes amount from host per short period of time
 status: experimental
+description: High DNS queries bytes amount from host per short period of time
 author: Daniil Yugoslavskiy, oscd.community
 date: 2019/10/24
-tags:
-    - attack.exfiltration
-    - attack.t1048
+modified: 2020/08/27
 falsepositives:
     - Legitimate high DNS bytes out rate to domain name which should be added to whitelist
 level: medium
+tags:
+    - attack.exfiltration
+    - attack.t1048 # an old one
+    - attack.t1048.003
 ---
 logsource:
     category: dns

rules/network/net_high_dns_requests_rate.yml

@@ -1,16 +1,21 @@
 action: global
 title: High DNS Requests Rate
 id: b4163085-4001-46a3-a79a-55d8bbbc7a3a
-description: High DNS requests amount from host per short period of time
 status: experimental
+description: High DNS requests amount from host per short period of time
 author: Daniil Yugoslavskiy, oscd.community
 date: 2019/10/24
-tags:
-    - attack.exfiltration
-    - attack.t1048
+modified: 2020/08/27
 falsepositives:
     - Legitimate high DNS requests rate to domain name which should be added to whitelist
 level: medium
+tags:
+    - attack.exfiltration
+    - attack.t1048 # an old one
+    - attack.t1048.003
+    - attack.command_and_control
+    - attack.t1071 # an old one
+    - attack.t1071.004
 ---
 logsource:
     category: dns

rules/network/net_high_null_records_requests_rate.yml

@@ -1,12 +1,10 @@
 title: High NULL Records Requests Rate
 id: 44ae5117-9c44-40cf-9c7c-7edad385ca70
-description: Extremely high rate of NULL record type DNS requests from host per short period of time. Possible result of iodine tool execution
 status: experimental
+description: Extremely high rate of NULL record type DNS requests from host per short period of time. Possible result of iodine tool execution
 author: Daniil Yugoslavskiy, oscd.community
 date: 2019/10/24
-tags:
-    - attack.exfiltration
-    - attack.t1048
+modified: 2020/08/27
 logsource:
     category: dns
 detection:
@@ -17,3 +15,10 @@ detection:
 falsepositives:
     - Legitimate high DNS NULL requests rate to domain name which should be added to whitelist
 level: medium
+tags:
+    - attack.exfiltration
+    - attack.t1048 # an old one
+    - attack.t1048.003
+    - attack.command_and_control
+    - attack.t1071 # an old one
+    - attack.t1071.004

rules/network/net_high_txt_records_requests_rate.yml

@@ -1,12 +1,10 @@
 title: High TXT Records Requests Rate
 id: f0a8cedc-1d22-4453-9c44-8d9f4ebd5d35
-description: Extremely high rate of TXT record type DNS requests from host per short period of time. Possible result of Do-exfiltration tool execution
 status: experimental
+description: Extremely high rate of TXT record type DNS requests from host per short period of time. Possible result of Do-exfiltration tool execution
 author: Daniil Yugoslavskiy, oscd.community
 date: 2019/10/24
-tags:
-    - attack.exfiltration
-    - attack.t1048
+modified: 2020/08/27
 logsource:
     category: dns
 detection:
@@ -17,3 +15,10 @@ detection:
 falsepositives:
     - Legitimate high DNS TXT requests rate to domain name which should be added to whitelist
 level: medium
+tags:
+    - attack.exfiltration
+    - attack.t1048 # an old one
+    - attack.t1048.003
+    - attack.command_and_control
+    - attack.t1071 # an old one
+    - attack.t1071.004