Skip to content

Bugfix scripts and links security vulnerabilities #528

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

Merged
kbeker merged 3 commits into from
Sep 3, 2019
Merged

Bugfix scripts and links security vulnerabilities #528

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
998702a
Add django-staticinline package
kbeker Aug 28, 2019
41cd646
Add Subresource Integrity to <link> tags
kbeker Aug 29, 2019
1b703ae
Add Subresource Integrity to <script> tags
kbeker Aug 29, 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
1 change: 1 addition & 0 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ psycopg2-binary = "==2.7.7"
python-dateutil = "*"
raven = "*"
pyyaml = "*"
django-staticinline = "*"

[requires]
python_version = "3.7"
10 changes: 9 additions & 1 deletion Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 23 additions & 4 deletions employees/templates/employees/author_report_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,19 @@
{% load data_structure_element_selectors %}

{% block extra_head %}
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="{% static 'employees/style.css' %}">
<link
rel="stylesheet"
href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css"
integrity="sha384-Nlo8b0yiGl7Dn+BgLn4mxhIIBU6We7aeeiulNCjHdUv/eKHx59s3anfSUjExbDxn"
crossorigin="anonymous"
/>
<link
rel="stylesheet"
type="text/css"
href="{% static 'employees/style.css' %}"
integrity="{% staticinline "employees/style.css" encode="sri" %}"
crossorigin="anonymous"
/>
{% endblock %}

{% block content %}
Expand Down Expand Up @@ -90,6 +101,14 @@ <h1>{{ object.email }} {{ title_date }}{{ UI_text.PAGE_TITLE.value }}</h1>

{% block extra_script %}
{{ month_form.media }}
<script src="//code.jquery.com/jquery-3.3.1.js"></script>
<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script
src="https://code.jquery.com/jquery-3.3.1.js"
integrity="sha384-fJU6sGmyn07b+uD1nMk7/iSb4yvaowcueiQhfVgQuD98rfva8mcr1eSvjchfpMrH"
crossorigin="anonymous"
></script>
<script
src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"
integrity="sha384-JPbtLYL10d/Z1crlc6GGGGM3PavCzzoUJ1UxH0bXHOfguWHQ6XAWrIzW+MBGGXe5"
crossorigin="anonymous"
></script>
{% endblock %}
15 changes: 12 additions & 3 deletions employees/templates/employees/project_report_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
{% load crispy_forms_tags %}

{% block extra_head %}
<link rel="stylesheet" type="text/css" href="{% static 'employees/style.css' %}">
<link
rel="stylesheet"
type="text/css"
href="{% static 'employees/style.css' %}"
integrity="{% staticinline "employees/style.css" encode="sri" %}"
crossorigin="anonymous"
/>
{% endblock %}

{% block content %}
Expand All @@ -26,6 +32,9 @@ <h1>{{ UI_text.PAGE_TITLE.value }}{{ report.project }} ({{ report.date }})</h1>
{% endblock %}

{% block extra_script %}
{{ form.media }}
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.10/jquery.mask.js"></script>
{{ form.media }}
<script
src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.10/jquery.mask.js"
integrity="sha384-ZfoEytSMLhLb1Qbwt7UEBdsjsJDd/M14/Uvu7cgxvZc8RQf6nkDemUVF9LDjRP9R"
crossorigin="anonymous"></script>
{% endblock %}
27 changes: 23 additions & 4 deletions employees/templates/employees/project_report_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,19 @@
{% load data_structure_element_selectors %}

{% block extra_head %}
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="{% static 'employees/style.css' %}">
<link
rel="stylesheet"
href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css"
integrity="sha384-Nlo8b0yiGl7Dn+BgLn4mxhIIBU6We7aeeiulNCjHdUv/eKHx59s3anfSUjExbDxn"
crossorigin="anonymous"
/>
<link
rel="stylesheet"
type="text/css"
href="{% static 'employees/style.css' %}"
integrity="{% staticinline "employees/style.css" encode="sri" %}"
crossorigin="anonymous"
/>
{% endblock %}

{% block content %}
Expand Down Expand Up @@ -94,6 +105,14 @@ <h4><strong>{{ author.grouper }}</strong></h4>

{% block extra_script %}
{{ month_form.media }}
<script src="//code.jquery.com/jquery-3.3.1.js"></script>
<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script
src="https://code.jquery.com/jquery-3.3.1.js"
integrity="sha384-fJU6sGmyn07b+uD1nMk7/iSb4yvaowcueiQhfVgQuD98rfva8mcr1eSvjchfpMrH"
crossorigin="anonymous"
></script>
<script
src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"
integrity="sha384-JPbtLYL10d/Z1crlc6GGGGM3PavCzzoUJ1UxH0bXHOfguWHQ6XAWrIzW+MBGGXe5"
crossorigin="anonymous"
></script>
{% endblock %}
42 changes: 31 additions & 11 deletions employees/templates/employees/report_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,19 @@
{% load crispy_forms_tags %}

