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

Added alert to admin interface of instances still on Trusty after Mar 4 #4055

Merged
merged 3 commits into from
Jan 25, 2019
Merged

Added alert to admin interface of instances still on Trusty after Mar 4 #4055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c40c93
Added alert to admin interface of instances still on Trusty after Mar 4
zenmonkeykstop Jan 14, 2019
aa368e8
updated apparmor rules to allow apache2 to check /etc/lsb-release
zenmonkeykstop Jan 23, 2019
4aaa0d8
added negative test for date to Xenial alert
zenmonkeykstop Jan 24, 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
2 changes: 2 additions & 0 deletions install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/usr.sbin.apache2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
/etc/apache2/sites-enabled/ r,
/etc/ld.so.cache r,
/etc/localtime r,
/etc/lsb-release r,
/etc/magic r,
/etc/mime.types r,
/etc/services r,
Expand Down Expand Up @@ -259,6 +260,7 @@
/var/www/securedrop/static/i/font-awesome/lock-black.png r,
/var/www/securedrop/static/i/font-awesome/refresh-blue.png r,
/var/www/securedrop/static/i/font-awesome/refresh-white.png r,
/var/www/securedrop/static/i/font-awesome/skull-crossbones-white.png r,
/var/www/securedrop/static/i/font-awesome/times-white.png r,
/var/www/securedrop/static/i/font-awesome/trash-black.png r,
/var/www/securedrop/static/i/toronion.png r,
Expand Down
11 changes: 11 additions & 0 deletions securedrop/journalist_app/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import i18n
import template_filters
import version
import platform

from crypto_util import CryptoUtil
from db import db
Expand Down Expand Up @@ -61,6 +62,12 @@ def create_app(config):
app.config['SQLALCHEMY_DATABASE_URI'] = db_uri
db.init_app(app)

# Magic values for Xenial upgrade message
app.config.update(
XENIAL_WARNING_DATE=datetime.strptime('Mar 4 2019', '%b %d %Y'),
XENIAL_VER='16.04'
)

app.storage = Storage(config.STORE_DIR,
config.TEMP_DIR,
config.JOURNALIST_KEY)
Expand Down Expand Up @@ -135,6 +142,10 @@ def setup_g():
g.html_lang = i18n.locale_to_rfc_5646(g.locale)
g.locales = i18n.get_locale2name()

if (platform.linux_distribution()[1] != app.config['XENIAL_VER'] and
datetime.now() >= app.config['XENIAL_WARNING_DATE']):
g.show_xenial_warning = True

if request.path.split('/')[1] == 'api':
pass # We use the @token_required decorator for the API endpoints
else: # We are not using the API
Expand Down
9 changes: 9 additions & 0 deletions securedrop/journalist_templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@
<body>

{% if g.user %}

{% if g.show_xenial_warning %}
<div class="xenial-upgrade critical">
<img class="critical-skull" src="{{ url_for('static', filename='i/font-awesome/skull-crossbones-white.png') }}"
width="14px" height="16px">
{{ gettext ('<strong>Critical Security:</strong> The operating system used by your SecureDrop servers has reached its end-of-life. A manual update is urgently required to remain safe - <a href="//securedrop.org/xenial-upgrade" rel="noreferrer">Learn More</a>') }}
</div>
{% endif %}

<div id="logout">
{{ gettext('Logged on as') }} <a href="{{ url_for('account.edit') }}" id="link-edit-account">{{ g.user.username }}</a> |
{% if g.user and g.user.is_admin %}
Expand Down
3 changes: 3 additions & 0 deletions securedrop/sass/_base.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
@import modules/panel
// Warning - Messages to user e.g. about protecting your security by turning Tor settings to high
@import modules/warning
// Critical - Messages to admin about issues that compromise security of instance
@import modules/critical
// Confirm prompt - When deleting something this prompt is shown
@import modules/confirm-prompt
// 'Serious' text - Seems to be unused. Delete?
Expand Down Expand Up @@ -121,6 +123,7 @@
+cols
+panel
+warning
+critical
+confirm-prompt
+serious-text
+code
Expand Down
20 changes: 20 additions & 0 deletions securedrop/sass/modules/_critical.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
=critical
.critical
display: block
background-color: $color_warning_red
color: white
padding: 10px 0
width: 100%
text-align: center
font-size: small
box-sizing: border-box
-moz-box-sizing: border-box

a
color: white

#critical-close
cursor: pointer

img.critical-skull
vertical-align: sub
Binary file added securedrop/static/i/font-awesome/skull-crossbones-white.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions securedrop/tests/test_journalist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import random
import zipfile
import base64
import datetime

from base64 import b64decode
from cStringIO import StringIO
Expand Down Expand Up @@ -1585,6 +1586,55 @@ def test_render_locales(config, journalist_app, test_journo, test_source):
assert url_end + '?l=en_US' in text, text


def test_render_xenial_positive(config, journalist_app, test_journo):
yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
journalist_app.config.update(
XENIAL_WARNING_DATE=yesterday,
XENIAL_VER='16.04'
)

with journalist_app.test_client() as app:
_login_user(app, test_journo['username'], test_journo['password'],
test_journo['otp_secret'])

resp = app.get(url_for('main.index'))

text = resp.data.decode('utf-8')
assert "critical-skull" in text, text


def test_render_xenial_negative_version(config, journalist_app, test_journo):
yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
journalist_app.config.update(
XENIAL_WARNING_DATE=yesterday,
XENIAL_VER='14.04'
)

with journalist_app.test_client() as app:
_login_user(app, test_journo['username'], test_journo['password'],
test_journo['otp_secret'])
resp = app.get('/')

text = resp.data.decode('utf-8')
assert "critical-skull" not in text, text


def test_render_xenial_negative_date(config, journalist_app, test_journo):
tomorrow = datetime.datetime.now() + datetime.timedelta(days=1)
journalist_app.config.update(
XENIAL_WARNING_DATE=tomorrow,
XENIAL_VER='16.04'
)

with journalist_app.test_client() as app:
_login_user(app, test_journo['username'], test_journo['password'],
test_journo['otp_secret'])
resp = app.get('/')

text = resp.data.decode('utf-8')
assert "critical-skull" not in text, text


def test_download_selected_submissions_from_source(journalist_app,
test_journo,
test_source):
Expand Down