From 9f21b3fa0d3db1991a63c1c460a7a8b589d9aa88 Mon Sep 17 00:00:00 2001 From: aloftus23 Date: Tue, 26 Nov 2024 11:40:12 -0500 Subject: [PATCH] Fixes django project, resolves numerous config issues and allows the app to run --- setup.py | 8 +- src/pe_reports/Dockerfile | 49 ++ src/pe_reports/__init__.py | 105 ---- src/pe_reports/docker-compose.yaml | 82 ++- .../config/nginx_config_conf.d/nginx.conf | 12 + .../config/rabbitmq.conf | 4 + .../data/rabbit@atc_rabbitmq-feature_flags | 2 + .../rabbitmq/data/rabbit@atc_rabbitmq.pid | 1 + .../rabbit@atc_rabbitmq/cluster_nodes.config | 1 + .../vhosts/628WB79CIFDYO9LJI6DKMI09L/.vhost | 1 + .../msg_store_persistent/0.rdq | 0 .../msg_store_transient/0.rdq | 0 .../628WB79CIFDYO9LJI6DKMI09L/recovery.dets | Bin 0 -> 5464 bytes .../nodes_running_at_shutdown | 1 + .../quorum/rabbit@atc_rabbitmq/meta.dets | Bin 0 -> 5464 bytes .../quorum/rabbit@atc_rabbitmq/names.dets | Bin 0 -> 5464 bytes .../rabbit_durable_exchange.DCD | Bin 0 -> 1329 bytes .../rabbit_durable_queue.DCD | Bin 0 -> 94 bytes .../rabbit_durable_route.DCD | 1 + .../rabbit_runtime_parameters.DCD | Bin 0 -> 195 bytes .../data/rabbit@atc_rabbitmq/rabbit_serial | 1 + .../rabbit_topic_permission.DCD | 1 + .../data/rabbit@atc_rabbitmq/rabbit_user.DCD | Bin 0 -> 232 bytes .../rabbit_user_permission.DCD | Bin 0 -> 190 bytes .../data/rabbit@atc_rabbitmq/rabbit_vhost.DCD | Bin 0 -> 172 bytes .../data/rabbit@atc_rabbitmq/schema.DAT | Bin 0 -> 33650 bytes .../data/rabbit@atc_rabbitmq/schema_version | 1 + .../dataAPI/tasks.py | 2 +- .../dataAPI/views.py | 135 +++-- .../dmz_mini_dl/models.py | 19 +- .../pe_reports_django/asgi.py | 11 +- .../pe_reports_django/db_routers.py | 32 ++ .../pe_reports_django/requirements.txt | 483 +++++++++--------- .../pe_reports_django/settings.py | 4 +- .../static/CISAImage.png | Bin .../static/admin/css/autocomplete.css | 0 .../static/admin/css/base.css | 0 .../static/admin/css/changelists.css | 0 .../static/admin/css/dark_mode.css | 0 .../static/admin/css/dashboard.css | 0 .../static/admin/css/fonts.css | 0 .../static/admin/css/forms.css | 0 .../static/admin/css/login.css | 0 .../static/admin/css/nav_sidebar.css | 0 .../static/admin/css/responsive.css | 0 .../static/admin/css/responsive_rtl.css | 0 .../static/admin/css/rtl.css | 0 .../css/vendor/select2/LICENSE-SELECT2.md | 0 .../admin/css/vendor/select2/select2.css | 0 .../admin/css/vendor/select2/select2.min.css | 0 .../static/admin/css/widgets.css | 0 .../static/admin/fonts/LICENSE.txt | 0 .../static/admin/fonts/README.txt | 0 .../admin/fonts/Roboto-Bold-webfont.woff | Bin .../admin/fonts/Roboto-Light-webfont.woff | Bin .../admin/fonts/Roboto-Regular-webfont.woff | Bin .../static/admin/img/LICENSE | 0 .../static/admin/img/README.txt | 0 .../static/admin/img/calendar-icons.svg | 0 .../static/admin/img/gis/move_vertex_off.svg | 0 .../static/admin/img/gis/move_vertex_on.svg | 0 .../static/admin/img/icon-addlink.svg | 0 .../static/admin/img/icon-alert.svg | 0 .../static/admin/img/icon-calendar.svg | 0 .../static/admin/img/icon-changelink.svg | 0 .../static/admin/img/icon-clock.svg | 0 .../static/admin/img/icon-deletelink.svg | 0 .../static/admin/img/icon-no.svg | 0 .../static/admin/img/icon-unknown-alt.svg | 0 .../static/admin/img/icon-unknown.svg | 0 .../static/admin/img/icon-viewlink.svg | 0 .../static/admin/img/icon-yes.svg | 0 .../static/admin/img/inline-delete.svg | 0 .../static/admin/img/search.svg | 0 .../static/admin/img/selector-icons.svg | 0 .../static/admin/img/sorting-icons.svg | 0 .../static/admin/img/tooltag-add.svg | 0 .../static/admin/img/tooltag-arrowright.svg | 0 .../static/admin/js/SelectBox.js | 0 .../static/admin/js/SelectFilter2.js | 0 .../static/admin/js/actions.js | 0 .../admin/js/admin/DateTimeShortcuts.js | 0 .../admin/js/admin/RelatedObjectLookups.js | 0 .../static/admin/js/autocomplete.js | 0 .../static/admin/js/calendar.js | 0 .../static/admin/js/cancel.js | 0 .../static/admin/js/change_form.js | 0 .../static/admin/js/collapse.js | 0 .../static/admin/js/core.js | 0 .../static/admin/js/filters.js | 0 .../static/admin/js/inlines.js | 0 .../static/admin/js/jquery.init.js | 0 .../static/admin/js/nav_sidebar.js | 0 .../static/admin/js/popup_response.js | 0 .../static/admin/js/prepopulate.js | 0 .../static/admin/js/prepopulate_init.js | 0 .../static/admin/js/urlify.js | 0 .../static/admin/js/vendor/jquery/LICENSE.txt | 0 .../static/admin/js/vendor/jquery/jquery.js | 0 .../admin/js/vendor/jquery/jquery.min.js | 0 .../static/admin/js/vendor/select2/LICENSE.md | 0 .../static/admin/js/vendor/select2/i18n/af.js | 0 .../static/admin/js/vendor/select2/i18n/ar.js | 0 .../static/admin/js/vendor/select2/i18n/az.js | 0 .../static/admin/js/vendor/select2/i18n/bg.js | 0 .../static/admin/js/vendor/select2/i18n/bn.js | 0 .../static/admin/js/vendor/select2/i18n/bs.js | 0 .../static/admin/js/vendor/select2/i18n/ca.js | 0 .../static/admin/js/vendor/select2/i18n/cs.js | 0 .../static/admin/js/vendor/select2/i18n/da.js | 0 .../static/admin/js/vendor/select2/i18n/de.js | 0 .../admin/js/vendor/select2/i18n/dsb.js | 0 .../static/admin/js/vendor/select2/i18n/el.js | 0 .../static/admin/js/vendor/select2/i18n/en.js | 0 .../static/admin/js/vendor/select2/i18n/es.js | 0 .../static/admin/js/vendor/select2/i18n/et.js | 0 .../static/admin/js/vendor/select2/i18n/eu.js | 0 .../static/admin/js/vendor/select2/i18n/fa.js | 0 .../static/admin/js/vendor/select2/i18n/fi.js | 0 .../static/admin/js/vendor/select2/i18n/fr.js | 0 .../static/admin/js/vendor/select2/i18n/gl.js | 0 .../static/admin/js/vendor/select2/i18n/he.js | 0 .../static/admin/js/vendor/select2/i18n/hi.js | 0 .../static/admin/js/vendor/select2/i18n/hr.js | 0 .../admin/js/vendor/select2/i18n/hsb.js | 0 .../static/admin/js/vendor/select2/i18n/hu.js | 0 .../static/admin/js/vendor/select2/i18n/hy.js | 0 .../static/admin/js/vendor/select2/i18n/id.js | 0 .../static/admin/js/vendor/select2/i18n/is.js | 0 .../static/admin/js/vendor/select2/i18n/it.js | 0 .../static/admin/js/vendor/select2/i18n/ja.js | 0 .../static/admin/js/vendor/select2/i18n/ka.js | 0 .../static/admin/js/vendor/select2/i18n/km.js | 0 .../static/admin/js/vendor/select2/i18n/ko.js | 0 .../static/admin/js/vendor/select2/i18n/lt.js | 0 .../static/admin/js/vendor/select2/i18n/lv.js | 0 .../static/admin/js/vendor/select2/i18n/mk.js | 0 .../static/admin/js/vendor/select2/i18n/ms.js | 0 .../static/admin/js/vendor/select2/i18n/nb.js | 0 .../static/admin/js/vendor/select2/i18n/ne.js | 0 .../static/admin/js/vendor/select2/i18n/nl.js | 0 .../static/admin/js/vendor/select2/i18n/pl.js | 0 .../static/admin/js/vendor/select2/i18n/ps.js | 0 .../admin/js/vendor/select2/i18n/pt-BR.js | 0 .../static/admin/js/vendor/select2/i18n/pt.js | 0 .../static/admin/js/vendor/select2/i18n/ro.js | 0 .../static/admin/js/vendor/select2/i18n/ru.js | 0 .../static/admin/js/vendor/select2/i18n/sk.js | 0 .../static/admin/js/vendor/select2/i18n/sl.js | 0 .../static/admin/js/vendor/select2/i18n/sq.js | 0 .../admin/js/vendor/select2/i18n/sr-Cyrl.js | 0 .../static/admin/js/vendor/select2/i18n/sr.js | 0 .../static/admin/js/vendor/select2/i18n/sv.js | 0 .../static/admin/js/vendor/select2/i18n/th.js | 0 .../static/admin/js/vendor/select2/i18n/tk.js | 0 .../static/admin/js/vendor/select2/i18n/tr.js | 0 .../static/admin/js/vendor/select2/i18n/uk.js | 0 .../static/admin/js/vendor/select2/i18n/vi.js | 0 .../admin/js/vendor/select2/i18n/zh-CN.js | 0 .../admin/js/vendor/select2/i18n/zh-TW.js | 0 .../admin/js/vendor/select2/select2.full.js | 0 .../js/vendor/select2/select2.full.min.js | 0 .../admin/js/vendor/xregexp/LICENSE.txt | 0 .../static/admin/js/vendor/xregexp/xregexp.js | 0 .../admin/js/vendor/xregexp/xregexp.min.js | 0 .../static/css/custom.css | 0 .../static/js/htmx.js | 0 .../static/power.svg | 0 .../templates/base.html | 134 +++-- .../templates/home.html | 0 170 files changed, 585 insertions(+), 505 deletions(-) create mode 100644 src/pe_reports/Dockerfile create mode 100755 src/pe_reports/pe_reports_django_project/config/nginx_config_conf.d/nginx.conf create mode 100755 src/pe_reports/pe_reports_django_project/config/rabbitmq.conf create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq-feature_flags create mode 100644 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq.pid create mode 100644 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/cluster_nodes.config create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/.vhost create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/msg_store_persistent/0.rdq create mode 100644 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/msg_store_transient/0.rdq create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/recovery.dets create mode 100644 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/nodes_running_at_shutdown create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/quorum/rabbit@atc_rabbitmq/meta.dets create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/quorum/rabbit@atc_rabbitmq/names.dets create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_durable_exchange.DCD create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_durable_queue.DCD create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_durable_route.DCD create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_runtime_parameters.DCD create mode 100644 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_serial create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_topic_permission.DCD create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_user.DCD create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_user_permission.DCD create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_vhost.DCD create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/schema.DAT create mode 100755 src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/schema_version mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/dataAPI/tasks.py mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/dataAPI/views.py mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/dmz_mini_dl/models.py mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/pe_reports_django/asgi.py create mode 100755 src/pe_reports/pe_reports_django_project/pe_reports_django/db_routers.py mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/pe_reports_django/requirements.txt mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/pe_reports_django/settings.py mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/CISAImage.png mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/autocomplete.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/base.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/changelists.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/dark_mode.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/dashboard.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/fonts.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/forms.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/login.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/nav_sidebar.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/responsive.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/responsive_rtl.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/rtl.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/vendor/select2/LICENSE-SELECT2.md mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/vendor/select2/select2.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/vendor/select2/select2.min.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/css/widgets.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/fonts/LICENSE.txt mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/fonts/README.txt mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/fonts/Roboto-Bold-webfont.woff mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/fonts/Roboto-Light-webfont.woff mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/fonts/Roboto-Regular-webfont.woff mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/LICENSE mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/README.txt mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/calendar-icons.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/gis/move_vertex_off.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/gis/move_vertex_on.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-addlink.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-alert.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-calendar.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-changelink.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-clock.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-deletelink.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-no.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-unknown-alt.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-unknown.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-viewlink.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/icon-yes.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/inline-delete.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/search.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/selector-icons.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/sorting-icons.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/tooltag-add.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/img/tooltag-arrowright.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/SelectBox.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/SelectFilter2.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/actions.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/admin/DateTimeShortcuts.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/admin/RelatedObjectLookups.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/autocomplete.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/calendar.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/cancel.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/change_form.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/collapse.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/core.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/filters.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/inlines.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/jquery.init.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/nav_sidebar.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/popup_response.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/prepopulate.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/prepopulate_init.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/urlify.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/jquery/LICENSE.txt mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/jquery/jquery.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/jquery/jquery.min.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/LICENSE.md mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/af.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ar.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/az.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/bg.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/bn.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/bs.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ca.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/cs.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/da.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/de.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/dsb.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/el.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/en.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/es.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/et.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/eu.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/fa.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/fi.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/fr.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/gl.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/he.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hi.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hr.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hsb.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hu.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hy.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/id.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/is.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/it.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ja.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ka.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/km.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ko.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/lt.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/lv.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/mk.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ms.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/nb.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ne.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/nl.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/pl.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ps.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/pt-BR.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/pt.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ro.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ru.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sk.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sl.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sq.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sr-Cyrl.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sr.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sv.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/th.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/tk.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/tr.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/uk.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/vi.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/zh-CN.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/zh-TW.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/select2.full.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/select2.full.min.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/xregexp/LICENSE.txt mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/xregexp/xregexp.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/admin/js/vendor/xregexp/xregexp.min.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/css/custom.css mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/js/htmx.js mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/static/power.svg mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/templates/base.html mode change 100644 => 100755 src/pe_reports/pe_reports_django_project/templates/home.html diff --git a/setup.py b/setup.py index 997067cc..2e227cf0 100644 --- a/setup.py +++ b/setup.py @@ -129,7 +129,7 @@ def get_version(version_file): "matplotlib == 3.3.4", "nested-lookup", "openpyxl", - "pandas == 1.1.5", + "pandas", "pdfkit", "psutil", "psycopg2-binary", @@ -152,7 +152,11 @@ def get_version(version_file): "shodan == 1.27.0", "sshtunnel", "sslyze>=5.0.0", - # "spacy", + "spacy", + "spacy-loogers", + "spacy-legacy", + "spacy-transformers", + "spacy-alignments" "nltk", "beautifulsoup4", "sublist3r", diff --git a/src/pe_reports/Dockerfile b/src/pe_reports/Dockerfile new file mode 100644 index 00000000..10587de3 --- /dev/null +++ b/src/pe_reports/Dockerfile @@ -0,0 +1,49 @@ +# Use the Python 3.10.2 image as the base image + +FROM python:3.10.2 + +# Install required tools +#RUN apt-get update && apt-get install -y curl build-essential + +# Install Rust and Cargo +#RUN curl https://sh.rustup.rs -sSf | sh -s -- -y + +# Add Rust to PATH +#ENV PATH="/root/.cargo/bin:${PATH}" + +# Install required tools +RUN apt-get update && apt-get install -y bash g++ gcc make redis redis-tools + +# Create non-root user +RUN useradd -m -u 1001 atc_api + +# Upgrade pip and certifi +RUN python3 -m pip install --upgrade pip && pip install --upgrade certifi + + + +# Set environment variables +ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONUNBUFFERED 1 + +# Create working directory with correct ownership +RUN mkdir /code && chown atc_api:atc_api /code +WORKDIR /code + +# Install dependencies +COPY --chown=atc_api:atc_api ./pe_reports_django_project/pe_reports_django/requirements.txt /code/ +RUN pip install --no-cache-dir -r requirements.txt +RUN pip install --upgrade numpy spacy +# Copy the project code +COPY --chown=atc_api:atc_api pe_reports_django_project /code + +# Switch to non-root user +USER atc_api + +# Set Django environment variable +ENV DJANGO_SETTINGS_MODULE=pe_reports_django.settings + +# Run the application +CMD uvicorn --workers 4 pe_reports_django.asgi:app1 --host 0.0.0.0 --port 8000 --reload + + diff --git a/src/pe_reports/__init__.py b/src/pe_reports/__init__.py index c9fbe7ac..e69de29b 100644 --- a/src/pe_reports/__init__.py +++ b/src/pe_reports/__init__.py @@ -1,105 +0,0 @@ -"""The pe_reports library.""" -# We disable a Flake8 check for "Module imported but unused (F401)" here because -# although this import is not directly used, it populates the value -# package_name.__version__, which is used to get version information about this -# Python package. - -# Standard Python Libraries -import logging -from logging.handlers import RotatingFileHandler -import os - -# Third-Party Libraries -# from celery import Celery -from flask import Flask, render_template -from flask_login import LoginManager -from flask_migrate import Migrate -from flask_sqlalchemy import SQLAlchemy - -# cisagov Libraries -from pe_reports.data.config import config - -from ._version import __version__ # noqa: F401 - -# Stakeholder views -# from pe_reports.home.views import home_blueprint -# from pe_reports.report_gen.views import report_gen_blueprint -# from pe_reports.stakeholder.views import stakeholder_blueprint -# from pe_reports.stakeholder_bulk_upload.views import stakeholder_bulk_upload_blueprint -# from pe_reports.stakeholder_full.views import stakeholder_full_blueprint - - -params = config() -login_manager = LoginManager() -# Flask implementation -app = Flask(__name__) -app.config["SECRET_KEY"] = os.getenv("FLASK_SECRET_KEY", "dev") -app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False -app.config[ - "SQLALCHEMY_DATABASE_URI" -] = f'postgresql+psycopg2://{params["user"]}:{params["password"]}@{params["host"]}:{params["port"]}/{params["database"]}' - - -# Configure the redis server -# app.config["CELERY_BROKER_URL"] = "redis://localhost:6379/0" -# app.config["CELERY_RESULT_BACKEND"] = "redis://localhost:6379/0" -app.config["UPLOAD_FOLDER"] = "src/pe_reports/uploads/" -app.config["ALLOWED_EXTENSIONS"] = {"txt", "csv"} - -CENTRAL_LOGGING_FILE = "pe_reports_logging.log" -DEBUG = False -# Setup Logging -"""Set up logging and call the run_pe_script function.""" -if DEBUG is True: - level = "DEBUG" -else: - level = "INFO" - -# Logging will rotate at 2GB -logging.basicConfig( - format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", - datefmt="%m/%d/%Y %I:%M:%S", - level=level, - handlers=[ - RotatingFileHandler(CENTRAL_LOGGING_FILE, maxBytes=2000000, backupCount=10) - ], -) - -app.config["LOGGER"] = logging.getLogger(__name__) - -# with open('username.txt', 'w') as file: -# file.write(pwd.getpwuid(os.getuid())[0]) - -# Creates a Celery object -# celery = Celery(app.name, broker=app.config["CELERY_BROKER_URL"]) -# celery.conf.update(app.config) - -# Config DB -db = SQLAlchemy(app) -Migrate(app, db) - -# TODO: Add a login page in the future. Issue #207 contains details -# login_manager.init_app(app) -# login_manager.login_view = "login" - -__all__ = ["app", "pages", "report_generator", "stylesheet"] - - -# Register the flask apps -# app.register_blueprint(stakeholder_blueprint) -# app.register_blueprint(stakeholder_full_blueprint) -# app.register_blueprint(stakeholder_bulk_upload_blueprint) -# app.register_blueprint(report_gen_blueprint) -# TODO: Add login blueprint. Issue #207 contains details -# app.register_blueprint(manage_login_blueprint) -# app.register_blueprint(home_blueprint) - - -@app.errorhandler(404) -def page_not_found(e): - return render_template("404.html") - - -if __name__ == "__main__": - logging.info("The program has started...") - app.run(host="127.0.0.1", debug=DEBUG, port=8000) diff --git a/src/pe_reports/docker-compose.yaml b/src/pe_reports/docker-compose.yaml index a3b5de8c..5cf56c83 100644 --- a/src/pe_reports/docker-compose.yaml +++ b/src/pe_reports/docker-compose.yaml @@ -1,16 +1,15 @@ ---- -version: "3.8" +version: "3.9" services: - pe_reports_rabbitmq: - container_name: pe_reports_rabbitmq - hostname: pe_reports_rabbitmq + atc_rabbitmq: + container_name: atc_rabbitmq + hostname: atc_rabbitmq image: rabbitmq:3.8.14-management restart: always ports: - - 15672:15672 - - 5672:5672 + - 15674:15672 + - 5674:5672 env_file: - - ../../src/pe_reports/pe_reports_django_project/.env + - ./pe_reports_django_project/.env environment: - RABBITMQ_DEFAULT_USER=${RABBITMQ_USER} - RABBITMQ_DEFAULT_PASS=${RABBITMQ_PASS} @@ -24,37 +23,70 @@ services: - LANGUAGE=C.UTF-8 - LC_ALL=C.UTF-8 volumes: - - /home/ubuntu/pe-reports/src/pe_reports/data/rabbitmq/data:/var/lib/rabbitmq/mnesia:rw - - /var/www/pe-reports/src/pe_reports/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf + - ./pe_reports_django_project/data/rabbitmq/data:/var/lib/rabbitmq/mnesia:rw + - ./pe_reports_django_project/config:/etc/rabbitmq:rw networks: - - pe_reports_rabbitmq_network + - atc_network - pe_reports_redis: - container_name: pe_reports_redis - hostname: pe_reports_redis - image: redis:latest + atc_redis: + container_name: atc_redis + hostname: atc_redis + image: redis:7.4.1 restart: always ports: - - 6379:6379 + - 6378:6379 volumes: - - redis_data:/data + - ./pe_reports_django_project/redis_data:/data networks: - - pe_reports_redis_network + - atc_network + + web: + build: . + container_name: atc_web + volumes: + - ./pe_reports_django_project:/code + - ./pe_reports_django_project/config:/code/config + ports: + - "8002:8000" + env_file: + - pe_reports_django_project/.env + environment: + - DJANGO_SETTINGS_MODULE:pe_reports_django.settings + networks: + - atc_network + + nginx: image: nginx:1.25.0 + container_name: atc_nginx ports: - - "8089:8089" + - "8091:8091" volumes: - - ./config/nginx_config_conf.d:/etc/nginx/conf.d - - ./pe_reports_django_project/static:/var/www/pe-reports/static - - ./pe-reports:/var/www/pe-reports + - ./pe_reports_django_project/config/nginx_config_conf.d:/etc/nginx/conf.d networks: - - pe_reports_nginx_network + - atc_network + depends_on: + - web + + # database: + # image: postgres + # restart: always + # env_file: + # - ./pe_reports_django_project/.env + # networks: + # - atc_network + # volumes: + # - ./pe_reports_django_project/postgres_data:/var/lib/postgresql/data + # ports: + # - 5437:5432 + # container_name: atc_database networks: - pe_reports_network: + atc_network: driver: bridge + + volumes: - redis_data: {} + redis_data: {} \ No newline at end of file diff --git a/src/pe_reports/pe_reports_django_project/config/nginx_config_conf.d/nginx.conf b/src/pe_reports/pe_reports_django_project/config/nginx_config_conf.d/nginx.conf new file mode 100755 index 00000000..6008eb2c --- /dev/null +++ b/src/pe_reports/pe_reports_django_project/config/nginx_config_conf.d/nginx.conf @@ -0,0 +1,12 @@ +server { + listen 8091; + server_name localhost; + + location / { + proxy_pass http://web:8000; # Assuming 'web' is the service name and '8000' is the port where Gunicorn runs + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } +} \ No newline at end of file diff --git a/src/pe_reports/pe_reports_django_project/config/rabbitmq.conf b/src/pe_reports/pe_reports_django_project/config/rabbitmq.conf new file mode 100755 index 00000000..9c184353 --- /dev/null +++ b/src/pe_reports/pe_reports_django_project/config/rabbitmq.conf @@ -0,0 +1,4 @@ +loopback_users.guest = false +listeners.tcp.default = 5672 +default_pass = guest1 +default_user = admin diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq-feature_flags b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq-feature_flags new file mode 100755 index 00000000..a9a883dd --- /dev/null +++ b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq-feature_flags @@ -0,0 +1,2 @@ +[implicit_default_bindings,maintenance_mode_status,quorum_queue,user_limits, + virtual_host_metadata]. diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq.pid b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq.pid new file mode 100644 index 00000000..88101bcc --- /dev/null +++ b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq.pid @@ -0,0 +1 @@ +465 \ No newline at end of file diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/cluster_nodes.config b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/cluster_nodes.config new file mode 100644 index 00000000..48a2fbb4 --- /dev/null +++ b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/cluster_nodes.config @@ -0,0 +1 @@ +{[rabbit@atc_rabbitmq],[rabbit@atc_rabbitmq]}. diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/.vhost b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/.vhost new file mode 100755 index 00000000..35ec3b9d --- /dev/null +++ b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/.vhost @@ -0,0 +1 @@ +/ \ No newline at end of file diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/msg_store_persistent/0.rdq b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/msg_store_persistent/0.rdq new file mode 100755 index 00000000..e69de29b diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/msg_store_transient/0.rdq b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/msg_store_transient/0.rdq new file mode 100644 index 00000000..e69de29b diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/recovery.dets b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/msg_stores/vhosts/628WB79CIFDYO9LJI6DKMI09L/recovery.dets new file mode 100755 index 0000000000000000000000000000000000000000..c1ae47e3b05f8128913ddbd12be673bebf7cc413 GIT binary patch literal 5464 zcmZQz5Vc@fefB*A0|O%zb0U~vF`zIAFfuT~7!aDSiJR2M?+wQhXC(r{vY8fVAT7gAut*OqaiRF0;3@?8UmvsFd71*Aut*O dqaiRF0wW>>1ehV?rV7xpNFE5^z!KiJR2M?+wQhXC(r{vY8fVAT7gAut*OqaiRF0;3@?8UmvsFd71*Aut*O dqaiRF0wW>>1ehV?rV7xpNFE5^z!KiJR2M?+wQhXC(r{vY8fVAT7gAut*OqaiRF0;3@?8UmvsFd71*Aut*O dqaiRF0wW>>1ehV?rV7xpNFE5^z!KQgAqL)niC5r#YA2*Z zsw$zVikN(Nw(dUv^xbI3^Tqx36aa4c-PPr@3=k$+F^?rNB#p3#0%KcPfH#Xy7vP^o zvvY()%{WiZ1v4UU!@QIp2ME46c(+F!!tYPp^{wq1BJ9(XkW9@<`Zm#26}1+W+c%?= zU$?F>VR;#0s!14xpbLDXYeLvfSXQmh2ZV90kdjmp{v|eUAc9|4q}{Ag=jCy#3~9wO zoA(ktc7k)uLRw%gxysJ?zk(aW2~$Pw2zS9Sf@a1M;VDL){_i=2_U`t`(%E?cU&qz&7Ni9lYU{6U-i3bW~GcX(K8DulC snCKZ=rZ5N>B_<_hmN+DqB*#OTxrG_bNem2ZN0Jzr{dJNUcx8S70C;&Bm;e9( literal 0 HcmV?d00001 diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_durable_route.DCD b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_durable_route.DCD new file mode 100755 index 00000000..f8dd237a --- /dev/null +++ b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_durable_route.DCD @@ -0,0 +1 @@ +cXM \ No newline at end of file diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_runtime_parameters.DCD b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_runtime_parameters.DCD new file mode 100755 index 0000000000000000000000000000000000000000..15854308204bea62ed1c4d5a76fef7d0ce052dfc GIT binary patch literal 195 zcmXxcK?;IE7>41$MhvP|-6B#FTGTEf0x6AFwuxb8{y_&F%TX7tyGlptI^CgxYWMQN z_w@S25$AXW00~bI;UjkuhUGP*xnw8}!T<$QI}|_ye^G$5^n*3R)G*FfyJ4-M-_&(Z zIDq@&K#p?`@a1M;VDL){_i=2_U`t`(%E?cU&qz&7Ni9lYU{6U-i3bW~GcX(K8DulC znCKZ=rZ5N>B_<_hmN+DqB*#OTxrG_bNem2ZN0JzrecO^4*ck(XrZ&M%<;~11NiE7t z%!w~8PA$p>%CV-GrWTigSSp+;zilku`lkLiTA;_c&E9Wv`H}-OZ8?s$NSOE3D=C*V z%xL+Q160VE!oZuDlAD>ASzJ<-Sdw3qmBJtgu|K{bvADQAzbGX>Be6ImGcP^9I3v-> K)T{)kjR63OYDe+_ literal 0 HcmV?d00001 diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_user_permission.DCD b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_user_permission.DCD new file mode 100755 index 0000000000000000000000000000000000000000..a58a4453679006d3d2cb5d3ce6bd115b74d4f68b GIT binary patch literal 190 zcmZQ%VrEH>@a1M;VDL){_i=2_U`t`(%E?cU&qz&7Ni9lYU{6U-i3bW~GcX(K8DulC znCKZ=rZ5N>B_<_hmN+DqB*#OTxrG_bNem2ZN0Jzr{dJNUcz3Y@O^tw<%ACT$Us{}6 y6km{9l$%*xoSC1O0Tkl`iM7nkG$6|<(7rb1YZ`WY-hX@qK!G?ShdDg^*ZPcno6 literal 0 HcmV?d00001 diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_vhost.DCD b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/rabbit_vhost.DCD new file mode 100755 index 0000000000000000000000000000000000000000..21746957b7234eae86df04b4ec4f553316db6345 GIT binary patch literal 172 zcmZQ%VrEH>@a1M;VDL){_i=2_U`t`(%E?cU&qz&7Ni9lYU{6U-i3bW~GcX(K8DulC znCKZ=rZ5N>B_<_hmN+DqB*#OTxrG_bNem2ZN0JzrecO^4*iIe%n_4A}?un^Sdz_v6!>15>Jj3T>4Iw+j{yUAU zSL*T82$2Ni$Fm3>P0)U|{YpJs#c6=Wj#k!4#g4_aSsw3jM5=j+=cShPdXPq4DRgRv!8M z1>o;1&(`t=8uIj-X_KWdb$H*&8a7a&L2PrWn$`Fhn^2SYOrI9ZF0nP;XyA$9&}qXr8$L8TP3j(NKI)n}bgi`wt4w^~ zwW=-O^yq8To_$iS!vlwP&v#q8&w8F{d8Vs1U8iZfz8LewX_w4LD~EK)Icvc~YxzbA zeeXxVs(gK_yt7ft-TvQu^lzASAPpVW@Pg@jmeYW{F~J0#Ig>I2<=)D(xOwjH^8Akl z6QnKF9M7kOsL zWm|p#g4J_L#q%9t9%9RDLS{%1n?*FeYF zmPhqaR1|b*HV{&Q3-=}3#K;AzFPNdg)CUxnDVflUSe<@&``v4IamXJ}3i&Loi*B5! zuJr;1@IH?J85#dOIR1UG==ClFpi{enkN}fW>coqH>1Z?UtO=%R*23Vm-z^;A!r-Nw z3H84c2E72z4R{AU!|{KIjQ)h@GM6ZYOUM2Gk2+I)xYBqH6a+w|s2Mbt5 z8WDl?y}**7Mhwn}sCUc)6D5cW_>S(>p(bz%%T`k(hT%f+0_vKM3vOb;X=dakK5v}8 zhvWWOI!@vS@S%Fd=1?GaGr)iDx{Uv6j(?*CU+SjjIuH?yTK}<)!jhmzVuR^Rf+C|w zj2NIXyDEet!Ow@_(*mit%uFo(BPaiLkc0g4jddvZ+;u+x|B&Zjg!p3TUAh>W?@<=4 zH4UwO-upxYZ2G)U{_yl6G4KCb$Gi(^gU7l4FUs@3i{sxjZA}E(KnCS4n|>hHffj!*_H1@0al}0{cPe3Rc8Tje56H51>P{fsz3e5gO6KN2CB` zR*Wps5U!dAtn}(mi{>PZbFmPVGjSGPL~{>vp>X@(N+_fPoIdF!x5)j!zsdM7&D+{M zIDgG3;+HOjFdmZw)F=L)G}?Ah^L!YQr31ddZQ4~Zm@GFHR8$~zZW)pg{T~^sv{Nd^5CFi9F+*S@e1RA5 zd-Gu~FD}2M)PA2LczwgdHpjmy<6o@ni_o8WL9da$hJBL=6^ZThsPR?`P|6(?L$NgUr*^l4<1%|zC`othU$s`!Ko~>Z3-rY0u&^OiY zp1u|W`P~8j^A#EYV*OwE|L0m}tIhe3ZPZ=&_lxIG>~oAHF-m`WN$GcT`KjelZ+X^& zsX6B%xmx!8^G(ZuHA1gW;5vK<$9}@Q*wD3bO@;1XhSUs}oXIY9j}r{TdQQ-n6fr1z zKA}N~JA!zE#ogOoH}?3{ zQEu$KmvsB|>ZINqRaE}L)q#0)=h_nPO=-Us&5S7@}19xY%R zj8T)H8BkIpfNpo+a1rpt&whGb#3A2G7?&ulYFjgifYPZFhyXk;gF<+_p`{+0$@1!bvfdMlpI4oZ}!VhF%9oqWMLd6~Hm=gA=~}&X*n%PO{2?>1&Ht4K4`< zI_Ce`mg_p89W}4j)byHFH@v2)w~4y=W&x6s2tn6W>yMBq%U z=I5{cJ+r37p(Gro+HNHZ;HP=~?=!NgbFc3b{Vc$rF8epky5=-k0x&>H@?{aY17Fjo(h!8Wz7#cPZrfxsqLo6I@zIqUZ1VTp)mElOUhN;ul z{!ApsZ=Ug9;S%GP+Dx>S0G;q%3x_!VBl-XP`2Ig;l-q>ns5D4J=dm4jG+y{bxD}cY z1j=XPX%z!@STx``AEKeM7ERq@XB1|%L|D4~=I1z?gP>XRLkIDYtRF8Kf@BUB<%93RDPy6K!59x2Kum{ZlZp6- z|I1f}o1so0O^(IQxC854|9?@&|KWCKWy+r=ek73uYwlq3W560*V5P0@+ZYaEH2+(yVN3@R4^&2I2mBJ+ zN9eDiiMmmQ&O!Mit()ZS;FmYQ7A{XB^!;#o3gy@@cZ&8Egr)K}RFKNks3euQqe-be zgZ4}19q5Eq-if{}m3QTWUk(+|-;L$+o`PK7TawFnPRiwd`{nZNiJ&|d(BpwQgr0T( E4;zmc%K!iX literal 0 HcmV?d00001 diff --git a/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/schema_version b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/schema_version new file mode 100755 index 00000000..203a50c1 --- /dev/null +++ b/src/pe_reports/pe_reports_django_project/data/rabbitmq/data/rabbit@atc_rabbitmq/schema_version @@ -0,0 +1 @@ +[store_msg,persistent_bytes,multiple_routing_keys,exchange_options,queue_options,topic_permission,vhost_limits,user_password_hashing,cluster_name,policy_apply_to,topic_trie_node,mirrored_supervisor,gm,user_admin_to_tags,exchange_event_serial,semi_durable_route,topic_trie,add_opts_to_listener,remove_user_scope,move_messages_to_vhost_store]. diff --git a/src/pe_reports/pe_reports_django_project/dataAPI/tasks.py b/src/pe_reports/pe_reports_django_project/dataAPI/tasks.py old mode 100644 new mode 100755 index b4bf133a..5ba2dd66 --- a/src/pe_reports/pe_reports_django_project/dataAPI/tasks.py +++ b/src/pe_reports/pe_reports_django_project/dataAPI/tasks.py @@ -69,7 +69,7 @@ # Import schemas from . import schemas -LOGGER = logginng.getLogger(__name__) +LOGGER = logging.getLogger(__name__) # ---------- Task Helper Functions ---------- def convert_uuid_to_string(uuid): diff --git a/src/pe_reports/pe_reports_django_project/dataAPI/views.py b/src/pe_reports/pe_reports_django_project/dataAPI/views.py old mode 100644 new mode 100755 index 0ee1aa79..76e0c5d3 --- a/src/pe_reports/pe_reports_django_project/dataAPI/views.py +++ b/src/pe_reports/pe_reports_django_project/dataAPI/views.py @@ -105,6 +105,7 @@ ReportSummaryStats, RootDomains, ShodanAssets, + ShodanVulns, SubDomains, VwBreachcomp, VwBreachcompBreachdetails, @@ -7170,7 +7171,7 @@ def shodan_assets_insert( "tags": row_dict.get("tags", []), "country_code": row_dict.get("country_code"), "location": row_dict.get("location"), - "data_source_uid": row_dict.get("data_source_uid"), + "data_source_uid_id": row_dict.get("data_source_uid"), } # Use 'update_or_create' to either create or update the record @@ -7223,39 +7224,111 @@ def shodan_vulns_insert( for row in data.vuln_data: row_dict = row.__dict__ try: - CredentialExposures.objects.get( - breach_name=row_dict["breach_name"], - email=row_dict["email"], - ) - # If record already exists, do nothing - except CredentialExposures.DoesNotExist: - # If record doesn't exist yet, create one - curr_org_inst = Organizations.objects.get( - organizations_uid=row_dict["organizations_uid"] - ) - curr_source_inst = DataSource.objects.get( - data_source_uid=row_dict["data_source_uid"] - ) - curr_breach_inst = CredentialBreaches.objects.get( - breach_name=row_dict["breach_name"], - ) - CredentialExposures.objects.create( - # credential_exposures_uid=uuid.uuid1(), - email=row_dict["email"], - organizations_uid=curr_org_inst, - root_domain=row_dict["root_domain"], - sub_domain=row_dict["sub_domain"], - modified_date=row_dict["modified_date"], - breach_name=row_dict["breach_name"], - credential_breaches_uid=curr_breach_inst, - data_source_uid=curr_source_inst, - name=row_dict["name"], - ) - create_cnt += 1 + org_instance = Organizations.objects.get(organizations_uid=row_dict["organizations_uid"]) + acronym = org_instance.acronym # Assuming 'acronym' is a field in Organizations model + # Assuming ExternalOrganizations is a model that matches organization acronym to an organization_id + mdl_org = MDL_Organization.objects.get(acronym=acronym) + try: + mdl_data_source = MDL_DataSource.objects.get(name="Shodan") + except DataSource.DoesNotExist: + LOGGER.warning(f"DataSource with UID {row_dict['data_source_uid_id']} not found.") + mdl_data_source = None # Set to None if DataSource is not found + + mdl_vuln_data = { + "organization_name": row_dict.get("organization"), + "cve": row_dict.get("cve"), + "severity": row_dict.get("severity"), + "cvss": row_dict.get("cvss"), + "summary": row_dict.get("summary"), + "product": row_dict.get("product"), + "attack_vector": row_dict.get("attack_vector"), + "av_description": row_dict.get("av_description"), + "attack_complexity": row_dict.get("attack_complexity"), + "ac_description": row_dict.get("ac_description"), + "confidentiality_impact": row_dict.get("confidentiality_impact"), + "ci_description": row_dict.get("ci_description"), + "integrity_impact": row_dict.get("integrity_impact"), + "ii_description": row_dict.get("ii_description"), + "availability_impact": row_dict.get("availability_impact"), + "ai_description": row_dict.get("ai_description"), + "tags": row_dict.get("tags"), + "domains": row_dict.get("domains"), + "hostnames": row_dict.get("hostnames"), + "isn": row_dict.get("isn"), + "asn": row_dict.get("asn"), + "data_source": mdl_data_source, + "type": row_dict.get("type"), + "name": row_dict.get("name"), + "potential_vulns": row_dict.get("potential_vulns"), + "mitigation": row_dict.get("mitigation"), + "server": row_dict.get("server"), + "is_verified": row_dict.get("is_verified"), + "banner": row_dict.get("banner"), + "version": row_dict.get("version"), + "cpe": row_dict.get("cpe") + } + + mdl_obj, created = MDL_ShodanVulns.objects.update_or_create( + organization=mdl_org, # Directly use organizations_uid + ip=row_dict["ip"], + port=row_dict["port"], + protocol=row_dict["protocol"], + timestamp=row_dict["timestamp"], + defaults=mdl_vuln_data) + except: + LOGGER.warning(f"Shodan Vuln failed to save to MDL.") + + try: + vuln_data = { + "organization": row_dict.get("organization"), + "cve": row_dict.get("cve"), + "severity": row_dict.get("severity"), + "cvss": row_dict.get("cvss"), + "summary": row_dict.get("summary"), + "product": row_dict.get("product"), + "attack_vector": row_dict.get("attack_vector"), + "av_description": row_dict.get("av_description"), + "attack_complexity": row_dict.get("attack_complexity"), + "ac_description": row_dict.get("ac_description"), + "confidentiality_impact": row_dict.get("confidentiality_impact"), + "ci_description": row_dict.get("ci_description"), + "integrity_impact": row_dict.get("integrity_impact"), + "ii_description": row_dict.get("ii_description"), + "availability_impact": row_dict.get("availability_impact"), + "ai_description": row_dict.get("ai_description"), + "tags": row_dict.get("tags"), + "domains": row_dict.get("domains"), + "hostnames": row_dict.get("hostnames"), + "isn": row_dict.get("isn"), + "asn": row_dict.get("asn"), + "data_source_uid_id": row_dict.get("data_source_uid"), + "type": row_dict.get("type"), + "name": row_dict.get("name"), + "potential_vulns": row_dict.get("potential_vulns"), + "mitigation": row_dict.get("mitigation"), + "server": row_dict.get("server"), + "is_verified": row_dict.get("is_verified"), + "banner": row_dict.get("banner"), + "version": row_dict.get("version"), + "cpe": row_dict.get("cpe") + } + + obj, created = MDL_ShodanVulns.objects.update_or_create( + organizations_uid=org_instance, # Directly use organizations_uid + ip=row_dict["ip"], + port=row_dict["port"], + protocol=row_dict["protocol"], + timestamp=row_dict["timestamp"], + defaults=vuln_data) + if created: + create_cnt+=1 + except: + LOGGER.warning(f"Shodan Vuln failed to save to PE DB.") + continue # Return success message return ( str(create_cnt) - + " records created in the credential_exposures table" + + " records created in the shodan vulns table" ) except ObjectDoesNotExist: LOGGER.info("API key expired please try again") diff --git a/src/pe_reports/pe_reports_django_project/dmz_mini_dl/models.py b/src/pe_reports/pe_reports_django_project/dmz_mini_dl/models.py old mode 100644 new mode 100755 index 79047a5c..953759d4 --- a/src/pe_reports/pe_reports_django_project/dmz_mini_dl/models.py +++ b/src/pe_reports/pe_reports_django_project/dmz_mini_dl/models.py @@ -2346,24 +2346,25 @@ class Meta: class ShodanAssets(models.Model): """Define ShodanAssets model.""" - shodan_asset_uid = models.UUIDField(primary_key=True, default=uuid.uuid1()) + shodan_asset_uid = models.UUIDField(primary_key=True, default=uuid.uuid1) organization = models.ForeignKey( - Organization, on_delete=models.CASCADE, db_column="organization_uid" + Organization, on_delete=models.CASCADE, db_column="organization_uid", blank=True, null=True ) - organization = models.TextField(blank=True, null=True) + # If you still need to store the organization name or acronym, use a separate field for that + organization_name = models.TextField(blank=True, null=True) # New field to store the name or acronym ip = models.TextField(blank=True, null=True) port = models.IntegerField(blank=True, null=True) protocol = models.TextField(blank=True, null=True) timestamp = models.DateTimeField(blank=True, null=True) product = models.TextField(blank=True, null=True) server = models.TextField(blank=True, null=True) - tags = models.TextField(blank=True, null=True) # This field type is a guess. - domains = models.TextField(blank=True, null=True) # This field type is a guess. - hostnames = models.TextField(blank=True, null=True) # This field type is a guess. + tags = models.JSONField(blank=True, null=True) # Store tags as a list (JSON format) + domains = models.JSONField(blank=True, null=True) # Store domains as a list (JSON format) + hostnames = models.JSONField(blank=True, null=True) # Store hostnames as a list (JSON format) isn = models.TextField(blank=True, null=True) asn = models.IntegerField(blank=True, null=True) data_source = models.ForeignKey( - DataSource, on_delete=models.CASCADE, db_column="data_source_uid" + DataSource, on_delete=models.CASCADE, db_column="data_source_uid", blank=True, null=True ) country_code = models.TextField(blank=True, null=True) location = models.TextField(blank=True, null=True) @@ -2420,11 +2421,11 @@ class Meta: class ShodanVulns(models.Model): """Define ShodanVulns model.""" - shodan_vuln_uid = models.UUIDField(primary_key=True, default=uuid.uuid1()) + shodan_vuln_uid = models.UUIDField(primary_key=True, default=uuid.uuid1) organization = models.ForeignKey( Organization, on_delete=models.CASCADE, db_column="organization_uid" ) - organization = models.TextField(blank=True, null=True) + organization_name = models.TextField(blank=True, null=True) ip = models.TextField(blank=True, null=True) port = models.TextField(blank=True, null=True) protocol = models.TextField(blank=True, null=True) diff --git a/src/pe_reports/pe_reports_django_project/pe_reports_django/asgi.py b/src/pe_reports/pe_reports_django_project/pe_reports_django/asgi.py old mode 100644 new mode 100755 index 0ca7fdf9..5e57a42a --- a/src/pe_reports/pe_reports_django_project/pe_reports_django/asgi.py +++ b/src/pe_reports/pe_reports_django_project/pe_reports_django/asgi.py @@ -8,9 +8,9 @@ """ # Standard Python Libraries import os - -# Third-Party Libraries -from dataAPI.views import api_router +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pe_reports_django.settings") +import django +django.setup() # Following 2 lines custom code from django.apps import apps @@ -21,9 +21,10 @@ from fastapi.staticfiles import StaticFiles from starlette.middleware.cors import CORSMiddleware -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pe_reports_django.settings") +# Third-Party Libraries +from dataAPI.views import api_router -application = get_wsgi_application() +# application = get_wsgi_application() # Below this comment is custom code apps.populate(settings.INSTALLED_APPS) diff --git a/src/pe_reports/pe_reports_django_project/pe_reports_django/db_routers.py b/src/pe_reports/pe_reports_django_project/pe_reports_django/db_routers.py new file mode 100755 index 00000000..e0a9bc66 --- /dev/null +++ b/src/pe_reports/pe_reports_django_project/pe_reports_django/db_routers.py @@ -0,0 +1,32 @@ +class MyAppRouter: + def db_for_read(self, model, **hints): + # Specify the app you want to route to the mini_data_lake database + if model._meta.app_label == 'dmz_mini_dl': + return 'mini_data_lake' + return 'default' # All other models go to the default database + + def db_for_write(self, model, **hints): + if model._meta.app_label == 'dmz_mini_dl': + return 'mini_data_lake' + return 'default' # All other models go to the default database + + def allow_relation(self, obj1, obj2, **hints): + # Check the app labels of both objects + app_label1 = obj1._meta.app_label + app_label2 = obj2._meta.app_label + + # If both objects are from the specific app, allow the relation + if app_label1 == 'dmz_mini_dl' and app_label2 == 'dmz_mini_dl': + return True + + # If only one of them is from the specific app, disallow the relation + if app_label1 == 'dmz_mini_dl' or app_label2 == 'dmz_mini_dl': + return False + + # Allow relations between all other models + return True + + def allow_migrate(self, db, app_label, model_name=None, **hints): + if app_label == 'dmz_mini_dl': + return db == 'mini_data_lake' # Migrate the specific app to the mini_data_lake database + return db == 'default' # All other apps migrate to the default database \ No newline at end of file diff --git a/src/pe_reports/pe_reports_django_project/pe_reports_django/requirements.txt b/src/pe_reports/pe_reports_django_project/pe_reports_django/requirements.txt old mode 100644 new mode 100755 index 0671ea45..35cb5f54 --- a/src/pe_reports/pe_reports_django_project/pe_reports_django/requirements.txt +++ b/src/pe_reports/pe_reports_django_project/pe_reports_django/requirements.txt @@ -1,254 +1,229 @@ -alembic==1.8.1 -amqp==5.1.1 -anyio==3.6.1 -arabic-reshaper==2.1.3 -asgiref==3.6.0 -asn1crypto==1.5.1 -asttokens==2.0.5 -async-timeout==4.0.2 -attrs==21.4.0 -Babel==2.12.1 -backcall==0.2.0 -bcrypt==4.0.1 -beautifulsoup4==4.10.0 -billiard==3.6.4.0 -blis==0.7.8 -boto3==1.21.10 -botocore==1.24.10 -build==0.7.0 -catalogue==2.0.6 -celery==5.2.7 -certifi==2021.10.8 -cffi==1.15.0 -cfgv==3.3.1 -channels==4.0.0 -chardet==3.0.4 -charset-normalizer==2.0.12 -check-manifest==0.48 -chevron==0.14.0 -circlify==0.15.0 -click==8.1.3 -click-didyoumean==0.3.0 -click-plugins==1.1.1 -click-repl==0.2.0 -colorama==0.4.4 -contextlib2==21.6.0 -coverage==6.3.2 -coveralls==3.3.1 -crispy-bootstrap5==0.7 -cryptography==36.0.2 -cssselect2==0.7.0 -cycler==0.11.0 -cymem==2.0.6 -DataProperty==0.55.0 -dateparser==1.1.0 -decorator==5.1.1 -demoji==1.1.0 -Deprecated==1.2.13 -distlib==0.3.4 -Django==4.1.5 -django-crispy-forms==1.14.0 -django-database-view==0.3.0 -dnspython==2.2.1 -dnstwist==20220815 -docopt==0.6.2 -docx==0.2.4 -docxcompose==1.4.0 -docxtpl==0.16.6 -dshield==0.2.1 -ecdsa==0.18.0 -email-validator==1.3.0 -en-core-web-lg @ https://github.com/explosion/spacy-models/releases/download/en_core_web_lg-3.4.0/en_core_web_lg-3.4.0-py3-none-any.whl -en-core-web-trf @ https://github.com/explosion/spacy-models/releases/download/en_core_web_trf-3.4.0/en_core_web_trf-3.4.0-py3-none-any.whl -et-xmlfile==1.1.0 -executing==0.8.3 -Faker==13.3.2 -fastapi==0.88.0 -filelock==3.6.0 -Flask==2.1.2 -Flask-Login==0.6.1 -Flask-Migrate==3.1.0 -Flask-SQLAlchemy==2.5.1 -Flask-WTF==1.0.1 -flower==1.2.0 -future==0.18.2 -glob2==0.7 -googletrans==4.0.0rc1 -greenlet==2.0.0a2 -gunicorn==20.1.0 -h11==0.9.0 -h2==3.2.0 -hpack==3.0.0 -hstspreload==2021.12.1 -html5lib==1.1 -httpcore==0.9.1 -httptools==0.5.0 -httpx==0.13.3 -huggingface-hub==0.8.1 -humanize==4.6.0 -hyperframe==5.2.0 -identify==2.5.0 -idna==2.5 -importlib-resources==5.4.0 -iniconfig==1.1.1 -ipython==8.4.0 -itsdangerous==2.1.2 -jedi==0.18.1 -Jinja2==3.1.2 -jmespath==0.10.0 -joblib==1.1.0 -jsonschema==4.4.0 -kiwisolver==1.3.2 -kombu==5.2.4 -langcodes==3.3.0 -limits==3.4.0 -lxml==4.8.0 -Mako==1.2.1 -MarkupSafe==2.1.1 -matplotlib==3.3.4 -matplotlib-inline==0.1.3 -mbstrdecoder==1.1.0 -mongo-db-from-config @ http://github.com/cisagov/mongo-db-from-config/tarball/develop -murmurhash==1.0.7 -mypy==0.961 -mypy-extensions==0.4.3 -nassl==4.0.2 -nltk==3.7 -nodeenv==1.6.0 -numpy==1.22.3 -openpyxl==3.0.9 -oscrypto==1.3.0 -packaging==21.3 -pandas==1.1.5 -paramiko==2.12.0 -parso==0.8.3 -path==16.4.0 -pathvalidate==2.5.0 -pathy==0.6.2 -pdfkit==1.0.0 --e git+https://github.com/cisagov/pe-reports.git@eda9a332132581c12b8620ed925e4b82d0d62316#egg=pe_reports -pep517==0.12.0 -pexpect==4.8.0 -phonenumbers==8.12.45 -pickleshare==0.7.5 -Pillow==9.0.1 -platformdirs==2.5.1 -pluggy==1.0.0 -pre-commit==2.18.1 -preshed==3.0.6 -prometheus-client==0.16.0 -prompt-toolkit==3.0.38 --e git+https://github.com/cisagov/pshtt.git@65596ff08fa7bf0357b5af63da73e2dead91c304#egg=pshtt -psutil==5.9.1 -psycopg2-binary==2.9.3 -ptyprocess==0.7.0 -publicsuffix==1.1.1 -pure-eval==0.2.2 -py==1.11.0 -pyasn1==0.4.8 -pycparser==2.21 -pydantic==1.9.0 -Pygments==2.12.0 -pygtail==0.12.0 -pyHanko==0.16.0 -pyhanko-certvalidator==0.19.8 -pymongo==4.0.1 -PyMuPDF==1.19.0 -PyNaCl==1.5.0 -pyOpenSSL==22.0.0 -pyparsing==3.0.7 -PyPDF2==1.26.0 -PyPDF3==1.0.6 -pyrsistent==0.18.1 -pytablereader==0.31.3 -pytablewriter==0.64.2 -pytest==7.0.1 -pytest-cov==3.0.0 -python-bidi==0.4.2 -python-dateutil==2.8.2 -python-decouple==3.6 -python-docx==0.8.11 -python-dotenv==0.21.0 -python-jose==3.3.0 -python-multipart==0.0.5 -python-pptx==0.6.21 -python-stdnum==1.17 -pytz==2023.3 -pytz-deprecation-shim==0.1.0.post0 -PyYAML==6.0 -qrcode==7.3.1 -rabbitmq==0.2.0 -regex==2022.3.15 -reportlab==3.6.6 -requests==2.27.1 -retry==0.9.2 -rfc3986==1.5.0 -rsa==4.9 -s3transfer==0.5.2 -schema==0.7.5 -scikit-learn==1.0.2 -scipy==1.8.0 -scrubadub==2.0.0 -semver==2.13.0 -shodan==1.27.0 -six==1.16.0 -sklearn==0.0 -slowapi==0.1.8 -smart-open==5.2.1 -sniffio==1.2.0 -soupsieve==2.3.1 -spacy==3.4.0 -spacy-alignments==0.8.5 -spacy-legacy==3.0.9 -spacy-loggers==1.0.3 -spacy-transformers==1.1.7 -SQLAlchemy==1.4.39 -sqlparse==0.4.3 -srsly==2.4.4 -sshtunnel==0.4.0 -sslyze==5.0.3 -stack-data==0.3.0 -starlette==0.22.0 -Sublist3r==1.0 -svglib==1.5.1 -tabledata==1.3.0 -tcolorpy==0.1.2 -textblob==0.15.3 -thinc==8.1.0 -threadpoolctl==3.1.0 -tinycss2==1.2.1 -tls-parser==2.0.0 -tokenizers==0.12.1 -toml==0.10.2 -tomli==2.0.1 -torch==1.12.0 -tornado==6.3.1 -tox==3.24.5 -tqdm==4.63.0 -traitlets==5.3.0 -transformers==4.20.1 -typepy==1.3.0 -typer==0.4.2 -types-PyYAML==6.0.4 -typing_extensions==4.1.1 -tzdata==2021.5 -tzlocal==4.1 -unicorn==2.0.1.post1 -uritools==4.0.1 -urllib3==1.26.0 -uvicorn==0.18.3 -uvloop==0.17.0 -vine==5.0.0 -virtualenv==20.14.0 -wasabi==0.9.1 -watchfiles==0.17.0 -wcwidth==0.2.6 -webencodings==0.5.1 -websockets==10.3 -Werkzeug==2.0.0 -wget==3.2 -whitenoise==6.3.0 -wrapt==1.15.0 -WTForms==3.0.1 -xhtml2pdf==0.2.5 -XlsxWriter==3.0.3 +aioredis +alembic +amqp +anyio +arabic-reshaper +argcomplete +asgiref +async-timeout +attrs +Babel +bcrypt +beautifulsoup4 +billiard +blinker +blis +boto3 +botocore +build +CacheControl +catalogue +celery +certifi +cffi +chardet +charset-normalizer +chevron +circlify +cleo +click +click-didyoumean +click-plugins +click-repl +colorama +confection +contextlib2 +coverage +crashtest +crispy-bootstrap5 +cron-descriptor +cryptography +cycler +cymem +Cython +decorator +demoji +Deprecated +distlib +Django +django-celery-beat +django-crispy-forms +django-netfields +django-timezone-field +dnspython +dnstwist +docopt +docxcompose +docxtpl +dshield +dulwich +ecdsa +ecs-logging +elastic-apm +email-validator +en-core-web-lg @ https://github.com/explosion/spacy-models/releases/download/en_core_web_lg-3.5.0/en_core_web_lg-3.5.0-py3-none-any.whl#sha256 +et-xmlfile +exceptiongroup +fastapi +fastapi-limiter +filelock +Flask +Flask-Login +Flask-Migrate +Flask-SQLAlchemy +Flask-WTF +flower +freetype-py +glob2 +googletrans +greenlet +gunicorn +h11 +h2 +hpack +hstspreload +html5lib +httpcore +httpx +humanize +hyperframe +idna +importlib-metadata +importlib-resources +iniconfig +installer +itsdangerous +jaraco.classes +jeepney +Jinja2 +jmespath +joblib +jsonschema +keyring +kiwisolver +kombu +langcodes +limits +lockfile +lxml +Mako +MarkupSafe +matplotlib +mongo-db-from-config @ http://github.com/cisagov/mongo-db-from-config/tarball/develop#sha256 +more-itertools +msgpack +murmurhash +nassl +nested-lookup +netaddr +nltk +numpy +openpyxl +packaging +pandas +paramiko +pathy +pdfkit +pdfrw +-e git+https://github.com/cisagov/ATC-Framework.git@CD-add-CODEOWNERS#egg=pe_reports +pexpect +pika +Pillow +pipx +pkginfo +platformdirs +pluggy +poetry +poetry-core +poetry-plugin-export +preshed +prometheus-client +prompt-toolkit +psutil +psycopg2-binary +ptyprocess +publicsuffixlist +py +pyasn1 +pycairo +pycparser +pydantic +pymongo +PyMuPDF +PyNaCl +pyOpenSSL +pyparsing +PyPDF2 +pyproject_hooks +pyrsistent +pytest +pytest-cov +python-bidi +python-crontab +python-dateutil +python-decouple +python-docx +python-jose +python-multipart +python-pptx +pytz +PyYAML +rapidfuzz +redis +regex +reportlab +requests +requests-toolbelt +retry +rfc3986 +rlPyCairo +rsa +s3transfer +schema +scikit-learn +scipy +SecretStorage +shellingham +shodan +six +slowapi +smart-open +sniffio +soupsieve +spacy +spacy-legacy +spacy-loggers +SQLAlchemy +sqlparse +srsly +sshtunnel +sslyze +starlette +Sublist3r +thinc +threadpoolctl +tls-parser +tomli +tomlkit +tornado +tqdm +trove-classifiers +typer +types-PyYAML +typing_extensions +tzdata +urllib3 +userpath +uvicorn +vine +virtualenv +wasabi +wcwidth +webencodings +Werkzeug +whitenoise +wrapt +WTForms +xhtml2pdf +XlsxWriter +zipp \ No newline at end of file diff --git a/src/pe_reports/pe_reports_django_project/pe_reports_django/settings.py b/src/pe_reports/pe_reports_django_project/pe_reports_django/settings.py old mode 100644 new mode 100755 index a1575f7e..348d4e49 --- a/src/pe_reports/pe_reports_django_project/pe_reports_django/settings.py +++ b/src/pe_reports/pe_reports_django_project/pe_reports_django/settings.py @@ -100,7 +100,7 @@ "class": "logging.handlers.RotatingFileHandler", "maxBytes": 1024 * 1024 * 15, "backupCount": 10, - "filename": "./pe_reportsLogFile.log", + "filename": os.path.join(BASE_DIR, "pe_reportsLogFile.log"), "formatter": "verbose", }, }, @@ -196,7 +196,7 @@ CELERY_BROKER_URL = ( f"amqp://{config('RABBITMQ_USER')}:{config('RABBITMQ_PASS')}@localhost:5672/" ) -CELERY_RESULT_BACKEND = "redis://localhost:6379" +CELERY_RESULT_BACKEND = "redis://atc_redis:6379" CELERY_RESULT_EXPIRES = 86400 CELERY_BEAT_SCHEDULE_FILENAME = os.path.join(BASE_DIR, "celerybeat-schedule.db") diff --git a/src/pe_reports/pe_reports_django_project/static/CISAImage.png b/src/pe_reports/pe_reports_django_project/static/CISAImage.png old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/autocomplete.css b/src/pe_reports/pe_reports_django_project/static/admin/css/autocomplete.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/base.css b/src/pe_reports/pe_reports_django_project/static/admin/css/base.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/changelists.css b/src/pe_reports/pe_reports_django_project/static/admin/css/changelists.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/dark_mode.css b/src/pe_reports/pe_reports_django_project/static/admin/css/dark_mode.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/dashboard.css b/src/pe_reports/pe_reports_django_project/static/admin/css/dashboard.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/fonts.css b/src/pe_reports/pe_reports_django_project/static/admin/css/fonts.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/forms.css b/src/pe_reports/pe_reports_django_project/static/admin/css/forms.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/login.css b/src/pe_reports/pe_reports_django_project/static/admin/css/login.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/nav_sidebar.css b/src/pe_reports/pe_reports_django_project/static/admin/css/nav_sidebar.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/responsive.css b/src/pe_reports/pe_reports_django_project/static/admin/css/responsive.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/responsive_rtl.css b/src/pe_reports/pe_reports_django_project/static/admin/css/responsive_rtl.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/rtl.css b/src/pe_reports/pe_reports_django_project/static/admin/css/rtl.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/vendor/select2/LICENSE-SELECT2.md b/src/pe_reports/pe_reports_django_project/static/admin/css/vendor/select2/LICENSE-SELECT2.md old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/vendor/select2/select2.css b/src/pe_reports/pe_reports_django_project/static/admin/css/vendor/select2/select2.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/vendor/select2/select2.min.css b/src/pe_reports/pe_reports_django_project/static/admin/css/vendor/select2/select2.min.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/css/widgets.css b/src/pe_reports/pe_reports_django_project/static/admin/css/widgets.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/fonts/LICENSE.txt b/src/pe_reports/pe_reports_django_project/static/admin/fonts/LICENSE.txt old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/fonts/README.txt b/src/pe_reports/pe_reports_django_project/static/admin/fonts/README.txt old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/fonts/Roboto-Bold-webfont.woff b/src/pe_reports/pe_reports_django_project/static/admin/fonts/Roboto-Bold-webfont.woff old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/fonts/Roboto-Light-webfont.woff b/src/pe_reports/pe_reports_django_project/static/admin/fonts/Roboto-Light-webfont.woff old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/fonts/Roboto-Regular-webfont.woff b/src/pe_reports/pe_reports_django_project/static/admin/fonts/Roboto-Regular-webfont.woff old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/LICENSE b/src/pe_reports/pe_reports_django_project/static/admin/img/LICENSE old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/README.txt b/src/pe_reports/pe_reports_django_project/static/admin/img/README.txt old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/calendar-icons.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/calendar-icons.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/gis/move_vertex_off.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/gis/move_vertex_off.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/gis/move_vertex_on.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/gis/move_vertex_on.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-addlink.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-addlink.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-alert.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-alert.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-calendar.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-calendar.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-changelink.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-changelink.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-clock.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-clock.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-deletelink.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-deletelink.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-no.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-no.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-unknown-alt.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-unknown-alt.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-unknown.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-unknown.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-viewlink.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-viewlink.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/icon-yes.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/icon-yes.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/inline-delete.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/inline-delete.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/search.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/search.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/selector-icons.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/selector-icons.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/sorting-icons.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/sorting-icons.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/tooltag-add.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/tooltag-add.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/img/tooltag-arrowright.svg b/src/pe_reports/pe_reports_django_project/static/admin/img/tooltag-arrowright.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/SelectBox.js b/src/pe_reports/pe_reports_django_project/static/admin/js/SelectBox.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/SelectFilter2.js b/src/pe_reports/pe_reports_django_project/static/admin/js/SelectFilter2.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/actions.js b/src/pe_reports/pe_reports_django_project/static/admin/js/actions.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/admin/DateTimeShortcuts.js b/src/pe_reports/pe_reports_django_project/static/admin/js/admin/DateTimeShortcuts.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/admin/RelatedObjectLookups.js b/src/pe_reports/pe_reports_django_project/static/admin/js/admin/RelatedObjectLookups.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/autocomplete.js b/src/pe_reports/pe_reports_django_project/static/admin/js/autocomplete.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/calendar.js b/src/pe_reports/pe_reports_django_project/static/admin/js/calendar.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/cancel.js b/src/pe_reports/pe_reports_django_project/static/admin/js/cancel.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/change_form.js b/src/pe_reports/pe_reports_django_project/static/admin/js/change_form.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/collapse.js b/src/pe_reports/pe_reports_django_project/static/admin/js/collapse.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/core.js b/src/pe_reports/pe_reports_django_project/static/admin/js/core.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/filters.js b/src/pe_reports/pe_reports_django_project/static/admin/js/filters.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/inlines.js b/src/pe_reports/pe_reports_django_project/static/admin/js/inlines.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/jquery.init.js b/src/pe_reports/pe_reports_django_project/static/admin/js/jquery.init.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/nav_sidebar.js b/src/pe_reports/pe_reports_django_project/static/admin/js/nav_sidebar.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/popup_response.js b/src/pe_reports/pe_reports_django_project/static/admin/js/popup_response.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/prepopulate.js b/src/pe_reports/pe_reports_django_project/static/admin/js/prepopulate.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/prepopulate_init.js b/src/pe_reports/pe_reports_django_project/static/admin/js/prepopulate_init.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/urlify.js b/src/pe_reports/pe_reports_django_project/static/admin/js/urlify.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/jquery/LICENSE.txt b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/jquery/LICENSE.txt old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/jquery/jquery.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/jquery/jquery.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/jquery/jquery.min.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/jquery/jquery.min.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/LICENSE.md b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/LICENSE.md old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/af.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/af.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ar.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ar.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/az.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/az.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/bg.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/bg.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/bn.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/bn.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/bs.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/bs.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ca.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ca.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/cs.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/cs.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/da.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/da.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/de.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/de.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/dsb.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/dsb.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/el.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/el.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/en.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/en.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/es.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/es.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/et.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/et.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/eu.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/eu.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/fa.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/fa.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/fi.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/fi.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/fr.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/fr.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/gl.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/gl.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/he.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/he.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hi.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hi.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hr.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hr.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hsb.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hsb.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hu.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hu.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hy.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/hy.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/id.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/id.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/is.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/is.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/it.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/it.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ja.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ja.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ka.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ka.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/km.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/km.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ko.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ko.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/lt.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/lt.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/lv.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/lv.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/mk.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/mk.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ms.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ms.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/nb.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/nb.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ne.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ne.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/nl.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/nl.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/pl.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/pl.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ps.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ps.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/pt-BR.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/pt-BR.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/pt.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/pt.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ro.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ro.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ru.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/ru.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sk.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sk.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sl.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sl.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sq.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sq.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sr-Cyrl.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sr-Cyrl.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sr.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sr.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sv.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/sv.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/th.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/th.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/tk.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/tk.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/tr.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/tr.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/uk.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/uk.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/vi.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/vi.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/zh-CN.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/zh-CN.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/zh-TW.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/i18n/zh-TW.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/select2.full.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/select2.full.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/select2.full.min.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/select2/select2.full.min.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/xregexp/LICENSE.txt b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/xregexp/LICENSE.txt old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/xregexp/xregexp.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/xregexp/xregexp.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/xregexp/xregexp.min.js b/src/pe_reports/pe_reports_django_project/static/admin/js/vendor/xregexp/xregexp.min.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/css/custom.css b/src/pe_reports/pe_reports_django_project/static/css/custom.css old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/js/htmx.js b/src/pe_reports/pe_reports_django_project/static/js/htmx.js old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/static/power.svg b/src/pe_reports/pe_reports_django_project/static/power.svg old mode 100644 new mode 100755 diff --git a/src/pe_reports/pe_reports_django_project/templates/base.html b/src/pe_reports/pe_reports_django_project/templates/base.html old mode 100644 new mode 100755 index 479220fd..95f82d41 --- a/src/pe_reports/pe_reports_django_project/templates/base.html +++ b/src/pe_reports/pe_reports_django_project/templates/base.html @@ -1,9 +1,9 @@ {% load static %} - + - {% block title %} {% endblock %} - P&E Application + {% block title %}{% endblock %} - P&E Application @@ -48,74 +48,71 @@ {% url 'home' as url %} Home + Home +
  • {% url 'peBulkUpload' as url %} Add P&E Stakeholder + Add P&E Stakeholder +
    • -
  • {% url 'report_gen' as url %} Report Generator + Report Generator +
    • -
  • {% url 'stakeholder_lite' as url %} Stakeholder Lite + Stakeholder Lite +
    • -
  • {% url 'bulkupload' as url %} Bulk File Upload + Bulk File Upload +
    • {% if user.is_staff %}
  • {% url 'weekly_status' as url %} Weekly Status + Weekly Status +
    • {% endif %} @@ -123,58 +120,53 @@ -
    +

    Welcome to P&E Reports

    - -
    -
    - - {% if messages %} {% for message in messages %} - + {% endfor %}
    - {% endif %} {% block content %} {% endblock content %} - - {% block extra_js %} - - {% endblock %} + + {% endblock %} + diff --git a/src/pe_reports/pe_reports_django_project/templates/home.html b/src/pe_reports/pe_reports_django_project/templates/home.html old mode 100644 new mode 100755