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

keyrings: update ROS signing key #2578

Merged
merged 2 commits into from
Jun 1, 2019
+16 −2
Merged

keyrings: update ROS signing key #2578

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
7a804b6
keyrings: update ROS signing key
kyrofa May 30, 2019
e4d1da4
Continue trusting old key until rotation is complete
kyrofa May 31, 2019
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
Binary file modified keyrings/ros.gpg
View file
Open in desktop
Binary file not shown.
Binary file added keyrings/ros_old.gpg
View file
Open in desktop
Binary file not shown.
9 changes: 8 additions & 1 deletion snapcraft/plugins/catkin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@

_ROS_KEYRING_PATH = os.path.join(snapcraft.internal.common.get_keyringsdir(), "ros.gpg")

# This needs to be removed once ROS finishes rolling out key rotation. See
# https://discourse.ros.org/t/security-issue-on-ros-build-farm/9342 for more
# details.
_OLD_ROS_KEYRING_PATH = os.path.join(
snapcraft.internal.common.get_keyringsdir(), "ros_old.gpg"
)


class CatkinInvalidSystemDependencyError(errors.SnapcraftError):
fmt = (
Expand Down Expand Up @@ -268,7 +275,7 @@ def PLUGIN_STAGE_SOURCES(self):

@property
def PLUGIN_STAGE_KEYRINGS(self):
return [_ROS_KEYRING_PATH]
return [_ROS_KEYRING_PATH, _OLD_ROS_KEYRING_PATH]

def __init__(self, name, options, project):
super().__init__(name, options, project)
Expand Down
9 changes: 8 additions & 1 deletion snapcraft/plugins/colcon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@

_ROS_KEYRING_PATH = os.path.join(snapcraft.internal.common.get_keyringsdir(), "ros.gpg")

# This needs to be removed once ROS finishes rolling out key rotation. See
# https://discourse.ros.org/t/security-issue-on-ros-build-farm/9342 for more
# details.
_OLD_ROS_KEYRING_PATH = os.path.join(
snapcraft.internal.common.get_keyringsdir(), "ros_old.gpg"
)


class ColconInvalidSystemDependencyError(errors.SnapcraftError):
fmt = (
Expand Down Expand Up @@ -233,7 +240,7 @@ def PLUGIN_STAGE_SOURCES(self):

@property
def PLUGIN_STAGE_KEYRINGS(self):
return [_ROS_KEYRING_PATH]
return [_ROS_KEYRING_PATH, _OLD_ROS_KEYRING_PATH]

def __init__(self, name, options, project):
super().__init__(name, options, project)
Expand Down