{% block extra_head %}
<link rel="stylesheet" type="text/css" href="{% static 'employees/style.css' %}">
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
<link
rel="stylesheet"
href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css"
integrity="sha384-Nlo8b0yiGl7Dn+BgLn4mxhIIBU6We7aeeiulNCjHdUv/eKHx59s3anfSUjExbDxn"
crossorigin="anonymous"
/>
<link
rel="stylesheet"
type="text/css"
href="{% static 'employees/style.css' %}"
integrity="{% staticinline "employees/style.css" encode="sri" %}"
crossorigin="anonymous"
/>
{% endblock %}

{% block content %}
Expand All @@ -32,13 +43,22 @@ <h1>{{ UI_text.PAGE_TITLE.value }}{{ report.project }} ({{ report.date }})</h1>
{% endblock %}

{% block extra_script %}
{{ form.media }}
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.10/jquery.mask.js"></script>
<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script type="text/javascript">
var discard_text = "{{ UI_text.DELETE_POPUP_NO.value }}";
var confirmation_text = "{{ UI_text.DELETE_POPUP_YES.value }}";
var redirect_url ="{% url 'custom-report-delete' pk=report.pk %}";
</script>
<script src="{% static 'employees/scripts/basic_popup_window.js' %}"></script>
{{ form.media }}
<script
src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.10/jquery.mask.js"
integrity="sha384-ZfoEytSMLhLb1Qbwt7UEBdsjsJDd/M14/Uvu7cgxvZc8RQf6nkDemUVF9LDjRP9R"
crossorigin="anonymous"></script>
<script
src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"
integrity="sha384-JPbtLYL10d/Z1crlc6GGGGM3PavCzzoUJ1UxH0bXHOfguWHQ6XAWrIzW+MBGGXe5"
crossorigin="anonymous"></script>
<script type="text/javascript">
var discard_text = "{{ UI_text.DELETE_POPUP_NO.value }}";
var confirmation_text = "{{ UI_text.DELETE_POPUP_YES.value }}";
var redirect_url ="{% url 'custom-report-delete' pk=report.pk %}";
</script>
<script
src="{% static 'employees/scripts/basic_popup_window.js' %}"
integrity="{% staticinline 'employees/scripts/basic_popup_window.js' encode="sri" %}"
crossorigin="anonymous"></script>
{% endblock %}
87 changes: 62 additions & 25 deletions employees/templates/employees/report_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,32 @@
{% load data_structure_element_selectors %}

{% block extra_head %}
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="{% static 'employees/style.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'employees/popup_style.css' %}">
<link
rel="stylesheet"
href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css"
integrity="sha384-Nlo8b0yiGl7Dn+BgLn4mxhIIBU6We7aeeiulNCjHdUv/eKHx59s3anfSUjExbDxn"
crossorigin="anonymous"
/>
<link
rel="stylesheet"
type="text/css"
href="{% static 'employees/style.css' %}"
integrity="{% staticinline "employees/style.css" encode="sri" %}"
crossorigin="anonymous"
/>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"
integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
crossorigin="anonymous"
/>
<link
rel="stylesheet"
type="text/css"
href="{% static 'employees/popup_style.css' %}"
integrity="{% staticinline 'employees/popup_style.css' encode="sri" %}"
crossorigin="anonymous"
/>
{% endblock %}

{% block content %}
Expand Down Expand Up @@ -96,25 +118,40 @@
{% endblock %}

{% block extra_script %}
{{ form.media }}
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.10/jquery.mask.js"></script>
{{ month_form.media }}
<script src="//code.jquery.com/jquery-3.3.1.js"></script>
<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script src="{% static 'employees/scripts/create_and_join_popup_window.js' %}"></script>
{% if hide_join %}
<script type="text/javascript">
document.getElementById("join_form").hidden = true;
</script>
{% endif %}
<script src="{% static 'employees/scripts/load_activities_for_project.js' %}"></script>
{% if form.errors or form.non_field_errors%}
<script type="text/javascript">
var form_errors = true;
</script>
{% else %}
<script type="text/javascript">
var form_errors = false;
</script>
{% endif %}
{{ form.media }}
<script
src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.10/jquery.mask.js"
integrity="sha384-ZfoEytSMLhLb1Qbwt7UEBdsjsJDd/M14/Uvu7cgxvZc8RQf6nkDemUVF9LDjRP9R"
crossorigin="anonymous"></script>
{{ month_form.media }}
<script
src="https://code.jquery.com/jquery-3.3.1.js"
integrity="sha384-fJU6sGmyn07b+uD1nMk7/iSb4yvaowcueiQhfVgQuD98rfva8mcr1eSvjchfpMrH"
crossorigin="anonymous"></script>
<script
src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"
integrity="sha384-JPbtLYL10d/Z1crlc6GGGGM3PavCzzoUJ1UxH0bXHOfguWHQ6XAWrIzW+MBGGXe5"
crossorigin="anonymous"></script>
<script
src="{% static 'employees/scripts/create_and_join_popup_window.js' %}"
integrity="{% staticinline 'employees/scripts/create_and_join_popup_window.js' encode="sri" %}"
crossorigin="anonymous"></script>
{% if hide_join %}
<script type="text/javascript">
document.getElementById("join_form").hidden = true;
</script>
{% endif %}
<script
src="{% static 'employees/scripts/load_activities_for_project.js' %}"
integrity="{% staticinline 'employees/scripts/load_activities_for_project.js' encode="sri" %}"
crossorigin="anonymous"></script>
{% if form.errors or form.non_field_errors%}
<script type="text/javascript">
var form_errors = true;
</script>
{% else %}
<script type="text/javascript">
var form_errors = false;
</script>
{% endif %}
{% endblock %}
34 changes: 29 additions & 5 deletions managers/templates/managers/project_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,19 @@
{% load crispy_forms_tags %}

