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.

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

Handle errors from Octopoes connector #647

Merged
merged 2 commits into from
Apr 7, 2023

Conversation

praseodym
Copy link
Contributor

@praseodym praseodym commented Apr 3, 2023

Changes

Handle errors from the Octopoes connector on the crisis room and
findings pages by displaying a message to the user and logging the error
to the Django logger.

Issue ticket number and link

Closes #613

Proof

Screenshot 2023-04-03 at 15-19-38 OpenKAT - organization_crisis_room

Extra instructions for others

This section may be skipped or omitted. Uncomment and answer the below questions if relevant.

Checklist for author(s):

  • All the commits in this PR are properly PGP-signed and verified;
  • This PR comes from a feature or hotfix branch, in line with our git branching strategy;
  • This PR is "bite-sized" and only focuses on a single issue, problem, or feature;
  • I am not reinventing the wheel: there is no high-quality library that already has this feature;
  • I have changed the example .env files if I added, removed, or changed any config options, and I have informed others that they need to modify their .env files if required;
  • I have performed a self-review of my own code;
  • I have commented my code, particularly in hard-to-understand areas;
  • I have made corresponding changes to the documentation, if necessary;
  • I have written unit, integration, and end-to-end tests for the change that I made;

If a non-trivial PR:

  • This PR is part of a milestone and has appropriate labels;
  • This PR is properly linked to the project board (either directly or via an issue);
  • I have added screenshots or some other proof that my code does what it is supposed to do;
## Checklist for functional reviewer(s):
- [ ] If a non-trivial PR: This PR is properly linked to an issue on the project board;
- [ ] I have checked out this branch, and successfully ran `make kat`;
- [ ] I have ran `make test-rf` and all end-to-end Robot Framework tests pass;
- [ ] I confirmed that the PR's advertised `feature` or `hotfix` works as intended;
- [ ] I confirmed that there are no unintended functional regressions in this branch;

### What works:
* _bullet point + screenshot (if useful) per tested functionality_

### What doesn't work:
* _bullet point + screenshot (if useful) per tested functionality_

### Bug or feature?:
* _bullet point + screenshot (if useful) if it is unclear whether something is a bug or an intended feature._
## Checklist for code reviewer(s):
- [ ] The code passes the CI tests and linters;
- [ ] The code does not bypass authentication or security mechanisms;
- [ ] The code does not introduce any dependency on a library that has not been properly vetted;
- [ ] The code does not violate Model-View-Template and our other architectural principles;
- [ ] The code contains docstrings, comments, and documentation where needed;
- [ ] The code prioritizes readability over performance where appropriate;
- [ ] The code conforms to our agreed coding standards.

@praseodym praseodym requested a review from a team as a code owner April 3, 2023 13:34
@github-actions
Copy link
Contributor

github-actions bot commented Apr 3, 2023

File Coverage
All files 67%
bits/definitions.py 65%
bits/runner.py 56%
bits/https_availability/https_availability.py 93%
bits/oois_in_headers/oois_in_headers.py 57%
bits/spf_discovery/internetnl_spf_parser.py 55%
bits/spf_discovery/spf_discovery.py 72%
octopoes/api/api.py 89%
octopoes/api/models.py 75%
octopoes/api/router.py 56%
octopoes/core/app.py 69%
octopoes/core/service.py 53%
octopoes/events/events.py 96%
octopoes/events/manager.py 65%
octopoes/models/__init__.py 86%
octopoes/models/datetime.py 66%
octopoes/models/exception.py 83%
octopoes/models/origin.py 70%
octopoes/models/path.py 99%
octopoes/models/types.py 95%
octopoes/models/ooi/certificate.py 96%
octopoes/models/ooi/email_security.py 95%
octopoes/models/ooi/findings.py 94%
octopoes/models/ooi/network.py 97%
octopoes/models/ooi/service.py 91%
octopoes/models/ooi/software.py 71%
octopoes/models/ooi/web.py 81%
octopoes/models/ooi/dns/records.py 95%
octopoes/models/ooi/dns/zone.py 82%
octopoes/repositories/ooi_repository.py 40%
octopoes/repositories/origin_parameter_repository.py 52%
octopoes/repositories/origin_repository.py 52%
octopoes/repositories/scan_profile_repository.py 45%
octopoes/xtdb/client.py 39%
octopoes/xtdb/query_builder.py 69%
octopoes/xtdb/related_field_generator.py 73%
tests/conftest.py 91%

Minimum allowed coverage is 75%

Generated by 🐒 cobertura-action against 81ce6df

