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

Add configurable octpoes request timeout #1382

Merged
merged 6 commits into from
Jul 14, 2023
Merged

Add configurable octpoes request timeout #1382

merged 6 commits into from
Jul 14, 2023

Conversation

jpbruinsslot
Copy link
Contributor

Changes

Add a configurable request timeout for the octopoes service

Issue link

Closes #1360

@jpbruinsslot jpbruinsslot added the mula Issues related to the scheduler label Jul 12, 2023
@jpbruinsslot jpbruinsslot requested a review from a team as a code owner July 12, 2023 14:08
praseodym
praseodym previously approved these changes Jul 12, 2023
View reviewed changes
ammar92
ammar92 requested changes Jul 12, 2023
View reviewed changes
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.

Just a few remarks

mula/scheduler/connectors/services/octopoes.py Outdated Show resolved Hide resolved
mula/scheduler/connectors/services/octopoes.py Outdated Show resolved Hide resolved
ammar92
ammar92 approved these changes Jul 13, 2023
View reviewed changes
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.

No remarks!

@Darwinkel
Copy link
Contributor

Checklist for QA:

  • I have checked out this branch, and successfully ran a fresh make reset.
  • I confirmed that there are no unintended functional regressions in this branch:
    • I have managed to pass the onboarding flow
    • Objects and Findings are created properly
    • Tasks are created and completed properly
  • I confirmed that the PR's advertised feature or hotfix works as intended.

I tried changing the new variable and checking if errors show up sooner/later in the scheduler container log if octopoes goes down, but I haven't gotten conclusive results as to whether it works as it should.

What works:

  • No apparent regressions

@underdarknl underdarknl merged commit b7e6be6 into main Jul 14, 2023
@underdarknl underdarknl deleted the feature/mula/octopoes-request-timeout branch July 14, 2023 10:13
jpbruinsslot added a commit that referenced this pull request Jul 24, 2023
@jpbruinsslot
Merge branch 'main' into feature/mula/rate-limit
f70c8fb 
* main:
  Fix robot test (#1420)
  Use the correct clearance level variable in organization member list template (#1427)
  Fix translation in Debian package (#1432)
  Reschedule tasks when no results in bytes are found after grace period (#1410)
  Don't scan hostname nmap in nmap boefje (#1415)
  Add and use our own CVE API (#1383)
  Add `task_id` as a query parameter to the `GET /origins` endpoint (#1414)
  Remove member group checks and check for permission instead (#1275)
  Bump cryptography from 41.0.0 to 41.0.2 in /boefjes/boefjes/plugins/kat_ssl_certificates (#1396)
  Bump cryptography from 41.0.1 to 41.0.2 in /bytes (#1397)
  Build the Debian build image on the main branch (#1387)
  Add explicit `black` config to all modules (#1395)
  Fix <no title> in the user guide docs (#1391)
  Add configurable octpoes request timeout (#1382)
  Remove hardcoded clearance level in member list for superusers (#1390)
  Add Debian build depends for CVE API package (#1384)
  Add buttons to manual rerun tasks, both boefjes or normalizers (#1339)
  Use fix multiprocessing bug on macOS where `qsize()` is not implemented (#1374)
jpbruinsslot added a commit that referenced this pull request Jul 25, 2023
@jpbruinsslot
Merge branch 'main' into feature/mula/rescheduling
3607738 
* main: (95 commits)
  Translations for release 1.11 - EN -> NL, PAP (#1439)
  Add Question ooi model and create the first bit that generates a question (#1407)
  make port classification configurable (#1418)
  KATalogus API filtering and pagination (#1405)
  Fix robot test (#1420)
  Use the correct clearance level variable in organization member list template (#1427)
  Fix translation in Debian package (#1432)
  Reschedule tasks when no results in bytes are found after grace period (#1410)
  Don't scan hostname nmap in nmap boefje (#1415)
  Add and use our own CVE API (#1383)
  Add `task_id` as a query parameter to the `GET /origins` endpoint (#1414)
  Remove member group checks and check for permission instead (#1275)
  Bump cryptography from 41.0.0 to 41.0.2 in /boefjes/boefjes/plugins/kat_ssl_certificates (#1396)
  Bump cryptography from 41.0.1 to 41.0.2 in /bytes (#1397)
  Build the Debian build image on the main branch (#1387)
  Add explicit `black` config to all modules (#1395)
  Fix <no title> in the user guide docs (#1391)
  Add configurable octpoes request timeout (#1382)
  Remove hardcoded clearance level in member list for superusers (#1390)
  Add Debian build depends for CVE API package (#1384)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ammar92 ammar92 ammar92 approved these changes

@underdarknl underdarknl underdarknl approved these changes

@praseodym praseodym praseodym left review comments

Assignees
No one assigned
Labels
mula Issues related to the scheduler
Projects
KAT
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Mula has counterproductive timeout on random endpoint
5 participants
@jpbruinsslot @Darwinkel @praseodym @underdarknl @ammar92