Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release 3.4.2 from pilot branch to master branch #230

Merged
merged 53 commits into from
Nov 21, 2024
Merged

Merge release 3.4.2 from pilot branch to master branch #230

merged 53 commits into from
Nov 21, 2024

Commits on Nov 14, 2019

  1. Clarification about password protected zip files

    @whartond
    whartond committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    486dcbc View commit details
    Browse the repository at this point in the history

  2. include Suricata-Update in list of ruleset management tools

    @whartond
    whartond committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    77db63a View commit details
    Browse the repository at this point in the history

  3. include Suricata-Update link in list of ruleset management tools

    @whartond
    whartond committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    9c200d2 View commit details
    Browse the repository at this point in the history

  4. README tweak

    @whartond
    whartond committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    094e725 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2019

  1. use specific flowsynth files instead of latest from repo

    counterthreatunit committed Dec 30, 2019
    Configuration menu
    Copy the full SHA
    4e848b8 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Merge branch 'master' into pilot

    @whartond
    whartond committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    207822a View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Merge pull request #169 from whartond/pilot 

    Make the pilot branch the same as master
    @rkoumis
    rkoumis authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    05db72d View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2024

  1. Merge pull request #186 from secureworks/master 

    merge master into pilot
    @rkoumis
    rkoumis authored Nov 10, 2024
    Configuration menu
    Copy the full SHA
    d8d8ed7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #188 from secureworks/master 

    Update pilot CHANGELOG from master
    @rkoumis
    rkoumis authored Nov 10, 2024
    Configuration menu
    Copy the full SHA
    d254191 View commit details
    Browse the repository at this point in the history

  3. Use pyproject.toml (#184) 

    - updated Dockerfile-dalton
- emptied out the requirements.txt file
    @rkoumis
    rkoumis committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    f0131b3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #189 from rkoumis/184-pyproject-toml 

    Use pyproject.toml (#184)
    @rkoumis
    rkoumis authored Nov 10, 2024
    Configuration menu
    Copy the full SHA
    508e04c View commit details
    Browse the repository at this point in the history

  5. Ran "ruff format" changing single quotes to double

    @rkoumis
    rkoumis committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    fce3ec1 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #190 from rkoumis/183-ruff-format 

    Run ruff format to standardize file formatting
    @rkoumis
    rkoumis authored Nov 10, 2024
    Configuration menu
    Copy the full SHA
    584eb24 View commit details
    Browse the repository at this point in the history

  7. Ran ruff check --unsafe-fixes --fix 

    - there are 22 items to fix manually.
    @rkoumis
    rkoumis committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    668dda0 View commit details
    Browse the repository at this point in the history

  8. Manual tweaks after running ruff check --fix

    @rkoumis
    rkoumis committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    70c5db3 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #192 from rkoumis/183-ruff-check 

    Ran ruff check --fix to fix style issues automatically
    @rkoumis
    rkoumis authored Nov 10, 2024
    Configuration menu
    Copy the full SHA
    bacab6a View commit details
    Browse the repository at this point in the history

  10. Added github CI workflow 

    - updated the changelog
    @rkoumis
    rkoumis committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    50247d3 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. Merge pull request #193 from rkoumis/191-github-actions 

    Added github CI workflow
    @rkoumis
    rkoumis authored Nov 11, 2024
    Configuration menu
    Copy the full SHA
    f3173d6 View commit details
    Browse the repository at this point in the history

  2. Run unit tests #182 

    - small refactoring inside dalton.py and flowsynth.py
- initialize logging at init time not import time
- check for rulesets at init time not import time
- added some basic tests
    @rkoumis
    rkoumis committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    081115c View commit details
    Browse the repository at this point in the history

  3. Automated lint fixes

    @rkoumis
    rkoumis committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    edcdeb5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #194 from rkoumis/182-unit-tests-can-run 

    unit tests can run
    @rkoumis
    rkoumis authored Nov 11, 2024
    Configuration menu
    Copy the full SHA
    d780e3d View commit details
    Browse the repository at this point in the history

  5. Run ruff format and check on dalton agent 

    - these fixes all were done by ruff
- I used `ruff format` and `ruff check --fix --unsafe-fixes`
- Some manual fixes still are needed
    @rkoumis
    rkoumis committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    a68d7f9 View commit details
    Browse the repository at this point in the history

  6. Manual fixes or tweaks to make ruff happy

    @rkoumis
    rkoumis committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    8434d75 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #195 from rkoumis/183-lint-dalton-agent 

    Also lint dalton agent
    @rkoumis
    rkoumis authored Nov 11, 2024
    Configuration menu
    Copy the full SHA
    a324062 View commit details
    Browse the repository at this point in the history

  8. Updated nginx to 1.27.2 

    - Added a Makefile target to lint the Dockerfiles
- The default nginx docker image has a CMD of ["nginx" "-g" "daemon off;"] so
  - we don't need the CMD in our Dockerfile
  - and we can't have "daemon off" in our nginx config
    @rkoumis
    rkoumis committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    7c031ae View commit details
    Browse the repository at this point in the history

  9. Merge pull request #202 from rkoumis/200-update-nginx 

    Update nginx
    @rkoumis
    rkoumis authored Nov 11, 2024
    Configuration menu
    Copy the full SHA
    6587cc8 View commit details
    Browse the repository at this point in the history

  10. Update redis from 3.2 to 7.4 

    - do not send a NoneType or a boolean False to redis-py
    @rkoumis
    rkoumis committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    8eb3004 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #205 from rkoumis/201-update-redis 

    Update redis from 3.2 to 7.4
    @rkoumis
    rkoumis authored Nov 11, 2024
    Configuration menu
    Copy the full SHA
    c616462 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Add unit tests for the flowsynth web UI 

    - Small refactoring
- Small tweaks to comments
- Update Makefile
- Properly show any flowsynth errors
    @rkoumis
    rkoumis committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    dd97d59 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #206 from rkoumis/204-flowsynth-tests 

    Add unit tests for the flowsynth web UI
    @rkoumis
    rkoumis authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    55dc3dd View commit details
    Browse the repository at this point in the history

  3. Sort imports using ruff

    @rkoumis
    rkoumis committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    50e8bf0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #208 from rkoumis/207-run-isort 

    Use ruff to sort imports
    @rkoumis
    rkoumis authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    4c3f4ac View commit details
    Browse the repository at this point in the history

  5. Additional code checking by ruff 

    - ruff found a couple of good fixes
- added a unit test for dalton
    @rkoumis
    rkoumis committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    eab3764 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #210 from rkoumis/209-ruff-bugbears 

    Additional code checking by ruff
    @rkoumis
    rkoumis authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    7dc5a02 View commit details
    Browse the repository at this point in the history

  7. Use pre-built zeek images 

    - slight tweaks to the Dockerfiles
- ran hadolint
    @rkoumis
    rkoumis committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    9ede867 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #211 from rkoumis/181-pre-built-zeek 

    Use pre-built zeek images
    @rkoumis
    rkoumis authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    dc2d1e3 View commit details
    Browse the repository at this point in the history

  9. Use bump-my-version tool to help manage versioning 

    - Added two makefile targets for bumping the version.
    @rkoumis
    rkoumis committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    a4d784d View commit details
    Browse the repository at this point in the history

  10. Bump version: 3.3.6 → 3.4.0

    @rkoumis
    rkoumis committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    1612c82 View commit details
    Browse the repository at this point in the history

  11. Bump dalton-agent version: 3.1.1 → 3.1.2

    @rkoumis
    rkoumis committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    42452d6 View commit details
    Browse the repository at this point in the history

  12. A couple of issues that the linter did not like

    @rkoumis
    rkoumis committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    adf82a1 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #212 from rkoumis/197-bump-version 

    Use bump-my-version tool to help with versioning
    @rkoumis
    rkoumis authored Nov 12, 2024
    Configuration menu
    Copy the full SHA
    a259d7e View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. redis is not happy with a boolean 

    - since the redis update in #205
    @rkoumis
    rkoumis committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    5173193 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #214 from rkoumis/203-zeek-json-bug 

    job results boolean bug with zeek and json
    @rkoumis
    rkoumis authored Nov 13, 2024
    Configuration menu
    Copy the full SHA
    20d476b View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. Fix for issue #213 where zeek logs were not shown 

    - zeek_json contains the data or "False"
    @rkoumis
    rkoumis committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    b22d394 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #216 from rkoumis/213-zeek-results-borked 

    Zeek results were not being shown
    @rkoumis
    rkoumis authored Nov 14, 2024
    Configuration menu
    Copy the full SHA
    52e86f4 View commit details
    Browse the repository at this point in the history

  3. Add unit tests for dalton app 

    - eliminate the redis global variable 'r'
- remove other usages of the 'global' keyword
- added github workflow for hadolint
    @rkoumis
    rkoumis committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    57587a8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #215 from rkoumis/203-dalton-unit-tests 

    Add unit tests for dalton app
    @rkoumis
    rkoumis authored Nov 14, 2024
    Configuration menu
    Copy the full SHA
    6fc6135 View commit details
    Browse the repository at this point in the history

  5. Bump version: 3.4.0 → 3.4.1

    @rkoumis
    rkoumis committed Nov 14, 2024
    Configuration menu
    Copy the full SHA
    5d162dc View commit details
    Browse the repository at this point in the history

  6. Merge pull request #217 from rkoumis/bump-version-to-3-4-1 

    Bump version: 3.4.0 → 3.4.1
    @rkoumis
    rkoumis authored Nov 14, 2024
    Configuration menu
    Copy the full SHA
    b1101d3 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2024

  1. Update flask dependencies 

    - remove unused or unuseful dependencies
    @rkoumis
    rkoumis committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    02f3630 View commit details
    Browse the repository at this point in the history

  2. Allow the user or the agent to upload large files 

    - added changelog entry
- start the flask app with the `flask` command line tool
    @rkoumis
    rkoumis committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    6680037 View commit details
    Browse the repository at this point in the history

  3. Bump version: 3.4.1 → 3.4.2

    @rkoumis
    rkoumis committed Nov 15, 2024
    Configuration menu
    Copy the full SHA
    bec6082 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #222 from rkoumis/180-flask-dependency-update 

    Update flask dependencies
    @rkoumis
    rkoumis authored Nov 15, 2024
    Configuration menu
    Copy the full SHA
    ab4e0ea View commit details
    Browse the repository at this point in the history