{% block extra_head %}
<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css">
<link rel="stylesheet" type="text/css" href="{% static "employees/style.css" %}">
<link
rel="stylesheet"
href="https://code.jquery.com/ui/1.12.1/themes/smoothness/jquery-ui.css"
integrity="sha384-Nlo8b0yiGl7Dn+BgLn4mxhIIBU6We7aeeiulNCjHdUv/eKHx59s3anfSUjExbDxn"
crossorigin="anonymous"
/>
<link
rel="stylesheet"
type="text/css"
href="{% static "employees/style.css" %}"
integrity="{% staticinline "employees/style.css" encode="sri" %}"
crossorigin="anonymous"
/>
{% endblock %}

{% block content %}
Expand Down Expand Up @@ -46,8 +57,21 @@ <h2>
{% block extra_script %}
{{ form.media }}
{% if request.user.is_admin and object %}
<script src="//code.jquery.com/jquery-3.3.1.js"></script>
<script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<script type="text/javascript" src="{% static 'managers/scripts/delete_project_popup.js' %}"></script>
<script
src="https://code.jquery.com/jquery-3.3.1.js"
integrity="sha384-fJU6sGmyn07b+uD1nMk7/iSb4yvaowcueiQhfVgQuD98rfva8mcr1eSvjchfpMrH"
crossorigin="anonymous"
></script>
<script
src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"
integrity="sha384-JPbtLYL10d/Z1crlc6GGGGM3PavCzzoUJ1UxH0bXHOfguWHQ6XAWrIzW+MBGGXe5"
crossorigin="anonymous"
></script>
<script
type="text/javascript"
src="{% static 'managers/scripts/delete_project_popup.js' %}"
integrity="{% staticinline 'managers/scripts/delete_project_popup.js' encode="sri" %}"
crossorigin="anonymous"
></script>
{% endif %}
{% endblock %}
8 changes: 7 additions & 1 deletion managers/templates/managers/project_task_activities.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
{% load static %}

{% block extra_head %}
<link rel="stylesheet" type="text/css" href="{% static 'managers/style.css' %}"/>
<link
rel="stylesheet"
type="text/css"
href="{% static 'managers/style.css' %}"
integrity="{% staticinline 'managers/style.css' encode="sri" %}"
crossorigin="anonymous"
/>
{% endblock %}

{% block content %}
Expand Down
8 changes: 7 additions & 1 deletion managers/templates/managers/projects_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
{% load static %}

{% block extra_head %}
<link rel="stylesheet" type="text/css" href="{% static 'managers/style.css' %}"/>
<link
rel="stylesheet"
type="text/css"
href="{% static 'managers/style.css' %}"
integrity="{% staticinline 'managers/style.css' encode="sri" %}"
crossorigin="anonymous"
/>
{% endblock %}

{% block content %}
Expand Down
1 change: 1 addition & 0 deletions sheetstorm/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
'crispy_forms',
'raven.contrib.django.raven_compat',
'django_select2',
'staticinline.apps.StaticInlineAppConfig',
# SheetStorm
'managers.apps.ManagersConfig',
'employees.apps.EmployeesConfig',
Expand Down
6 changes: 5 additions & 1 deletion users/templates/account_confirmation/confirmation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
{% load static %}
{% block content %}
<head>
<script type="text/javascript" src="{% static 'users/scripts/redirect_to_home_page.js' %}"></script>
<script
type="text/javascript"
src="{% static 'users/scripts/redirect_to_home_page.js' %}"
integrity="{% staticinline 'users/scripts/redirect_to_home_page.js' encode="sri" %}"
crossorigin="anonymous"></script>
</head>
{% if is_activated is True %}
<p>{{ MESSAGES.SUCCESSFUL.value }}</p>
Expand Down
Loading