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

Update grsecurity kernels to 4.4.162 #3913

Merged
merged 5 commits into from Nov 26, 2018
Merged

Update grsecurity kernels to 4.4.162 #3913

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f286144
Remove 3.14 series kernels
emkll Oct 24, 2018
aeb9f1d
Add intel-microcode package
emkll Oct 24, 2018
eca014e
Bump kernels to 4.4.162
emkll Oct 24, 2018
dfabb1c
Adds config tests for kernel-related packages
Nov 2, 2018
9234c32
Use test_vars kernel version for DRY-ness
emkll Nov 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions install_files/ansible-base/group_vars/all/securedrop
View file
Open in desktop
Expand Up @@ -53,5 +53,5 @@ securedrop_cond_reboot_file: /tmp/sd-reboot-now

# If you bump this, also remember to bump in molecule/builder/tests/vars.yml
securedrop_pkg_grsec:
ver: "4.4.144-1"
depends: "linux-image-3.14.79-grsec,linux-image-4.4.135-grsec,linux-firmware-image-4.4.135-grsec,linux-image-4.4.144-grsec,linux-firmware-image-4.4.144-grsec"
ver: "4.4.162"
depends: "intel-microcode,linux-image-4.4.144-grsec,linux-firmware-image-4.4.144-grsec,linux-image-4.4.162-grsec,linux-firmware-image-4.4.162-grsec"
2 changes: 1 addition & 1 deletion molecule/builder/tests/vars.yml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ securedrop_version: "0.11.0~rc1"
ossec_version: "3.0.0"
keyring_version: "0.1.2"
config_version: "0.1.1"
grsec_version: "4.4.144-1"
grsec_version: "4.4.162"

# These values will be interpolated with values populated above
# via helper functions in the tests.
Expand Down
8 changes: 7 additions & 1 deletion molecule/testinfra/staging/common/test_grsecurity.py
View file
Open in desktop
Expand Up @@ -3,6 +3,9 @@
import re


KERNEL_VERSION = "4.4.162"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: in the spirit of DRY, can we use pytest.securedrop_test_vars.grsec_version here?



def test_ssh_motd_disabled(File):
"""
Ensure the SSH MOTD (Message of the Day) is disabled.
Expand All @@ -16,6 +19,9 @@ def test_ssh_motd_disabled(File):
@pytest.mark.skipif(os.environ.get('FPF_GRSEC', 'true') == "false",
reason="Need to skip in environment w/o grsec")
@pytest.mark.parametrize("package", [
'intel-microcode',
'linux-firmware-image-{}-grsec'.format(KERNEL_VERSION),
'linux-image-{}-grsec'.format(KERNEL_VERSION),
'paxctl',
'securedrop-grsec',
])
Expand Down Expand Up @@ -76,7 +82,7 @@ def test_grsecurity_kernel_is_running(Command):
"""
c = Command('uname -r')
assert c.stdout.endswith('-grsec')
assert c.stdout == '4.4.144-grsec'
assert c.stdout == '{}-grsec'.format(KERNEL_VERSION)


@pytest.mark.skipif(os.environ.get('FPF_GRSEC', 'true') == "false",
Expand Down