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

Add: Support authenticated connection to MQTT broker #566

Merged
merged 2 commits into from
Jan 25, 2024
Merged

Add: Support authenticated connection to MQTT broker #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3eadcfc
Support authenticated connection to MQTT broker
jjnicola Dec 18, 2023
e67c5cc
Merge branch 'main' into mqtt-auth
jjnicola Jan 25, 2024
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
19 changes: 19 additions & 0 deletions notus/scanner/cli/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,25 @@ def __init__(self) -> None:
type=int,
help="Port of the MQTT broker. (default: %(default)s)",
)
parser.add_argument(
"--mqtt-broker-username",
default=None,
type=str,
help=(
"Username to connect to MQTT broker for MQTT communication."
"Default %(default)s"
),
)
parser.add_argument(
"--mqtt-broker-password",
default=None,
type=str,
help=(
"PASSWORD to connect to MQTT broker for MQTT communication."
"Default %(default)s"
),
)

parser.add_argument(
"--disable-hashsum-verification",
type=bool,
Expand Down
10 changes: 10 additions & 0 deletions notus/scanner/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@
"NOTUS_SCANNER_MQTT_BROKER_ADDRESS",
DEFAULT_MQTT_BROKER_ADDRESS,
),
(
"mqtt-broker-username",
"NOTUS_SCANNER_MQTT_BROKER_USERNAME",
None,
),
(
"mqtt-broker-password",
"NOTUS_SCANNER_MQTT_BROKER_PASSWORD",
None,
),
(
"mqtt-broker-port",
"NOTUS_SCANNER_MQTT_BROKER_PORT",
Expand Down
7 changes: 7 additions & 0 deletions notus/scanner/daemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ def on_hash_sum_verification_failure(
def run_daemon(
mqtt_broker_address: str,
mqtt_broker_port: int,
mqtt_broker_username: str,
mqtt_broker_password: str,
products_directory_path: Path,
disable_hashsum_verification: bool,
):
Expand All @@ -87,6 +89,9 @@ def run_daemon(
mqtt_broker_address=mqtt_broker_address,
mqtt_broker_port=mqtt_broker_port,
)
if mqtt_broker_username and mqtt_broker_password:
client.username_pw_set(mqtt_broker_username, mqtt_broker_password)

daemon: MQTTDaemon
try:
daemon = MQTTDaemon(client)
Expand Down Expand Up @@ -130,6 +135,8 @@ def main():
run_daemon(
args.mqtt_broker_address,
args.mqtt_broker_port,
args.mqtt_broker_username,
args.mqtt_broker_password,
args.products_directory,
args.disable_hashsum_verification,
)
Expand Down
Loading