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

Resolve substitutions upon SecurityNodeActionExtension._setup_security() #3

Merged
merged 2 commits into from
Jun 15, 2021
Merged

Resolve substitutions upon SecurityNodeActionExtension._setup_security() #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
838c853
Resolve substitutions upon SecurityNodeActionExtension._setup_security()
hidmic Jun 2, 2021
739d1b8
normalize node package and node executable before performing substitu…
wjwwood Jun 3, 2021
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
11 changes: 9 additions & 2 deletions ros2launch_security/node_action/security.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from launch.launch_context import LaunchContext
from launch.substitutions import LocalSubstitution
from launch.utilities import normalize_to_list_of_substitutions
from launch.utilities import perform_substitutions
from launch_ros.actions.node import Node, NodeActionExtension

import nodl
Expand Down Expand Up @@ -50,8 +51,14 @@ def _setup_security(
) -> None:
"""Enable encryption, creating a key for the node if necessary."""
nodl_node = nodl.get_node_by_executable(
package_name=node_action.node_package,
executable_name=node_action.node_executable
package_name=perform_substitutions(
context,
normalize_to_list_of_substitutions(node_action.node_package)
),
executable_name=perform_substitutions(
context,
normalize_to_list_of_substitutions(node_action.node_executable)
)
)

self.__enclave = node_action.node_name.replace(
Expand Down