Merge pull request GreedyBear-Project#882 from intelowlproject/develop

3.2.0

Author: regulartim

.env_template

@@ -13,4 +13,4 @@ COMPOSE_FILE=docker/default.yml:docker/local.override.yml
 #COMPOSE_FILE=docker/default.yml:docker/local.override.yml:docker/elasticsearch.yml
 
 # If you want to run a specific version, populate this
-# REACT_APP_INTELOWL_VERSION="3.1.0"
+# REACT_APP_INTELOWL_VERSION="3.2.0"

.github/CONTRIBUTING.md

@@ -1,3 +1,3 @@
 GreedyBear is handled by the same maintainers of [IntelOwl](https://github.com/intelowlproject/IntelOwl/).
 
-So, please refer to the [IntelOwl Contribute file](https://github.com/intelowlproject/IntelOwl/blob/master/CONTRIBUTING.md)
+So, please refer to the [IntelOwl Contribute guide](https://intelowlproject.github.io/docs/GreedyBear/Contribute/)

.github/configurations/node_linters/eslint/.eslintrc.json

@@ -5,13 +5,15 @@
         "es2021": true,
         "jest": true
     },
+    "parser": "@babel/eslint-parser",
     "extends": [
         "airbnb", "plugin:jsdoc/recommended", "./eslint-config-certego",
         "airbnb/hooks", "./eslint-config-certego-react",
         "prettier"
     ],
     "parserOptions": {
-        "ecmaVersion": "latest"
+        "ecmaVersion": "latest",
+        "requireConfigFile": false
     },
     "ignorePatterns": [
         "node_modules/",

.github/configurations/node_linters/eslint/package.json

@@ -1,11 +1,12 @@
 {
   "devDependencies": {
+    "@babel/eslint-parser": "^7.28.6",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jsdoc": "^46.9.0",
-    "eslint-plugin-jsx-a11y": "^6.6.1",
-    "eslint-plugin-react": "^7.31.10",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
+    "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^4.6.0"
   }
 }

.github/pull_request_template.md

@@ -1,33 +1,48 @@
-(Please add to the PR name the issue/s that this PR would close if merged by using a [Github](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) keyword. Example: `<feature name>. Closes #999`. If your PR is made by a single commit, please add that clause in the commit too. This is all required to automate the closure of related issues.)
-
 # Description
 
-Please include a summary of the change.
+Please include a short summary of the change. Don't just paste LLM output here.
 
-## Related issues
-Please add related issues.
+### Related issues
 
-## Type of change
+Please add related issues: the issues you are trying to solve as well as other issues that are important in the context of this pull request.
 
-Please delete options that are not relevant.
+### Type of change
 
 - [ ] Bug fix (non-breaking change which fixes an issue).
 - [ ] New feature (non-breaking change which adds functionality).
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected).
+- [ ] Chore (refactoring, dependency updates, CI/CD changes, code cleanup, docs-only changes).
 
 # Checklist
 
+Please complete this checklist carefully. It helps guide your contribution and lets maintainers verify that all requirements are met.
+
+### Formalities
+
 - [ ] I have read and understood the rules about [how to Contribute](https://intelowlproject.github.io/docs/GreedyBear/Contribute/) to this project.
+- [ ] I chose an appropriate title for the pull request in the form: `<feature name>. Closes #999`
+- [ ] My branch is based on `develop`.
 - [ ] The pull request is for the branch `develop`.
-- [ ] I have added documentation of the new features.
+- [ ] I have reviewed and verified any LLM-generated code included in this PR.
+
+### Docs and tests
+
+- [ ] I documented my code changes with docstrings and/or comments.
+- [ ] I have checked if my changes affect user-facing behavior that is described in the [docs](https://intelowlproject.github.io/docs/GreedyBear/Introduction/). If so, I also created a pull request in the [docs repository](https://github.com/intelowlproject/docs).
 - [ ] Linter (`Ruff`) gave 0 errors. If you have correctly installed [pre-commit](https://intelowlproject.github.io/docs/GreedyBear/Contribute/#how-to-start-setup-project-and-development-instance), it does these checks and adjustments on your behalf.
-- [ ] I have added tests for the feature/bug I solved. All the tests (new and old ones) gave 0 errors.
-- [ ] If changes were made to an existing model/serializer/view, the docs were updated and regenerated (check [CONTRIBUTE.md](https://github.com/intelowlproject/docs/blob/main/docs/GreedyBear/Contribute.md)).
-- [ ] If the GUI has been modified:
-    - [ ] I have a provided a screenshot of the result in the PR.
-    - [ ] I have created new frontend tests for the new component or updated existing ones.
+- [ ] I have added tests for the feature/bug I solved.
+- [ ] All the tests gave 0 errors.
+
+### GUI changes
+
+Ignore this section if you did not make any changes to the GUI.
+
+- [ ] I have provided a screenshot of the result in the PR.
+- [ ] I have created new frontend tests for the new component or updated existing ones.
 
-### Important Rules
-- If you miss to compile the Checklist properly, your PR won't be reviewed by the maintainers.
-- If your changes decrease the overall tests coverage (you will know after the Codecov CI job is done), you should add the required tests to fix the problem
-- Everytime you make changes to the PR and you think the work is done, you should explicitly ask for a review. After being reviewed and received a "change request", you should explicitly ask for a review again once you have made the requested changes.
+# Review process
+
+- We encourage you to create a draft PR first, even when your changes are incomplete. This way you refine your code while we can track your progress and actively review and help.
+- If you think your draft PR is ready to be reviewed by the maintainers, click the corresponding button. Your draft PR will become a real PR.
+- If your changes decrease the overall tests coverage (you will know after the Codecov CI job is done), you should add the required tests to fix the problem.
+- Every time you make changes to the PR and you think the work is done, you should explicitly ask for a review. After receiving a "change request", address the feedback and click "request re-review" next to the reviewer's profile picture at the top right.

.github/workflows/_node.yml

@@ -17,12 +17,16 @@ on:
         required: false
         default: true
 
-      use_jest:
-        description: Use jest suite
+
+
+      use_vitest:
+        description: Use vitest suite
         default: false
         type: boolean
         required: false
 
+
+
       use_react:
         description: Use react library
         default: false
@@ -46,7 +50,7 @@ on:
         required: false
 
       use_coverage:
-        description: Output coverage. Require jest to be set.
+        description: Output coverage. Require vitest to be set.
         default: false
         type: boolean
         required: false
@@ -104,12 +108,7 @@ jobs:
 
       - name: Add dependencies
         run: |
-          if [[ '${{ inputs.use_jest }}' != 'false' ]]; then
-            npm i -D --package-lock-only jest @testing-library/jest-dom babel-jest @babel/core @babel/preset-env
-            if [[ '${{ inputs.use_react }}' != 'false' ]]; then
-              npm i -D --package-lock-only  @testing-library/react
-            fi
-          fi
+
           if [[ '${{ inputs.use_eslint }}' != 'false' ]]; then
             npm i -D --package-lock-only eslint
           fi
@@ -163,22 +162,24 @@ jobs:
         working-directory: ${{ inputs.working_directory }}
         shell: bash
 
-      - name: Run jest tests
-        if: ${{ inputs.use_jest }}
-        id: jest-tests
+      - name: Run vitest tests
+        if: ${{ inputs.use_vitest }}
+        id: vitest-tests
         run: |
           if [[ '${{ inputs.use_coverage }}' != 'false' ]]; then
-            CMD="npm test -- --silent --coverage"
+            CMD="npm run test-coverage"
           else
             CMD="npm test"
           fi
           echo "Running command: ${CMD}"
           if [[ '${{ inputs.use_coverage }}' != 'false' ]] && [[ '${{ inputs.upload_coverage }}' != 'false' ]]; then
-            echo "Uploading jest coverage report"
-            echo "## Jest coverage report" >> $GITHUB_STEP_SUMMARY
-            echo "$($CMD | grep -Ev "^(>|$)")" > jest-coverage.txt
-            head -n -1 jest-coverage.txt | tail -n +2 >> $GITHUB_STEP_SUMMARY
-            rm jest-coverage.txt
+            echo "Uploading vitest coverage report"
+            $CMD --no-color 2>&1 | sed -n '/^-\{3,\}/,$ p' > vitest-coverage.txt
+            echo "## Vitest coverage report" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            cat vitest-coverage.txt >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            rm vitest-coverage.txt
           else
             $CMD
           fi

.github/workflows/pull_request_automation.yml

@@ -35,13 +35,13 @@ jobs:
 
       use_react: true
       check_packages_licenses: false
-      use_jest: true
+      use_vitest: true
 
       use_coverage: true
       upload_coverage: true
       max_timeout: 15
       node_versions: >-
-        ["20"]
+        ["24"]
       ubuntu_version: latest
 
 
@@ -78,8 +78,7 @@ jobs:
       postgres_version: 18
       use_memcached: false
       use_elastic_search: false
-      use_rabbitmq: true
-      rabbitmq_version: "4"
+      use_rabbitmq: false
       use_mongo: false
       use_celery: false
 
@@ -105,7 +104,6 @@ jobs:
         "POSTGRES_USER": "user",
         "POSTGRES_DB": "greedybear_db",
         "HTTPS_ENABLED": "not_enabled",
-        "BROKER_URL": "amqp://guest:guest@rabbitmq:5672",
         }
       python_versions: >-
         ["3.13"]

api/urls.py

@@ -13,6 +13,7 @@
     feeds_asn,
     feeds_pagination,
     general_honeypot_list,
+    health_view,
     news_view,
 )
 
@@ -31,6 +32,7 @@
     path("command_sequence", command_sequence_view),
     path("general_honeypot", general_honeypot_list),
     path("news/", news_view),
+    path("health/", health_view),
     # router viewsets
     path("", include(router.urls)),
     # certego_saas:

api/views/__init__.py

@@ -3,5 +3,6 @@
 from api.views.enrichment import *
 from api.views.feeds import *
 from api.views.general_honeypot import *
+from api.views.health import *
 from api.views.news import *
 from api.views.statistics import *