@praseodym praseodym added this to the OpenKAT v1.9 milestone Apr 3, 2023
@praseodym praseodym added the rocky Issues related to Rocky label Apr 3, 2023
ammar92
ammar92 previously approved these changes Apr 4, 2023
Copy link
Contributor

@ammar92 ammar92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice stuff 👍 One small remark, but consider it approved

rocky/crisis_room/views.py Outdated Show resolved Hide resolved
Handle errors from the Octopoes connector on the crisis room and
findings pages by displaying a message to the user and logging the error
to the Django logger.
@praseodym praseodym force-pushed the fix/handle-findings-octopoes-connector-error branch from f531a34 to 044c877 Compare April 6, 2023 13:12
@underdarknl underdarknl merged commit 2cc15b5 into main Apr 7, 2023
@underdarknl underdarknl deleted the fix/handle-findings-octopoes-connector-error branch April 7, 2023 08:19
jpbruinsslot added a commit that referenced this pull request Apr 11, 2023
* main:
  Add new xtdb-http-multinode version to 1.7 release notes (#692)
  Fix pdflatex crash when there are underscores (#690)
  fix crisis room when no description (#686)
  Appropriate min_scan_level for bits (#684)
  Handle errors from Octopoes connector (#647)
  Translate Dutch images in docs to English (#128)
  Don't set KAT_VERSION by default in .env-dist (#629)
  Feature/no bits without clearence (#645)
  Add missing migration and unit test for missing migrations (#677)
  Use `unless-stopped` Docker restart policy (#683)
  Update to xtdb-http-multinode v1.0.4 (#681)
  Remove unused SCHEDULER_DSP_INTERVAL and SCHEDULER_DSP_BROKER_URL env vars (#633)
  the latest version of nuclei updated the json-lines param (#664)
  Add MutedFinding OOI and filter them in report (#670)
  Fix djLint T001, T002, T003, T032 (#672)
  Keiko output context data (#671)
jpbruinsslot added a commit that referenced this pull request Apr 11, 2023
* main: (41 commits)
  Bump pre-commit from 3.2.1 to 3.2.2 (#693)
  Add new xtdb-http-multinode version to 1.7 release notes (#692)
  Fix pdflatex crash when there are underscores (#690)
  fix crisis room when no description (#686)
  Appropriate min_scan_level for bits (#684)
  Handle errors from Octopoes connector (#647)
  Translate Dutch images in docs to English (#128)
  Don't set KAT_VERSION by default in .env-dist (#629)
  Feature/no bits without clearence (#645)
  Add missing migration and unit test for missing migrations (#677)
  Use `unless-stopped` Docker restart policy (#683)
  Update to xtdb-http-multinode v1.0.4 (#681)
  Remove unused SCHEDULER_DSP_INTERVAL and SCHEDULER_DSP_BROKER_URL env vars (#633)
  the latest version of nuclei updated the json-lines param (#664)
  Add MutedFinding OOI and filter them in report (#670)
  Fix djLint T001, T002, T003, T032 (#672)
  Keiko output context data (#671)
  Log pdflatex output on error (#667)
  Add djLint for Rocky templates (#626)
  Fix Keiko report downloads on uWSGI (#657)
  ...
jpbruinsslot added a commit that referenced this pull request Apr 11, 2023
* main: (54 commits)
  Final djLint fixes (#701)
  Bump pre-commit from 3.2.1 to 3.2.2 (#693)
  Add new xtdb-http-multinode version to 1.7 release notes (#692)
  Fix pdflatex crash when there are underscores (#690)
  fix crisis room when no description (#686)
  Appropriate min_scan_level for bits (#684)
  Handle errors from Octopoes connector (#647)
  Translate Dutch images in docs to English (#128)
  Don't set KAT_VERSION by default in .env-dist (#629)
  Feature/no bits without clearence (#645)
  Add missing migration and unit test for missing migrations (#677)
  Use `unless-stopped` Docker restart policy (#683)
  Update to xtdb-http-multinode v1.0.4 (#681)
  Remove unused SCHEDULER_DSP_INTERVAL and SCHEDULER_DSP_BROKER_URL env vars (#633)
  the latest version of nuclei updated the json-lines param (#664)
  Add MutedFinding OOI and filter them in report (#670)
  Fix djLint T001, T002, T003, T032 (#672)
  Keiko output context data (#671)
  Log pdflatex output on error (#667)
  Add djLint for Rocky templates (#626)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rocky Issues related to Rocky
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Retrieve findings crashes Rocky when too many findings are present
4 participants