tasks from different organization visible in Rocky on task list for boefje

[underdarknl]

Describe the bug
A clear and concise description of what the bug is.

To Reproduce
Steps to reproduce the behavior:

• do scans in first org
• Create second org
• Go to boefjes detail page, and notice jobs from first orga listed in second org

Expected behavior
Not seeing jobs from other orga's.

Screenshots

OpenKAT version
Main, after scheduler merge.

Additional context
Add any other context about the problem here.

[jpbruinsslot]

Seems likely that the following needs to be amended filtering on organisation id:

nl-kat-coordination/rocky/rocky/views/scheduler.py

Lines 60 to 66 in deaddf7

	def get_task_filters(self) -> dict[str, Any]:
	return {
	"scheduler_id": self.scheduler_id,
	"task_type": self.task_type,
	"plugin_id": None, # plugin_id present and set at plugin detail
	**self.get_task_filter_form_data(),
	} | self.get_organization_specific_tasks()

[underdarknl]

Checking the request, the organization code is correctly visible in the filer clause send to the scheduler.
I believe the problem lies in

nl-kat-coordination/mula/scheduler/server/handlers/tasks.py

Line 56 in 3624392

def list(

specifically the lines that update the Dict made on line

nl-kat-coordination/mula/scheduler/server/handlers/tasks.py

Line 75 in 3624392

f_req = filters or storage.filters.FilterRequest(filters={})

Because the Dict with the organisation filter is updated on line

nl-kat-coordination/mula/scheduler/server/handlers/tasks.py

Line 120 in 3624392

f_req.filters.update(f_plugin) # type: ignore

Only the last applied filter remains. This explains why the general task list works corectly, but the ooi and boefje tasks lists drop the organization filter.

The filters should probable be accumulated in a list instead of a Dict with just two possible keywords (and / or )

[jpbruinsslot]

This will happen when a combination of the (deprecated) queryparams input_ooi and/ plugin_id is used in combination with payload filters. This worked before because the queryparameter scheduler_id was formatted with an organisation id.

I recommend updating the rocky code to move the input_ooi and plugin_id queryparameter filtering into the payload filters and removing the deprecated code in the scheduler.

[underdarknl]

We could also just remove the deprecated special casing and upgrade Rocky to not use those two vars anymore.