Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions bbot/core/event/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1890,18 +1890,18 @@ def make_event(
event_type = "IP_ADDRESS"
data = net.network_address

event_class = globals().get(event_type, DefaultEvent)
return event_class(
data,
event_type=event_type,
parent=parent,
context=context,
module=module,
scan=scan,
tags=tags,
_dummy=dummy,
_internal=internal,
)
event_class = globals().get(event_type, DefaultEvent)
return event_class(
data,
event_type=event_type,
parent=parent,
context=context,
module=module,
scan=scan,
tags=tags,
_dummy=dummy,
_internal=internal,
)


def event_from_json(j):
Expand Down
10 changes: 5 additions & 5 deletions bbot/test/test_step_1/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ async def test_cli_args(monkeypatch, caplog, capsys, clean_default_config):
print(out)
# parse YAML output
preset = yaml.safe_load(out)
assert preset == {
"description": "depstest",
"scan_name": "depstest",
"config": {"deps": {"behavior": "retry_failed"}},
}
# description and scan_name should reflect the CLI name
assert preset["description"] == "depstest"
assert preset["scan_name"] == "depstest"
# deps behavior should be set to retry_failed, but allow other config keys to exist
assert preset.get("config", {}).get("deps") == {"behavior": "retry_failed"}

# list modules
monkeypatch.setattr("sys.argv", ["bbot", "--list-modules"])
Expand Down
2 changes: 1 addition & 1 deletion bbot/test/test_step_2/module_tests/test_module_excavate.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def check(self, module_test, events):
]
)
found_badsecrets_vulnerability = bool(
[e for e in events if e.type == "VULNERABILITY" and str(e.module) == "badsecrets"]
[e for e in events if e.type == "FINDING" and str(e.module) == "badsecrets"]
)

assert found_js_url_event, "Failed to find URL event for script.js"
Expand Down
Loading