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.

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

Update kernels to 4.4.167 and remove wireless support #4002

Merged
merged 2 commits into from
Jan 8, 2019
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
4 changes: 2 additions & 2 deletions install_files/ansible-base/group_vars/all/securedrop
Original file line number Diff line number Diff line change
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.162"
depends: "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"
ver: "4.4.167"
depends: "linux-image-4.4.162-grsec,linux-firmware-image-4.4.162-grsec,linux-image-4.4.167-grsec,linux-firmware-image-4.4.167-grsec"
2 changes: 1 addition & 1 deletion molecule/builder/tests/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ securedrop_version: "0.12.0~rc1"
ossec_version: "3.0.0"
keyring_version: "0.1.2"
config_version: "0.1.1"
grsec_version: "4.4.162"
grsec_version: "4.4.167"

# These values will be interpolated with values populated above
# via helper functions in the tests.
Expand Down
23 changes: 23 additions & 0 deletions molecule/testinfra/staging/common/test_grsecurity.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,26 @@ def test_pax_flags(Command, File, binary):
# the "p" and "m" flags.
assert "PAGEEXEC is disabled" not in c.stdout
assert "MPROTECT is disabled" not in c.stdout


@pytest.mark.parametrize('kernel_opts', [
'WLAN',
'NFC',
'WIMAX',
'WIRELESS',
'HAMRADIO',
'IRDA',
'BT',
])
def test_wireless_disabled_in_kernel_config(host, kernel_opts):
"""
Kernel modules for wireless are blacklisted, but we go one step further and
remove wireless support from the kernel. Let's make sure wireless is
disabled in the running kernel config!
"""

kernel_config_path = "/boot/config-{}-grsec".format(KERNEL_VERSION)
kernel_config = host.file(kernel_config_path).content_string

line = "# CONFIG_{} is not set".format(kernel_opts)
assert line in kernel_config
2 changes: 1 addition & 1 deletion molecule/testinfra/staging/vars/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,4 @@ log_events_with_ossec_alerts:
rule_id: "400503"

fpf_apt_repo_url: "https://apt-test.freedom.press"
grsec_version: "4.4.162"
grsec_version: "4.4.167"