diff --git a/.vscode/launch.json b/.vscode/launch.json index fcb0ccac1..dabd46511 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,15 +6,31 @@ "configurations": [ { "command": "npm start", - "name": "Launch web app", + "name": "Launch web app with Intersection Data", + "request": "launch", + "cwd": "${workspaceFolder}/webapp", + "type": "node-terminal", + "preLaunchTask": "run-intersection" + }, + { + "command": "npm start", + "name": "Launch web app without Intersection Data", "request": "launch", "cwd": "${workspaceFolder}/webapp", "type": "node-terminal", "preLaunchTask": "run-keycloak-and-postgres" }, + { + "command": "npm start", + "name": "Launch web app with Full ConflictMonitor", + "request": "launch", + "cwd": "${workspaceFolder}/webapp", + "type": "node-terminal", + "preLaunchTask": "run-full-conflictmonitor" + }, { "name": "Python: Flask", - "type": "python", + "type": "debugpy", "request": "launch", "stopOnEntry": false, "program": "${workspaceRoot}/services/api/src/main.py", @@ -29,7 +45,7 @@ "compounds": [ { "name": "Debug Solution", - "configurations": ["Python: Flask", "Launch web app"] + "configurations": ["Python: Flask", "Launch web app with Intersection Data"] } ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index ac1ec05f1..5920a681b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -22,5 +22,40 @@ "[python]": { "editor.defaultFormatter": "ms-python.black-formatter", "editor.formatOnSave": true - } + }, + "cSpell.words": [ + "BOOTSTRAPSERVERS", + "cdot", + "cimms", + "collstats", + "conflictmonitor", + "conflictvisualizer", + "cviz", + "cvmanager", + "CVPEP", + "formik", + "geojsonconverter", + "healthcheck", + "inet", + "INITDB", + "inprog", + "keyfile", + "LOGLEVEL", + "MESSAGETYPE", + "millis", + "mongosh", + "pgdb", + "postgis", + "pytz", + "reduxjs", + "rsus", + "SASL", + "SNMP", + "svcs", + "TABLENAME", + "usdotjpoode", + "utctimestamp", + "wydot", + "Zabbix" + ] } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e34b83b7f..7c4624ecf 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -14,6 +14,27 @@ }, "command": "${command:python.interpreterPath} -m pytest -v --cov-report xml:cov.xml --cov ." }, + { + "label": "run-intersection", + "type": "docker-compose", + "dockerCompose": { + "up": { + "detached": true, + "build": true, + "services": [ + "cvmanager_postgres", + "cvmanager_keycloak", + "kafka", + "kafka_init", + "conflictvisualizer_api", + "mongodb_container" + ] + }, + "files": ["${workspaceFolder}/docker-compose.yml"], + "envFile": "${workspaceFolder}/.env" + }, + "dependsOn": ["run-keycloak-and-postgres"] + }, { "label": "run-keycloak-and-postgres", "type": "docker-compose", @@ -26,6 +47,32 @@ "files": ["${workspaceFolder}/docker-compose.yml"], "envFile": "${workspaceFolder}/.env" } + }, + { + "label": "run-full-conflictmonitor", + "type": "docker-compose", + "dockerCompose": { + "up": { + "detached": true, + "build": true, + "services": [ + "cvmanager_postgres", + "cvmanager_keycloak", + "kafka", + "kafka_init", + "ode", + "geojsonconverter", + "conflictmonitor", + "deduplicator", + "conflictvisualizer_api", + "mongodb_container", + "connect" + ] + }, + "files": ["${workspaceFolder}/docker-compose-full-cm.yml"], + "envFile": "${workspaceFolder}/.env" + }, + "dependsOn": ["run-keycloak-and-postgres"] } ] } diff --git a/README.md b/README.md index 56425ad5f..6056d21a2 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,102 @@ The JPO CV Manager was originally developed for the Google Cloud Platform and a - Keycloak is used for the CV Manager webapp's authentication. - The Keycloak pod requires a `realm.json` file in the folder: `./resources/keycloak/` to startup with the proper configurations. It also requires a login theme that can be modified and generated using the [keycloakify](https://github.com/keycloakify/keycloakify) forked repository in resources/keycloak/keycloakify. The theme will be automatically generated when using the docker image provided but can also be built using instructions found in the keycloakify folder. +### Intersection Data + ConflictMonitor Integration + +The CVManager now has the ability to manage, configure, and display data from connected intersections. Using the JPO-ODE ConflictMonitor and other JPO-ODE resources, intersection-specific data can be collected, processed, and analyzed. The CVManager has the ability to display the results of this analysis, show live message data, and configure intersection monitoring. This includes the following: + +- Displaying live MAPs, SPATs, and BSMs on a Mapbox map +- Displaying archived MAPs, SPATs, and BSMs on a Mapbox map +- Querying, downloading, and displaying events created by the ConflictMonitor +- Querying, downloading, and displaying assessments of events created by the ConflictMonitor +- Querying, managing, and displaying notifications created by the ConflictMonitor +- Updating and managing configuration parameters controlling message analysis, assessments, and notifications + +More information on the ConflictMonitor and other services described above can be found here: + +- [jpo-conflictmonitor](https://github.com/usdot-jpo-ode/jpo-conflictmonitor) +- [jpo-geojsonconverter](https://github.com/usdot-jpo-ode/jpo-geojsonconverter) +- [jpo-ode](https://github.com/usdot-jpo-ode/jpo-ode) +- [jpo-conflictvisualizer](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer) + +**Ongoing Efforts** +This feature is under active development. This is a joint effort involving combining the features of the existing CIMMS conflictvisualizer tools with the CVManager components, to enable connected vehicle and intersection analysis in one application. + +#### Local Development + +Ease of local development has been a major consideration in the integration of intersection data into the CVManager application. Through the use of public docker images and sample datasets, this process is relatively simple. The services required to show intersection data on the CVManager webapp are: + +- [jpo-conflictvisualizer (api)](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer/tree/cvmgr-cimms-integration/api) + - Modified jpo-conflictvisualizer api which is able to utilize the cvmanager keycloak realm +- kafka + - Base kafka image used to supply required topics to the conflictvisualizer api +- kafka_init + - Kafka topic creation image, to create required topics for the conflictvisualizer api +- MongoDB + - Base MongoDB image, with sample data, used to supply data to the conflictvisualizer api + +**Running a Simple Local Environment** + +1. Update your .env from the sample.env, all intersection-specific service variables are at the bottom. +2. Build the docker-compose: + +```sh +docker compose up -d +``` + +If any issues occur, try: + +```sh +docker compose up --build -d +``` + +This command will create all of the CVManager containers as well a the intersection-specific containers. Now, intersection-specific data will be available through the CVManager webapp. + +**Running the CVManager without Intersection Services** + +1. Update your .env from the sample_no_cm.env (It is not necessary to clear out the intersection-specific variables) +2. Build the docker-compose-no-cm: + If you would like to run all of the ConflictMonitor services including the JPO-ODE and GeoJSONConverter, use the docker-compose-full-cm.yml: + +```sh +docker compose -f docker-compose-no-cm.yml up --build -d +``` + +**Running all ConflictMonitor Services** + +1. Update your .env from the sample.env, all intersection-specific service variables are at the bottom. No additional variables are currently required on top of the simple intersection configuration. +2. Build the combined docker-compose: + +```sh +docker compose -f docker-compose-full-cm.yml up --build -d +``` + +**ConflictMonitor Configuration Scripts** + +A set of scripts and data dumps exists in the [conflictmonitor folder](./conflictmonitor), see the readme in that location for more information. + +#### ConflictVisualizer API + +- The CV Manager webapp has been integrated with the ConflictVisualizer tool to allow users to view data directly from a jpo-conflictmonitor instance. This integration currently requires an additional jpo-conflictvisualizer api to be deployed alongside the jpo-cvmanager api. This allows the webapp to make authenticated requests to the jpo-conflictvisualizer api to retrieve the conflict monitor data. +- [jpo-conflictvisualizer (api)](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer/tree/cvmgr-cimms-integration/api) +- kafka +- kafka_init (to create required kafka topics) +- MongoDB (to hold message and configuration data) + +The ConflictVisualizer api pulls archived message and configuration data from MongoDB, and is able to live-stream SPATs, MAPs, and BSMs from specific kafka topics + +#### MongoDB + +MongoDB is the backing database of the ConflictVisualizer api. This database holds configuration parameters, archived data (SPATs, MAPs, BSMs, ...), and processed data (notifications, assessments, events). For local development, a mongodump has been created in the conflictmonitor/mongo/dump_2024_08_20 directory. This includes notifications, assessments, events, as well as SPATs, MAPs, and BSMs. All of this data is available through the conflictvisualizer api. + +#### Kafka + +Kafka is used by the ConflictVisualizer api to receive data from the ODE, GeoJSONConverter, and ConflictMonitor. These connections enable live data to + +#### Generating Sample Data + +Some simple sample data is injected into the MongoDB instance when created. If more data is useful, the test-message-sender from the jpo-conflictmonitor can also be used to generate live sample data. This component should be cloned/installed separately, and is described here: [jpo-conflictmonitor/test-message-sender](https://github.com/usdot-jpo-ode/jpo-conflictmonitor/tree/develop/test-message-sender) + ## Getting Started The following steps are intended to help get a new user up and running the JPO CV Manager in their own environment. @@ -55,6 +151,7 @@ The following steps are intended to help get a new user up and running the JPO C 1. Follow the Requirements and Limitations section and make sure all requirements are met. 2. Create a copy of the sample.env named ".env" and refer to the Environmental variables section below for more information on each variable. 1. Make sure at least the DOCKER_HOST_IP, KEYCLOAK_ADMIN_PASSWORD, KEYCLOAK_API_CLIENT_SECRET_KEY, and MAPBOX_TOKEN are set for this. + 2. Some of these variables, delineated by sections, pertain to the [jpo-conflictvisualizer (api)](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer/tree/cvmgr-cimms-integration/api), [jpo-conflictmonitor](https://github.com/usdot-jpo-ode/jpo-conflictmonitor), [jpo-geojsonconverter](https://github.com/usdot-jpo-ode/jpo-geojsonconverter), [jpo-ode](https://github.com/usdot-jpo-ode/jpo-ode). Please see the documentation provided for these projects when setting these variables. 3. The CV Manager has four components that need to be containerized and deployed: the API, the PostgreSQL database, Keycloak, and the webapp. - If you are looking to deploy the CV Manager locally, you can simply run the docker-compose, make sure to fill out the .env file to ensure it launches properly. Also, edit your host file ([How to edit the host file](<[resources/kubernetes](https://docs.rackspace.com/support/how-to/modify-your-hosts-file/)>)) and add IP address of your docker host to these custom domains (remove the carrot brackets and just put the IP address): @@ -66,7 +163,15 @@ The following steps are intended to help get a new user up and running the JPO C 4. Apply the docker compose to start the required components: - docker compose up -d + ```sh + docker compose up -d + ``` + + If any issues occur, try: + + ```sh + docker compose up --build -d + ``` 5. Access the website by going to: @@ -144,7 +249,15 @@ For the "Debug Solution" to run properly on Windows 10/11 using WSL, the followi 3. Apply the docker compose to start the required components: - docker compose up -d +```sh +docker compose up -d +``` + +To run only the critical cvmanager components (no conflictmonitor/conflictvisualizer), use this command: + +```sh +docker compose up -d cvmanager_api cvmanager_webapp cvmanager_postgres cvmanager_keycloak +``` 4. Access the website by going to: @@ -189,13 +302,15 @@ For the "Debug Solution" to run properly on Windows 10/11 using WSL, the followi - SSM_DB_NAME: The database name for SSM visualization data. - SRM_DB_NAME: The database name for SRM visualization data. - FIRMWARE_MANAGER_ENDPOINT: Endpoint for the firmware manager deployment's API. -- CSM_EMAIL_TO_SEND_FROM: Origin email address for the API. +- CSM_EMAIL_TO_SEND_FROM: Origin email address for the API error developer emails. +- CSM_EMAILS_TO_SEND_TO: Destination email addresses for the API error developer emails. - CSM_EMAIL_APP_USERNAME: Username for the SMTP server. - CSM_EMAIL_APP_PASSWORD: Password for the SMTP server. -- CSM_EMAILS_TO_SEND_TO: Destination email list. - CSM_TARGET_SMTP_SERVER_ADDRESS: Destination SMTP server address. - CSM_TARGET_SMTP_SERVER_PORT: Destination SMTP server port. - API_LOGGING_LEVEL: The level of which the CV Manager API will log. (DEBUG, INFO, WARNING, ERROR) +- CSM_TLS_ENABLED: Set to "true" if the SMTP server requires TLS. +- CSM_AUTH_ENABLED: Set to "true" if the SMTP server requires authentication. - WZDX_ENDPOINT: WZDX datafeed endpoint. - WZDX_API_KEY: API key for the WZDX datafeed. - TIMEZONE: Timezone to be used for the API. @@ -210,8 +325,30 @@ For the "Debug Solution" to run properly on Windows 10/11 using WSL, the followi MongoDB Variables +#### For Windows Users Only + +If running on Windows, please make sure that your global git config is set up to not convert end-of-line characters during checkout. + +Disable `git core.autocrlf` (One Time Only) + +```bash +git config --global core.autocrlf false +``` + - MONGO_DB_URI: URI for the MongoDB connections. - MONGO_DB_NAME: Database name for RSU counts. +- MONGO_ADMIN_DB_USER: Admin Username for MongoDB +- MONGO_ADMIN_DB_PASS: Admin Password for MongoDB +- MONGO_CV_MANAGER_DB_USER: CV Manager Username for MongoDB +- MONGO_CV_MANAGER_DB_PASS: CV Manager Password for MongoDB + +- MONGO_IP: IP Address of the MongoDB (Defaults to $DOCKER_HOST_IP) +- MONGO_DB_USER: Username of the account used to connect to MongoDB +- MONGO_DB_PASS: Password of the account used to connect to MongoDB +- MONGO_PORT: Port number of MongoDB (default is 27017) +- MONGO_COLLECTION_TTL: Number of days documents will be kept in a MongoDB collection + +- INSERT_SAMPLE_DATA: If true, sample data will be inserted in the CVCounts, V2XGeoJson, and OdeSsmJson collections Keycloak Variables diff --git a/conflictmonitor/README.md b/conflictmonitor/README.md new file mode 100644 index 000000000..8773e1329 --- /dev/null +++ b/conflictmonitor/README.md @@ -0,0 +1,11 @@ +# JPO-Conflictmonitor Components + +This directory contains configuration files for the jpo-conflictmonitor, referenced in the docker-compose.yml. These files configure the kafka init container as well as the mongodb container. + +## kafka + +This directory contains kafka scripts, used for initializing the relevant kafka topics required for ConflictMonitor components. This script came from the JPO-ConflictMonitor repository, and has been modified to create additional topics required by the conflictvisualizer api. + +## mongo + +This directory contains scripts from the ConflictMonitor for initializing collections and indexes, as well as a mongodump dataset used for the visualizer. These files are referenced in the docker-compose.yml, and should not need to be modified for local development. diff --git a/conflictmonitor/kafka/kafka_init.sh b/conflictmonitor/kafka/kafka_init.sh new file mode 100644 index 000000000..7109bbbb9 --- /dev/null +++ b/conflictmonitor/kafka/kafka_init.sh @@ -0,0 +1,93 @@ +sleep 2s +/opt/bitnami/kafka/bin/kafka-topics.sh --bootstrap-server kafka:9092 --list +echo 'Creating kafka topics' + +# Create topics +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeSpatTxPojo" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeSpatPojo" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.FilteredOdeSpatJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeSpatRxPojo" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeBsmJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.FilteredOdeBsmJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.J2735TimBroadcastJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.Asn1DecoderInput" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.Asn1EncoderInput" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.SDWDepositorInput" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeMapTxPojo" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeSsmPojo" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeSrmTxPojo" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdePsmTxPojo" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdePsmJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.Asn1DecoderOutput" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.Asn1EncoderOutput" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmAppHealthNotification" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmAppHealthNotifications" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmAssessment" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmBsmEvents" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmBsmIntersection" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmBsmJsonRepartition" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmConnectionOfTravelAssessment" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmConnectionOfTravelEvent" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmConnectionOfTravelNotification" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmCustomConfigTable" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmDefaultConfigTable" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmEvent" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmIntersectionConfigTable" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmIntersectionReferenceAlignmentEvents" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmIntersectionReferenceAlignmentNotification" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmKafkaStateChangeEvents" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmLaneDirectionOfTravelAssessment" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmLaneDirectionOfTravelEvent" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmLaneDirectionOfTravelNotification" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmMapBoundingBox" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmMapBroadcastRateEvents" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmMapMinimumDataEvents" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmMergedConfigTable" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmNotification" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmSignalGroupAlignmentEvents" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmSignalGroupAlignmentNotification" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmSignalStateConflictEvents" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmSignalStateConflictNotification" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmSignalStateEventAssessment" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmSpatBroadcastRateEvents" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmSpatMinimumDataEvents" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmSpatTimeChangeDetailsEvent" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmSpatTimeChangeDetailsNotification" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmStopLinePassageEvent" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmStopLinePassageNotification" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmStopLineStopAssessment" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmStopLineStopEvent" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.CmStopLineStopNotification" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.DeduplicatedOdeMapJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.DeduplicatedOdeTimJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.DeduplicatedProcessedMap" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.DeduplicatedProcessedMapWKT" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.FilteredOdeBsmJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.FilteredOdeTimJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeBsmJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeBsmPojo" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeDriverAlertJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeMapJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeRawEncodedBSMJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeRawEncodedMAPJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeRawEncodedPSMJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeRawEncodedSPATJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeRawEncodedSRMJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeRawEncodedSSMJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeRawEncodedTIMJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeSpatJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeSpatRxJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeSrmJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeSsmJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeTIMCertExpirationTimeJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeTimBroadcastJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.OdeTimJson" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.ProcessedMap" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.ProcessedMapWKT" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 +/opt/bitnami/kafka/bin/kafka-topics.sh --create --if-not-exists --topic "topic.ProcessedSpat" --bootstrap-server kafka:9092 --replication-factor 1 --partitions 1 + + + +echo 'Kafka created with the following topics:' +/opt/bitnami/kafka/bin/kafka-topics.sh --bootstrap-server kafka:9092 --list +exit \ No newline at end of file diff --git a/conflictmonitor/mongo/Dockerfile b/conflictmonitor/mongo/Dockerfile new file mode 100644 index 000000000..edf4f7172 --- /dev/null +++ b/conflictmonitor/mongo/Dockerfile @@ -0,0 +1,5 @@ +FROM mongo:6 + +COPY a_init_replicas.js /docker-entrypoint-initdb.d/a_init_replicas.js +COPY b_create_indexes.js /docker-entrypoint-initdb.d/b_create_indexes.js + diff --git a/conflictmonitor/mongo/a_init_replicas.js b/conflictmonitor/mongo/a_init_replicas.js new file mode 100644 index 000000000..303c3c521 --- /dev/null +++ b/conflictmonitor/mongo/a_init_replicas.js @@ -0,0 +1,38 @@ +/* + +This script is the first of two scripts responsible for setting up mongoDB on initial boot. +These scripts should be copied to the /docker-entrypoint-initdb.d/ directory within the docker image; +the docker image will then execute these scripts automatically when the database is first created. +This script and its partner are prefixed with the letters a and b respectively to ensure they are run +in the proper order when copied into the mongoDB docker image. + +Since the conflict monitor uses a replica set in its mongoDB configuration. Initializing the replica set +and configuring the collections are separated from one another. The purpose of this to force a reconnect +to the database. This in turn allows the new connection to be connected to the primary replica which is +required for creating indexes on all the collections. This script is only responsible for creating the +replica set. Almost all other configuration should go in b_create_indexes.js + +Documentation on how the mongoDB docker image runs startup scripts can be found here +https://hub.docker.com/_/mongo/ + +*/ + +const CM_MONGO_ROOT_USERNAME = process.env.MONGO_INITDB_ROOT_USERNAME +const CM_MONGO_ROOT_PASSWORD = process.env.MONGO_INITDB_ROOT_PASSWORD + +db = db.getSiblingDB('admin') +db.auth(CM_MONGO_ROOT_USERNAME, CM_MONGO_ROOT_PASSWORD) +db = db.getSiblingDB('ConflictMonitor') + +console.log('Initializing Replicas') +try { + db_status = rs.status() +} catch (err) { + console.log('Initializing New DB') + try { + rs.initiate({ _id: 'rs0', members: [{ _id: 0, host: 'localhost:27017' }] }).ok + } catch (err) { + console.log('Unable to Initialize DB') + console.log(err) + } +} diff --git a/conflictmonitor/mongo/b_create_indexes.js b/conflictmonitor/mongo/b_create_indexes.js new file mode 100644 index 000000000..be021552f --- /dev/null +++ b/conflictmonitor/mongo/b_create_indexes.js @@ -0,0 +1,622 @@ +// Create indexes on all collections + +/* +This is the second script responsible for configuring mongoDB automatically on startup. +This script is responsible for creating users, creating collections, adding indexes, and configuring TTLs +For more information see the header in a_init_replicas.js +*/ + +console.log('') +console.log('Running create_indexes.js') + +// Setup Username and Password Definitions +const CM_MONGO_ROOT_USERNAME = process.env.CM_MONGO_ROOT_USERNAME +const CM_MONGO_ROOT_PASSWORD = process.env.CM_MONGO_ROOT_PASSWORD + +const CM_MONGO_CONNECTOR_USERNAME = process.env.CM_MONGO_CONNECTOR_USERNAME +const CM_MONGO_CONNECTOR_PASSWORD = process.env.CM_MONGO_CONNECTOR_PASSWORD + +const CM_MONGO_API_USERNAME = process.env.CM_MONGO_API_USERNAME +const CM_MONGO_API_PASSWORD = process.env.CM_MONGO_API_PASSWORD + +const CM_MONGO_USER_USERNAME = process.env.CM_MONGO_USER_USERNAME +const CM_MONGO_USER_PASSWORD = process.env.CM_MONGO_USER_PASSWORD + +const CM_DATABASE_NAME = process.env.CM_DATABASE_NAME || 'ConflictMonitor' + +const expireSeconds = 5184000 // 2 months +const retryMilliseconds = 10000 + +const users = [ + // {username: CM_MONGO_ROOT_USERNAME, password: CM_MONGO_ROOT_PASSWORD, roles: "root", database: "admin" }, + { + username: CM_MONGO_CONNECTOR_USERNAME, + password: CM_MONGO_CONNECTOR_PASSWORD, + roles: 'readWrite', + database: CM_DATABASE_NAME, + }, + { username: CM_MONGO_API_USERNAME, password: CM_MONGO_API_PASSWORD, roles: 'readWrite', database: CM_DATABASE_NAME }, + { username: CM_MONGO_USER_USERNAME, password: CM_MONGO_USER_PASSWORD, roles: 'read', database: CM_DATABASE_NAME }, +] + +// name -> collection name +// ttlField -> field to perform ttl on +// timeField -> field to index for time queries +// intersectionField -> field containing intersection id for id queries +const collections = [ + // ODE Json data + { + name: 'OdeDriverAlertJson', + ttlField: 'recordGeneratedAt', + timeField: 'metadata.odeReceivedAt', + intersectionField: null, + rsuIP: 'metadata.originIp', + }, + { + name: 'OdeBsmJson', + ttlField: 'recordGeneratedAt', + timeField: 'metadata.odeReceivedAt', + intersectionField: null, + rsuIP: 'metadata.originIp', + }, + { + name: 'OdeMapJson', + ttlField: 'recordGeneratedAt', + timeField: 'metadata.odeReceivedAt', + intersectionField: null, + rsuIP: 'metadata.originIp', + }, + { + name: 'OdeSpatJson', + ttlField: 'recordGeneratedAt', + timeField: 'metadata.odeReceivedAt', + intersectionField: null, + rsuIP: 'metadata.originIp', + }, + { + name: 'OdeSpatRxJson', + ttlField: 'recordGeneratedAt', + timeField: 'metadata.odeReceivedAt', + intersectionField: null, + rsuIP: 'metadata.originIp', + }, + { + name: 'OdeSrmJson', + ttlField: 'recordGeneratedAt', + timeField: 'metadata.odeReceivedAt', + intersectionField: null, + rsuIP: 'metadata.originIp', + }, + { + name: 'OdeSsmJson', + ttlField: 'recordGeneratedAt', + timeField: 'metadata.odeReceivedAt', + intersectionField: null, + rsuIP: 'metadata.originIp', + }, + { + name: 'OdeTimJson', + ttlField: 'recordGeneratedAt', + timeField: 'metadata.odeReceivedAt', + intersectionField: null, + rsuIP: 'metadata.originIp', + }, + { + name: 'OdeTimBroadcastJson', + ttlField: 'recordGeneratedAt', + timeField: 'metadata.odeReceivedAt', + intersectionField: null, + rsuIP: 'metadata.originIp', + }, + { + name: 'OdeTIMCertExpirationTimeJson', + ttlField: 'recordGeneratedAt', + timeField: 'metadata.odeReceivedAt', + intersectionField: null, + rsuIP: 'metadata.originIp', + }, + + // Ode Raw ASN + { + name: 'OdeRawEncodedBSMJson', + ttlField: 'recordGeneratedAt', + timeField: 'BsmMessageContent.metadata.utctimestamp', + intersectionField: null, + rsuIP: 'BsmMessageContent.metadata.originRsu', + }, + { + name: 'OdeRawEncodedMAPJson', + ttlField: 'recordGeneratedAt', + timeField: 'MapMessageContent.metadata.utctimestamp', + intersectionField: null, + rsuIP: 'MapMessageContent.metadata.originRsu', + }, + { + name: 'OdeRawEncodedSPATJson', + ttlField: 'recordGeneratedAt', + timeField: 'SpatMessageContent.metadata.utctimestamp', + intersectionField: null, + rsuIP: 'SpatMessageContent.metadata.originRsu', + }, + { + name: 'OdeRawEncodedSRMJson', + ttlField: 'recordGeneratedAt', + timeField: 'SrmMessageContent.metadata.utctimestamp', + intersectionField: null, + rsuIP: 'SpatMessageContent.metadata.originRsu', + }, + { + name: 'OdeRawEncodedSSMJson', + ttlField: 'recordGeneratedAt', + timeField: 'SsmMessageContent.metadata.utctimestamp', + intersectionField: null, + rsuIP: 'SpatMessageContent.metadata.originRsu', + }, + { + name: 'OdeRawEncodedTIMJson', + ttlField: 'recordGeneratedAt', + timeField: 'TimMessageContent.metadata.utctimestamp', + intersectionField: null, + rsuIP: 'SpatMessageContent.metadata.originRsu', + }, + + // GeoJson Converter Data + { + name: 'ProcessedMap', + ttlField: 'recordGeneratedAt', + timeField: 'properties.timeStamp', + intersectionField: 'properties.intersectionId', + }, + { + name: 'ProcessedSpat', + ttlField: 'recordGeneratedAt', + timeField: 'utcTimeStamp', + intersectionField: 'intersectionId', + }, + + // Conflict Monitor Events + { + name: 'CmStopLineStopEvent', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmStopLinePassageEvent', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmIntersectionReferenceAlignmentEvents', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmSignalGroupAlignmentEvents', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmConnectionOfTravelEvent', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmSignalStateConflictEvents', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmLaneDirectionOfTravelEvent', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmSpatTimeChangeDetailsEvent', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmSpatMinimumDataEvents', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmMapBroadcastRateEvents', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmMapMinimumDataEvents', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmSpatBroadcastRateEvents', + ttlField: 'eventGeneratedAt', + timeField: 'eventGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmBsmEvents', + ttlField: 'recordGeneratedAt', + timeField: 'recordGeneratedAt', + intersectionField: 'intersectionID', + }, + + // Conflict Monitor Assessments + { + name: 'CmLaneDirectionOfTravelAssessment', + ttlField: 'assessmentGeneratedAt', + timeField: 'assessmentGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmConnectionOfTravelAssessment', + ttlField: 'assessmentGeneratedAt', + timeField: 'assessmentGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmSignalStateEventAssessment', + ttlField: 'assessmentGeneratedAt', + timeField: 'assessmentGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmStopLineStopAssessment', + ttlField: 'assessmentGeneratedAt', + timeField: 'assessmentGeneratedAt', + intersectionField: 'intersectionID', + }, + + // Conflict Monitor Notifications + { + name: 'CmSpatTimeChangeDetailsNotification', + ttlField: 'notificationGeneratedAt', + timeField: 'notificationGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmLaneDirectionOfTravelNotification', + ttlField: 'notificationGeneratedAt', + timeField: 'notificationGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmConnectionOfTravelNotification', + ttlField: 'notificationGeneratedAt', + timeField: 'notificationGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmAppHealthNotifications', + ttlField: 'notificationGeneratedAt', + timeField: 'notificationGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmSignalStateConflictNotification', + ttlField: 'notificationGeneratedAt', + timeField: 'notificationGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmSignalGroupAlignmentNotification', + ttlField: 'notificationGeneratedAt', + timeField: 'notificationGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmStopLinePassageNotification', + ttlField: 'notificationGeneratedAt', + timeField: 'notificationGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmStopLineStopNotification', + ttlField: 'notificationGeneratedAt', + timeField: 'notificationGeneratedAt', + intersectionField: 'intersectionID', + }, + { + name: 'CmNotification', + ttlField: 'notificationGeneratedAt', + timeField: 'notificationGeneratedAt', + intersectionField: 'intersectionID', + }, + + // Mongo Management Collection + { name: 'MongoStorage', ttlField: null, timeField: 'recordGeneratedAt', intersectionField: null }, +] + +try { + db.getMongo().setReadPref('primaryPreferred') + db = db.getSiblingDB('ConflictMonitor') + db.getMongo().setReadPref('primaryPreferred') + var isMaster = db.isMaster() + if (isMaster.primary) { + console.log('Connected to the primary replica set member.') + } else { + console.log('Not connected to the primary replica set member. Current node: ' + isMaster.host) + } +} catch (err) { + console.log('Could not switch DB to Sibling DB') + console.log(err) +} + +// Create Users in Database +for (user of users) { + createUser(user) +} + +// Wait for the collections to exist in mongo before trying to create indexes on them +let missing_collection_count +do { + try { + missing_collection_count = 0 + const collectionNames = db.getCollectionNames() + for (collection of collections) { + // Create Collection if it doesn't exist + let created = false + if (!collectionNames.includes(collection.name)) { + created = createCollection(collection) + // created = true; + } else { + created = true + } + + if (created) { + createTTLIndex(collection) + createTimeIntersectionIndex(collection) + createTimeRsuIpIndex(collection) + createTimeIndex(collection) + } else { + missing_collection_count++ + console.log('Collection ' + collection.name + ' does not exist yet') + } + } + if (missing_collection_count > 0) { + console.log( + 'Waiting on ' + + missing_collection_count + + ' collections to be created...will try again in ' + + retryMilliseconds + + ' ms' + ) + sleep(retryMilliseconds) + } + } catch (err) { + console.log('Error while setting up TTL indexes in collections') + console.log(rs.status()) + console.error(err) + sleep(retryMilliseconds) + } +} while (missing_collection_count > 0) + +console.log('Finished Creating All TTL indexes') + +function createUser(user) { + try { + console.log('Creating User: ' + user.username + ' with Permissions: ' + user.roles) + db.createUser({ + user: user.username, + pwd: user.password, + roles: [{ role: user.roles, db: user.database }], + }) + } catch (err) { + console.log(err) + console.log('Unable to Create User. Perhaps the User already exists.') + } +} + +function createCollection(collection) { + try { + db.createCollection(collection.name) + return true + } catch (err) { + console.log('Unable to Create Collection: ' + collection.name) + console.log(err) + return false + } +} + +// Create TTL Indexes +function createTTLIndex(collection) { + try { + if (collection.hasOwnProperty('ttlField') && collection.ttlField != null) { + const ttlField = collection.ttlField + const collectionName = collection.name + + let indexJson = {} + indexJson[ttlField] = 1 + + if (ttlIndexExists(collection)) { + db.runCommand({ + collMod: collectionName, + index: { + keyPattern: indexJson, + expireAfterSeconds: expireSeconds, + }, + }) + console.log('Updated TTL index for ' + collectionName + ' using the field: ' + ttlField + ' as the timestamp') + } else { + db[collectionName].createIndex(indexJson, { expireAfterSeconds: expireSeconds }) + console.log('Created TTL index for ' + collectionName + ' using the field: ' + ttlField + ' as the timestamp') + } + } + } catch (err) { + console.log( + 'Failed to Create or Update index for ' + collectionName + 'using the field: ' + ttlField + ' as the timestamp' + ) + } +} + +function createTimeIndex(collection) { + if (timeIndexExists(collection)) { + // Skip if Index already Exists + return + } + + if (collection.hasOwnProperty('timeField') && collection.timeField != null) { + const collectionName = collection.name + const timeField = collection.timeField + console.log('Creating Time Index for ' + collectionName) + + var indexJson = {} + indexJson[timeField] = -1 + + try { + db[collectionName].createIndex(indexJson) + console.log( + 'Created Time Intersection index for ' + collectionName + ' using the field: ' + timeField + ' as the timestamp' + ) + } catch (err) { + db.runCommand({ + collMod: collectionName, + index: { + keyPattern: indexJson, + }, + }) + console.log('Updated Time index for ' + collectionName + ' using the field: ' + timeField + ' as the timestamp') + } + } +} + +function createTimeRsuIpIndex() { + if (timeRsuIpIndexExists(collection)) { + // Skip if Index already Exists + return + } + + if ( + collection.hasOwnProperty('timeField') && + collection.timeField != null && + collection.hasOwnProperty('rsuIP') && + collection.rsuIP != null + ) { + const collectionName = collection.name + const timeField = collection.timeField + const rsuIP = collection.rsuIP + console.log('Creating Time rsuIP Index for ' + collectionName) + + var indexJson = {} + indexJson[rsuIP] = -1 + indexJson[timeField] = -1 + + try { + db[collectionName].createIndex(indexJson) + console.log( + 'Created Time rsuIP Intersection index for ' + + collectionName + + ' using the field: ' + + timeField + + ' as the timestamp and : ' + + rsuIP + + ' as the rsuIP' + ) + } catch (err) { + db.runCommand({ + collMod: collectionName, + index: { + keyPattern: indexJson, + }, + }) + console.log( + 'Updated Time rsuIP index for ' + + collectionName + + ' using the field: ' + + timeField + + ' as the timestamp and : ' + + rsuIP + + ' as the rsuIP' + ) + } + } +} + +function createTimeIntersectionIndex(collection) { + if (timeIntersectionIndexExists(collection)) { + // Skip if Index already Exists + return + } + + if ( + collection.hasOwnProperty('timeField') && + collection.timeField != null && + collection.hasOwnProperty('intersectionField') && + collection.intersectionField != null + ) { + const collectionName = collection.name + const timeField = collection.timeField + const intersectionField = collection.intersectionField + console.log('Creating time intersection index for ' + collectionName) + + var indexJson = {} + indexJson[intersectionField] = -1 + indexJson[timeField] = -1 + + try { + db[collectionName].createIndex(indexJson) + console.log( + 'Created time intersection index for ' + + collectionName + + ' using the field: ' + + timeField + + ' as the timestamp and : ' + + intersectionField + + ' as the rsuIP' + ) + } catch (err) { + db.runCommand({ + collMod: collectionName, + index: { + keyPattern: indexJson, + }, + }) + console.log( + 'Updated time intersection index for ' + + collectionName + + ' using the field: ' + + timeField + + ' as the timestamp and : ' + + intersectionField + + ' as the rsuIP' + ) + } + } +} + +function ttlIndexExists(collection) { + return db[collection.name].getIndexes().find((idx) => idx.hasOwnProperty('expireAfterSeconds')) !== undefined +} + +function timeIntersectionIndexExists(collection) { + return ( + db[collection.name] + .getIndexes() + .find((idx) => idx.name == collection.intersectionField + '_-1_' + collection.timeField + '_-1') !== undefined + ) +} + +function timeRsuIpIndexExists(collection) { + return ( + db[collection.name] + .getIndexes() + .find((idx) => idx.name == collection.rsuIP + '_-1_' + collection.timeField + '_-1') !== undefined + ) +} + +function timeIndexExists(collection) { + return db[collection.name].getIndexes().find((idx) => idx.name == collection.timeField + '_-1') !== undefined +} diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmAppHealthNotifications.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmAppHealthNotifications.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmAppHealthNotifications.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmAppHealthNotifications.metadata.json new file mode 100644 index 000000000..c13fe3578 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmAppHealthNotifications.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"1"}},"name":"notificationGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_notificationGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"notificationGeneratedAt_-1"}],"uuid":"92411e5291cf418c9f41ff9d566f993e","collectionName":"CmAppHealthNotifications","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmBsmEvents.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmBsmEvents.bson new file mode 100644 index 000000000..1c3e7499d Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmBsmEvents.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmBsmEvents.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmBsmEvents.metadata.json new file mode 100644 index 000000000..33dc04498 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmBsmEvents.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"recordGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_recordGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"-1"}},"name":"recordGeneratedAt_-1"}],"uuid":"59245e7327b740db904193929b3feb3d","collectionName":"CmBsmEvents","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelAssessment.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelAssessment.bson new file mode 100644 index 000000000..676d808fa Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelAssessment.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelAssessment.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelAssessment.metadata.json new file mode 100644 index 000000000..734fe8da2 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelAssessment.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"assessmentGeneratedAt":{"$numberInt":"1"}},"name":"assessmentGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"assessmentGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_assessmentGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"assessmentGeneratedAt":{"$numberInt":"-1"}},"name":"assessmentGeneratedAt_-1"}],"uuid":"898eb35088194246ae8736ee9ba7a79a","collectionName":"CmConnectionOfTravelAssessment","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelEvent.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelEvent.bson new file mode 100644 index 000000000..b333b4450 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelEvent.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelEvent.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelEvent.metadata.json new file mode 100644 index 000000000..3d5de4c42 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelEvent.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"aee5c8e72cbd4de4867e5bdf60f7aa94","collectionName":"CmConnectionOfTravelEvent","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelNotification.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelNotification.bson new file mode 100644 index 000000000..e8524b13a Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelNotification.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelNotification.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelNotification.metadata.json new file mode 100644 index 000000000..37e1ffb8c --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmConnectionOfTravelNotification.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"1"}},"name":"notificationGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_notificationGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"notificationGeneratedAt_-1"}],"uuid":"7d3debaa2a434f2fac503ef5f212bfd6","collectionName":"CmConnectionOfTravelNotification","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmIntersectionReferenceAlignmentEvents.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmIntersectionReferenceAlignmentEvents.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmIntersectionReferenceAlignmentEvents.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmIntersectionReferenceAlignmentEvents.metadata.json new file mode 100644 index 000000000..93edf73e7 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmIntersectionReferenceAlignmentEvents.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"3d817377165c4c12a521259972fe83e5","collectionName":"CmIntersectionReferenceAlignmentEvents","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelAssessment.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelAssessment.bson new file mode 100644 index 000000000..053e764ef Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelAssessment.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelAssessment.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelAssessment.metadata.json new file mode 100644 index 000000000..4168a2ef7 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelAssessment.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"assessmentGeneratedAt":{"$numberInt":"1"}},"name":"assessmentGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"assessmentGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_assessmentGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"assessmentGeneratedAt":{"$numberInt":"-1"}},"name":"assessmentGeneratedAt_-1"}],"uuid":"e75ddc4389574f579313a1c59c909aef","collectionName":"CmLaneDirectionOfTravelAssessment","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelEvent.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelEvent.bson new file mode 100644 index 000000000..26ed57664 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelEvent.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelEvent.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelEvent.metadata.json new file mode 100644 index 000000000..5626b99b5 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelEvent.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"6cc659d287e345429a0af3c22881a7a7","collectionName":"CmLaneDirectionOfTravelEvent","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelNotification.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelNotification.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelNotification.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelNotification.metadata.json new file mode 100644 index 000000000..e986d5445 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmLaneDirectionOfTravelNotification.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"1"}},"name":"notificationGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_notificationGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"notificationGeneratedAt_-1"}],"uuid":"a330e14c06cd4671ad4d6c158f2e6f4b","collectionName":"CmLaneDirectionOfTravelNotification","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapBroadcastRateEvents.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapBroadcastRateEvents.bson new file mode 100644 index 000000000..e516d8270 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapBroadcastRateEvents.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapBroadcastRateEvents.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapBroadcastRateEvents.metadata.json new file mode 100644 index 000000000..edb1dc366 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapBroadcastRateEvents.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"e46adb65bf9640ccbe771860cecdc509","collectionName":"CmMapBroadcastRateEvents","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapMinimumDataEvents.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapMinimumDataEvents.bson new file mode 100644 index 000000000..b68582e53 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapMinimumDataEvents.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapMinimumDataEvents.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapMinimumDataEvents.metadata.json new file mode 100644 index 000000000..d69bcfe29 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmMapMinimumDataEvents.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"e99d527c2e95468ab71462119a643e97","collectionName":"CmMapMinimumDataEvents","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmNotification.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmNotification.bson new file mode 100644 index 000000000..b05a6eef7 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmNotification.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmNotification.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmNotification.metadata.json new file mode 100644 index 000000000..8ebbc7121 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmNotification.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"1"}},"name":"notificationGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_notificationGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"notificationGeneratedAt_-1"}],"uuid":"eabb40aea6474584ad95b68b21389093","collectionName":"CmNotification","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalGroupAlignmentEvents.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalGroupAlignmentEvents.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalGroupAlignmentEvents.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalGroupAlignmentEvents.metadata.json new file mode 100644 index 000000000..6a9391a43 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalGroupAlignmentEvents.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"8328a9d2938f498186bb7fddfe592d0d","collectionName":"CmSignalGroupAlignmentEvents","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalGroupAlignmentNotification.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalGroupAlignmentNotification.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalGroupAlignmentNotification.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalGroupAlignmentNotification.metadata.json new file mode 100644 index 000000000..fcd65388f --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalGroupAlignmentNotification.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"1"}},"name":"notificationGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_notificationGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"notificationGeneratedAt_-1"}],"uuid":"37752835aec84553a6da5b157e349916","collectionName":"CmSignalGroupAlignmentNotification","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictEvents.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictEvents.bson new file mode 100644 index 000000000..c1376e234 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictEvents.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictEvents.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictEvents.metadata.json new file mode 100644 index 000000000..aa0e61554 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictEvents.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"fc7592e5e22a4d4d839bdef3d67f8df0","collectionName":"CmSignalStateConflictEvents","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictNotification.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictNotification.bson new file mode 100644 index 000000000..6fc89a86e Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictNotification.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictNotification.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictNotification.metadata.json new file mode 100644 index 000000000..f987bf11b --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateConflictNotification.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"1"}},"name":"notificationGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_notificationGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"notificationGeneratedAt_-1"}],"uuid":"8c12d548508c469fb0608f3da3541972","collectionName":"CmSignalStateConflictNotification","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateEventAssessment.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateEventAssessment.bson new file mode 100644 index 000000000..e45d1457b Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateEventAssessment.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateEventAssessment.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateEventAssessment.metadata.json new file mode 100644 index 000000000..4737a7668 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSignalStateEventAssessment.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"assessmentGeneratedAt":{"$numberInt":"1"}},"name":"assessmentGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"assessmentGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_assessmentGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"assessmentGeneratedAt":{"$numberInt":"-1"}},"name":"assessmentGeneratedAt_-1"}],"uuid":"adf2ebacec734a23882284e57cf4ff46","collectionName":"CmSignalStateEventAssessment","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatBroadcastRateEvents.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatBroadcastRateEvents.bson new file mode 100644 index 000000000..78a5c7b2c Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatBroadcastRateEvents.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatBroadcastRateEvents.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatBroadcastRateEvents.metadata.json new file mode 100644 index 000000000..dedb512f5 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatBroadcastRateEvents.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"2a1850ad34e24bbb8e7ece763613af6f","collectionName":"CmSpatBroadcastRateEvents","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatMinimumDataEvents.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatMinimumDataEvents.bson new file mode 100644 index 000000000..d5ed25d64 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatMinimumDataEvents.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatMinimumDataEvents.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatMinimumDataEvents.metadata.json new file mode 100644 index 000000000..6869b1ee8 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatMinimumDataEvents.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"0fbe65c42dd34577a43c0749e84a1c07","collectionName":"CmSpatMinimumDataEvents","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsEvent.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsEvent.bson new file mode 100644 index 000000000..47b6e31f1 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsEvent.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsEvent.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsEvent.metadata.json new file mode 100644 index 000000000..9bcfd7205 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsEvent.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"dce52437dc98477489db1bb95a3e737c","collectionName":"CmSpatTimeChangeDetailsEvent","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsNotification.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsNotification.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsNotification.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsNotification.metadata.json new file mode 100644 index 000000000..b82385a14 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmSpatTimeChangeDetailsNotification.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"1"}},"name":"notificationGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_notificationGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"notificationGeneratedAt_-1"}],"uuid":"9d620a6e7aff43b7ab056964ec394fc1","collectionName":"CmSpatTimeChangeDetailsNotification","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageEvent.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageEvent.bson new file mode 100644 index 000000000..b153a67d8 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageEvent.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageEvent.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageEvent.metadata.json new file mode 100644 index 000000000..c7fdedf7e --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageEvent.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"cf6964a7ec4345b9bb9cf3520733d5f4","collectionName":"CmStopLinePassageEvent","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageNotification.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageNotification.bson new file mode 100644 index 000000000..ee38186f4 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageNotification.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageNotification.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageNotification.metadata.json new file mode 100644 index 000000000..2a641613d --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLinePassageNotification.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"1"}},"name":"notificationGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_notificationGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"notificationGeneratedAt_-1"}],"uuid":"f014869780154679af98c08cb5133aca","collectionName":"CmStopLinePassageNotification","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopAssessment.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopAssessment.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopAssessment.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopAssessment.metadata.json new file mode 100644 index 000000000..1786236d0 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopAssessment.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"assessmentGeneratedAt":{"$numberInt":"1"}},"name":"assessmentGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"assessmentGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_assessmentGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"assessmentGeneratedAt":{"$numberInt":"-1"}},"name":"assessmentGeneratedAt_-1"}],"uuid":"00722b1d3d224d7abda9074cf74f6148","collectionName":"CmStopLineStopAssessment","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopEvent.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopEvent.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopEvent.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopEvent.metadata.json new file mode 100644 index 000000000..76ffcddd9 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopEvent.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"1"}},"name":"eventGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"eventGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_eventGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"eventGeneratedAt":{"$numberInt":"-1"}},"name":"eventGeneratedAt_-1"}],"uuid":"4c36b1e21b63454ea440c591517a5dea","collectionName":"CmStopLineStopEvent","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopNotification.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopNotification.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopNotification.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopNotification.metadata.json new file mode 100644 index 000000000..dd428aba4 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/CmStopLineStopNotification.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"1"}},"name":"notificationGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionID":{"$numberInt":"-1"},"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"intersectionID_-1_notificationGeneratedAt_-1"},{"v":{"$numberInt":"2"},"key":{"notificationGeneratedAt":{"$numberInt":"-1"}},"name":"notificationGeneratedAt_-1"}],"uuid":"d3c4aaf656be47379413cc615c769d22","collectionName":"CmStopLineStopNotification","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/MongoStorage.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/MongoStorage.bson new file mode 100644 index 000000000..8350326ae Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/MongoStorage.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/MongoStorage.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/MongoStorage.metadata.json new file mode 100644 index 000000000..744ec1766 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/MongoStorage.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"-1"}},"name":"recordGeneratedAt_-1"}],"uuid":"f08f273cb7a744a4810f0c223d281103","collectionName":"MongoStorage","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeBsmJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeBsmJson.bson new file mode 100644 index 000000000..104e5e059 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeBsmJson.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeBsmJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeBsmJson.metadata.json new file mode 100644 index 000000000..656cb8e9e --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeBsmJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"metadata.originIp":{"$numberInt":"-1"},"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.originIp_-1_metadata.odeReceivedAt_-1"},{"v":{"$numberInt":"2"},"key":{"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.odeReceivedAt_-1"}],"uuid":"9796744b53a64b01ac4cb63bf1ff73b5","collectionName":"OdeBsmJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeDriverAlertJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeDriverAlertJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeDriverAlertJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeDriverAlertJson.metadata.json new file mode 100644 index 000000000..70a96d5de --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeDriverAlertJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"metadata.originIp":{"$numberInt":"-1"},"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.originIp_-1_metadata.odeReceivedAt_-1"},{"v":{"$numberInt":"2"},"key":{"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.odeReceivedAt_-1"}],"uuid":"8d31621ad4864a6489740ebb0d8f898b","collectionName":"OdeDriverAlertJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeMapJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeMapJson.bson new file mode 100644 index 000000000..b3150180f Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeMapJson.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeMapJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeMapJson.metadata.json new file mode 100644 index 000000000..6887901fb --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeMapJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"metadata.originIp":{"$numberInt":"-1"},"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.originIp_-1_metadata.odeReceivedAt_-1"},{"v":{"$numberInt":"2"},"key":{"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.odeReceivedAt_-1"}],"uuid":"b78e3ec27ba34f9e804c93c3a6608999","collectionName":"OdeMapJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedBSMJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedBSMJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedBSMJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedBSMJson.metadata.json new file mode 100644 index 000000000..e0b5ebe3c --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedBSMJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"BsmMessageContent.metadata.originRsu":{"$numberInt":"-1"},"BsmMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"BsmMessageContent.metadata.originRsu_-1_BsmMessageContent.metadata.utctimestamp_-1"},{"v":{"$numberInt":"2"},"key":{"BsmMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"BsmMessageContent.metadata.utctimestamp_-1"}],"uuid":"e914264f17244a46b92aed6fadbcdade","collectionName":"OdeRawEncodedBSMJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedMAPJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedMAPJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedMAPJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedMAPJson.metadata.json new file mode 100644 index 000000000..55d585086 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedMAPJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"MapMessageContent.metadata.originRsu":{"$numberInt":"-1"},"MapMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"MapMessageContent.metadata.originRsu_-1_MapMessageContent.metadata.utctimestamp_-1"},{"v":{"$numberInt":"2"},"key":{"MapMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"MapMessageContent.metadata.utctimestamp_-1"}],"uuid":"42381a3198124e7e8bee08430afc1a68","collectionName":"OdeRawEncodedMAPJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSPATJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSPATJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSPATJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSPATJson.metadata.json new file mode 100644 index 000000000..1cb503cdc --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSPATJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"SpatMessageContent.metadata.originRsu":{"$numberInt":"-1"},"SpatMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"SpatMessageContent.metadata.originRsu_-1_SpatMessageContent.metadata.utctimestamp_-1"},{"v":{"$numberInt":"2"},"key":{"SpatMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"SpatMessageContent.metadata.utctimestamp_-1"}],"uuid":"87ff1ce53101416fbcc9cbbb075c39a4","collectionName":"OdeRawEncodedSPATJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSRMJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSRMJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSRMJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSRMJson.metadata.json new file mode 100644 index 000000000..913cab262 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSRMJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"SpatMessageContent.metadata.originRsu":{"$numberInt":"-1"},"SrmMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"SpatMessageContent.metadata.originRsu_-1_SrmMessageContent.metadata.utctimestamp_-1"},{"v":{"$numberInt":"2"},"key":{"SrmMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"SrmMessageContent.metadata.utctimestamp_-1"}],"uuid":"ea932c2c9a0f4842b5c25df4d3cb7946","collectionName":"OdeRawEncodedSRMJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSSMJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSSMJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSSMJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSSMJson.metadata.json new file mode 100644 index 000000000..fddfb07a5 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedSSMJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"SpatMessageContent.metadata.originRsu":{"$numberInt":"-1"},"SsmMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"SpatMessageContent.metadata.originRsu_-1_SsmMessageContent.metadata.utctimestamp_-1"},{"v":{"$numberInt":"2"},"key":{"SsmMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"SsmMessageContent.metadata.utctimestamp_-1"}],"uuid":"e6b5362f810a49a5808855cc6d3d3074","collectionName":"OdeRawEncodedSSMJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedTIMJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedTIMJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedTIMJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedTIMJson.metadata.json new file mode 100644 index 000000000..28393cb47 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeRawEncodedTIMJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"SpatMessageContent.metadata.originRsu":{"$numberInt":"-1"},"TimMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"SpatMessageContent.metadata.originRsu_-1_TimMessageContent.metadata.utctimestamp_-1"},{"v":{"$numberInt":"2"},"key":{"TimMessageContent.metadata.utctimestamp":{"$numberInt":"-1"}},"name":"TimMessageContent.metadata.utctimestamp_-1"}],"uuid":"869e674cbc80493db9a4166761883718","collectionName":"OdeRawEncodedTIMJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatJson.bson new file mode 100644 index 000000000..1c6a6c331 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatJson.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatJson.metadata.json new file mode 100644 index 000000000..469f125a4 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"metadata.originIp":{"$numberInt":"-1"},"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.originIp_-1_metadata.odeReceivedAt_-1"},{"v":{"$numberInt":"2"},"key":{"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.odeReceivedAt_-1"}],"uuid":"ae2efabd0e8140c1903f94dea1668fdf","collectionName":"OdeSpatJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatRxJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatRxJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatRxJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatRxJson.metadata.json new file mode 100644 index 000000000..c6785351c --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSpatRxJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"metadata.originIp":{"$numberInt":"-1"},"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.originIp_-1_metadata.odeReceivedAt_-1"},{"v":{"$numberInt":"2"},"key":{"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.odeReceivedAt_-1"}],"uuid":"57b7a96118b74039934e03d9d5712564","collectionName":"OdeSpatRxJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSrmJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSrmJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSrmJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSrmJson.metadata.json new file mode 100644 index 000000000..8ef07a0ba --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSrmJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"metadata.originIp":{"$numberInt":"-1"},"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.originIp_-1_metadata.odeReceivedAt_-1"},{"v":{"$numberInt":"2"},"key":{"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.odeReceivedAt_-1"}],"uuid":"518b754346e447799fd080c6bd88b266","collectionName":"OdeSrmJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSsmJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSsmJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSsmJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSsmJson.metadata.json new file mode 100644 index 000000000..c6133a995 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeSsmJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"metadata.originIp":{"$numberInt":"-1"},"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.originIp_-1_metadata.odeReceivedAt_-1"},{"v":{"$numberInt":"2"},"key":{"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.odeReceivedAt_-1"}],"uuid":"4471fb38e08148f392a0fe5693037071","collectionName":"OdeSsmJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTIMCertExpirationTimeJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTIMCertExpirationTimeJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTIMCertExpirationTimeJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTIMCertExpirationTimeJson.metadata.json new file mode 100644 index 000000000..dba33ee1e --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTIMCertExpirationTimeJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"metadata.originIp":{"$numberInt":"-1"},"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.originIp_-1_metadata.odeReceivedAt_-1"},{"v":{"$numberInt":"2"},"key":{"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.odeReceivedAt_-1"}],"uuid":"4661a0d2a96549518df7bb43ef919e46","collectionName":"OdeTIMCertExpirationTimeJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTimBroadcastJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTimBroadcastJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTimBroadcastJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTimBroadcastJson.metadata.json new file mode 100644 index 000000000..92fa1fe02 --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTimBroadcastJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"metadata.originIp":{"$numberInt":"-1"},"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.originIp_-1_metadata.odeReceivedAt_-1"},{"v":{"$numberInt":"2"},"key":{"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.odeReceivedAt_-1"}],"uuid":"3d04dc77685245fc8f6d10734391a4f7","collectionName":"OdeTimBroadcastJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTimJson.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTimJson.bson new file mode 100644 index 000000000..e69de29bb diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTimJson.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTimJson.metadata.json new file mode 100644 index 000000000..5299ee36b --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/OdeTimJson.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"metadata.originIp":{"$numberInt":"-1"},"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.originIp_-1_metadata.odeReceivedAt_-1"},{"v":{"$numberInt":"2"},"key":{"metadata.odeReceivedAt":{"$numberInt":"-1"}},"name":"metadata.odeReceivedAt_-1"}],"uuid":"d098528dd8c54b81b752f7d483437743","collectionName":"OdeTimJson","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedMap.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedMap.bson new file mode 100644 index 000000000..4f55a4bb7 Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedMap.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedMap.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedMap.metadata.json new file mode 100644 index 000000000..03db7a1ab --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedMap.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"properties.intersectionId":{"$numberInt":"-1"},"properties.timeStamp":{"$numberInt":"-1"}},"name":"properties.intersectionId_-1_properties.timeStamp_-1"},{"v":{"$numberInt":"2"},"key":{"properties.timeStamp":{"$numberInt":"-1"}},"name":"properties.timeStamp_-1"}],"uuid":"7a2c6de872414bea9d98b007ee88872f","collectionName":"ProcessedMap","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedSpat.bson b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedSpat.bson new file mode 100644 index 000000000..608ef66bd Binary files /dev/null and b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedSpat.bson differ diff --git a/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedSpat.metadata.json b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedSpat.metadata.json new file mode 100644 index 000000000..34bd63a8e --- /dev/null +++ b/conflictmonitor/mongo/dump_2024_08_20/ConflictMonitor/ProcessedSpat.metadata.json @@ -0,0 +1 @@ +{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"},{"v":{"$numberInt":"2"},"key":{"recordGeneratedAt":{"$numberInt":"1"}},"name":"recordGeneratedAt_1","expireAfterSeconds":{"$numberInt":"5184000"}},{"v":{"$numberInt":"2"},"key":{"intersectionId":{"$numberInt":"-1"},"utcTimeStamp":{"$numberInt":"-1"}},"name":"intersectionId_-1_utcTimeStamp_-1"},{"v":{"$numberInt":"2"},"key":{"utcTimeStamp":{"$numberInt":"-1"}},"name":"utcTimeStamp_-1"}],"uuid":"7bfae48f39204c518542a13d3a59acd8","collectionName":"ProcessedSpat","type":"collection"} \ No newline at end of file diff --git a/conflictmonitor/mongo/keyfile.txt b/conflictmonitor/mongo/keyfile.txt new file mode 100644 index 000000000..a32a4347a --- /dev/null +++ b/conflictmonitor/mongo/keyfile.txt @@ -0,0 +1 @@ +1234567890 diff --git a/conflictmonitor/mongo/manage-volume-cron b/conflictmonitor/mongo/manage-volume-cron new file mode 100644 index 000000000..0833b0652 --- /dev/null +++ b/conflictmonitor/mongo/manage-volume-cron @@ -0,0 +1,13 @@ +CM_DATABASE_NAME=${CM_DATABASE_NAME} +CM_DATABASE_STORAGE_COLLECTION_NAME=${CM_DATABASE_STORAGE_COLLECTION_NAME} +CM_DATABASE_SIZE_GB=${CM_DATABASE_SIZE_GB} +CM_DATABASE_SIZE_TARGET_PERCENT=${CM_DATABASE_SIZE_TARGET_PERCENT} +CM_DATABASE_DELETE_THRESHOLD_PERCENT=${CM_DATABASE_DELETE_THRESHOLD_PERCENT} +CM_DATABASE_MAX_TTL_RETENTION_SECONDS=${CM_DATABASE_MAX_TTL_RETENTION_SECONDS} +CM_DATABASE_MIN_TTL_RETENTION_SECONDS=${CM_DATABASE_MIN_TTL_RETENTION_SECONDS} +CM_DATABASE_COMPACTION_TRIGGER_PERCENT=${CM_DATABASE_COMPACTION_TRIGGER_PERCENT} +MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME} +MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD} + +0 * * * * root mongosh /docker-entrypoint-initdb.d/manage_volume.js > /var/log/cron.log 2>&1 +# An empty line is required at the end of this file for a valid cron file. \ No newline at end of file diff --git a/conflictmonitor/mongo/manage_volume.js b/conflictmonitor/mongo/manage_volume.js new file mode 100644 index 000000000..11026acfc --- /dev/null +++ b/conflictmonitor/mongo/manage_volume.js @@ -0,0 +1,238 @@ +// Mongo Data Management Script + +// Features +// Automatically Logs Collection Sizes +// Automatically Updates Data Retention Periods to prevent overflow +// Performs Emergency Record Deletion when Collections get to large + +// Database to Perform operation on. +const CM_DATABASE_NAME = process.env.CM_DATABASE_NAME || 'ConflictMonitor' + +// The name of the collection to store the data as. +const CM_DATABASE_STORAGE_COLLECTION_NAME = process.env.CM_DATABASE_STORAGE_COLLECTION_NAME || 'MongoStorage' + +// Total Size of the database disk in GB. This script will work to ensure all data fits within this store. +const CM_DATABASE_SIZE_GB = process.env.CM_DATABASE_SIZE_GB || 1000 + +// Specified as a percent of total database size. This is the storage target the database will try to hit. +const CM_DATABASE_SIZE_TARGET_PERCENT = process.env.CM_DATABASE_SIZE_TARGET_PERCENT || 0.8 + +// Specified as a percent of total database size. +const CM_DATABASE_DELETE_THRESHOLD_PERCENT = process.env.CM_DATABASE_DELETE_THRESHOLD_PERCENT || 0.9 + +// The maximum amount of time data should be retained. Measured in Seconds. +const CM_DATABASE_MAX_TTL_RETENTION_SECONDS = process.env.CM_DATABASE_MAX_TTL_RETENTION_SECONDS || 5184000 // 60 Days + +// The minimum amount of time data should be retained. Measured in Seconds. This only effects TTL's set on the data. It will not prevent the database from manual data deletion. +const CM_DATABASE_MIN_TTL_RETENTION_SECONDS = process.env.CM_DATABASE_MIN_TTL_RETENTION_SECONDS || 604800 // 7 Days + +// When the free space of a collection exceeds this percent of the collections total volume, automatic compaction should occur +const CM_DATABASE_COMPACTION_TRIGGER_PERCENT = process.env.CM_DATABASE_COMPACTION_TRIGGER_PERCENT || 0.5 + +const CM_MONGO_ROOT_USERNAME = process.env.MONGO_INITDB_ROOT_USERNAME || 'root' +const CM_MONGO_ROOT_PASSWORD = process.env.MONGO_INITDB_ROOT_PASSWORD || 'root' + +const MS_PER_HOUR = 60 * 60 * 1000 +const BYTE_TO_GB = 1024 * 1024 * 1024 +const DB_TARGET_SIZE_BYTES = CM_DATABASE_SIZE_GB * CM_DATABASE_SIZE_TARGET_PERCENT * BYTE_TO_GB +const DB_DELETE_SIZE_BYTES = CM_DATABASE_SIZE_GB * CM_DATABASE_DELETE_THRESHOLD_PERCENT * BYTE_TO_GB + +print('Managing Mongo Data Volumes') + +db = db.getSiblingDB('admin') +db.auth(CM_MONGO_ROOT_USERNAME, CM_MONGO_ROOT_PASSWORD) +db = db.getSiblingDB('ConflictMonitor') + +class CollectionStats { + constructor(name, allocatedSpace, freeSpace, indexSpace) { + this.name = name + this.allocatedSpace = allocatedSpace + this.freeSpace = freeSpace + this.indexSize = indexSpace + } +} + +class StorageRecord { + constructor(collectionStats, totalAllocatedStorage, totalFreeSpace, totalIndexSize) { + this.collectionStats = collectionStats + this.recordGeneratedAt = ISODate() + this.totalAllocatedStorage = totalAllocatedStorage + this.totalFreeSpace = totalFreeSpace + this.totalIndexSize = totalIndexSize + this.totalSize = totalAllocatedStorage + totalFreeSpace + totalIndexSize + } +} + +function ema_deltas(records) { + const a = 0.5 + let average_delta = 0 + + for (let i = 0; i < records.length - 1; i++) { + const delta = records[i + 1] - records[i] + average_delta += Math.pow(a, records.length - i - 1) * delta + } + + return average_delta +} + +function updateTTL() { + print('Updating TTL') + const ttl = getLatestTTL() + if (ttl == 0) { + print('Skipping TTL Update') + // Do not update TTL's + return + } + + const newestRecords = db + .getCollection(CM_DATABASE_STORAGE_COLLECTION_NAME) + .find() + .sort({ recordGeneratedAt: -1 }) + .limit(10) + + let sizes = [] + newestRecords.forEach((doc) => { + let total = 0 + for (let i = 0; i < doc.collectionStats.length; i++) { + total += + doc.collectionStats[i].allocatedSpace + doc.collectionStats[i].freeSpace + doc.collectionStats[i].indexSize + } + + sizes.push(total) + }) + + // Overshoot Prevention + const growth = ema_deltas(sizes) + const oldestSpat = db.getCollection('ProcessedSpat').find().sort({ recordGeneratedAt: 1 }).limit(1) + + let new_ttl = ttl + let possible_ttl = ttl + + // Check if collection is still growing to capacity, or if it in steady state + if (oldestSpat.recordGeneratedAt > ISODate() - ttl + MS_PER_HOUR && growth > 0) { + possible_ttl = DB_TARGET_SIZE_BYTES / growth + } else { + possible_ttl = 3600 * ((DB_TARGET_SIZE_BYTES - sizes[0]) / BYTE_TO_GB) + ttl // Shift the TTL by roughly 1 hour for every GB of data over or under + } + + // Clamp TTL and assign to new TTL; + + if (!isNaN(possible_ttl) && possible_ttl != 0) { + if (possible_ttl > CM_DATABASE_MAX_TTL_RETENTION_SECONDS) { + new_ttl = CM_DATABASE_MAX_TTL_RETENTION_SECONDS + } else if (possible_ttl < CM_DATABASE_MIN_TTL_RETENTION_SECONDS) { + new_ttl = CM_DATABASE_MIN_TTL_RETENTION_SECONDS + } else { + new_ttl = Math.round(possible_ttl) + } + new_ttl = Number(new_ttl) + print('Calculated New TTL for MongoDB: ' + new_ttl) + applyNewTTL(new_ttl) + } else { + print('Not Updating TTL New TTL is NaN') + } +} + +function getLatestTTL() { + const indexes = db.getCollection('ProcessedSpat').getIndexes() + for (let i = 0; i < indexes.length; i++) { + if (indexes[i].hasOwnProperty('expireAfterSeconds')) { + return indexes[i]['expireAfterSeconds'] + } + } + return 0 +} + +function getTTLKey(collection) { + const indexes = db.getCollection(collection).getIndexes() + for (let i = 0; i < indexes.length; i++) { + if (indexes[i].hasOwnProperty('expireAfterSeconds')) { + return [indexes[i]['key'], indexes[i]['expireAfterSeconds']] + } + } + return [null, null] +} + +function applyNewTTL(ttl) { + var collections = db.getCollectionNames() + for (let i = 0; i < collections.length; i++) { + const collection = collections[i] + let [key, oldTTL] = getTTLKey(collection) + if (oldTTL != ttl && key != null) { + print('Updating TTL For Collection: ' + collection, ttl) + db.runCommand({ + collMod: collection, + index: { + keyPattern: key, + expireAfterSeconds: ttl, + }, + }) + } + } +} + +function addNewStorageRecord() { + var collections = db.getCollectionNames() + let totalAllocatedStorage = 0 + let totalFreeSpace = 0 + let totalIndexSize = 0 + + let records = [] + + for (var i = 0; i < collections.length; i++) { + let stats = db.getCollection(collections[i]).stats() + let colStats = db.runCommand({ collstats: collections[i] }) + let blockManager = colStats['wiredTiger']['block-manager'] + + let freeSpace = Number(blockManager['file bytes available for reuse']) + let allocatedStorage = Number(blockManager['file size in bytes']) + let indexSize = Number(stats.totalIndexSize) + + records.push(new CollectionStats(collections[i], allocatedStorage, freeSpace, indexSize)) + + totalAllocatedStorage += allocatedStorage + totalFreeSpace += freeSpace + totalIndexSize += indexSize + + print(collections[i], allocatedStorage / BYTE_TO_GB, freeSpace / BYTE_TO_GB, indexSize / BYTE_TO_GB) + } + + const storageRecord = new StorageRecord(records, totalAllocatedStorage, totalFreeSpace, totalIndexSize) + db.getCollection(CM_DATABASE_STORAGE_COLLECTION_NAME).insertOne(storageRecord) +} + +function compactCollections() { + print('Checking Collection Compaction') + + var collections = db.getCollectionNames() + + let activeCompactions = [] + db.currentOp({ active: true, secs_running: { $gt: 0 } }).inprog.forEach((op) => { + if (op.msg && op.msg.includes('compact')) { + print('Found Active Compactions') + activeCompactions.push(op.command.compact) + } + }) + + for (var i = 0; i < collections.length; i++) { + let colStats = db.runCommand({ collstats: collections[i] }) + let blockManager = colStats['wiredTiger']['block-manager'] + + let freeSpace = Number(blockManager['file bytes available for reuse']) + let allocatedStorage = Number(blockManager['file size in bytes']) + + // If free space makes up a significant proportion of allocated storage + if (freeSpace > allocatedStorage * CM_DATABASE_COMPACTION_TRIGGER_PERCENT && allocatedStorage > 1 * BYTE_TO_GB) { + if (!activeCompactions.includes(collections[i])) { + print('Compacting Collection', collections[i]) + db.runCommand({ compact: collections[i], force: true }) + } else { + print('Skipping Compaction, Collection Compaction is already scheduled') + } + } + } +} + +addNewStorageRecord() +updateTTL() +compactCollections() diff --git a/conflictmonitor/mongo/mongorestore.sh b/conflictmonitor/mongo/mongorestore.sh new file mode 100644 index 000000000..7ee6dc230 --- /dev/null +++ b/conflictmonitor/mongo/mongorestore.sh @@ -0,0 +1 @@ +mongorestore /dump --username ${MONGO_INITDB_ROOT_USERNAME} --password ${MONGO_INITDB_ROOT_PASSWORD} \ No newline at end of file diff --git a/docker-compose-addons.yml b/docker-compose-addons.yml index 0cd834c1f..b0092d77a 100644 --- a/docker-compose-addons.yml +++ b/docker-compose-addons.yml @@ -37,11 +37,9 @@ services: SMTP_USERNAME: ${SMTP_USERNAME} SMTP_PASSWORD: ${SMTP_PASSWORD} SMTP_EMAIL: ${SMTP_EMAIL} - SMTP_EMAIL_RECIPIENTS: ${SMTP_EMAIL_RECIPIENTS} MESSAGE_TYPES: ${COUNT_MESSAGE_TYPES} PROJECT_ID: ${GCP_PROJECT_ID} - ODE_KAFKA_BROKERS: ${ODE_KAFKA_BROKERS} PG_DB_HOST: ${PG_DB_HOST} PG_DB_NAME: ${PG_DB_NAME} @@ -100,11 +98,14 @@ services: depends_on: - cvmanager_postgres environment: + STORAGE_TYPE: ${STORAGE_TYPE} + ISS_API_KEY: ${ISS_API_KEY} ISS_API_KEY_NAME: ${ISS_API_KEY_NAME} ISS_PROJECT_ID: ${ISS_PROJECT_ID} ISS_SCMS_TOKEN_REST_ENDPOINT: ${ISS_SCMS_TOKEN_REST_ENDPOINT} ISS_SCMS_VEHICLE_REST_ENDPOINT: ${ISS_SCMS_VEHICLE_REST_ENDPOINT} + ISS_KEY_TABLE_NAME: ${ISS_KEY_TABLE_NAME} PG_DB_HOST: ${PG_DB_HOST} PG_DB_NAME: ${PG_DB_NAME} @@ -140,10 +141,9 @@ services: BLOB_STORAGE_PROVIDER: ${BLOB_STORAGE_PROVIDER} BLOB_STORAGE_BUCKET: ${BLOB_STORAGE_BUCKET} - GCP_PROJECT: ${GCP_PROJECT} + GCP_PROJECT: ${GCP_PROJECT_ID} GOOGLE_APPLICATION_CREDENTIALS: '/google/gcp_credentials.json' - FW_EMAIL_RECIPIENTS: ${FW_EMAIL_RECIPIENTS} SMTP_SERVER_IP: ${SMTP_SERVER_IP} SMTP_EMAIL: ${SMTP_EMAIL} SMTP_USERNAME: ${SMTP_USERNAME} @@ -155,4 +155,4 @@ services: logging: options: max-size: '10m' - max-file: '5' \ No newline at end of file + max-file: '5' diff --git a/docker-compose-full-cm.yml b/docker-compose-full-cm.yml new file mode 100644 index 000000000..7a0a68bd3 --- /dev/null +++ b/docker-compose-full-cm.yml @@ -0,0 +1,449 @@ +version: '3' +services: + cvmanager_api: + build: + context: services + dockerfile: Dockerfile.api + image: jpo_cvmanager_api:latest + restart: always + extra_hosts: + ${WEBAPP_DOMAIN}: ${WEBAPP_HOST_IP} + ${KEYCLOAK_DOMAIN}: ${KC_HOST_IP} + ports: + - '8081:5000' + environment: + PG_DB_HOST: ${PG_DB_HOST} + PG_DB_USER: ${PG_DB_USER} + PG_DB_PASS: ${PG_DB_PASS} + PG_DB_NAME: postgres + INSTANCE_CONNECTION_NAME: ${INSTANCE_CONNECTION_NAME} + + MONGO_DB_URI: ${MONGO_DB_URI} + MONGO_DB_NAME: ${MONGO_DB_NAME} + + COUNTS_MSG_TYPES: ${COUNTS_MSG_TYPES} + + GEO_DB_NAME: ${GEO_DB_NAME} + SSM_DB_NAME: ${SSM_DB_NAME} + SRM_DB_NAME: ${SRM_DB_NAME} + + MAX_GEO_QUERY_RECORDS: ${MAX_GEO_QUERY_RECORDS} + + FIRMWARE_MANAGER_ENDPOINT: ${FIRMWARE_MANAGER_ENDPOINT} + + WZDX_API_KEY: ${WZDX_API_KEY} + WZDX_ENDPOINT: ${WZDX_ENDPOINT} + + CORS_DOMAIN: ${CORS_DOMAIN} + KEYCLOAK_ENDPOINT: http://${KEYCLOAK_DOMAIN}:8084/ + KEYCLOAK_REALM: ${KEYCLOAK_REALM} + KEYCLOAK_API_CLIENT_ID: ${KEYCLOAK_API_CLIENT_ID} + KEYCLOAK_API_CLIENT_SECRET_KEY: ${KEYCLOAK_API_CLIENT_SECRET_KEY} + + CSM_EMAIL_TO_SEND_FROM: ${CSM_EMAIL_TO_SEND_FROM} + CSM_EMAIL_APP_USERNAME: ${CSM_EMAIL_APP_USERNAME} + CSM_EMAIL_APP_PASSWORD: ${CSM_EMAIL_APP_PASSWORD} + CSM_EMAILS_TO_SEND_TO: ${CSM_EMAILS_TO_SEND_TO} + CSM_TARGET_SMTP_SERVER_ADDRESS: ${CSM_TARGET_SMTP_SERVER_ADDRESS} + CSM_TARGET_SMTP_SERVER_PORT: ${CSM_TARGET_SMTP_SERVER_PORT} + + TIMEZONE: ${TIMEZONE} + LOGGING_LEVEL: ${API_LOGGING_LEVEL} + logging: + options: + max-size: '10m' + max-file: '5' + + cvmanager_webapp: + build: + context: webapp + dockerfile: Dockerfile + args: + API_URI: http://${WEBAPP_DOMAIN}:8081 + MAPBOX_TOKEN: ${MAPBOX_TOKEN} + KEYCLOAK_HOST_URL: http://${KEYCLOAK_DOMAIN}:8084/ + COUNT_MESSAGE_TYPES: ${COUNTS_MSG_TYPES} + VIEWER_MESSAGE_TYPES: ${VIEWER_MSG_TYPES} + DOT_NAME: ${DOT_NAME} + MAPBOX_INIT_LATITUDE: ${MAPBOX_INIT_LATITUDE} + MAPBOX_INIT_LONGITUDE: ${MAPBOX_INIT_LONGITUDE} + MAPBOX_INIT_ZOOM: ${MAPBOX_INIT_ZOOM} + CVIZ_API_SERVER_URL: ${CVIZ_API_SERVER_URL} + CVIZ_API_WS_URL: ${CVIZ_API_WS_URL} + image: jpo_cvmanager_webapp:latest + restart: always + depends_on: + cvmanager_keycloak: + condition: service_healthy + extra_hosts: + ${WEBAPP_DOMAIN}: ${WEBAPP_HOST_IP} + ${KEYCLOAK_DOMAIN}: ${KC_HOST_IP} + ports: + - '80:80' + logging: + options: + max-size: '10m' + + cvmanager_postgres: + image: postgis/postgis:15-master + restart: always + ports: + - '5432:5432' + environment: + POSTGRES_USER: ${PG_DB_USER} + POSTGRES_PASSWORD: ${PG_DB_PASS} + volumes: + - pgdb:/var/lib/postgresql/data + - ./resources/sql_scripts:/docker-entrypoint-initdb.d + logging: + options: + max-size: '10m' + + cvmanager_keycloak: + build: + context: ./resources/keycloak + dockerfile: Dockerfile + args: + KEYCLOAK_LOGIN_THEME_NAME: ${KEYCLOAK_LOGIN_THEME_NAME}.jar + image: jpo_cvmanager_keycloak:latest + restart: always + depends_on: + - cvmanager_postgres + extra_hosts: + ${WEBAPP_DOMAIN}: ${WEBAPP_HOST_IP} + ${KEYCLOAK_DOMAIN}: ${KC_HOST_IP} + ports: + - '8084:8080' + environment: + KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN} + KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD} + WEBAPP_ORIGIN: http://${WEBAPP_DOMAIN} + WEBAPP_CM_ORIGIN: http://${WEBAPP_CM_DOMAIN} + KC_HEALTH_ENABLED: true + KC_DB: postgres + KC_DB_URL: jdbc:postgresql://${PG_DB_HOST}/postgres?currentSchema=keycloak + KC_DB_USERNAME: ${PG_DB_USER} + KC_DB_PASSWORD: ${PG_DB_PASS} + KC_HOSTNAME: ${KEYCLOAK_DOMAIN} + KEYCLOAK_API_CLIENT_SECRET_KEY: ${KEYCLOAK_API_CLIENT_SECRET_KEY} + KEYCLOAK_CM_API_CLIENT_SECRET_KEY: ${KEYCLOAK_CM_API_CLIENT_SECRET_KEY} + GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID} + GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET} + command: + - start-dev + - --log-level=${KC_LOGGING_LEVEL} + - --import-realm + - --spi-theme-welcome-theme=custom-welcome + logging: + options: + max-size: '10m' + + kafka: + image: bitnami/kafka:latest + hostname: kafka + ports: + - '9092:9092' + volumes: + - kafka:/bitnami + environment: + KAFKA_ENABLE_KRAFT: 'yes' + KAFKA_CFG_PROCESS_ROLES: 'broker,controller' + KAFKA_CFG_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' + KAFKA_CFG_LISTENERS: 'PLAINTEXT://:9094,CONTROLLER://:9093,EXTERNAL://:9092' + KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,EXTERNAL:PLAINTEXT' + KAFKA_CFG_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka:9094,EXTERNAL://${DOCKER_HOST_IP}:9092' + KAFKA_BROKER_ID: '1' + KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: '1@kafka:9093' + ALLOW_PLAINTEXT_LISTENER: 'yes' + KAFKA_CFG_NODE_ID: '1' + KAFKA_CFG_DELETE_TOPIC_ENABLE: 'true' + KAFKA_CFG_LOG_RETENTION_HOURS: 2 + logging: + options: + max-size: '10m' + max-file: '5' + + kafka_init: + image: bitnami/kafka:latest + depends_on: + kafka: + condition: service_started + volumes: + - ./conflictmonitor/kafka/kafka_init.sh:/kafka_init.sh + entrypoint: ['/bin/sh', 'kafka_init.sh'] + + ode: + image: usdotjpoode/jpo-ode:develop + ports: + - '8080:8080' + - '9090:9090' + - '46753:46753/udp' + - '46800:46800/udp' + - '47900:47900/udp' + - '44900:44900/udp' + - '44910:44910/udp' + - '44920:44920/udp' + - '44930:44930/udp' + - '44940:44940/udp' + - '5555:5555/udp' + - '6666:6666/udp' + environment: + DOCKER_HOST_IP: ${DOCKER_HOST_IP} + ZK: ${DOCKER_HOST_IP}:2181 + depends_on: + - kafka + volumes: + - ode_vol:/jpo-ode + - ode_vol:/home/uploads + logging: + options: + max-size: '10m' + max-file: '5' + + geojsonconverter: + image: usdotjpoode/geojsonconverter:develop + environment: + DOCKER_HOST_IP: ${DOCKER_HOST_IP} + geometry.output.mode: ${GEOMETRY_OUTPUT_MODE} + spring.kafka.bootstrap-servers: ${DOCKER_HOST_IP}:9092 + logging: + options: + max-size: '10m' + max-file: '5' + depends_on: + - ode + + conflictmonitor: + image: usdotjpoode/jpo-conflictmonitor:develop + restart: always + ports: + - '8082:8082' + environment: + DOCKER_HOST_IP: ${DOCKER_HOST_IP} + KAFKA_BROKER_IP: ${KAFKA_BROKER_IP} + DB_HOST_IP: ${DB_HOST_IP} + spring.kafka.bootstrap-servers: ${KAFKA_BROKER_IP}:9092 + healthcheck: + test: ['CMD', 'java', '-version'] + interval: 10s + timeout: 10s + retries: 20 + logging: + options: + max-size: '10m' + max-file: '5' + deploy: + resources: + limits: + memory: 3G + depends_on: + - ode + - geojsonconverter + + conflictvisualizer_api: + image: us-central1-docker.pkg.dev/cdot-oim-cv-dev/jpo-conflictvisualizer-api-cvmanager/jpo-conflictvisualizer-api-cvmanager:2024-q2 + ports: + - '8089:8081' + restart: always + extra_hosts: + ${WEBAPP_DOMAIN}: ${WEBAPP_HOST_IP} + ${KEYCLOAK_DOMAIN}: ${KC_HOST_IP} + environment: + AUTH_SERVER_URL: http://${KEYCLOAK_DOMAIN}:8084 + KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN} + KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD} + DB_HOST_IP: ${DB_HOST_IP} + DB_HOST_PORT: ${DB_HOST_PORT} + SPRING_KAFKA_BOOTSTRAPSERVERS: ${KAFKA_BROKER_IP}:${KAFKA_BROKER_PORT} + CM_SERVER_URL: 'NONE' + load: 'false' + KAFKA_TYPE: 'ON-PREM' + ACM_CONFIG_FILE: adm.properties + ACM_LOG_TO_CONSOLE: true + ACM_LOG_TO_FILE: false + ACM_LOG_LEVEL: DEBUG + CM_MONGO_API_USERNAME: ${CM_MONGO_API_USERNAME} + CM_MONGO_API_PASSWORD: ${CM_MONGO_API_PASSWORD} + entrypoint: + - sh + - -c + - | + sleep 60 + java -Djava.rmi.server.hostname=$DOCKER_HOST_IP -Dcom.sun.management.jmxremote.port=9090 -Dcom.sun.management.jmxremote.rmi.port=9090 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=true -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlogback.configurationFile=/home/logback.xml -jar /home/jpo-conflictvisualizer-api.jar + logging: + options: + max-size: '10m' + max-file: '5' + depends_on: + cvmanager_keycloak: + condition: service_healthy + mongodb_container: + condition: service_healthy + kafka_init: + condition: service_started + + deduplicator: + image: us-central1-docker.pkg.dev/cdot-oim-cv-dev/jpo-conflictvisualizer-api-cvmanager/jpo-deduplicator:v1.0.0 + restart: always + environment: + DOCKER_HOST_IP: ${DOCKER_HOST_IP} + KAFKA_BROKER_IP: ${KAFKA_BROKER_IP} + spring.kafka.bootstrap-servers: ${KAFKA_BROKER_IP}:9092 + healthcheck: + test: ['CMD', 'java', '-version'] + interval: 10s + timeout: 10s + retries: 20 + logging: + options: + max-size: '10m' + max-file: '5' + deploy: + resources: + limits: + memory: 3G + depends_on: + - conflictmonitor + + mongodb_container: + image: mongo:6 + container_name: jpo-conflictmonitor-mongodb-container + restart: always + environment: + - MONGO_REPLICA_SET_NAME=rs0 + - DB_HOST_IP=${DB_HOST_IP} + - MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME} + - MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD} + - CM_MONGO_CONNECTOR_USERNAME=${CM_MONGO_CONNECTOR_USERNAME} + - CM_MONGO_CONNECTOR_PASSWORD=${CM_MONGO_CONNECTOR_PASSWORD} + - CM_MONGO_API_USERNAME=${CM_MONGO_API_USERNAME} + - CM_MONGO_API_PASSWORD=${CM_MONGO_API_PASSWORD} + - CM_MONGO_USER_USERNAME=${CM_MONGO_USER_USERNAME} + - CM_MONGO_USER_PASSWORD=${CM_MONGO_USER_PASSWORD} + - CM_DATABASE_NAME=${CM_DATABASE_NAME} + - CM_DATABASE_STORAGE_COLLECTION_NAME=${CM_DATABASE_STORAGE_COLLECTION_NAME} + - CM_DATABASE_SIZE_GB=${CM_DATABASE_SIZE_GB} + - CM_DATABASE_SIZE_TARGET_PERCENT=${CM_DATABASE_SIZE_TARGET_PERCENT} + - CM_DATABASE_DELETE_THRESHOLD_PERCENT=${CM_DATABASE_DELETE_THRESHOLD_PERCENT} + - CM_DATABASE_MAX_TTL_RETENTION_SECONDS=${CM_DATABASE_MAX_TTL_RETENTION_SECONDS} + - CM_DATABASE_MIN_TTL_RETENTION_SECONDS=${CM_DATABASE_MIN_TTL_RETENTION_SECONDS} + - CM_DATABASE_COMPACTION_TRIGGER_PERCENT=${CM_DATABASE_COMPACTION_TRIGGER_PERCENT} + ports: + - '27017:27017' + volumes: + - mongodb_data_container:/data/db + - ./conflictmonitor/mongo/manage-volume-cron:/docker-entrypoint-initdb.d/manage-volume-cron + - ./conflictmonitor/mongo/keyfile.txt:/data/keyfile-import.txt + - ./conflictmonitor/mongo/a_init_replicas.js:/docker-entrypoint-initdb.d/a_init_replicas.js + - ./conflictmonitor/mongo/b_create_indexes.js:/docker-entrypoint-initdb.d/b_create_indexes.js + - ./conflictmonitor/mongo/manage_volume.js:/docker-entrypoint-initdb.d/manage_volume.js + - ./conflictmonitor/mongo/dump_2024_08_20:/dump + healthcheck: + test: | + test $$(mongosh --username ${MONGO_INITDB_ROOT_USERNAME} --password ${MONGO_INITDB_ROOT_PASSWORD} --quiet --eval "try { rs.initiate({ _id: 'rs0', members: [{ _id: 0, host: '${DB_HOST_IP}' }] }).ok } catch (_) { rs.status().ok }") -eq 1 + interval: 10s + start_period: 60s + entrypoint: + - bash + - -c + - | + apt update + apt install -y cron gettext systemctl dos2unix + systemctl start cron + systemctl enable cron + envsubst < /docker-entrypoint-initdb.d/manage-volume-cron > /etc/cron.d/manage-volume-cron + dos2unix /etc/cron.d/manage-volume-cron + chmod 644 /etc/cron.d/manage-volume-cron + systemctl restart cron + cp /data/keyfile-import.txt /data/keyfile.txt + chmod 400 /data/keyfile.txt + chown 999:999 /data/keyfile.txt + + exec docker-entrypoint.sh $$@ & + + sleep 30 + mongorestore /dump --username ${MONGO_INITDB_ROOT_USERNAME} --password ${MONGO_INITDB_ROOT_PASSWORD} + wait + + command: ['mongod', '--replSet', 'rs0', '--bind_ip_all', '--keyFile', '/data/keyfile.txt'] + logging: + options: + max-size: '10m' + max-file: '5' + deploy: + resources: + limits: + memory: 3G + + connect: + image: cp-kafka-connect:6.1.9 + build: + context: ./conflictmonitor/docker/connect + dockerfile: Dockerfile + container_name: jpo-conflictmonitor-kafka-connect + restart: always + ports: + - '8083:8083' + depends_on: + mongodb_container: + condition: service_healthy + kafka: + condition: service_started + conflictmonitor: + condition: service_started + environment: + DOCKER_HOST_IP: ${DOCKER_HOST_IP} + DB_HOST_IP: ${DB_HOST_IP} + CONNECT_BOOTSTRAP_SERVERS: ${KAFKA_BROKER_IP}:9092 + CONNECT_REST_ADVERTISED_HOST_NAME: connect + CONNECT_REST_PORT: 8083 + CONNECT_GROUP_ID: compose-connect-group + CONNECT_CONFIG_STORAGE_TOPIC: CmConnectConfigs + CONNECT_CONFIG_STORAGE_REPLICATION_FACTOR: 1 + CONNECT_CONFIG_STORAGE_CLEANUP_POLICY: compact + CONNECT_OFFSET_FLUSH_INTERVAL_MS: 10000 + CONNECT_OFFSET_STORAGE_TOPIC: CmConnectOffsets + CONNECT_OFFSET_STORAGE_REPLICATION_FACTOR: 1 + CONNECT_OFFSET_STORAGE_CLEANUP_POLICY: compact + CONNECT_STATUS_STORAGE_TOPIC: CmConnectStatus + CONNECT_STATUS_STORAGE_CLEANUP_POLICY: compact + CONNECT_STATUS_STORAGE_REPLICATION_FACTOR: 1 + CONNECT_KEY_CONVERTER: 'org.apache.kafka.connect.json.JsonConverter' + CONNECT_VALUE_CONVERTER: 'org.apache.kafka.connect.json.JsonConverter' + CONNECT_INTERNAL_KEY_CONVERTER: 'org.apache.kafka.connect.json.JsonConverter' + CONNECT_INTERNAL_VALUE_CONVERTER: 'org.apache.kafka.connect.json.JsonConverter' + CONNECT_LOG4J_ROOT_LOGLEVEL: 'ERROR' + CONNECT_LOG4J_LOGGERS: 'org.apache.kafka.connect.runtime.rest=ERROR,org.reflections=ERROR,com.mongodb.kafka=ERROR' + CONNECT_PLUGIN_PATH: /usr/share/confluent-hub-components + CONNECT_ZOOKEEPER_CONNECT: 'zookeeper:2181' + CM_MONGO_CONNECTOR_USERNAME: ${CM_MONGO_CONNECTOR_USERNAME} + CM_MONGO_CONNECTOR_PASSWORD: ${CM_MONGO_CONNECTOR_PASSWORD} + logging: + options: + max-size: '10m' + max-file: '5' + command: + - bash + - -c + - | + /etc/confluent/docker/run & + echo "Waiting for Kafka Connect to start listening on kafka-connect ❳" + while [ $$(curl -s -o /dev/null -w %{http_code} http://${KAFKA_CONNECT_IP}:8083/connectors) -eq 000 ] ; do + echo -e $$(date) " Kafka Connect listener HTTP state: " $$(curl -s -o /dev/null -w %{http_code} http://${KAFKA_CONNECT_IP}:8083/connectors) " (waiting for 200)" + sleep 5 + done + sleep 10 + echo -e "\n--\n+> Creating Kafka Connect MongoDB sink" + bash /scripts/connect_start.sh "mongodb://${CM_MONGO_CONNECTOR_USERNAME}:${CM_MONGO_CONNECTOR_USERNAME}@${DOCKER_HOST_IP}:27017/?authMechanism=DEFAULT&authSource=ConflictMonitor&replicaSet=rs0" + sleep infinity + deploy: + resources: + limits: + memory: 3G + +volumes: + mongodb_data_container: + pgdb: + driver: local + ode_vol: + kafka: {} diff --git a/docker-compose-mongo.yml b/docker-compose-mongo.yml new file mode 100644 index 000000000..1292dfa26 --- /dev/null +++ b/docker-compose-mongo.yml @@ -0,0 +1,55 @@ +version: '3' + +include: + - docker-compose.yml + +services: + mongo: + image: mongo:7 + container_name: mongo + restart: always + ports: + - '27017:27017' + environment: + MONGO_INITDB_ROOT_USERNAME: ${MONGO_ADMIN_DB_USER} + MONGO_INITDB_ROOT_PASSWORD: ${MONGO_ADMIN_DB_PASS} + MONGO_INITDB_DATABASE: admin + entrypoint: + - bash + - -c + - | + openssl rand -base64 741 > /mongo_keyfile + chmod 400 /mongo_keyfile + chown 999:999 /mongo_keyfile + exec docker-entrypoint.sh $$@ + command: 'mongod --bind_ip_all --replSet rs0 --keyFile /mongo_keyfile' + volumes: + - mongo_data:/data/db + healthcheck: + test: | + echo 'db.runCommand("ping").ok' | mongosh localhost:27017/test --quiet + interval: 10s + start_period: 30s + + mongo-setup: + image: mongo:7 + container_name: mongo_setup + depends_on: + - mongo + restart: on-failure + environment: + MONGO_ADMIN_DB_USER: ${MONGO_ADMIN_DB_USER} + MONGO_ADMIN_DB_PASS: ${MONGO_ADMIN_DB_PASS} + MONGO_DB_NAME: ${MONGO_DB_NAME} + MONGO_CV_MANAGER_DB_USER: ${MONGO_CV_MANAGER_DB_USER} + MONGO_CV_MANAGER_DB_PASS: ${MONGO_CV_MANAGER_DB_PASS} + MONGO_COLLECTION_TTL: ${MONGO_COLLECTION_TTL} + INSERT_SAMPLE_DATA: ${INSERT_SAMPLE_DATA} + entrypoint: ['/bin/bash', 'setup_mongo.sh'] + volumes: + - ./resources/mongo_scripts/setup_mongo.sh:/setup_mongo.sh + - ./resources/mongo_scripts/create_indexes.js:/create_indexes.js + - ./resources/mongo_scripts/insert_data.js:/insert_data.js + +volumes: + mongo_data: diff --git a/docker-compose-no-cm.yml b/docker-compose-no-cm.yml new file mode 100644 index 000000000..16d66d896 --- /dev/null +++ b/docker-compose-no-cm.yml @@ -0,0 +1,143 @@ +version: '3.9' +services: + cvmanager_api: + build: + context: services + dockerfile: Dockerfile.api + image: jpo_cvmanager_api:latest + restart: always + extra_hosts: + ${WEBAPP_DOMAIN}: ${WEBAPP_HOST_IP} + ${KEYCLOAK_DOMAIN}: ${KC_HOST_IP} + ports: + - '8081:5000' + environment: + PG_DB_HOST: ${PG_DB_HOST} + PG_DB_USER: ${PG_DB_USER} + PG_DB_PASS: ${PG_DB_PASS} + PG_DB_NAME: postgres + INSTANCE_CONNECTION_NAME: ${INSTANCE_CONNECTION_NAME} + + MONGO_DB_URI: ${MONGO_DB_URI} + MONGO_DB_NAME: ${MONGO_DB_NAME} + + COUNTS_MSG_TYPES: ${COUNTS_MSG_TYPES} + + GEO_DB_NAME: ${GEO_DB_NAME} + SSM_DB_NAME: ${SSM_DB_NAME} + SRM_DB_NAME: ${SRM_DB_NAME} + + MAX_GEO_QUERY_RECORDS: ${MAX_GEO_QUERY_RECORDS} + + FIRMWARE_MANAGER_ENDPOINT: ${FIRMWARE_MANAGER_ENDPOINT} + + WZDX_API_KEY: ${WZDX_API_KEY} + WZDX_ENDPOINT: ${WZDX_ENDPOINT} + + CORS_DOMAIN: ${CORS_DOMAIN} + KEYCLOAK_ENDPOINT: http://${KEYCLOAK_DOMAIN}:8084/ + KEYCLOAK_REALM: ${KEYCLOAK_REALM} + KEYCLOAK_API_CLIENT_ID: ${KEYCLOAK_API_CLIENT_ID} + KEYCLOAK_API_CLIENT_SECRET_KEY: ${KEYCLOAK_API_CLIENT_SECRET_KEY} + + CSM_EMAIL_TO_SEND_FROM: ${CSM_EMAIL_TO_SEND_FROM} + CSM_EMAIL_APP_USERNAME: ${CSM_EMAIL_APP_USERNAME} + CSM_EMAIL_APP_PASSWORD: ${CSM_EMAIL_APP_PASSWORD} + CSM_EMAILS_TO_SEND_TO: ${CSM_EMAILS_TO_SEND_TO} + CSM_TARGET_SMTP_SERVER_ADDRESS: ${CSM_TARGET_SMTP_SERVER_ADDRESS} + CSM_TARGET_SMTP_SERVER_PORT: ${CSM_TARGET_SMTP_SERVER_PORT} + + TIMEZONE: ${TIMEZONE} + LOGGING_LEVEL: ${API_LOGGING_LEVEL} + logging: + options: + max-size: '10m' + max-file: '5' + + cvmanager_webapp: + build: + context: webapp + dockerfile: Dockerfile + args: + API_URI: http://${WEBAPP_DOMAIN}:8081 + MAPBOX_TOKEN: ${MAPBOX_TOKEN} + KEYCLOAK_HOST_URL: http://${KEYCLOAK_DOMAIN}:8084/ + COUNT_MESSAGE_TYPES: ${COUNTS_MSG_TYPES} + VIEWER_MESSAGE_TYPES: ${VIEWER_MSG_TYPES} + DOT_NAME: ${DOT_NAME} + MAPBOX_INIT_LATITUDE: ${MAPBOX_INIT_LATITUDE} + MAPBOX_INIT_LONGITUDE: ${MAPBOX_INIT_LONGITUDE} + MAPBOX_INIT_ZOOM: ${MAPBOX_INIT_ZOOM} + CVIZ_API_SERVER_URL: ${CVIZ_API_SERVER_URL} + CVIZ_API_WS_URL: ${CVIZ_API_WS_URL} + image: jpo_cvmanager_webapp:latest + restart: always + depends_on: + cvmanager_keycloak: + condition: service_healthy + extra_hosts: + ${WEBAPP_DOMAIN}: ${WEBAPP_HOST_IP} + ${KEYCLOAK_DOMAIN}: ${KC_HOST_IP} + ports: + - '80:80' + logging: + options: + max-size: '10m' + + cvmanager_postgres: + image: postgis/postgis:15-master + restart: always + ports: + - '5432:5432' + environment: + POSTGRES_USER: ${PG_DB_USER} + POSTGRES_PASSWORD: ${PG_DB_PASS} + volumes: + - pgdb:/var/lib/postgresql/data + - ./resources/sql_scripts:/docker-entrypoint-initdb.d + logging: + options: + max-size: '10m' + + cvmanager_keycloak: + build: + context: ./resources/keycloak + dockerfile: Dockerfile + args: + KEYCLOAK_LOGIN_THEME_NAME: ${KEYCLOAK_LOGIN_THEME_NAME}.jar + image: jpo_cvmanager_keycloak:latest + restart: always + depends_on: + - cvmanager_postgres + extra_hosts: + ${WEBAPP_DOMAIN}: ${WEBAPP_HOST_IP} + ${KEYCLOAK_DOMAIN}: ${KC_HOST_IP} + ports: + - '8084:8080' + environment: + KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN} + KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD} + WEBAPP_ORIGIN: http://${WEBAPP_DOMAIN} + WEBAPP_CM_ORIGIN: http://${WEBAPP_CM_DOMAIN} + KC_HEALTH_ENABLED: true + KC_DB: postgres + KC_DB_URL: jdbc:postgresql://${PG_DB_HOST}/postgres?currentSchema=keycloak + KC_DB_USERNAME: ${PG_DB_USER} + KC_DB_PASSWORD: ${PG_DB_PASS} + KC_HOSTNAME: ${KEYCLOAK_DOMAIN} + KEYCLOAK_API_CLIENT_SECRET_KEY: ${KEYCLOAK_API_CLIENT_SECRET_KEY} + KEYCLOAK_CM_API_CLIENT_SECRET_KEY: ${KEYCLOAK_CM_API_CLIENT_SECRET_KEY} + GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID} + GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET} + command: + - start-dev + - --log-level=${KC_LOGGING_LEVEL} + - --import-realm + - --spi-theme-welcome-theme=custom-welcome + logging: + options: + max-size: '10m' + +volumes: + pgdb: + driver: local diff --git a/docker-compose-obu-ota-server.yml b/docker-compose-obu-ota-server.yml new file mode 100644 index 000000000..88854d9aa --- /dev/null +++ b/docker-compose-obu-ota-server.yml @@ -0,0 +1,56 @@ +version: '3' +services: + # OBU OTA Server and Nginx proxy services + jpo_ota_backend: + build: + context: ./services + dockerfile: Dockerfile.obu_ota_server + image: obu_ota_server:latest + restart: unless-stopped + ports: + - 8085:8085 + environment: + SERVER_HOST: ${OBU_OTA_SERVER_HOST} + LOGGING_LEVEL: ${OBU_OTA_SERVER_LOGGING_LEVEL} + BLOB_STORAGE_PROVIDER: ${BLOB_STORAGE_PROVIDER} + BLOB_STORAGE_BUCKET: ${OBU_OTA_BLOB_STORAGE_BUCKET} + BLOB_STORAGE_PATH: ${OBU_OTA_BLOB_STORAGE_PATH} + + OTA_USERNAME: ${OTA_USERNAME} + OTA_PASSWORD: ${OTA_PASSWORD} + + PG_DB_HOST: ${PG_DB_HOST} + PG_DB_NAME: ${PG_DB_NAME} + PG_DB_USER: ${PG_DB_USER} + PG_DB_PASS: ${PG_DB_PASS} + + MAX_COUNT: ${MAX_COUNT} + volumes: + - ./resources/ota/firmwares:/firmwares + logging: + options: + max-size: '10m' + max-file: '5' + + jpo_ota_nginx: + build: + context: resources/ota/nginx + image: obu_ota_nginx:latest + restart: unless-stopped + ports: + - 80:80 + - 443:443 + environment: + NGINX_ENVSUBST_OUTPUT_DIR: /etc/nginx + SERVER_HOST: ${OBU_OTA_SERVER_HOST} + volumes: + - ./resources/ota/nginx/nginx-${NGINX_ENCRYPTION}.conf:/etc/nginx/templates/nginx.conf.template + - ./resources/ota/nginx/gen_dhparam.sh:/docker-entrypoint.d/gen_dhparam.sh + - ./resources/ota/nginx/ssl/${SERVER_CERT_FILE}:/etc/ssl/certs/ota_server.crt + - ./resources/ota/nginx/ssl/${SERVER_KEY_FILE}:/etc/ssl/private/ota_server.key + depends_on: + - jpo_ota_backend + logging: + options: + max-size: '10m' + max-file: '5' diff --git a/docker-compose-webapp-deployment.yml b/docker-compose-webapp-deployment.yml index 17484d076..955390938 100644 --- a/docker-compose-webapp-deployment.yml +++ b/docker-compose-webapp-deployment.yml @@ -17,6 +17,8 @@ services: MAPBOX_INIT_LATITUDE: ${MAPBOX_INIT_LATITUDE} MAPBOX_INIT_LONGITUDE: ${MAPBOX_INIT_LONGITUDE} MAPBOX_INIT_ZOOM: ${MAPBOX_INIT_ZOOM} + CVIZ_API_SERVER_URL: ${CVIZ_API_SERVER_URL} + CVIZ_API_WS_URL: ${CVIZ_API_WS_URL} image: jpo_cvmanager_webapp:latest restart: always logging: diff --git a/docker-compose.yml b/docker-compose.yml index c2a5117e2..d9362828e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: cvmanager_api: build: @@ -22,7 +21,6 @@ services: MONGO_DB_NAME: ${MONGO_DB_NAME} COUNTS_MSG_TYPES: ${COUNTS_MSG_TYPES} - GOOGLE_APPLICATION_CREDENTIALS: '/google/gcp_credentials.json' GEO_DB_NAME: ${GEO_DB_NAME} SSM_DB_NAME: ${SSM_DB_NAME} @@ -42,16 +40,16 @@ services: KEYCLOAK_API_CLIENT_SECRET_KEY: ${KEYCLOAK_API_CLIENT_SECRET_KEY} CSM_EMAIL_TO_SEND_FROM: ${CSM_EMAIL_TO_SEND_FROM} - CSM_EMAIL_APP_USERNAME: ${CSM_EMAIL_APP_USERNAME} - CSM_EMAIL_APP_PASSWORD: ${CSM_EMAIL_APP_PASSWORD} CSM_EMAILS_TO_SEND_TO: ${CSM_EMAILS_TO_SEND_TO} CSM_TARGET_SMTP_SERVER_ADDRESS: ${CSM_TARGET_SMTP_SERVER_ADDRESS} CSM_TARGET_SMTP_SERVER_PORT: ${CSM_TARGET_SMTP_SERVER_PORT} + CSM_TLS_ENABLED: ${CSM_TLS_ENABLED} + CSM_AUTH_ENABLED: ${CSM_AUTH_ENABLED} + CSM_EMAIL_APP_USERNAME: ${CSM_EMAIL_APP_USERNAME} + CSM_EMAIL_APP_PASSWORD: ${CSM_EMAIL_APP_PASSWORD} TIMEZONE: ${TIMEZONE} LOGGING_LEVEL: ${API_LOGGING_LEVEL} - volumes: - - ${GOOGLE_APPLICATION_CREDENTIALS}:/google/gcp_credentials.json logging: options: max-size: '10m' @@ -71,6 +69,8 @@ services: MAPBOX_INIT_LATITUDE: ${MAPBOX_INIT_LATITUDE} MAPBOX_INIT_LONGITUDE: ${MAPBOX_INIT_LONGITUDE} MAPBOX_INIT_ZOOM: ${MAPBOX_INIT_ZOOM} + CVIZ_API_SERVER_URL: ${CVIZ_API_SERVER_URL} + CVIZ_API_WS_URL: ${CVIZ_API_WS_URL} image: jpo_cvmanager_webapp:latest restart: always depends_on: @@ -139,6 +139,152 @@ services: options: max-size: '10m' + kafka: + image: bitnami/kafka:latest + hostname: kafka + ports: + - '9092:9092' + volumes: + - kafka:/bitnami + environment: + KAFKA_ENABLE_KRAFT: 'yes' + KAFKA_CFG_PROCESS_ROLES: 'broker,controller' + KAFKA_CFG_CONTROLLER_LISTENER_NAMES: 'CONTROLLER' + KAFKA_CFG_LISTENERS: 'PLAINTEXT://:9094,CONTROLLER://:9093,EXTERNAL://:9092' + KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,EXTERNAL:PLAINTEXT' + KAFKA_CFG_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka:9094,EXTERNAL://${DOCKER_HOST_IP}:9092' + KAFKA_BROKER_ID: '1' + KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: '1@kafka:9093' + ALLOW_PLAINTEXT_LISTENER: 'yes' + KAFKA_CFG_NODE_ID: '1' + KAFKA_CFG_DELETE_TOPIC_ENABLE: 'true' + KAFKA_CFG_LOG_RETENTION_HOURS: 2 + logging: + options: + max-size: '10m' + max-file: '5' + + kafka_init: + image: bitnami/kafka:latest + depends_on: + kafka: + condition: service_started + volumes: + - ./conflictmonitor/kafka/kafka_init.sh:/kafka_init.sh + entrypoint: ['/bin/sh', 'kafka_init.sh'] + + conflictvisualizer_api: + image: us-central1-docker.pkg.dev/cdot-oim-cv-dev/jpo-conflictvisualizer-api-cvmanager/jpo-conflictvisualizer-api-cvmanager:2024-q2 + ports: + - '8089:8081' + restart: always + extra_hosts: + ${WEBAPP_DOMAIN}: ${WEBAPP_HOST_IP} + ${KEYCLOAK_DOMAIN}: ${KC_HOST_IP} + environment: + AUTH_SERVER_URL: http://${KEYCLOAK_DOMAIN}:8084 + KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN} + KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD} + DB_HOST_IP: ${DB_HOST_IP} + DB_HOST_PORT: ${DB_HOST_PORT} + SPRING_KAFKA_BOOTSTRAPSERVERS: ${KAFKA_BROKER_IP}:${KAFKA_BROKER_PORT} + CM_SERVER_URL: 'NONE' + load: 'false' + KAFKA_TYPE: 'ON-PREM' + ACM_CONFIG_FILE: adm.properties + ACM_LOG_TO_CONSOLE: true + ACM_LOG_TO_FILE: false + ACM_LOG_LEVEL: DEBUG + CM_MONGO_API_USERNAME: ${CM_MONGO_API_USERNAME} + CM_MONGO_API_PASSWORD: ${CM_MONGO_API_PASSWORD} + entrypoint: + - sh + - -c + - | + sleep ${CM_STARTUP_DELAY_SECONDS:-90} + java -Djava.rmi.server.hostname=$DOCKER_HOST_IP -Dcom.sun.management.jmxremote.port=9090 -Dcom.sun.management.jmxremote.rmi.port=9090 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=true -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlogback.configurationFile=/home/logback.xml -jar /home/jpo-conflictvisualizer-api.jar + logging: + options: + max-size: '10m' + max-file: '5' + depends_on: + cvmanager_keycloak: + condition: service_healthy + mongodb_container: + condition: service_healthy + kafka_init: + condition: service_started + + mongodb_container: + image: mongo:6 + container_name: jpo-conflictmonitor-mongodb-container + restart: always + environment: + - MONGO_REPLICA_SET_NAME=rs0 + - DB_HOST_IP=${DB_HOST_IP} + - MONGO_INITDB_ROOT_USERNAME=${MONGO_INITDB_ROOT_USERNAME} + - MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD} + - CM_MONGO_CONNECTOR_USERNAME=${CM_MONGO_CONNECTOR_USERNAME} + - CM_MONGO_CONNECTOR_PASSWORD=${CM_MONGO_CONNECTOR_PASSWORD} + - CM_MONGO_API_USERNAME=${CM_MONGO_API_USERNAME} + - CM_MONGO_API_PASSWORD=${CM_MONGO_API_PASSWORD} + - CM_MONGO_USER_USERNAME=${CM_MONGO_USER_USERNAME} + - CM_MONGO_USER_PASSWORD=${CM_MONGO_USER_PASSWORD} + - CM_DATABASE_NAME=${CM_DATABASE_NAME} + - CM_DATABASE_STORAGE_COLLECTION_NAME=${CM_DATABASE_STORAGE_COLLECTION_NAME} + - CM_DATABASE_SIZE_GB=${CM_DATABASE_SIZE_GB} + - CM_DATABASE_SIZE_TARGET_PERCENT=${CM_DATABASE_SIZE_TARGET_PERCENT} + - CM_DATABASE_DELETE_THRESHOLD_PERCENT=${CM_DATABASE_DELETE_THRESHOLD_PERCENT} + - CM_DATABASE_MAX_TTL_RETENTION_SECONDS=${CM_DATABASE_MAX_TTL_RETENTION_SECONDS} + - CM_DATABASE_MIN_TTL_RETENTION_SECONDS=${CM_DATABASE_MIN_TTL_RETENTION_SECONDS} + - CM_DATABASE_COMPACTION_TRIGGER_PERCENT=${CM_DATABASE_COMPACTION_TRIGGER_PERCENT} + ports: + - '27017:27017' + volumes: + - mongodb_data_container:/data/db + - ./conflictmonitor/mongo/manage-volume-cron:/docker-entrypoint-initdb.d/manage-volume-cron + - ./conflictmonitor/mongo/keyfile.txt:/data/keyfile-import.txt + - ./conflictmonitor/mongo/a_init_replicas.js:/docker-entrypoint-initdb.d/a_init_replicas.js + - ./conflictmonitor/mongo/b_create_indexes.js:/docker-entrypoint-initdb.d/b_create_indexes.js + - ./conflictmonitor/mongo/manage_volume.js:/docker-entrypoint-initdb.d/manage_volume.js + - ./conflictmonitor/mongo/mongorestore.sh:/docker-entrypoint-initdb.d/mongorestore.sh + - ./conflictmonitor/mongo/dump_2024_08_20:/dump + healthcheck: + test: | + test $$(mongosh --username ${MONGO_INITDB_ROOT_USERNAME} --password ${MONGO_INITDB_ROOT_PASSWORD} --quiet --eval "try { rs.initiate({ _id: 'rs0', members: [{ _id: 0, host: '${DB_HOST_IP}' }] }).ok } catch (_) { rs.status().ok }") -eq 1 + interval: 10s + start_period: 60s + entrypoint: + - bash + - -c + - | + apt update + apt install -y cron gettext systemctl dos2unix + systemctl start cron + systemctl enable cron + envsubst < /docker-entrypoint-initdb.d/manage-volume-cron > /etc/cron.d/manage-volume-cron + dos2unix /etc/cron.d/manage-volume-cron + chmod 644 /etc/cron.d/manage-volume-cron + systemctl restart cron + cp /data/keyfile-import.txt /data/keyfile.txt + chmod 400 /data/keyfile.txt + chown 999:999 /data/keyfile.txt + + exec docker-entrypoint.sh $$@ + + command: ['mongod', '--replSet', 'rs0', '--bind_ip_all', '--keyFile', '/data/keyfile.txt'] + logging: + options: + max-size: '10m' + max-file: '5' + deploy: + resources: + limits: + memory: 3G + volumes: + mongodb_data_container: pgdb: driver: local + ode_vol: + kafka: {} diff --git a/docs/Release_notes.md b/docs/Release_notes.md index c7e198dbd..0d776a96d 100644 --- a/docs/Release_notes.md +++ b/docs/Release_notes.md @@ -1,8 +1,39 @@ ## JPO CV Manager Release Notes +## Version 1.4.0 + +### **Summary** + +This release includes the integration of the jpo-conflictvisualizer's web application directly into the CV Manager web application, the addition of the Commsignia OBU OTA firmware server, customizable user and organization level emails, Material UI theming, and many smaller changes and bug fixes. The integration of the jpo-conflictvisualizer expands the set of required services to run the jpo-cvmanager so the docker-compose has been updated to support this. You can read more about the specifics of the jpo-conflict visualizer at its repository [here](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer). In the future, this documentation will be integrated into the jpo-cvmanager repository. The OBU OTA server is specifically developed for the Commsignia OBU OTA functionality and currently does not support other devices. The email customization menu is for user level emails only and organization level emails will override these. + +Enhancements in this release: + +- USDOT PR 22: Optional TLS/Authentication for emailer support. +- CDOT PR 101: Organization level emails override user email preferences and send emails to a specified group email. (Such as Google Groups) +- CDOT PR 100: Enhanced firmware manager logs for better RSU identification on failures. +- CDOT 99: PostgreSQL based logging for the OBU OTA firmware server for recording OBU requests to the server. +- CDOT PR 95: The CV Manager's web application Admin page's 'Add' and 'Edit' menus for RSUs, Users, and Organizations has been reworked as a dialog box using Material UI. +- CDOT PR 94: Material UI theming throughout the CV Manager web application. +- CDOT PR 93: CIMMS dashboard integration. +- CDOT PR 89: Update TIM message forwarding configurations to use the TX table instead of the RX table. +- CDOT PR 88: Reduces the ping requirement strictness for the ping checker in the rsu_status_check service due to false negatives during testing. +- CDOT PR 86: OBU OTA server bug fixes. +- CDOT PR 84: Adds logic for the iss_health_check to check for missing fields in the ISS response object. +- CDOT PR 83: CV Manager web application bug fix for correctly populating consecutive selected RSU/User/Organization from the Admin pin. +- CDOT PR 82: Adds toast notifications to the CV Manager web application. +- CDOT PR 81: Adds an email customization menu on the CV Manager web application and API to support allowing users to customize which kinds of emails to receive. +- CDOT PR 80: Resolve issue with the organization dropdown not affecting the web application display. +- CDOT PR 78: Upgrade Material UI version from v4 to v5. +- CDOT PR 77: Fixes the orphaned RSU and user bug that was possible to create from the CV Manager web application. +- CDOT PR 76: Add local mongoDB to the jpo-cvmanager repository. +- CDOT PR 75: OBU OTA server added as a service to support Commsignia OBU OTA firmware upgrades. +- CDOT PR 58: Native jpo-conflictvisualizer integration directly into the jpo-cvmanager web application. +- CDOT PR 90, 91, 92, 96, 98: Miscellaneous unit test and bug fixes. + ## Version 1.3.0 ### **Summary** + This release includes enhanced MongoDB support, replacing GCP BigQuery in the CV Manager and integrating with the existing [Conflict Visualizer](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer) MongoDB deployment. The web application now meets WCAG accessibility standards, featuring improved V2X data visualization and CV counts. Key updates include a daily aggregate of CV counts for better MongoDB query performance, Keycloak token refresh optimization, SNMP configurations pulled from PostgreSQL, support for PSM and TIM messages and new services like the RSU Status Checker. Additional enhancements include email alerts for firmware manager failures, a 'Contact Support' button on the 'Help' page and a filter for RSU vendors. The project now fully supports Python 3.12.2, includes various bug fixes and introduces several performance improvements across different modules. Enhancements in this release: diff --git a/resources/keycloak/Dockerfile b/resources/keycloak/Dockerfile index 65b8b3edd..ec806ff85 100644 --- a/resources/keycloak/Dockerfile +++ b/resources/keycloak/Dockerfile @@ -11,5 +11,5 @@ COPY --from=ubi-micro-build /mnt/rootfs / COPY custom-welcome /opt/keycloak/themes/custom-welcome COPY realm.json /opt/keycloak/data/import/realm.json COPY ${KEYCLOAK_LOGIN_THEME_NAME} /opt/keycloak/providers/theme.jar -HEALTHCHECK --interval=5s --timeout=10s --retries=20 \ +HEALTHCHECK --interval=5s --timeout=10s --retries=30 \ CMD curl --fail http://localhost:8080/health || exit 1 \ No newline at end of file diff --git a/resources/keycloak/realm.json b/resources/keycloak/realm.json index a3babe998..eff02e622 100644 --- a/resources/keycloak/realm.json +++ b/resources/keycloak/realm.json @@ -81,9 +81,7 @@ "description": "${role_admin}", "composite": true, "composites": { - "realm": [ - "create-realm" - ], + "realm": ["create-realm"], "client": { "cvmanager-realm": [ "manage-events", @@ -157,15 +155,9 @@ "description": "${role_default-roles}", "composite": true, "composites": { - "realm": [ - "offline_access", - "uma_authorization" - ], + "realm": ["offline_access", "uma_authorization"], "client": { - "account": [ - "manage-account", - "view-profile" - ] + "account": ["manage-account", "view-profile"] } }, "clientRole": false, @@ -245,9 +237,7 @@ "composite": true, "composites": { "client": { - "conflictvisualizer-realm": [ - "query-clients" - ] + "conflictvisualizer-realm": ["query-clients"] } }, "clientRole": true, @@ -270,10 +260,7 @@ "composite": true, "composites": { "client": { - "conflictvisualizer-realm": [ - "query-users", - "query-groups" - ] + "conflictvisualizer-realm": ["query-users", "query-groups"] } }, "clientRole": true, @@ -442,10 +429,7 @@ "composite": true, "composites": { "client": { - "cvmanager-realm": [ - "query-groups", - "query-users" - ] + "cvmanager-realm": ["query-groups", "query-users"] } }, "clientRole": true, @@ -522,9 +506,7 @@ "composite": true, "composites": { "client": { - "cvmanager-realm": [ - "query-clients" - ] + "cvmanager-realm": ["query-clients"] } }, "clientRole": true, @@ -617,10 +599,7 @@ "composite": true, "composites": { "client": { - "master-realm": [ - "query-groups", - "query-users" - ] + "master-realm": ["query-groups", "query-users"] } }, "clientRole": true, @@ -670,9 +649,7 @@ "composite": true, "composites": { "client": { - "master-realm": [ - "query-clients" - ] + "master-realm": ["query-clients"] } }, "clientRole": true, @@ -733,9 +710,7 @@ "composite": true, "composites": { "client": { - "account": [ - "manage-account-links" - ] + "account": ["manage-account-links"] } }, "clientRole": true, @@ -749,9 +724,7 @@ "composite": true, "composites": { "client": { - "account": [ - "view-consent" - ] + "account": ["view-consent"] } }, "clientRole": true, @@ -824,9 +797,7 @@ "clientRole": false, "containerId": "02814271-c58d-403f-89a6-7c831ad6a61d" }, - "requiredCredentials": [ - "password" - ], + "requiredCredentials": ["password"], "otpPolicyType": "totp", "otpPolicyAlgorithm": "HmacSHA1", "otpPolicyInitialCounter": 0, @@ -834,15 +805,9 @@ "otpPolicyLookAheadWindow": 1, "otpPolicyPeriod": 30, "otpPolicyCodeReusable": false, - "otpSupportedApplications": [ - "totpAppMicrosoftAuthenticatorName", - "totpAppGoogleName", - "totpAppFreeOTPName" - ], + "otpSupportedApplications": ["totpAppMicrosoftAuthenticatorName", "totpAppGoogleName", "totpAppFreeOTPName"], "webAuthnPolicyRpEntityName": "keycloak", - "webAuthnPolicySignatureAlgorithms": [ - "ES256" - ], + "webAuthnPolicySignatureAlgorithms": ["ES256"], "webAuthnPolicyRpId": "", "webAuthnPolicyAttestationConveyancePreference": "not specified", "webAuthnPolicyAuthenticatorAttachment": "not specified", @@ -852,9 +817,7 @@ "webAuthnPolicyAvoidSameAuthenticatorRegister": false, "webAuthnPolicyAcceptableAaguids": [], "webAuthnPolicyPasswordlessRpEntityName": "keycloak", - "webAuthnPolicyPasswordlessSignatureAlgorithms": [ - "ES256" - ], + "webAuthnPolicyPasswordlessSignatureAlgorithms": ["ES256"], "webAuthnPolicyPasswordlessRpId": "", "webAuthnPolicyPasswordlessAttestationConveyancePreference": "not specified", "webAuthnPolicyPasswordlessAuthenticatorAttachment": "not specified", @@ -882,10 +845,7 @@ ], "disableableCredentialTypes": [], "requiredActions": [], - "realmRoles": [ - "default-roles-master", - "admin" - ], + "realmRoles": ["default-roles-master", "admin"], "clientRoles": { "conflictvisualizer-realm": [ "manage-clients", @@ -914,19 +874,14 @@ "scopeMappings": [ { "clientScope": "offline_access", - "roles": [ - "offline_access" - ] + "roles": ["offline_access"] } ], "clientScopeMappings": { "account": [ { "client": "account-console", - "roles": [ - "manage-account", - "view-groups" - ] + "roles": ["manage-account", "view-groups"] } ] }, @@ -941,9 +896,7 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/realms/master/account/*" - ], + "redirectUris": ["/realms/master/account/*"], "webOrigins": [], "notBefore": 0, "bearerOnly": false, @@ -961,19 +914,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "8517338d-71d1-4b50-b04f-24782591477a", @@ -985,9 +927,7 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/realms/master/account/*" - ], + "redirectUris": ["/realms/master/account/*"], "webOrigins": [], "notBefore": 0, "bearerOnly": false, @@ -1016,19 +956,8 @@ "config": {} } ], - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "57a06e7a-767a-4756-99d1-803e9d9fc7db", @@ -1054,19 +983,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "52b6ea69-e6e2-4f49-b0a5-794e544dbecb", @@ -1092,19 +1010,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "2624779c-3669-4386-aeb4-9a4623d1098c", @@ -1181,19 +1088,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "4d685882-aae4-4931-8f69-add8a8523629", @@ -1205,12 +1101,8 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/admin/master/console/*" - ], - "webOrigins": [ - "+" - ], + "redirectUris": ["/admin/master/console/*"], + "webOrigins": ["+"], "notBefore": 0, "bearerOnly": false, "consentRequired": false, @@ -1245,19 +1137,8 @@ } } ], - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] } ], "clientScopes": [ @@ -1768,20 +1649,8 @@ ] } ], - "defaultDefaultClientScopes": [ - "role_list", - "profile", - "email", - "roles", - "web-origins", - "acr" - ], - "defaultOptionalClientScopes": [ - "offline_access", - "address", - "phone", - "microprofile-jwt" - ], + "defaultDefaultClientScopes": ["role_list", "profile", "email", "roles", "web-origins", "acr"], + "defaultOptionalClientScopes": ["offline_access", "address", "phone", "microprofile-jwt"], "browserSecurityHeaders": { "contentSecurityPolicyReportOnly": "", "xContentTypeOptions": "nosniff", @@ -1793,9 +1662,7 @@ }, "smtpServer": {}, "eventsEnabled": false, - "eventsListeners": [ - "jboss-logging" - ], + "eventsListeners": ["jboss-logging"], "enabledEventTypes": [], "adminEventsEnabled": false, "adminEventsDetailsEnabled": false, @@ -1810,12 +1677,8 @@ "subType": "anonymous", "subComponents": {}, "config": { - "host-sending-registration-request-must-match": [ - "true" - ], - "client-uris-must-match": [ - "true" - ] + "host-sending-registration-request-must-match": ["true"], + "client-uris-must-match": ["true"] } }, { @@ -1844,9 +1707,7 @@ "subType": "anonymous", "subComponents": {}, "config": { - "allow-default-scopes": [ - "true" - ] + "allow-default-scopes": ["true"] } }, { @@ -1891,9 +1752,7 @@ "subType": "authenticated", "subComponents": {}, "config": { - "allow-default-scopes": [ - "true" - ] + "allow-default-scopes": ["true"] } }, { @@ -1903,9 +1762,7 @@ "subType": "anonymous", "subComponents": {}, "config": { - "max-clients": [ - "200" - ] + "max-clients": ["200"] } } ], @@ -1916,18 +1773,10 @@ "providerId": "hmac-generated", "subComponents": {}, "config": { - "kid": [ - "dfbf699f-79c0-4f35-aaa7-db56e599f03b" - ], - "secret": [ - "W9kRtZFV_dTxQNGd-nueSDnnNxWBfZ08d76T4W0TTi46fO7Fl5Wh-5QlciXAXsps96kMSN0hfJeYf6d_1fIeBw" - ], - "priority": [ - "100" - ], - "algorithm": [ - "HS256" - ] + "kid": ["dfbf699f-79c0-4f35-aaa7-db56e599f03b"], + "secret": ["W9kRtZFV_dTxQNGd-nueSDnnNxWBfZ08d76T4W0TTi46fO7Fl5Wh-5QlciXAXsps96kMSN0hfJeYf6d_1fIeBw"], + "priority": ["100"], + "algorithm": ["HS256"] } }, { @@ -1936,15 +1785,9 @@ "providerId": "aes-generated", "subComponents": {}, "config": { - "kid": [ - "c9aa2fa7-ccd5-42ed-9a7b-a62772c09191" - ], - "secret": [ - "QoOE0VU8d5-rflhDANBHxQ" - ], - "priority": [ - "100" - ] + "kid": ["c9aa2fa7-ccd5-42ed-9a7b-a62772c09191"], + "secret": ["QoOE0VU8d5-rflhDANBHxQ"], + "priority": ["100"] } }, { @@ -1956,15 +1799,11 @@ "privateKey": [ "MIIEowIBAAKCAQEAwT7c3z44h6uPMd4X7jqoH0DAnjyi+PoPllJXl0M9km0uD/ppE2WG/BLAdWepYYoiSbRv3iXjx7IJ6PPkQ4gJ4Gxj3+6yREruN3FrvAbD7VHLpoKsdGRnzmnHnV+XOE01a4KIMGp9wBnZzQ35PrTtkRqp5qLtkZ0KLtNAEGNKLj4lZtW/aLUg536NlSCn/LmvQhtpF60BtfKfGSPi5tEz3DbfBI9rxlo7K9ZImH6Z/HDEjSKrQhlPdiBlqBH85xRFTHTkP1ESusJ/grKyT3dlIFUjTTmh5A1EMsMKkO0CmczIdzhXbMZ1MpisQXgEU01dbLQpjDslkjqNzKLfiMwWpwIDAQABAoIBAAN4V6HQOSM/LqgrL4/dJRAeILYQTwEzjKgGfzlcakQIgFmwYbxVtgd/ZjmUNY6PhAFjDtj2LH+yv1nt0c7/CQ6wGp/7uCa9EoT6CLPTJBNhusE3x2m4chYx9hPfu5l4TPsSkMmABc2n5A+gipHs71N8uOL1KAcI7Aq6p6zE8MnzMv8TUH2a7DF/EaBDrHOX3YbZJHV88+0g3ILf6cBtRVhvIyB/wWaQb01AV/H3Fg9z/YMd6SgbJItn0wWpkePT7bXKIuK5O1Ba8Rcepw5wpMHOeX/ZtK1rm8PplgcuOZ4v5jwnBlvGTO6PN3LhPhqf7itlHncRD8ujlgvX+HtvjzECgYEA85y71HAsAduWZuOjPDk3BBGpF2QfRhLm5qEvw0vxpOwFkynGlieKiEKI5BAGY0w5iz4/g95yiFHEF/bHz/UUXm9LCe2Gy/cd6v46daqfWkhHMEFlNEfxHCRCj9d/J+Kuxpi9K5E/qSHZHC+nHo5V52gpZ8HlJZLRqrfqYDYKoa8CgYEAyxJ4wGv2uQdZ63GKP10vJ2jyPUFmLrysd8ekqpyyFTX1cKcxtOCnofFJ9xURCYHV7NXkJbBZU1tXibHtOvRwzjjqvllr9sSCdhWehxSdta61N4hlYYFIXujEMC3boT/d72BVpQyE7eZ64/1fz4gesj8rV91AQmjzjtigRZJRcIkCgYBZXze9YQWUDOYpivu4vVjEomIBVdbvU0HofFvUbwkQsxH8gkf7kDgPczFbUdG2HiHCRqzwiOxFvJGPJRb64PN/DZ9e3ggkzdzo+CmkP1tEuN19A5DIVFhNNbRBpxJcJJpv+1rzH89WEjffUlAiMp+rTJhcG1MgrLNEyUIv18OguwKBgQCWFUzRSfnKvjgi3oNCWWhkRBfkVdVjbWY6EH8O6UhkjMCdRbRi7jZ2ZZI43oT89cxZgatgf3lFNhj4V1vxWn+UqlQz4nr8ojeZdlj3lLEKedjM9i2XZqlKG9YDlaDhCAbKx/QES8Bi4xioL7cD9qJZMn6iLY80hcScKlYplP5DoQKBgA3hirTJB+2+D3ou+HQJEMP8X8pMZ9mNQ8YBqOQEm+UaQ4Cg06/HLdKqHmZ1srpGybZ6atZwddW90lEbWDUafz9x6K7AUpEfyx0jw7jfLDy1Sl9SSbU3zpVUZJbJfPVL/xZic9ACJVa315qTI7z45fB+pCau6Xv6pmEeOgSCo1BQ" ], - "keyUse": [ - "SIG" - ], + "keyUse": ["SIG"], "certificate": [ "MIICmzCCAYMCBgGND5WfHjANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZtYXN0ZXIwHhcNMjQwMTE2MDAwMzAwWhcNMzQwMTE2MDAwNDQwWjARMQ8wDQYDVQQDDAZtYXN0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBPtzfPjiHq48x3hfuOqgfQMCePKL4+g+WUleXQz2SbS4P+mkTZYb8EsB1Z6lhiiJJtG/eJePHsgno8+RDiAngbGPf7rJESu43cWu8BsPtUcumgqx0ZGfOacedX5c4TTVrgogwan3AGdnNDfk+tO2RGqnmou2RnQou00AQY0ouPiVm1b9otSDnfo2VIKf8ua9CG2kXrQG18p8ZI+Lm0TPcNt8Ej2vGWjsr1kiYfpn8cMSNIqtCGU92IGWoEfznFEVMdOQ/URK6wn+CsrJPd2UgVSNNOaHkDUQywwqQ7QKZzMh3OFdsxnUymKxBeARTTV1stCmMOyWSOo3Mot+IzBanAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAL38ECCrYGlZDfY1urNoQS6xDDgSyyzTN8jhKpffur1K7t2Gsa9LhjKAYYmx0/BzP/3e24QaYIGfM/kMx2FnnQ/eXA+AFy8pGAAHZadag2WKNu7aU2DY4ng9KubfdA4HvxZFbhRJVg3sdF02y0OxY+UWEV7y3/LKbwjeOwDNvth7NTGIvip10HGMGb2PjCdtQXFF8PcFmfx6uJPKDqOyzS3StG3fquLmhfk+YB3MdVmsMEVxs8qP1ReiJ3XJV6lUKd1A3AR1R/+odCXnsYgf/rjmhauwzF7F57mumLBLS1OADhOLLCFs6boMmhJF5t7vs/084kcnGcVCRBNOSppE+rE=" ], - "priority": [ - "100" - ] + "priority": ["100"] } }, { @@ -1976,18 +1815,12 @@ "privateKey": [ "MIIEowIBAAKCAQEA3h062LCEjaFRP5RmGymtdXcdn61ZrINb9j4kMt2dSYDi1euN9G85LBePslVytwv8rk7k8Z4ReWf33GGJjonBFTKYaL0g3ZRCp4cizWtDIJtXBJSodjsigze73rMXs395Y4n/uMcKo1c7va16x3agUrntX9HZRpOGQ0UUpYzzdUiMYGoa9bWKuvxqAQDonNRXx04Mz+J48TtmfB73R9pM07NvclihZikp3kUv43vffKbu7jaEVcmBO7Zj2rlTHB3xRnDNhGKes4bK00ldzdUwpjWyqGw7fxMj0XK19VPbIaqwq7VJIqi4wM6qcZFKo/mFIkvvLX1jZLLSe+AoRCrznwIDAQABAoIBABN5M5TA8SDWYQsL0IyWxwRH87scAIMypx2ROCzqJ3qaHV53qaP3G7zvueOpldunkOPwEHwrNB6qoggFLda8jBxMKcxGXKXLSbFqFH/huhUXRCCnhJeNEAsPbV4VN0GVA7MEQSfVnOtSNW99ULOWhRrg/dygnNs7tDycnLahA3f866O6hHPF6ggT3j9kEV54ya2krUmU0eGZXZAMcIAbuGgJr/MPiE5u9r2VIjwJTujyf1TgBMpfJaWLOIYDUs528VEZUFJbv5CHc3c8cKexiBafqcz8/keL7teninV6ASLRSNmYHjhFtIk68OSKYvZqJAceZR2wYxLh/IwP2+xH3o0CgYEA+k8hm/x5XZ9PuFT5Hl0SluYLumIUeDRvzwK96WdlBRe2tVmHvDg9wQFa2YyDx5nXl+YoglnlgAZ+Nk34L1sOBCpEZhFZ7c0efLZEtjFf1cbO4Ar0FgDfU6KxyZj7HXJn0FvgW1h1KleZV5miaTfEGZ3uE841TlFcKWk76tC1UEsCgYEA4yn/CmZeYU+ZbqTOWStOluXzfJpHmZOFE+cKlICH6RrcX7VCxhjXRVgJ4dpjAMnGUfkL821V3JknEPFyKS1JpfSWvF5751re97MtRysD+2xw6P8rrgjQuuHE+uZAGuCWCUjgFUUElSYgNPpvaU508vyi4CDYrZoFzEplzkC23X0CgYATRMYskNny6BGl+fyXZsjIjvr2JRi4TCkTQX3HGut+4d1xxmuZhKbUVbtdpeB7HA+ppNEXf74YBefvXD8vvg2tKmfLh6hpkvG23f0aHWDoPv6r5ov1qamHca3H/BvQn374Xio+Pef/E3E9ehkzilRxOGQcaDJYThEPKweuwtRCUwKBgDjrG+laLwnI7RPpHX8AN+fdZD3zVj9n1C9hc6gz8Fn7Df65JysFrGLGpWs+0hGvfQ6rDVCIM7xbb4tyQ/2HSG3ZtC8sqXUVsspzzcOIRq4nxL7MuQAZW1uIGFgZezSA03cuGF+b9IL+k5FSsrm7G9iKbrEj6cbN0egXOB0O4ALtAoGBAMHZA9TqnWR+G8rj0eNSR/YXVQDY5uQJbj2sCke2VvwTZ0G5VHK+xuLESjsy5KMKYQtcT/ZRR6EDo0Jr/xbNeLs+D1iGBklRUOwtED7i7mlPDj6P+nfLAWR+k5L9zYg5mddYdq6+J7nf/l1VDnppE3NDwETOTG8nd34ENdOHn9qq" ], - "keyUse": [ - "ENC" - ], + "keyUse": ["ENC"], "certificate": [ "MIICmzCCAYMCBgGND5Wg5jANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZtYXN0ZXIwHhcNMjQwMTE2MDAwMzAwWhcNMzQwMTE2MDAwNDQwWjARMQ8wDQYDVQQDDAZtYXN0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeHTrYsISNoVE/lGYbKa11dx2frVmsg1v2PiQy3Z1JgOLV6430bzksF4+yVXK3C/yuTuTxnhF5Z/fcYYmOicEVMphovSDdlEKnhyLNa0Mgm1cElKh2OyKDN7vesxezf3ljif+4xwqjVzu9rXrHdqBSue1f0dlGk4ZDRRSljPN1SIxgahr1tYq6/GoBAOic1FfHTgzP4njxO2Z8HvdH2kzTs29yWKFmKSneRS/je998pu7uNoRVyYE7tmPauVMcHfFGcM2EYp6zhsrTSV3N1TCmNbKobDt/EyPRcrX1U9shqrCrtUkiqLjAzqpxkUqj+YUiS+8tfWNkstJ74ChEKvOfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJX4WIFQtIxBmbG/0NlJ+aGTSmayU1Qo+La2Qy1yvclX0OfvyQBkXlvOmnDRsBdl/lKXh804LCHl2qXFbS8r9Qy5d/Vb71hynUc5IAHyRlMY3xaz8mH8xxFZh7iUFkl3hXA4bNqa9f4zDmTyoNjlFn5pgL98PFqU3Lc4nuL73woow5JCMuTALBj9+IKP6UZxh05eR5T9JEV3fwXW+MCvRwxl8b6Eu2g7WOykk3IjMV7u7zBGtTjMsQAREmFTtP4Pk2oeeDr08YpxufSZWAY8nDtVteq54ueP39fnAYwrApRT5zFrW/XbMtYffL+l/VHwCTYRV1BqcyUNrRli4sMYSYw=" ], - "priority": [ - "100" - ], - "algorithm": [ - "RSA-OAEP" - ] + "priority": ["100"], + "algorithm": ["RSA-OAEP"] } } ] @@ -2786,15 +2619,9 @@ "description": "${role_default-roles}", "composite": true, "composites": { - "realm": [ - "offline_access", - "uma_authorization" - ], + "realm": ["offline_access", "uma_authorization"], "client": { - "account": [ - "view-profile", - "manage-account" - ] + "account": ["view-profile", "manage-account"] } }, "clientRole": false, @@ -2820,9 +2647,7 @@ "composite": true, "composites": { "client": { - "realm-management": [ - "query-clients" - ] + "realm-management": ["query-clients"] } }, "clientRole": true, @@ -2854,10 +2679,7 @@ "composite": true, "composites": { "client": { - "realm-management": [ - "query-groups", - "query-users" - ] + "realm-management": ["query-groups", "query-users"] } }, "clientRole": true, @@ -3039,9 +2861,7 @@ "composite": true, "composites": { "client": { - "account": [ - "view-consent" - ] + "account": ["view-consent"] } }, "clientRole": true, @@ -3082,9 +2902,7 @@ "composite": true, "composites": { "client": { - "account": [ - "manage-account-links" - ] + "account": ["manage-account-links"] } }, "clientRole": true, @@ -3127,14 +2945,9 @@ "name": "ADMIN", "path": "/ADMIN", "attributes": {}, - "realmRoles": [ - "ADMIN" - ], + "realmRoles": ["ADMIN"], "clientRoles": { - "realm-management": [ - "manage-realm", - "realm-admin" - ] + "realm-management": ["manage-realm", "realm-admin"] }, "subGroups": [] }, @@ -3143,9 +2956,7 @@ "name": "USER", "path": "/USER", "attributes": {}, - "realmRoles": [ - "USER" - ], + "realmRoles": ["USER"], "clientRoles": {}, "subGroups": [] } @@ -3158,9 +2969,7 @@ "clientRole": false, "containerId": "32e7a5de-88df-49ff-be58-a2358342aef0" }, - "requiredCredentials": [ - "password" - ], + "requiredCredentials": ["password"], "otpPolicyType": "totp", "otpPolicyAlgorithm": "HmacSHA1", "otpPolicyInitialCounter": 0, @@ -3168,15 +2977,9 @@ "otpPolicyLookAheadWindow": 1, "otpPolicyPeriod": 30, "otpPolicyCodeReusable": false, - "otpSupportedApplications": [ - "totpAppMicrosoftAuthenticatorName", - "totpAppGoogleName", - "totpAppFreeOTPName" - ], + "otpSupportedApplications": ["totpAppMicrosoftAuthenticatorName", "totpAppGoogleName", "totpAppFreeOTPName"], "webAuthnPolicyRpEntityName": "keycloak", - "webAuthnPolicySignatureAlgorithms": [ - "ES256" - ], + "webAuthnPolicySignatureAlgorithms": ["ES256"], "webAuthnPolicyRpId": "", "webAuthnPolicyAttestationConveyancePreference": "not specified", "webAuthnPolicyAuthenticatorAttachment": "not specified", @@ -3186,9 +2989,7 @@ "webAuthnPolicyAvoidSameAuthenticatorRegister": false, "webAuthnPolicyAcceptableAaguids": [], "webAuthnPolicyPasswordlessRpEntityName": "keycloak", - "webAuthnPolicyPasswordlessSignatureAlgorithms": [ - "ES256" - ], + "webAuthnPolicyPasswordlessSignatureAlgorithms": ["ES256"], "webAuthnPolicyPasswordlessRpId": "", "webAuthnPolicyPasswordlessAttestationConveyancePreference": "not specified", "webAuthnPolicyPasswordlessAuthenticatorAttachment": "not specified", @@ -3224,14 +3025,9 @@ ], "disableableCredentialTypes": [], "requiredActions": [], - "realmRoles": [ - "ADMIN", - "default-roles-conflictvisualizer" - ], + "realmRoles": ["ADMIN", "default-roles-conflictvisualizer"], "notBefore": 0, - "groups": [ - "/ADMIN" - ] + "groups": ["/ADMIN"] }, { "id": "a08a9efc-cd46-4111-836f-b665db815faa", @@ -3254,32 +3050,22 @@ ], "disableableCredentialTypes": [], "requiredActions": [], - "realmRoles": [ - "USER", - "default-roles-conflictvisualizer" - ], + "realmRoles": ["USER", "default-roles-conflictvisualizer"], "notBefore": 0, - "groups": [ - "/USER" - ] + "groups": ["/USER"] } ], "scopeMappings": [ { "clientScope": "offline_access", - "roles": [ - "offline_access" - ] + "roles": ["offline_access"] } ], "clientScopeMappings": { "account": [ { "client": "account-console", - "roles": [ - "manage-account", - "view-groups" - ] + "roles": ["manage-account", "view-groups"] } ] }, @@ -3294,9 +3080,7 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/realms/conflictvisualizer/account/*" - ], + "redirectUris": ["/realms/conflictvisualizer/account/*"], "webOrigins": [], "notBefore": 0, "bearerOnly": false, @@ -3314,19 +3098,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "c7c9fb05-a4d2-460a-a0b5-ae22374035f4", @@ -3338,9 +3111,7 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/realms/conflictvisualizer/account/*" - ], + "redirectUris": ["/realms/conflictvisualizer/account/*"], "webOrigins": [], "notBefore": 0, "bearerOnly": false, @@ -3369,19 +3140,8 @@ "config": {} } ], - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "a3dea47a-aa8e-4eb9-bd60-cc2ccc6c6b66", @@ -3407,19 +3167,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "0f9298ea-1f51-48e6-ab84-bbbebabdbdb6", @@ -3445,19 +3194,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "bdbb88ca-d453-40c2-b547-5d5887e8c3ba", @@ -3471,12 +3209,8 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/*" - ], - "webOrigins": [ - "/*" - ], + "redirectUris": ["/*"], + "webOrigins": ["/*"], "notBefore": 0, "bearerOnly": false, "consentRequired": false, @@ -3496,19 +3230,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": true, "nodeReRegistrationTimeout": -1, - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "70254050-2a61-479d-93db-a962a2f558d2", @@ -3523,14 +3246,8 @@ "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", "secret": "${KEYCLOAK_CM_API_CLIENT_SECRET_KEY}", - "redirectUris": [ - "http://localhost:3000/*", - "${WEBAPP_CM_ORIGIN}/*" - ], - "webOrigins": [ - "http://localhost:3000", - "${WEBAPP_CM_ORIGIN}" - ], + "redirectUris": ["http://localhost:3000/*", "${WEBAPP_CM_ORIGIN}/*"], + "webOrigins": ["http://localhost:3000", "${WEBAPP_CM_ORIGIN}"], "notBefore": 0, "bearerOnly": false, "consentRequired": false, @@ -3553,19 +3270,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": true, "nodeReRegistrationTimeout": -1, - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "a2076ecd-5345-490a-bac9-77a7d69c280b", @@ -3591,19 +3297,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "35726e9e-f948-4775-a957-e54bf22f490e", @@ -3615,12 +3310,8 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/admin/conflictvisualizer/console/*" - ], - "webOrigins": [ - "+" - ], + "redirectUris": ["/admin/conflictvisualizer/console/*"], + "webOrigins": ["+"], "notBefore": 0, "bearerOnly": false, "consentRequired": false, @@ -3655,19 +3346,8 @@ } } ], - "defaultClientScopes": [ - "web-origins", - "acr", - "roles", - "profile", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "roles", "profile", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] } ], "clientScopes": [ @@ -4178,20 +3858,8 @@ ] } ], - "defaultDefaultClientScopes": [ - "role_list", - "profile", - "email", - "roles", - "web-origins", - "acr" - ], - "defaultOptionalClientScopes": [ - "offline_access", - "address", - "phone", - "microprofile-jwt" - ], + "defaultDefaultClientScopes": ["role_list", "profile", "email", "roles", "web-origins", "acr"], + "defaultOptionalClientScopes": ["offline_access", "address", "phone", "microprofile-jwt"], "browserSecurityHeaders": { "contentSecurityPolicyReportOnly": "", "xContentTypeOptions": "nosniff", @@ -4203,9 +3871,7 @@ }, "smtpServer": {}, "eventsEnabled": false, - "eventsListeners": [ - "jboss-logging" - ], + "eventsListeners": ["jboss-logging"], "enabledEventTypes": [], "adminEventsEnabled": false, "adminEventsDetailsEnabled": false, @@ -4220,9 +3886,7 @@ "subType": "anonymous", "subComponents": {}, "config": { - "max-clients": [ - "200" - ] + "max-clients": ["200"] } }, { @@ -4267,9 +3931,7 @@ "subType": "anonymous", "subComponents": {}, "config": { - "allow-default-scopes": [ - "true" - ] + "allow-default-scopes": ["true"] } }, { @@ -4279,12 +3941,8 @@ "subType": "anonymous", "subComponents": {}, "config": { - "host-sending-registration-request-must-match": [ - "true" - ], - "client-uris-must-match": [ - "true" - ] + "host-sending-registration-request-must-match": ["true"], + "client-uris-must-match": ["true"] } }, { @@ -4294,9 +3952,7 @@ "subType": "authenticated", "subComponents": {}, "config": { - "allow-default-scopes": [ - "true" - ] + "allow-default-scopes": ["true"] } }, { @@ -4329,15 +3985,11 @@ "privateKey": [ "MIIEogIBAAKCAQEAy4jPC9qu4pLJF5i1GSPYPaStuGi0o9k5CfXvrRynZbaZMZWg3r+t9VWsSuGuRXWvN0Q6ChzClV0SJ2jYvCV7qhHEE+1NE7dgkL1wh8e58dsHeKx3lFOtCVg6iSNsL65MWLerbaW2pnswXy/lkwquX8Zof5DD20fM6WrReVSb6mlO60SZ5c3WoidgAAo4HaeyXS/0ASrCAdKQwSHph6oYLPSHpDshDsitRBuS8Hk5+Ex1ZCw1ym/Hbs8Z5NeqQok1KzTCwwJ/EOPfkXuicQnYDHxvFAtDim0kepH8xw1T5+SV3/X7ICYTTIwQGNn0TB5uoZcO2BRSzsZekKdt/dT6CwIDAQABAoIBACgl7u2AMBIqcTdR3Js+alfShaAEK2nMngc8d5A2wEB8keBpiweVWNu1kBxfQxCZg7wLncVD4hAzgTK76FDItgmYooxpuVQDzq0OaUWnXKL8GQ+xOY9NKCtZN4a4sY0APTgc1th0oUBauXJ1ULw+FaJ30UIkjLXTBnUeqH5d9bl5vQsgcCLxhUIGM8OvOaLFex9W0tg9AlmW2f7ZgybP6Fa4uJXSo02K4zwDAwtOQmnEvCcfI2qMSDGZbdeXUTZUkys66s1q6OrXc1bo77VSzA1ClHZmFM8AO+wHuVgiK9tTtipUJ4MuuOVA2jQJHBs7oSYvTV/azclNCkJci5Fwi2ECgYEA906N0jWEJQJSDqe+YxbKH0gBE4g8TaShuaT+ljNHQCPuT/7NnAIEMci63eIw0oseCM/MfJnjPmP5naFICqlTWLQYjlloxrzVkz2y/wrZM/YJUCFGIP26jMcJLPYHeLK9QD7utp+P6UJ9fMQ2kkD7BjErEFV548fscSptBh+uAiECgYEA0rBb0iCETlUeSQATP9U/V8HdN3Hf6ua8limu02/kFWGwnSoDPuy+IU1fAMuFkgMBiGpJjbBw6mUcuhj7YkvQybnQY6e8vpS+f9jNoFCQt2n+r61XPEqig6fbmYKiJk9Al9GjRtomVikIjmv4NIo3v2qe4ExH4haqzjZChriDzqsCgYA2KlxhmBsTSAjU8OSAK3Olmk2yC3q5vr81O/AO0bhfUf9WQgaijsaAaOiUxH/Q/Wtcnra467Ob7KW1Yqe2vhNlMDzYoLiUHrPghfj4Z1XfTZoIlOEZRLlhMA7QbCqCwxM0SRRbp2MLweZeN1OEgPr6BjbaYv5JZ3Zf6tzqJHImQQKBgCDW2kkDRnwLKmBIgbeWXnwoPHnS5wrvEf/52UUdkJiAlI26qazaK7x3GdK+5j/e9hM0Nei+0qrGPdcH487rcEyxCLkvwOyXtKWqvko5pITiIY9yXkGIhJIuzLy9rtZ3zeKcC24UvJr7ZFkGnTZbQNs2HDNr0Fx+GftwW6gyBGFnAoGAKIKCtasZKWOYeaSHDGEUSw8xLEnC7lXy0dJ/68X++06aMeQsjfa4nyEmSiuZ/IdqK1m8gHyQXXQueJigRyNiSBG7MWv3xzrLJ8Sr25k7AdTyU0vvbW/VXJnK+lX63NiE7V7fPGhWxLF8c01L4XpVcsGU3sAphDG+0+kYz5e8FQw=" ], - "keyUse": [ - "SIG" - ], + "keyUse": ["SIG"], "certificate": [ "MIICszCCAZsCBgGND5sWKTANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDDBJjb25mbGljdHZpc3VhbGl6ZXIwHhcNMjQwMTE2MDAwODU4WhcNMzQwMTE2MDAxMDM4WjAdMRswGQYDVQQDDBJjb25mbGljdHZpc3VhbGl6ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLiM8L2q7ikskXmLUZI9g9pK24aLSj2TkJ9e+tHKdltpkxlaDev631VaxK4a5Fda83RDoKHMKVXRInaNi8JXuqEcQT7U0Tt2CQvXCHx7nx2wd4rHeUU60JWDqJI2wvrkxYt6ttpbamezBfL+WTCq5fxmh/kMPbR8zpatF5VJvqaU7rRJnlzdaiJ2AACjgdp7JdL/QBKsIB0pDBIemHqhgs9IekOyEOyK1EG5LweTn4THVkLDXKb8duzxnk16pCiTUrNMLDAn8Q49+Re6JxCdgMfG8UC0OKbSR6kfzHDVPn5JXf9fsgJhNMjBAY2fRMHm6hlw7YFFLOxl6Qp2391PoLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAILnjnYEP3d+eIIEYfh3T0S3I6Vmf2DezOJV36u1obFvuE80QbdKsUka+0FimcKnXcQroB1ZVO761Zy3W4IefqHZvCKMaVMIHt6yG3qK9kGb28xKPAqN1Zal9BAJk/XdVlmqtshm0UZYQ49cBqLhhP8mqfIR+mv3Ict8PnVFGkBWkihW+Nvx0M5gHIYlncAjgRCoWXBlR75ZgLuVTtMVwE80NlRfp/hkgkaj1WagC3xdZ5f5CLVcwTvvLqpcZ8FbB5iNI3oQLAXgpHgh2EpDYvB4DViGjJ9N/Z1GYCPETOK1A+hf4PGA3wF4fujOJ8VN2HRXUS2aoZ+OOxMfwqgvFYA=" ], - "priority": [ - "100" - ] + "priority": ["100"] } }, { @@ -4349,18 +4001,12 @@ "privateKey": [ "MIIEpQIBAAKCAQEAk45iaNteDDROult+hGyb91tKRFIYkapxqQe0Liv7qZorAe7OQrqU+r9TdFer1sbTLAyPYvUoblanWBgdoyd+atL/MhTdifE6F3G0HGzqHO62lgUaFr9nuMMjJojWOOUzVuOVATD8N6S8knW2y27JUyzS+cnIUB1iXHmZAY3RwU7a82+j2J+xT5DfF0MYIq8R/R9Uztmgz6W3PLQbvQ4C/QRy9kt1yxmQGWZUmAlIWgKTP1Bo7ID2/zdRjMEzr61X1P1wvIKg8+0+MgUUd1KqM1e8AC6UbY5N6ASOtIggnICkrmB9pG4bNsM383el69AxHagIttB79dH0+CeOdlmi0QIDAQABAoIBAAGd17oqXRdpI0urYPF2dyb4mxGwjJBb+67MZM70sGclRz9YLG5SuPseSX3G0B0kRIABCzkcUnsS+/ZdHUYCUsI82Yrk66BtQiOrnTuKfe4fN2ThXW3OXwaJLMNpUF+DM1LKX4GJ1dmONnqsS3pjFlWQ8ibGbSljiQZWVrTLpvalMEKXjxvdf4i3gTB7zBAUr55qv7PSskzftoK2HNooWpR36DlLjMJHLrYToOuaHpREgUprvbLLzC5Y17hMBlLUevczHIg0/av4xYnS/QYEqhEHTHwjY4gtjQ4EdwdE7xvX0rYCgQtYypyTCyySVbu18rAsedOxKu4yycPHw+10OAECgYEAxOGUBd5Omcdi6/ehrYt7LukC9ukPDql1OeUmrVpblQD7t6I2A0CP15JlVfaJoZG3nfy40lJasI9ZWhfv1Uz9D9AFDlYlBF7SILrlI8c9+lJP0QC1KQyTrXL72tXk5Sb3dQEJvQJxMfgWUrPgJvvnIexEAl67+5RUdC7ly2P+vkECgYEAv90nT74zWzLzgnWQG3sgBw2P2Fh09LWEJA3hu02WWyalXXwY/l5Y4LmDIo9M9RWiHNz3GZ6blkBwIGjJTa39Xj1G6454Cg4sZ2oZ7ucZpgFYq7vGjQxysybD33aKI6ZoL7yX+yjSI/HIy7baavRNdoxAXrUj97F09YfR6STX4JECgYEAtLKtXu14ip97ZUO0eknIV3e5JtEk5roVQ3vUEcsavxlV7mbM2BNLcfmFVG6gR1AsjK5FG5RGdEI9KflKQCUXJoov+caK1wYIKc4fPMVDVxpw80yI+RH4AHvGOEWUfdVTzWmUfItfRRODuYgqNN2Cd5oXmW1Fb1PmZ3QbqJ8wUYECgYEAnXWJYrds/Ga3VBTZnMQSh9dIezw1V/N0LAa8f/Rv9gSkaDGFbZTOijeVeJJ0jRsg/WEW5g62D7x4iRCWTMsDCgluH7m/qDjzljeMavV8pjGqrN4hV/akV4Tz8XweaJ2UGcFEVZqtw1QV/6HkZSx0OltmJJOyngAkRbEew6E6DhECgYEAoq52lDO+OBEqqrZ2i/j2BhveN7SPT+8gyf6Zb6EcnV8QuqJmIie3LEwJnBBDkrE8EhjK1DbxCFCd+7ObtPM4YAN5DuKs0CSuvDBoza70/ek112S6+87gZ1boyCKPsx8kdPyge3QICOFUwzxhmFjtKr6uzJMvTn3QzUgf5DtLRmI=" ], - "keyUse": [ - "ENC" - ], + "keyUse": ["ENC"], "certificate": [ "MIICszCCAZsCBgGND5sW7zANBgkqhkiG9w0BAQsFADAdMRswGQYDVQQDDBJjb25mbGljdHZpc3VhbGl6ZXIwHhcNMjQwMTE2MDAwODU4WhcNMzQwMTE2MDAxMDM4WjAdMRswGQYDVQQDDBJjb25mbGljdHZpc3VhbGl6ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTjmJo214MNE66W36EbJv3W0pEUhiRqnGpB7QuK/upmisB7s5CupT6v1N0V6vWxtMsDI9i9ShuVqdYGB2jJ35q0v8yFN2J8ToXcbQcbOoc7raWBRoWv2e4wyMmiNY45TNW45UBMPw3pLySdbbLbslTLNL5ychQHWJceZkBjdHBTtrzb6PYn7FPkN8XQxgirxH9H1TO2aDPpbc8tBu9DgL9BHL2S3XLGZAZZlSYCUhaApM/UGjsgPb/N1GMwTOvrVfU/XC8gqDz7T4yBRR3UqozV7wALpRtjk3oBI60iCCcgKSuYH2kbhs2wzfzd6Xr0DEdqAi20Hv10fT4J452WaLRAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIQU/kDws30SkbpE4GXTHzPPpChJV7zTCdc05mg/bAQ4HEYPgX0UhfFRJsGiK9XnhmookGyPSbsf8xA9lbiHT3BDF5lW+pZ7trGv3c05/S0hpTBDFme+THJPva8yGgDXWTHyLB7L8GJA4WMeQtZ7+xU6A6o3W7RGnDRv2zfdoegbHXAD36xV387RoMhwiWC8IpGNRI1Vop2oVSskfnjKGSOxB60COCo/pCjbhRAC2pA2pad0a1d6vuKZVes0qPaoIbrbOnZqswzOt+7gbmufZ6pNG7gB4dYIdbrkwu5ykjHKXicAgTGPsom68+ODYJiEA6CzPLKsmD3VplBTPu7Huu8=" ], - "priority": [ - "100" - ], - "algorithm": [ - "RSA-OAEP" - ] + "priority": ["100"], + "algorithm": ["RSA-OAEP"] } }, { @@ -4369,18 +4015,10 @@ "providerId": "hmac-generated", "subComponents": {}, "config": { - "kid": [ - "093421fa-ea07-4a61-bd3e-1e7f49f7bf2c" - ], - "secret": [ - "g5uGwWmIkYk-wYldnQ28zpvqB6v6HPrqwQCfuPPZvsI5chYFIQQdLZaPTUwBBNMiiGbuq3h4LUy3Nw1MY9mrug" - ], - "priority": [ - "100" - ], - "algorithm": [ - "HS256" - ] + "kid": ["093421fa-ea07-4a61-bd3e-1e7f49f7bf2c"], + "secret": ["g5uGwWmIkYk-wYldnQ28zpvqB6v6HPrqwQCfuPPZvsI5chYFIQQdLZaPTUwBBNMiiGbuq3h4LUy3Nw1MY9mrug"], + "priority": ["100"], + "algorithm": ["HS256"] } }, { @@ -4389,15 +4027,9 @@ "providerId": "aes-generated", "subComponents": {}, "config": { - "kid": [ - "b1167c6a-732c-485b-9291-8e74be24ee5f" - ], - "secret": [ - "7O87ebN9g4E0a3Y25qmGZg" - ], - "priority": [ - "100" - ] + "kid": ["b1167c6a-732c-485b-9291-8e74be24ee5f"], + "secret": ["7O87ebN9g4E0a3Y25qmGZg"], + "priority": ["100"] } } ] @@ -5156,21 +4788,33 @@ "failureFactor": 30, "roles": { "realm": [ + { + "id": "cb80b6bc-eafa-4f58-80ca-1e38ac8af5a1", + "name": "USER", + "description": "Conflictvisualizer User", + "composite": false, + "clientRole": false, + "containerId": "d0dc22ea-63fe-42ee-81d0-beed32b15ea7", + "attributes": {} + }, + { + "id": "eeb12ecf-17c1-45f0-9bc4-957a618039f9", + "name": "ADMIN", + "description": "Conflictvisualizer Administrator", + "composite": false, + "clientRole": false, + "containerId": "d0dc22ea-63fe-42ee-81d0-beed32b15ea7", + "attributes": {} + }, { "id": "998ccb10-fd0a-4e8a-9e56-e1c7962bf20c", "name": "default-roles-cvmanager", "description": "${role_default-roles}", "composite": true, "composites": { - "realm": [ - "offline_access", - "uma_authorization" - ], + "realm": ["offline_access", "uma_authorization"], "client": { - "account": [ - "manage-account", - "view-profile" - ] + "account": ["manage-account", "view-profile"] } }, "clientRole": false, @@ -5232,10 +4876,7 @@ "composite": true, "composites": { "client": { - "realm-management": [ - "query-groups", - "query-users" - ] + "realm-management": ["query-groups", "query-users"] } }, "clientRole": true, @@ -5285,9 +4926,7 @@ "composite": true, "composites": { "client": { - "realm-management": [ - "query-clients" - ] + "realm-management": ["query-clients"] } }, "clientRole": true, @@ -5433,9 +5072,7 @@ "composite": true, "composites": { "client": { - "account": [ - "view-consent" - ] + "account": ["view-consent"] } }, "clientRole": true, @@ -5467,9 +5104,7 @@ "composite": true, "composites": { "client": { - "account": [ - "manage-account-links" - ] + "account": ["manage-account-links"] } }, "clientRole": true, @@ -5515,7 +5150,28 @@ ] } }, - "groups": [], + "groups": [ + { + "id": "1d271cc0-96b8-434d-9c87-375cd789897a", + "name": "ADMIN", + "path": "/ADMIN", + "attributes": {}, + "realmRoles": ["ADMIN"], + "clientRoles": { + "realm-management": ["manage-users", "realm-admin"] + }, + "subGroups": [] + }, + { + "id": "3385cd0b-1ddf-460e-8c67-c4cf138868ec", + "name": "USER", + "path": "/USER", + "attributes": {}, + "realmRoles": ["USER"], + "clientRoles": {}, + "subGroups": [] + } + ], "defaultRole": { "id": "998ccb10-fd0a-4e8a-9e56-e1c7962bf20c", "name": "default-roles-cvmanager", @@ -5524,9 +5180,8 @@ "clientRole": false, "containerId": "d0dc22ea-63fe-42ee-81d0-beed32b15ea7" }, - "requiredCredentials": [ - "password" - ], + "defaultGroups": ["/USER"], + "requiredCredentials": ["password"], "otpPolicyType": "totp", "otpPolicyAlgorithm": "HmacSHA1", "otpPolicyInitialCounter": 0, @@ -5534,15 +5189,9 @@ "otpPolicyLookAheadWindow": 1, "otpPolicyPeriod": 30, "otpPolicyCodeReusable": false, - "otpSupportedApplications": [ - "totpAppMicrosoftAuthenticatorName", - "totpAppGoogleName", - "totpAppFreeOTPName" - ], + "otpSupportedApplications": ["totpAppMicrosoftAuthenticatorName", "totpAppGoogleName", "totpAppFreeOTPName"], "webAuthnPolicyRpEntityName": "keycloak", - "webAuthnPolicySignatureAlgorithms": [ - "ES256" - ], + "webAuthnPolicySignatureAlgorithms": ["ES256"], "webAuthnPolicyRpId": "", "webAuthnPolicyAttestationConveyancePreference": "not specified", "webAuthnPolicyAuthenticatorAttachment": "not specified", @@ -5552,9 +5201,7 @@ "webAuthnPolicyAvoidSameAuthenticatorRegister": false, "webAuthnPolicyAcceptableAaguids": [], "webAuthnPolicyPasswordlessRpEntityName": "keycloak", - "webAuthnPolicyPasswordlessSignatureAlgorithms": [ - "ES256" - ], + "webAuthnPolicyPasswordlessSignatureAlgorithms": ["ES256"], "webAuthnPolicyPasswordlessRpId": "", "webAuthnPolicyPasswordlessAttestationConveyancePreference": "not specified", "webAuthnPolicyPasswordlessAuthenticatorAttachment": "not specified", @@ -5586,29 +5233,22 @@ ], "disableableCredentialTypes": [], "requiredActions": [], - "realmRoles": [ - "default-roles-cvmanager" - ], + "realmRoles": ["default-roles-cvmanager"], "notBefore": 0, - "groups": [] + "groups": ["/ADMIN"] } ], "scopeMappings": [ { "clientScope": "offline_access", - "roles": [ - "offline_access" - ] + "roles": ["offline_access"] } ], "clientScopeMappings": { "account": [ { "client": "account-console", - "roles": [ - "manage-account", - "view-groups" - ] + "roles": ["manage-account", "view-groups"] } ] }, @@ -5623,9 +5263,7 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/realms/cvmanager/account/*" - ], + "redirectUris": ["/realms/cvmanager/account/*"], "webOrigins": [], "notBefore": 0, "bearerOnly": false, @@ -5643,19 +5281,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "profile", - "roles", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "profile", "roles", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "48417936-3262-4cc6-a53d-69809be217ec", @@ -5667,9 +5294,7 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/realms/cvmanager/account/*" - ], + "redirectUris": ["/realms/cvmanager/account/*"], "webOrigins": [], "notBefore": 0, "bearerOnly": false, @@ -5698,19 +5323,8 @@ "config": {} } ], - "defaultClientScopes": [ - "web-origins", - "acr", - "profile", - "roles", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "profile", "roles", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "14c1acec-de65-4f71-a62e-dfc20eb42a11", @@ -5738,19 +5352,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "profile", - "roles", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "profile", "roles", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "a48352c8-caf6-4175-8f10-b889a6815067", @@ -5778,19 +5381,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "profile", - "roles", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "profile", "roles", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "02c60f24-1909-4d39-bab5-1db615e1b224", @@ -5805,12 +5397,8 @@ "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", "secret": "${KEYCLOAK_API_CLIENT_SECRET_KEY}", - "redirectUris": [ - "*" - ], - "webOrigins": [ - "*" - ], + "redirectUris": ["*"], + "webOrigins": ["*"], "notBefore": 0, "bearerOnly": false, "consentRequired": false, @@ -5833,20 +5421,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": true, "nodeReRegistrationTimeout": -1, - "defaultClientScopes": [ - "web-origins", - "acr", - "openid", - "profile", - "roles", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "openid", "profile", "roles", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "8232316f-728b-4e89-90ca-c91907d7718d", @@ -5860,14 +5436,8 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "http://localhost:3000/*", - "${WEBAPP_ORIGIN}/*" - ], - "webOrigins": [ - "http://localhost:3000", - "${WEBAPP_ORIGIN}" - ], + "redirectUris": ["http://localhost:3000/*", "${WEBAPP_ORIGIN}/*"], + "webOrigins": ["http://localhost:3000", "${WEBAPP_ORIGIN}"], "notBefore": 0, "bearerOnly": false, "consentRequired": false, @@ -5895,20 +5465,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": true, "nodeReRegistrationTimeout": -1, - "defaultClientScopes": [ - "web-origins", - "acr", - "openid", - "profile", - "roles", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "openid", "profile", "roles", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "b2cdce72-e870-4473-99c2-5dba6ebee37e", @@ -5936,19 +5494,8 @@ "authenticationFlowBindingOverrides": {}, "fullScopeAllowed": false, "nodeReRegistrationTimeout": 0, - "defaultClientScopes": [ - "web-origins", - "acr", - "profile", - "roles", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "profile", "roles", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] }, { "id": "71948848-7dc7-4c8f-9437-ffb5e27662d6", @@ -5960,12 +5507,8 @@ "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/admin/cvmanager/console/*" - ], - "webOrigins": [ - "+" - ], + "redirectUris": ["/admin/cvmanager/console/*"], + "webOrigins": ["+"], "notBefore": 0, "bearerOnly": false, "consentRequired": false, @@ -6000,19 +5543,8 @@ } } ], - "defaultClientScopes": [ - "web-origins", - "acr", - "profile", - "roles", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ] + "defaultClientScopes": ["web-origins", "acr", "profile", "roles", "email"], + "optionalClientScopes": ["address", "phone", "offline_access", "microprofile-jwt"] } ], "clientScopes": [ @@ -6537,20 +6069,8 @@ ] } ], - "defaultDefaultClientScopes": [ - "role_list", - "profile", - "email", - "roles", - "web-origins", - "acr" - ], - "defaultOptionalClientScopes": [ - "offline_access", - "address", - "phone", - "microprofile-jwt" - ], + "defaultDefaultClientScopes": ["role_list", "profile", "email", "roles", "web-origins", "acr"], + "defaultOptionalClientScopes": ["offline_access", "address", "phone", "microprofile-jwt"], "browserSecurityHeaders": { "contentSecurityPolicyReportOnly": "", "xContentTypeOptions": "nosniff", @@ -6563,9 +6083,7 @@ "smtpServer": {}, "loginTheme": "cv-manager", "eventsEnabled": false, - "eventsListeners": [ - "jboss-logging" - ], + "eventsListeners": ["jboss-logging"], "enabledEventTypes": [], "adminEventsEnabled": false, "adminEventsDetailsEnabled": false, @@ -6604,12 +6122,8 @@ "subType": "anonymous", "subComponents": {}, "config": { - "host-sending-registration-request-must-match": [ - "true" - ], - "client-uris-must-match": [ - "true" - ] + "host-sending-registration-request-must-match": ["true"], + "client-uris-must-match": ["true"] } }, { @@ -6638,9 +6152,7 @@ "subType": "authenticated", "subComponents": {}, "config": { - "allow-default-scopes": [ - "true" - ] + "allow-default-scopes": ["true"] } }, { @@ -6650,9 +6162,7 @@ "subType": "anonymous", "subComponents": {}, "config": { - "allow-default-scopes": [ - "true" - ] + "allow-default-scopes": ["true"] } }, { @@ -6670,9 +6180,7 @@ "subType": "anonymous", "subComponents": {}, "config": { - "max-clients": [ - "200" - ] + "max-clients": ["200"] } }, { @@ -6713,15 +6221,11 @@ "privateKey": [ "MIIEowIBAAKCAQEAsnxqBGGqOEoyQ0Dq3iWSf+H+7C/xbh/ROakF2+oEfGemWVjsfrDXBUZhm9wWPQnW/Ow8qioG0H//1Nv1dryzfScLm49luGfxbieUbRNDb+OvcDTf6i/8r1T+mCEW/vUDon7PNTpOckrP8rRUcbvTSqX0HGo9weMrYlnBcIZxYzkflYNmBrbj46Fp7wrmG1TzoeEIVBviq/jYBRdnCoJE2mLbCnXupJErnQeuhRezfw6uCMASjRkZb+HGk1mGQrykE3/U3eeGXLlVA0G+Fe34SoXStTCuENYFb/zXMskjC2L3EgqXatuPNt+pNZuJyFz8jKEtbgkBKGMLeDkm5NNr1QIDAQABAoIBAE+ZEoKvt4Tw+edqTRQS93mWpORaITZ2dA1d5qIDhEqiwtn3wUhivxG4KJGknjpMaBdVl1xf77gOTV51VcvFLdqzjgaq9bc+i7oPZq8aNynwBW5p9i3vhqX+pqfbofDD/gH6wZfAT/nCiWh4qWwrUnho+Cuv6ajNEa0D0DPJkUmpEP5r0Eq1ZBpkV6I7brKtCPoMHIbofm7oqshRYxvzSVhlYJUSU0aMVw/7Dww6zT5vrX6QJWHLY9mBR3YxS/uMG/vYMKEu2hXbsdjtBRDl/u4aiAIk+OIulcmAlDnxC0dFHgw7rsDpK5QI2SJ1m3MF3lZ4AiOZs/o900US+431ryUCgYEA8LiMGI5kdKvEnVbYAqEzoo5EHjx1l9ha6F8Dzy/bKKY6noPePCC24j27Zv25OjBcq8MxFvo7grqDG+ZtWzes17pxmpe3ttaXtuf9RRf8wLw323USRrwJu52xD5STfombRKHwpKEy/NRewTnX6qK6QvEki/9YbEbgPEuA8sOvUHsCgYEAvdCeE7MdiBZEinV3+voBZuCJzlN7d2gSoGWv/ZZUNBMqE3Wiyr5dx85TiBkIbghO+t5EOZRQFL403nIpDPLVXLSsZxdAbtOtSGcc7zjUITpuz6malr4Tzlp+4d0+8Vjc+ooDTnIanCq0bx1vpBTitx3qGHZR/OCVkQ57Lsl2C+8CgYAhCvQQGtunODzQ7C7SjZYs5iJrlBkAMu6nnwNC2WrX9ZluUOOclVEFVTv4MzPNzP2rhiui385zb2630bWJI+dR5YHamqDZNDO3I7kcVuKXAj8YnMVZeE5NtqOrY9WrNPBfR2tk7cu18ODg3TPKPXQb5EYEAZT9p+z32dVlfX7/KQKBgQClei+1YNuH/lG2m34DsNx0AaBh3WmvyW0jpELvQpUZ6PMvj8hiE9/SBs/PwHMW6etgzVCRGflOfBu/Kasb/L+BWIlMPnsPoz5X9nzFGLfmV/iu1V9Nt1uw9DfVVHpBEYVkbdlAFD2ak6hFjlX7p7GWjl+8/7muSWRa11MQkNV2xQKBgC1Fq/L0+pcNSNNKd323mKjZaGClN7Pz4FzivT2sM9qYjZsyhoX/N5rVPRqK1w3Sovq9sUaPJGAHkluBwcULYT0/wa3EAsGfOkwrHNh1bBqO39bfvhuoXuDhmxg5AkyXyuvz130SoCc9WXw+iWIA1sEy2xcnrqrzPCWsk39zCCa9" ], - "keyUse": [ - "SIG" - ], + "keyUse": ["SIG"], "certificate": [ "MIICoTCCAYkCBgGIIHh1fTANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDDAljdm1hbmFnZXIwHhcNMjMwNTE1MTczMDQ1WhcNMzMwNTE1MTczMjI1WjAUMRIwEAYDVQQDDAljdm1hbmFnZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyfGoEYao4SjJDQOreJZJ/4f7sL/FuH9E5qQXb6gR8Z6ZZWOx+sNcFRmGb3BY9Cdb87DyqKgbQf//U2/V2vLN9Jwubj2W4Z/FuJ5RtE0Nv469wNN/qL/yvVP6YIRb+9QOifs81Ok5ySs/ytFRxu9NKpfQcaj3B4ytiWcFwhnFjOR+Vg2YGtuPjoWnvCuYbVPOh4QhUG+Kr+NgFF2cKgkTaYtsKde6kkSudB66FF7N/Dq4IwBKNGRlv4caTWYZCvKQTf9Td54ZcuVUDQb4V7fhKhdK1MK4Q1gVv/NcyySMLYvcSCpdq248236k1m4nIXPyMoS1uCQEoYwt4OSbk02vVAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAD+vpYJuJ9ZG+nXcttflEs+FvUg4sFvQZVxLwHxusLKb095K9/UTbOi13bp/XyB/04SGZDZkb/RRjCXfLGbwAhlLvta83Y7D9egmYL4qT+4aQrctOdjX7qIjec8nklWSm/E5zAxF6qZ4pB8msK1X1d9vWJPtTY+y4uWWE/SO01acRPInazEtkwAVYaquZqZaP0d9/G7+a2DZ+0OMInaPBNF/Vw2PM1hItnJG8HzrqUMm5Y8zH76OpTBvZ6OxzhX4k1Z+mGnD3qv97vgfk65fpWVTjzymIyjPuVMOYXSuC4GWhQJQHlfoxATE3Rqs78Spa+y/4lkNWGmqgFcHVHoS6jw=" ], - "priority": [ - "100" - ] + "priority": ["100"] } }, { @@ -6730,15 +6234,9 @@ "providerId": "aes-generated", "subComponents": {}, "config": { - "kid": [ - "e3118a62-6142-4a6d-8676-77b02f80bc94" - ], - "secret": [ - "5XzP4ih0trhxh8R-lDT1gA" - ], - "priority": [ - "100" - ] + "kid": ["e3118a62-6142-4a6d-8676-77b02f80bc94"], + "secret": ["5XzP4ih0trhxh8R-lDT1gA"], + "priority": ["100"] } }, { @@ -6747,18 +6245,10 @@ "providerId": "hmac-generated", "subComponents": {}, "config": { - "kid": [ - "7bd6a6e5-2dc7-4274-a1a5-a5983aa82444" - ], - "secret": [ - "9rFpOZF24rMuJGtf2eBLOYsPg73OJYYWMZn-MJsLSD06G6BaBeVx8q8i_kG_07qx5Dd2W33-Yst36qzkXOFP_Q" - ], - "priority": [ - "100" - ], - "algorithm": [ - "HS256" - ] + "kid": ["7bd6a6e5-2dc7-4274-a1a5-a5983aa82444"], + "secret": ["9rFpOZF24rMuJGtf2eBLOYsPg73OJYYWMZn-MJsLSD06G6BaBeVx8q8i_kG_07qx5Dd2W33-Yst36qzkXOFP_Q"], + "priority": ["100"], + "algorithm": ["HS256"] } }, { @@ -6770,18 +6260,12 @@ "privateKey": [ "MIIEpAIBAAKCAQEA0MQIbGxBHMkPp/yI6dSj3/SWWsyQrGe+ftdg8CCUMrlFRAq34wamnbP5k0GozWqAY6paTPrPGjcuXQ0EaMwL5OKdFaFWGXwLLjrmTicCXIEyb8lo3Ty8/izPxVlHLs+iZtZm5uP9xfL7Nw6Ja9gXhQStHfZPnt7Q31Ht4GfN08FrKAoGTsy+EyLv4o/4LoSUwRyuyvNpva3fuwTUoZPP7Y3Mmo/Ijk3L1R7cXelxNkh5ApN6whzhcec3yPQrveBed39mZ0WXyslSvVHCDQ5uvGj5fk45tRCXsOVTz01EOmAbm2W6/OOs8Ixw2Ll3l33+5U+M8uL+neEKg1aqDUew7wIDAQABAoIBACS4Bh9D3yP3/Uf3tAEkxHoUpAluZ5fbW3cl3Mf/gvF1AsjX9cX5mn6sdB5BczZGIDTndqCJkLm0sPPu4TKpiQIGFckDKoiq97B27aEbXV/13XAqBca78yXlrdmxPULvhEoANfMwcKdLeIITjXopdOGRk/1sIE76M9TDrUpGF77BufUrQUcg7DCDBOVjGTt83RMQpXVxobEu/PIYwyhUH6tOgdVl9dvcCfaShQUNlW8kYYNlMYW0Giude9Aeu8pZAUM6UXTUtkyyFdarerhWFVSTT0x1u7EbqhdeqANmDbkpQ/sNCBCF4qwj2ff7ZN9M/oqf6wyoHzOV0RTaHJtpawECgYEA8h7beSfOZ0q/QVYymfGGSEnl99twbX+y0IrrfaudX0410kXGrxRrplxq9UfOfnVCl/LmOqr36Ne1lqDiGPRQWJfNp74NIMzs8z0pLLZJYfhd2yiUh4wtpMh+dV8Hrnm6lLvNhT9QR7bnm0OhESv3N0MgMHsch7AxhV0l21cu9YECgYEA3Luw3L1opSXRHgyeyAFiDD1YD3rTM0HaJKO/DjmmC10AlVmnYYZ0rvlvnrIE82d1kxG0Std691ILnvHHw9Vh1mLprGFCszwgJGicNy2Tr/DeXuaXmifVtUFxNaxYTeFcPCJPL2BjmQ9Naxhin/g4w5maK5LduGJTUR8aDjd2Pm8CgYBMGeTT/O4ES1s39xbqih6x5ABTWnbJBAU5RSDlnCZXyWZjVCkx6JI5dPztYYeG+eZXijJRKGHJnttln+XRACGs5vHuEm9f6uljPssNUbJZB87ATs34mNfT3mzZCWiJr5s0mp7rjc327Id5ptUeZ5pJlWCtvFRoVboK+A8pFQsegQKBgQDJHF0NEanJZkY8iaUVd2Uc37tfBzpsZiBZ57NIQ7AMhGTmrnO5gKbJUUyom2u1VVsjbysEUYWg1ujtnT60J7NngGGFBGygHzTt1z4Va/o2gFAqyQ/xjT/CUGjUTT17X8wIof3hnYHBT9bqr6IUPDWDyWxVLQ/EUhm1PJAhydh7EwKBgQDNgKsBjTrTpDtcewfYarAlyLnmsJ1Fd7t4ICpKl0zwOcBacN+IqHwKZ/CTnYbpuwbURm6B0uQe6ApJ49RRFIa9Zdi9hQ4MkGEvDmAYRxuzqYPm65ssYVwcPPVYNpo8TfY3ulCPhR0zKKuZS968SKUlVWxhlqovZslFZD01OAYRrQ==" ], - "keyUse": [ - "ENC" - ], + "keyUse": ["ENC"], "certificate": [ "MIICoTCCAYkCBgGIIHh17TANBgkqhkiG9w0BAQsFADAUMRIwEAYDVQQDDAljdm1hbmFnZXIwHhcNMjMwNTE1MTczMDQ1WhcNMzMwNTE1MTczMjI1WjAUMRIwEAYDVQQDDAljdm1hbmFnZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQxAhsbEEcyQ+n/Ijp1KPf9JZazJCsZ75+12DwIJQyuUVECrfjBqads/mTQajNaoBjqlpM+s8aNy5dDQRozAvk4p0VoVYZfAsuOuZOJwJcgTJvyWjdPLz+LM/FWUcuz6Jm1mbm4/3F8vs3Dolr2BeFBK0d9k+e3tDfUe3gZ83TwWsoCgZOzL4TIu/ij/guhJTBHK7K82m9rd+7BNShk8/tjcyaj8iOTcvVHtxd6XE2SHkCk3rCHOFx5zfI9Cu94F53f2ZnRZfKyVK9UcINDm68aPl+Tjm1EJew5VPPTUQ6YBubZbr846zwjHDYuXeXff7lT4zy4v6d4QqDVqoNR7DvAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGGOT5zqUXa3vj683lB77y81VszT/raGg/GOMxOuL+9jDRnqKukY4keqT+O0q8xHn4SxQ2r0P+1dQ4WOUL91Nmi5lAC31O411qgbRvNF2WjYiqwjYr4FxJxiCruCx0fnDjl/eCfQeojXt0jmOwkRdSeZW3oyxwSv1g2p4jVe5ICczDLAmCgF+3SCfudSMzdf533s9FiB2rYeslePYr9+/ukWAN9eZH7Gz7c6qEEpYmfs9IgK0MbYwmgjNIPvSu1R3Rg5O9Zbi3pC0NcLy5hTiFB2M68fsM/ZRz4xsh2K5bLDZdiqbZCgTbrw10yoZZ8YhqKcIYVtyizzs9zAqqNqBLk=" ], - "priority": [ - "100" - ], - "algorithm": [ - "RSA-OAEP" - ] + "priority": ["100"], + "algorithm": ["RSA-OAEP"] } } ] @@ -7497,4 +6981,4 @@ "policies": [] } } -] \ No newline at end of file +] diff --git a/resources/kubernetes/cv-manager-api.yaml b/resources/kubernetes/cv-manager-api.yaml index e0c99eb02..d3b851ec5 100644 --- a/resources/kubernetes/cv-manager-api.yaml +++ b/resources/kubernetes/cv-manager-api.yaml @@ -156,8 +156,6 @@ spec: secretKeyRef: name: some_email_secret_password key: some_email_secret_key - - name: CSM_EMAILS_TO_SEND_TO - value: "" - name: CSM_TARGET_SMTP_SERVER_ADDRESS value: "" - name: CSM_TARGET_SMTP_SERVER_PORT diff --git a/resources/kubernetes/cv-manager-postgres.yaml b/resources/kubernetes/cv-manager-postgres.yaml index 2a8904c47..9992340bf 100644 --- a/resources/kubernetes/cv-manager-postgres.yaml +++ b/resources/kubernetes/cv-manager-postgres.yaml @@ -351,7 +351,6 @@ data: first_name character varying(128) NOT NULL, last_name character varying(128) NOT NULL, super_user bit(1) NOT NULL, - receive_error_emails bit(1) NOT NULL, CONSTRAINT users_pkey PRIMARY KEY (user_id), CONSTRAINT users_email UNIQUE (email) ); diff --git a/resources/kubernetes/firmware-manager.yaml b/resources/kubernetes/firmware-manager.yaml index d72462387..9aaec97b2 100644 --- a/resources/kubernetes/firmware-manager.yaml +++ b/resources/kubernetes/firmware-manager.yaml @@ -84,8 +84,6 @@ spec: value: "" - name: LOGGING_LEVEL value: "INFO" - - name: FW_EMAIL_RECIPIENTS - value: "" - name: SMTP_SERVER_IP value: "" - name: SMTP_EMAIL diff --git a/resources/kubernetes/obu-ota-server.yaml b/resources/kubernetes/obu-ota-server.yaml new file mode 100644 index 000000000..92727c8db --- /dev/null +++ b/resources/kubernetes/obu-ota-server.yaml @@ -0,0 +1,184 @@ +# K8s ManagedCertificate for using SSL/TLS with a domain +# Domain and DNS forwarding to the Ingress endpoint must be configured +apiVersion: networking.gke.io/v1 +kind: ManagedCertificate +metadata: + name: obu-ota-server-managed-cert +spec: + domains: + - your.domain.com +--- +# K8s FrontendConfig for applying SSL certificate to Ingress +# Requires 'obu-ota-server-ssl-policy' SSL policy to exist +apiVersion: networking.gke.io/v1beta1 +kind: FrontendConfig +metadata: + name: obu-ota-server-frontend + labels: + app: obu-ota-server +spec: + redirectToHttps: + enabled: true + sslPolicy: obu-ota-server-ssl-policy +--- +# NodePort to expose CV Manager web application +apiVersion: v1 +kind: Service +metadata: + labels: + app: obu-ota-server + name: obu-ota-server-service-internal +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app: obu-ota-server + type: NodePort +--- +# External HTTP/HTTPS Ingress to internal NodePort +# Requires 'cv-manager-ip' as a global static external IP to be reserved +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: obu-ota-server-ingress + labels: + app: obu-ota-server + annotations: + kubernetes.io/ingress.regional-static-ip-name: 'cv-manager-ip' + networking.gke.io/managed-certificates: 'obu-ota-server-managed-cert' + networking.gke.io/v1beta1.FrontendConfig: 'obu-ota-server-frontend' +spec: + defaultBackend: + service: + name: obu-ota-server-service-internal + port: + number: 80 + + ingressClassName: nginx + rules: + - host: foo.bar.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: http-svc + port: + number: 80 +--- +# Persistent Volume for Downloaded fmwr +apiVersion: v1 +kind: PersistentVolume +metadata: + name: obu-ota-server-volume +spec: + accessModes: + - ReadWriteOnce + capacity: + storage: 10Gi + storageClassName: standard-rwo + gcePersistentDisk: + pdName: obu-ota-server-disk + fsType: ext4 +--- +# Persistent Volume Claim for Downloaded fmwr +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: obu-ota-server-claim +spec: + storageClassName: standard-rwo + volumeName: obu-ota-server-volume + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi +--- +apiVersion: 'apps/v1' +kind: 'Deployment' +metadata: + name: obu-ota-server +spec: + replicas: 1 + strategy: + type: Recreate + selector: + matchLabels: + app: obu-ota-server + template: + metadata: + labels: + app: obu-ota-server + spec: + containers: + - name: obu-ota-server + imagePullPolicy: Always + image: 'iss-health-check-image' + resources: + requests: + memory: 512Mi + cpu: 1 + limits: + memory: 1Gi + cpu: 1 + tty: true + stdin: true + ports: + - containerPort: 8085 + env: + - name: SERVER_HOST + value: '' + - name: LOGGING_LEVEL + value: '' + - name: BLOB_STORAGE_PROVIDER + value: '' + - name: GCP_PROJECT + value: '' + - name: BLOB_STORAGE_BUCKET + value: '' + - name: BLOB_STORAGE_PATH + value: '' + - name: GOOGLE_APPLICATION_CREDENTIALS + value: '' + - name: OTA_USERNAME + valueFrom: + secretKeyRef: + name: some-api-username-name + key: some-api-username-key + - name: OTA_PASSWORD + valueFrom: + secretKeyRef: + name: some-api-password-name + key: some-api-password-key + - name: MAX_COUNT + value: '' + - name: PG_DB_HOST + value: '' + - name: PG_DB_NAME + value: '' + - name: PG_DB_USER + valueFrom: + secretKeyRef: + name: some-postgres-secret-user + key: some-postgres-secret-key + - name: PG_DB_PASS + valueFrom: + secretKeyRef: + name: some-postgres-secret-password + key: some-postgres-secret-key + volumeMounts: + - name: cv-manager-service-key + mountPath: /home/secret + - name: firmware-folder + mountPath: '/firmwares/' + volumes: + - name: cv-manager-service-key + secret: + secretName: cv-manager-service-key + - name: firmware-folder + persistentVolumeClaim: + claimName: obu-ota-server-claim diff --git a/resources/mongo_scripts/create_indexes.js b/resources/mongo_scripts/create_indexes.js new file mode 100644 index 000000000..dbb07dc12 --- /dev/null +++ b/resources/mongo_scripts/create_indexes.js @@ -0,0 +1,197 @@ +// Create indexes on all collections + +/* +This script is responsible for initializing the replica set, creating collections, adding indexes and TTLs +*/ +console.log('Running create_indexes.js') + +const cv_manager_db = process.env.MONGO_DB_NAME +const cv_manager_user = process.env.MONGO_CV_MANAGER_DB_USER +const cv_manager_pass = process.env.MONGO_CV_MANAGER_DB_PASS + +const ttlInDays = process.env.MONGO_COLLECTION_TTL // TTL in days +const expire_seconds = ttlInDays * 24 * 60 * 60 +const retry_milliseconds = 5000 + +console.log('CV MANAGER DB Name: ' + cv_manager_db) + +try { + console.log('Initializing replica set...') + + var config = { + _id: 'rs0', + version: 1, + members: [ + { + _id: 0, + host: 'mongo:27017', + priority: 2, + }, + ], + } + rs.initiate(config, { force: true }) + rs.status() +} catch (e) { + rs.status().ok +} + +// name -> collection name +// ttlField -> field to perform ttl on +// timeField -> field to index for time queries + +const collections = [ + { name: 'OdeBsmJson', ttlField: 'recordGeneratedAt', timeField: 'metadata.odeReceivedAt' }, + { name: 'OdeRawEncodedBSMJson', ttlField: 'recordGeneratedAt', timeField: 'none' }, + + { name: 'OdeMapJson', ttlField: 'recordGeneratedAt', timeField: 'metadata.odeReceivedAt' }, + { name: 'OdeRawEncodedMAPJson', ttlField: 'recordGeneratedAt', timeField: 'none' }, + + { name: 'OdeSpatJson', ttlField: 'recordGeneratedAt', timeField: 'metadata.odeReceivedAt' }, + { name: 'OdeRawEncodedSPATJson', ttlField: 'recordGeneratedAt', timeField: 'none' }, + + { name: 'OdeTimJson', ttlField: 'recordGeneratedAt', timeField: 'metadata.odeReceivedAt' }, + { name: 'OdeRawEncodedTIMJson', ttlField: 'recordGeneratedAt', timeField: 'none' }, + + { name: 'OdePsmJson', ttlField: 'recordGeneratedAt', timeField: 'metadata.odeReceivedAt' }, + { name: 'OdeRawEncodedPsmJson', ttlField: 'recordGeneratedAt', timeField: 'none' }, +] + +// Function to check if the replica set is ready +function isReplicaSetReady() { + let status + try { + status = rs.status() + } catch (error) { + console.error('Error getting replica set status: ' + error) + return false + } + + // Check if the replica set has a primary + if (!status.hasOwnProperty('myState') || status.myState !== 1) { + console.log('Replica set is not ready yet') + return false + } + + console.log('Replica set is ready') + return true +} + +try { + // Wait for the replica set to be ready + while (!isReplicaSetReady()) { + sleep(retry_milliseconds) + } + sleep(retry_milliseconds) + // creates another user + console.log('Creating CV MANAGER user...') + admin = db.getSiblingDB('admin') + // Check if user already exists + var user = admin.getUser(cv_manager_user) + if (user == null) { + admin.createUser({ + user: cv_manager_user, + pwd: cv_manager_pass, + roles: [ + { role: 'readWrite', db: cv_manager_db }, + { role: 'readWrite', db: 'admin' }, + ], + }) + } else { + console.log('User "' + cv_manager_user + '" already exists.') + } +} catch (error) { + print('Error connecting to the MongoDB instance: ' + error) +} + +// Wait for the collections to exist in mongo before trying to create indexes on them +let missing_collection_count +const db = db.getSiblingDB(cv_manager_db) +do { + try { + missing_collection_count = 0 + const collection_names = db.getCollectionNames() + for (collection of collections) { + console.log('Creating Indexes for Collection' + collection['name']) + // Create Collection if It doesn't exist + let created = false + if (!collection_names.includes(collection.name)) { + created = createCollection(collection) + // created = true; + } else { + created = true + } + + if (created) { + if (collection.hasOwnProperty('ttlField') && collection.ttlField !== 'none') { + createTTLIndex(collection) + } + } else { + missing_collection_count++ + console.log('Collection ' + collection.name + ' does not exist yet') + } + } + if (missing_collection_count > 0) { + print( + 'Waiting on ' + + missing_collection_count + + ' collections to be created...will try again in ' + + retry_milliseconds + + ' ms' + ) + sleep(retry_milliseconds) + } + } catch (err) { + console.log('Error while setting up TTL indexes in collections') + console.log(rs.status()) + console.error(err) + sleep(retry_milliseconds) + } +} while (missing_collection_count > 0) + +console.log('Finished Creating All TTL indexes') + +function createCollection(collection) { + try { + db.createCollection(collection.name) + return true + } catch (err) { + console.log('Unable to Create Collection: ' + collection.name) + console.log(err) + return false + } +} + +// Create TTL Indexes +function createTTLIndex(collection) { + if (ttlIndexExists(collection)) { + console.log('TTL index already exists for ' + collection.name) + return + } + + const collection_name = collection.name + const timeField = collection.ttlField + + console.log('Creating TTL index for ' + collection_name + ' to remove documents after ' + expire_seconds + ' seconds') + + try { + var index_json = {} + index_json[timeField] = 1 + db[collection_name].createIndex(index_json, { expireAfterSeconds: expire_seconds }) + console.log('Created TTL index for ' + collection_name + ' using the field: ' + timeField + ' as the timestamp') + } catch (err) { + var pattern_json = {} + pattern_json[timeField] = 1 + db.runCommand({ + collMod: collection_name, + index: { + keyPattern: pattern_json, + expireAfterSeconds: expire_seconds, + }, + }) + console.log('Updated TTL index for ' + collection_name + ' using the field: ' + timeField + ' as the timestamp') + } +} + +function ttlIndexExists(collection) { + return db[collection.name].getIndexes().find((idx) => idx.hasOwnProperty('expireAfterSeconds')) !== undefined +} diff --git a/resources/mongo_scripts/insert_data.js b/resources/mongo_scripts/insert_data.js new file mode 100644 index 000000000..ec4ab10af --- /dev/null +++ b/resources/mongo_scripts/insert_data.js @@ -0,0 +1,212 @@ +const cv_manager_user = process.env.MONGO_ADMIN_DB_USER +const cv_manager_pass = process.env.MONGO_ADMIN_DB_PASS + +db = connect('mongodb://' + cv_manager_user + ':' + cv_manager_pass + '@mongo:27017/admin') +if (db === null) { + print('Error connecting to the MongoDB instance') +} else { + print('Successfully connected to the MongDB instance') +} + +var currentDate = new Date() +var currentDateIso = currentDate.toISOString().slice(0, -5) + +var datePreviousHour = new Date() +datePreviousHour.setHours(currentDate.getHours() - 1) +var datePreviousHourIso = datePreviousHour.toISOString().slice(0, -5) + +ConflictMonitor = db.getSiblingDB('ConflictMonitor') + +// Insert CVCounts documents +ConflictMonitor.CVCounts.insertMany([ + { + messageType: 'Map', + rsuIp: '10.0.0.180', + timestamp: new Date(currentDateIso.slice(0, -5) + '00:00Z'), + count: 153, + }, + { + messageType: 'Map', + rsuIp: '10.0.0.78', + timestamp: new Date(currentDateIso.slice(0, -5) + '00:00Z'), + count: 12, + }, + { + messageType: 'SPaT', + rsuIp: '10.0.0.180', + timestamp: new Date(currentDateIso.slice(0, -5) + '00:00Z'), + count: 24, + }, + { + messageType: 'SPaT', + rsuIp: '10.0.0.78', + timestamp: new Date(currentDateIso.slice(0, -5) + '00:00Z'), + count: 15, + }, + { + messageType: 'SPaT', + rsuIp: '10.0.0.180', + timestamp: new Date(datePreviousHourIso.slice(0, -5) + '00:00Z'), + count: 17, + }, + { + messageType: 'SPaT', + rsuIp: '10.0.0.78', + timestamp: new Date(datePreviousHourIso.slice(0, -5) + '00:00Z'), + count: 12, + }, + { + messageType: 'Map', + rsuIp: '10.0.0.180', + timestamp: new Date(datePreviousHourIso.slice(0, -5) + '00:00Z'), + count: 145, + }, + { + messageType: 'Map', + rsuIp: '10.0.0.78', + timestamp: new Date(datePreviousHourIso.slice(0, -5) + '00:00Z'), + count: 10, + }, +]) + +// insert V2XGeoJson documents +ConflictMonitor.V2XGeoJson.insertMany([ + { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [-104.997663, 39.708309], + }, + properties: { + id: '10.0.0.180', + timestamp: new Date(currentDateIso.slice(0, -5) + '15:00Z'), + msg_type: 'Bsm', + }, + }, + { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [-105.014169, 39.740033], + }, + properties: { + id: '10.0.0.180', + timestamp: new Date(currentDateIso.slice(0, -5) + '00:00Z'), + msg_type: 'Bsm', + }, + }, + { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [-104.990622, 39.7718], + }, + properties: { + id: '10.0.0.180', + timestamp: new Date(datePreviousHourIso.slice(0, -5) + '45:00Z'), + msg_type: 'Bsm', + }, + }, + { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [-104.982867, 39.817387], + }, + properties: { + id: '10.0.0.78', + timestamp: new Date(datePreviousHourIso.slice(0, -5) + '30:00Z'), + msg_type: 'Bsm', + }, + }, + { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [-104.987132, 39.856097], + }, + properties: { + id: '10.0.0.78', + timestamp: new Date(datePreviousHourIso.slice(0, -5) + '15:00Z'), + msg_type: 'Bsm', + }, + }, + { + type: 'Feature', + geometry: { + type: 'Point', + coordinates: [-104.98752, 39.882289], + }, + properties: { + id: '10.0.0.78', + timestamp: new Date(datePreviousHourIso.slice(0, -5) + '00:00Z'), + msg_type: 'Bsm', + }, + }, +]) + +// insert OdeSsmJson document +ConflictMonitor.OdeSsmJson.insertOne({ + metadata: { + logFileName: '', + recordType: 'ssmTx', + securityResultCode: 'success', + receivedMessageDetails: { rxSource: 'NA' }, + payloadType: 'us.dot.its.jpo.ode.model.OdeSsmPayload', + serialId: { + streamId: 'daccfc21-e356-4481-be37-5963a056bfc0', + bundleSize: 1, + bundleId: 0, + recordId: 0, + serialNumber: 0, + }, + odeReceivedAt: currentDate, + schemaVersion: 6, + maxDurationTime: 0, + recordGeneratedAt: '', + recordGeneratedBy: 'RSU', + sanitized: false, + odePacketID: '', + odeTimStartDateTime: '', + originIp: '10.0.0.78', + ssmSource: 'RSU', + }, + payload: { + data: { + second: 0, + status: { + signalStatus: [ + { + sequenceNumber: 0, + id: { + id: 12110, + }, + sigStatus: { + signalStatusPackage: [ + { + requester: { + id: { + stationID: 2366845094, + }, + request: 3, + sequenceNumber: 0, + typeData: { + role: 'publicTransport', + }, + }, + inboundOn: { + lane: 2, + }, + status: 'granted', + }, + ], + }, + }, + ], + }, + }, + dataType: 'us.dot.its.jpo.ode.plugin.j2735.J2735SSM', + }, +}) + +print('Successfully inserted sample data') diff --git a/resources/mongo_scripts/setup_mongo.sh b/resources/mongo_scripts/setup_mongo.sh new file mode 100644 index 000000000..85bc67caa --- /dev/null +++ b/resources/mongo_scripts/setup_mongo.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +until mongosh --host mongo:27017 --eval 'quit(db.runCommand({ ping: 1 }).ok ? 0 : 2)' &>/dev/null; do + sleep 1 +done + +echo "MongoDB is up and running!" + +cd / + +mongosh -u $MONGO_ADMIN_DB_USER -p $MONGO_ADMIN_DB_PASS --authenticationDatabase admin --host mongo:27017 /create_indexes.js + +if [ "$INSERT_SAMPLE_DATA" = "true" ]; then + echo "Inserting sample data" + mongosh -u $MONGO_ADMIN_DB_USER -p $MONGO_ADMIN_DB_PASS --authenticationDatabase admin --host mongo:27017 /insert_data.js +fi \ No newline at end of file diff --git a/resources/ota/firmwares/.gitignore b/resources/ota/firmwares/.gitignore new file mode 100644 index 000000000..df6ae8cdc --- /dev/null +++ b/resources/ota/firmwares/.gitignore @@ -0,0 +1 @@ +*.tar.sig diff --git a/resources/ota/firmwares/README.md b/resources/ota/firmwares/README.md new file mode 100644 index 000000000..6414fcba1 --- /dev/null +++ b/resources/ota/firmwares/README.md @@ -0,0 +1,3 @@ +# OTA Firmwares + +This folder is used as an attached volume to the OBU OTA server and stores the OBU firmware files either stored locally or downloaded from GCP. diff --git a/resources/ota/nginx/Dockerfile b/resources/ota/nginx/Dockerfile new file mode 100644 index 000000000..65aba528e --- /dev/null +++ b/resources/ota/nginx/Dockerfile @@ -0,0 +1,9 @@ +FROM nginx:1.25.4-alpine + +RUN apk update && apk add \ + apache2-utils \ + jq \ + openssl \ + bash + +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/resources/ota/nginx/gen_dhparam.sh b/resources/ota/nginx/gen_dhparam.sh new file mode 100755 index 000000000..824c4cd2b --- /dev/null +++ b/resources/ota/nginx/gen_dhparam.sh @@ -0,0 +1 @@ +openssl dhparam -out /etc/nginx/dhparam.pem 2048 \ No newline at end of file diff --git a/resources/ota/nginx/nginx-plain.conf b/resources/ota/nginx/nginx-plain.conf new file mode 100644 index 000000000..b8d9f0092 --- /dev/null +++ b/resources/ota/nginx/nginx-plain.conf @@ -0,0 +1,50 @@ +events { + worker_connections 768; +} + +http { + + upstream api { + server jpo_ota_backend:8085; + } + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + + server { + listen 80; + server_name $SERVER_HOST; + + client_max_body_size 300M; + + location ~ /\.ht { + deny all; + } + + # location ^~ /.well-known/acme-challenge { + # default_type text/plain; + # root /var/www/letsencrypt; + # } + + location / { + proxy_pass http://api/; + proxy_set_header Host $http_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; + proxy_set_header Range $http_range; + + proxy_http_version 1.1; + proxy_set_header Connection ''; + proxy_buffering off; + proxy_cache off; + proxy_read_timeout 86400; + + access_log /var/log/nginx/access_manifest.log; + } + } +} \ No newline at end of file diff --git a/resources/ota/nginx/nginx-ssl.conf b/resources/ota/nginx/nginx-ssl.conf new file mode 100644 index 000000000..976b0fb7b --- /dev/null +++ b/resources/ota/nginx/nginx-ssl.conf @@ -0,0 +1,89 @@ +events { + worker_connections 768; +} + +http { + + upstream api { + server jpo_ota_backend:8085; + } + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 2048; + + ## + # SSL Settings + ## + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE + ssl_prefer_server_ciphers on; + ssl_dhparam "/etc/nginx/dhparam.pem"; + ssl_ciphers ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ARIA256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ARIA128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256; + add_header Strict-Transport-Security "max-age=31557600; includeSubDomains"; + ssl_stapling on; + ssl_stapling_verify on; + + ## + # General Logging Settings + ## + + access_log /var/log/nginx/access.log; + + + # HTTP forwards everything to HTTPS + # + server { + listen 80; + + server_name $SERVER_HOST; + + location / { + return 301 https://$host$request_uri; + } + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + location ~ /\.ht { + deny all; + } + } + + server { + listen 443 default_server ssl; + server_name $SERVER_HOST; + + ssl_certificate /etc/ssl/certs/ota_server.crt; + ssl_certificate_key /etc/ssl/private/ota_server.key; + + client_max_body_size 300M; + + location ~ /\.ht { + deny all; + } + + # location ^~ /.well-known/acme-challenge { + # default_type text/plain; + # root /var/www/letsencrypt; + # } + + location / { + proxy_pass http://api/; + proxy_set_header Host $http_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; + proxy_set_header Range $http_range; + + proxy_http_version 1.1; + proxy_set_header Connection ''; + proxy_buffering off; + proxy_cache off; + proxy_read_timeout 86400; + + access_log /var/log/nginx/access.log; + } + } +} \ No newline at end of file diff --git a/resources/ota/nginx/ssl/.gitignore b/resources/ota/nginx/ssl/.gitignore new file mode 100644 index 000000000..592bac37d --- /dev/null +++ b/resources/ota/nginx/ssl/.gitignore @@ -0,0 +1,2 @@ +*.crt +*.key \ No newline at end of file diff --git a/resources/ota/nginx/ssl/README.md b/resources/ota/nginx/ssl/README.md new file mode 100644 index 000000000..c91acd246 --- /dev/null +++ b/resources/ota/nginx/ssl/README.md @@ -0,0 +1,25 @@ +# SSL + +This folder is used as an attached volume to the NGINX service and must include the server's `.crt` and `.key` file. All `.crt` and `.key` files are not tracked through git. + +The `.crt` file must be in the following multi-line format: + +```.crt +-----BEGIN CERTIFICATE----- +EC_KEY_BASED_CERTIFICATE +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +CA_INTERMEDIATE_CERTIFICATE +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +CA_ROOT_CERTIFICATE +-----END CERTIFICATE----- +``` + +The `.key` file must be in the following multi-line format: + +```.key +-----BEGIN EC PRIVATE KEY----- +EC_PRIVATE_KEY_DATA +-----END EC PRIVATE KEY----- +``` diff --git a/resources/sql_scripts/CVManager_CreateTables.sql b/resources/sql_scripts/CVManager_CreateTables.sql index da02cf1d4..57a3c3f38 100644 --- a/resources/sql_scripts/CVManager_CreateTables.sql +++ b/resources/sql_scripts/CVManager_CreateTables.sql @@ -237,7 +237,6 @@ CREATE TABLE IF NOT EXISTS public.users first_name character varying(128) NOT NULL, last_name character varying(128) NOT NULL, super_user bit(1) NOT NULL, - receive_error_emails bit(1) NOT NULL, CONSTRAINT users_pkey PRIMARY KEY (user_id), CONSTRAINT users_email UNIQUE (email) ); @@ -253,6 +252,7 @@ CREATE TABLE IF NOT EXISTS public.organizations ( organization_id integer NOT NULL DEFAULT nextval('organizations_organization_id_seq'::regclass), name character varying(128) COLLATE pg_catalog.default NOT NULL, + email character varying(128) COLLATE pg_catalog.default, CONSTRAINT organizations_pkey PRIMARY KEY (organization_id), CONSTRAINT organizations_name UNIQUE (name) ); @@ -401,4 +401,62 @@ CREATE TABLE IF NOT EXISTS public.snmp_msgfwd_config ON DELETE NO ACTION ); +CREATE SEQUENCE public.email_type_email_type_id_seq + INCREMENT 1 + START 1 + MINVALUE 1 + MAXVALUE 2147483647 + CACHE 1; + +CREATE TABLE IF NOT EXISTS public.email_type +( + email_type_id integer NOT NULL DEFAULT nextval('email_type_email_type_id_seq'::regclass), + CONSTRAINT email_type_pkey PRIMARY KEY (email_type_id), + email_type character varying(128) COLLATE pg_catalog.default NOT NULL, + CONSTRAINT email_type_unique UNIQUE (email_type) +); + +CREATE SEQUENCE public.user_email_notification_user_email_notification_id_seq + INCREMENT 1 + START 1 + MINVALUE 1 + MAXVALUE 2147483647 + CACHE 1; + +CREATE TABLE IF NOT EXISTS public.user_email_notification +( + user_email_notification_id integer NOT NULL DEFAULT nextval('user_email_notification_user_email_notification_id_seq'::regclass), + user_id integer NOT NULL, + email_type_id integer NOT NULL, + CONSTRAINT user_email_notification_pkey PRIMARY KEY (user_email_notification_id), + CONSTRAINT fk_user_id FOREIGN KEY (user_id) + REFERENCES public.users (user_id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION, + CONSTRAINT fk_email_type_id FOREIGN KEY (email_type_id) + REFERENCES public.email_type (email_type_id) MATCH SIMPLE + ON UPDATE NO ACTION + ON DELETE NO ACTION +); + +CREATE SEQUENCE public.obu_ota_request_id_seq + INCREMENT 1 + START 1 + MINVALUE 1 + MAXVALUE 2147483647 + CACHE 1; + +CREATE TABLE IF NOT EXISTS public.obu_ota_requests ( + request_id integer NOT NULL DEFAULT nextval('obu_ota_request_id_seq'::regclass), + obu_sn character varying(128) NOT NULL, + request_datetime timestamp NOT NULL, + origin_ip inet NOT NULL, + obu_firmware_version varchar(128) NOT NULL, + requested_firmware_version varchar(128) NOT NULL, + error_status bit(1) NOT NULL, + error_message varchar(128) NOT NULL, + manufacturer int4 NOT NULL, + CONSTRAINT fk_manufacturer FOREIGN KEY (manufacturer) REFERENCES public.manufacturers(manufacturer_id) +); + CREATE SCHEMA IF NOT EXISTS keycloak; \ No newline at end of file diff --git a/resources/sql_scripts/CVManager_SampleData.sql b/resources/sql_scripts/CVManager_SampleData.sql index 3d8af39bf..cb4238084 100644 --- a/resources/sql_scripts/CVManager_SampleData.sql +++ b/resources/sql_scripts/CVManager_SampleData.sql @@ -49,8 +49,8 @@ INSERT INTO public.rsu_organization( -- Replace user with a real gmail to test GCP OAuth2.0 support INSERT INTO public.users( - email, first_name, last_name, super_user, receive_error_emails) - VALUES ('test@gmail.com', 'Test', 'User', '1', '1'); + email, first_name, last_name, super_user) + VALUES ('test@gmail.com', 'Test', 'User', '1'); INSERT INTO public.user_organization( user_id, organization_id, role_id) @@ -69,3 +69,7 @@ INSERT INTO public.snmp_msgfwd_config( (2, 2, 2, 'BSM', '10.0.0.81', 46800, '2024/04/01T00:00:00', '2034/04/01T00:00:00', '1'), (2, 3, 1, 'MAP', '10.0.0.80', 44920, '2024/04/01T00:00:00', '2034/04/01T00:00:00', '1'), (2, 3, 2, 'SPAT', '10.0.0.80', 44910, '2024/04/01T00:00:00', '2034/04/01T00:00:00', '1'); + +INSERT INTO public.email_type( + email_type) + VALUES ('Support Requests'), ('Firmware Upgrade Failures'), ('Daily Message Counts'); \ No newline at end of file diff --git a/resources/sql_scripts/update_scripts/email_notification_update.sql b/resources/sql_scripts/update_scripts/email_notification_update.sql new file mode 100644 index 000000000..840b2ab69 --- /dev/null +++ b/resources/sql_scripts/update_scripts/email_notification_update.sql @@ -0,0 +1,18 @@ +-- Run this SQL update script if you already have a deployed CV Manager PostgreSQL database +-- This file assumes that the email_type and user_email_notification tables exist, and that the email_type +-- table has an entry for 'Support Requests'. + +DO $$ +DECLARE + error_email_type_id INT; +BEGIN + SELECT email_type_id INTO error_email_type_id FROM public.email_type WHERE email_type = 'Support Requests'; + + INSERT INTO public.user_email_notification (user_id, email_type_id) + SELECT user_id, error_email_type_id + FROM public.users + WHERE receive_error_emails = B'1'; + + ALTER TABLE public.users DROP Column receive_error_emails; + +END $$; \ No newline at end of file diff --git a/resources/sql_scripts/update_scripts/obu_ota_requests.sql b/resources/sql_scripts/update_scripts/obu_ota_requests.sql new file mode 100644 index 000000000..bff2b4215 --- /dev/null +++ b/resources/sql_scripts/update_scripts/obu_ota_requests.sql @@ -0,0 +1,20 @@ +CREATE SEQUENCE public.obu_ota_request_id_seq + INCREMENT 1 + START 1 + MINVALUE 1 + MAXVALUE 2147483647 + CACHE 1; + + +CREATE TABLE IF NOT EXISTS public.obu_ota_requests ( + request_id integer NOT NULL DEFAULT nextval('obu_ota_request_id_seq'::regclass), + obu_sn character varying(128) NOT NULL, + request_datetime timestamp NOT NULL, + origin_ip inet NOT NULL, + obu_firmware_version varchar(128) NOT NULL, + requested_firmware_version varchar(128) NOT NULL, + error_status bit(1) NOT NULL, + error_message varchar(128) NOT NULL, + manufacturer int4 NOT NULL, + CONSTRAINT fk_manufacturer FOREIGN KEY (manufacturer) REFERENCES public.manufacturers(manufacturer_id) +); \ No newline at end of file diff --git a/resources/sql_scripts/update_scripts/org_email_notification_update.sql b/resources/sql_scripts/update_scripts/org_email_notification_update.sql new file mode 100644 index 000000000..48dd607ae --- /dev/null +++ b/resources/sql_scripts/update_scripts/org_email_notification_update.sql @@ -0,0 +1,2 @@ +ALTER TABLE public.organizations + ADD COLUMN email character varying(128) COLLATE pg_catalog.default; diff --git a/resources/sql_scripts/update_scripts/receive_error_emails_update.sql b/resources/sql_scripts/update_scripts/receive_error_emails_update.sql deleted file mode 100644 index 8a5ea5c50..000000000 --- a/resources/sql_scripts/update_scripts/receive_error_emails_update.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE public.users - ADD receive_error_emails bit(1) NOT NULL - DEFAULT B'0'; \ No newline at end of file diff --git a/sample.env b/sample.env index 3cfb926c3..1ab17337b 100644 --- a/sample.env +++ b/sample.env @@ -4,7 +4,6 @@ DOCKER_HOST_IP= WEBAPP_HOST_IP=${DOCKER_HOST_IP} # Note if using WEBAPP_DOMAIN for the docker-compose-webapp-deployment.yml file you will need to include http:// or https:// WEBAPP_DOMAIN=cvmanager.local.com -WEBAPP_CM_DOMAIN=cimms.local.com KC_HOST_IP=${DOCKER_HOST_IP} # Firmware Manager connectivity in the format 'http://endpoint:port' @@ -15,10 +14,10 @@ FIRMWARE_MANAGER_ENDPOINT=http://${DOCKER_HOST_IP}:8089 # If using docker then this value should be set to: http://${WEBAPP_HOST_IP}:3000 # If running the webapp using npm then set it to: http://localhost:3000 # Leave as * to allow all domains access -CORS_DOMAIN = * +CORS_DOMAIN=* # PostgreSQL Database connection information -# this value may need to folow with the webapp host if debugging the applications +# this value may need to follow with the webapp host if debugging the applications PG_DB_HOST=${DOCKER_HOST_IP}:5432 PG_DB_NAME=postgres PG_DB_USER=postgres @@ -28,7 +27,7 @@ PG_DB_PASS= # If connecting to PGDB over websocket: INSTANCE_CONNECTION_NAME= -# Keycloak authentication crendentials +# Keycloak authentication credentials KEYCLOAK_ADMIN=admin KEYCLOAK_ADMIN_PASSWORD= @@ -36,7 +35,6 @@ KEYCLOAK_ADMIN_PASSWORD= KEYCLOAK_REALM=cvmanager KEYCLOAK_API_CLIENT_ID=cvmanager-api KEYCLOAK_API_CLIENT_SECRET_KEY= -KEYCLOAK_CM_API_CLIENT_SECRET_KEY= KEYCLOAK_LOGIN_THEME_NAME=sample_theme # Note if using KEYCLOAK_DOMAIN for the docker-compose-webapp-deployment.yml file you will need to include http:// or https:// KEYCLOAK_DOMAIN=cvmanager.auth.com @@ -53,8 +51,14 @@ GOOGLE_APPLICATION_CREDENTIALS='./resources/google/sample_gcp_service_account.js MONGO_DB_URI= MONGO_DB_NAME="ode" +# If running MongoDB locally with docker-compose-mongo.yml uncomment the following line +MONGO_COLLECTION_TTL=7 # days + +# If true sample data will be inserted into the MongoDB CVCounts, V2XGeoJson, and OdeSsmJson collections. +INSERT_SAMPLE_DATA=true + # Set these variables if using either "MONGODB" or "BIGQUERY" -# COUNTS_MSG_TYPES: Comma seperated list of message types. +# COUNTS_MSG_TYPES: Comma separated list of message types. # COUNTS_MSG_TYPES must be set for the counts menu to correctly populate when building an image for deployment COUNTS_MSG_TYPES='BSM,SSM,SPAT,SRM,MAP' VIEWER_MSG_TYPES='BSM' @@ -71,17 +75,18 @@ WZDX_ENDPOINT= # Contact Support Menu Email Configuration CSM_EMAIL_TO_SEND_FROM= -CSM_EMAIL_APP_USERNAME= -CSM_EMAIL_APP_PASSWORD= CSM_EMAILS_TO_SEND_TO= CSM_TARGET_SMTP_SERVER_ADDRESS= CSM_TARGET_SMTP_SERVER_PORT= +CSM_TLS_ENABLED=true +CSM_AUTH_ENABLED=true +CSM_EMAIL_APP_USERNAME= +CSM_EMAIL_APP_PASSWORD= # Email configuration for sending firmware-manager failure emails SMTP_EMAIL= SMTP_USERNAME= SMTP_PASSWORD= -FW_EMAIL_RECIPIENTS= SMTP_SERVER_IP= # Python timezone for the CV Manager (You can list pytz timezones with the command 'pytz.all_timezones') @@ -97,6 +102,12 @@ MAPBOX_INIT_ZOOM="10" GCP_PROJECT_ID = '' +# CIMMS IntersectionMap Variables +CVIZ_API_SERVER_URL=http://${DOCKER_HOST_IP}:8089 +CVIZ_API_WS_URL=ws://${DOCKER_HOST_IP}:8089 +WEBAPP_CM_DOMAIN='cvmanager.local.com' +KEYCLOAK_CM_API_CLIENT_SECRET_KEY= + # --------------------------------------------------------------------- # Count Metric Addon: @@ -110,13 +121,8 @@ SMTP_SERVER_IP = '' SMTP_USERNAME = '' SMTP_PASSWORD = '' SMTP_EMAIL = '' -# Multiple emails can be delimited by a ',' -SMTP_EMAIL_RECIPIENTS = 'test1@gmail.com,test2@gmail.com' - -# If ENABLE_EMAILER is 'False', set the following environment variables COUNT_MESSAGE_TYPES = 'bsm' -ODE_KAFKA_BROKERS = {DOCKER_HOST_IP}:9092 # EITHER "MONGODB" or "BIGQUERY" COUNT_DESTINATION_DB = 'MONGODB' @@ -132,7 +138,6 @@ KAFKA_BIGQUERY_TABLENAME = '' # Firmware Manager Addon: BLOB_STORAGE_PROVIDER=DOCKER BLOB_STORAGE_BUCKET= -GCP_PROJECT= ## Docker volume mount point for BLOB storage (if using Docker) HOST_BLOB_STORAGE_DIRECTORY=./local_blob_storage # --------------------------------------------------------------------- @@ -144,11 +149,22 @@ GEO_TTL_DURATION=90 # --------------------------------------------------------------------- # ISS Health Check Addon + +# Key Storage +## Type of key storage, options: gcp, postgres +STORAGE_TYPE=postgres + +# ISS Account Authentication ISS_API_KEY= ISS_API_KEY_NAME= ISS_PROJECT_ID= ISS_SCMS_TOKEN_REST_ENDPOINT= ISS_SCMS_VEHICLE_REST_ENDPOINT= + +## Postgres Storage (Required if STORAGE_TYPE=postgres) +### Table name to store keys +ISS_KEY_TABLE_NAME= + # --------------------------------------------------------------------- # RSU Status Addon: @@ -177,6 +193,33 @@ ZABBIX_PASSWORD= STALE_PERIOD=24 # --------------------------------------------------------------------- +# OBU OTA Server Addon: + +# Routeable host name for the server +OBU_OTA_SERVER_HOST = "localhost" + +# For users using GCP cloud storage +OBU_OTA_BLOB_STORAGE_BUCKET="" +OBU_OTA_BLOB_STORAGE_PATH="" + +# Nginx basic auth username and password +OTA_USERNAME = "admin" +OTA_PASSWORD = "admin" + +# Nginx encryption options: "plain", "ssl" +# Note that this just changes the config file attached as a volume to the Nginx container +NGINX_ENCRYPTION="plain" + +# SSL file name in path /docker/nginx/ssl/ +SERVER_CERT_FILE="ota_server.crt" +SERVER_KEY_FILE="ota_server.key" + +# Max number of succesfull firmware upgrades to keep in the database per device SN +MAX_COUNT = 10 + +# --------------------------------------------------------------------- + + # Levels are "DEBUG", "INFO", "WARNING", and "ERROR" API_LOGGING_LEVEL="INFO" FIRMWARE_MANAGER_LOGGING_LEVEL="INFO" @@ -184,5 +227,46 @@ GEO_LOGGING_LEVEL="INFO" ISS_LOGGING_LEVEL="INFO" RSU_STATUS_LOGGING_LEVEL="INFO" COUNTS_LOGGING_LEVEL="INFO" +OBU_OTA_LOGGING_LEVEL="INFO" # Supported log levels are "ALL", "DEBUG", "ERROR", "FATAL", "INFO", "OFF", "TRACE" and "WARN" -KC_LOGGING_LEVEL="INFO" \ No newline at end of file +KC_LOGGING_LEVEL="INFO" + +########################################## +# JPO ConflictMonitor Docker Environment # +# Documentation: https://github.com/usdot-jpo-ode/jpo-conflictmonitor +########################################## +DB_HOST_IP=${DOCKER_HOST_IP} +KAFKA_BROKER_IP=${DOCKER_HOST_IP} +CM_STARTUP_DELAY_SECONDS=90 + +# The Username and passwords to use for accessing mongoDB. +MONGO_INITDB_ROOT_USERNAME=root +MONGO_INITDB_ROOT_PASSWORD= +CM_MONGO_CONNECTOR_USERNAME=connector +CM_MONGO_CONNECTOR_PASSWORD= +CM_MONGO_API_USERNAME=api +CM_MONGO_API_PASSWORD= +CM_MONGO_USER_USERNAME=user +CM_MONGO_USER_PASSWORD= + +CM_DATABASE_NAME=ConflictMonitor +CM_DATABASE_STORAGE_COLLECTION_NAME=MongoStorage +CM_DATABASE_SIZE_GB=50 +CM_DATABASE_SIZE_TARGET_PERCENT=0.8 +CM_DATABASE_DELETE_THRESHOLD_PERCENT=0.9 +CM_DATABASE_MAX_TTL_RETENTION_SECONDS=5184000 # 60 days +CM_DATABASE_MIN_TTL_RETENTION_SECONDS=604800 # 7 days +CM_DATABASE_COMPACTION_TRIGGER_PERCENT=0.5 + + +############################################################## +# jpo-conflictvisualizer cvmanager api environment variables # +# Documentation: https://github.com/usdot-jpo-ode/jpo-conflictvisualizer/tree/cvmgr-cimms-integration/api +############################################################## +# Set the HOST IP of where the containers are running +KAFKA_BROKER_PORT=9092 + +# May be different from docker host ip for production deployments. Change as appropriate. +CM_SERVER_URL=http://${DOCKER_HOST_IP}:8082 + +DB_HOST_PORT=27017 diff --git a/sample_no_cm.env b/sample_no_cm.env new file mode 100644 index 000000000..b9e80951b --- /dev/null +++ b/sample_no_cm.env @@ -0,0 +1,223 @@ +# Environment variable file for the JPO CV Manager API deployment through docker-compose +DOCKER_HOST_IP= +# Note if debugging, this webapp host IP should be set to the IP of the host machine running the webapp (localhost) +WEBAPP_HOST_IP=${DOCKER_HOST_IP} +# Note if using WEBAPP_DOMAIN for the docker-compose-webapp-deployment.yml file you will need to include http:// or https:// +WEBAPP_DOMAIN=cvmanager.local.com +KC_HOST_IP=${DOCKER_HOST_IP} + +# Firmware Manager connectivity in the format 'http://endpoint:port' +FIRMWARE_MANAGER_ENDPOINT=http://${DOCKER_HOST_IP}:8089 + +# Allowed CORS domain for accessing the CV Manager API from (set to the web application hostname) +# Make sure to include http:// or https:// +# If using docker then this value should be set to: http://${WEBAPP_HOST_IP}:3000 +# If running the webapp using npm then set it to: http://localhost:3000 +# Leave as * to allow all domains access +CORS_DOMAIN=* + +# PostgreSQL Database connection information +# this value may need to follow with the webapp host if debugging the applications +PG_DB_HOST=${DOCKER_HOST_IP}:5432 +PG_DB_NAME=postgres +PG_DB_USER=postgres +# If the PG_DB_PASS variable has special characters, make sure to wrap it in single quotes +PG_DB_PASS= + +# If connecting to PGDB over websocket: +INSTANCE_CONNECTION_NAME= + +# Keycloak authentication credentials +KEYCLOAK_ADMIN=admin +KEYCLOAK_ADMIN_PASSWORD= + +# Keycloak Parameters - to generate secret key use a password generator such as: https://www.avast.com/en-us/random-password-generator#pc and set the length to 32 +KEYCLOAK_REALM=cvmanager +KEYCLOAK_API_CLIENT_ID=cvmanager-api +KEYCLOAK_API_CLIENT_SECRET_KEY= +KEYCLOAK_LOGIN_THEME_NAME=sample_theme +# Note if using KEYCLOAK_DOMAIN for the docker-compose-webapp-deployment.yml file you will need to include http:// or https:// +KEYCLOAK_DOMAIN=cvmanager.auth.com + + +# GCP OAuth2.0 client ID for SSO authentication in keycloak - if not specified the google SSO will not be functional +GOOGLE_CLIENT_ID= +GOOGLE_CLIENT_SECRET= + +# If "BIGQUERY", set the location of the GCP service account key attached as a volume +GOOGLE_APPLICATION_CREDENTIALS='./resources/google/sample_gcp_service_account.json' + +# If "MONGODB", set the MongoDB variables +MONGO_DB_URI= +MONGO_DB_NAME="ode" + +# If running MongoDB locally with docker-compose-mongo.yml uncomment the following line +MONGO_COLLECTION_TTL=7 # days + +# If true sample data will be inserted into the MongoDB CVCounts, V2XGeoJson, and OdeSsmJson collections. +INSERT_SAMPLE_DATA=true + +# Set these variables if using either "MONGODB" or "BIGQUERY" +# COUNTS_MSG_TYPES: Comma separated list of message types. +# COUNTS_MSG_TYPES must be set for the counts menu to correctly populate when building an image for deployment +COUNTS_MSG_TYPES='BSM,SSM,SPAT,SRM,MAP' +VIEWER_MSG_TYPES='BSM' +GEO_DB_NAME='V2XGeoJson' +SSM_DB_NAME= +SRM_DB_NAME= + +# Specifies the maximum number of V2x messages returned from the geo_query_geo_data_mongo method before filtering occurs +MAX_GEO_QUERY_RECORDS= + +# WZDx API key and endpoint for pulling WZDx data into the CV Manager +WZDX_API_KEY= +WZDX_ENDPOINT= + +# Contact Support Menu Email Configuration +CSM_EMAIL_TO_SEND_FROM= +CSM_EMAIL_APP_USERNAME= +CSM_EMAIL_APP_PASSWORD= +CSM_EMAILS_TO_SEND_TO= +CSM_TARGET_SMTP_SERVER_ADDRESS= +CSM_TARGET_SMTP_SERVER_PORT= + +# Python timezone for the CV Manager (You can list pytz timezones with the command 'pytz.all_timezones') +TIMEZONE="US/Mountain" + +# Mapbox token for map rendering in the webapp +MAPBOX_TOKEN= +# DOT_NAME must be set for the DOT name to correctly populate when building an image for deployment +DOT_NAME="CDOT" +MAPBOX_INIT_LATITUDE="39.7392" +MAPBOX_INIT_LONGITUDE="-104.9903" +MAPBOX_INIT_ZOOM="10" + +GCP_PROJECT_ID = '' + +# --------------------------------------------------------------------- + +# Count Metric Addon: +ENABLE_EMAILER = 'True' + +# If ENABLE_EMAILER is 'True', set the following environment variables +DEPLOYMENT_TITLE = 'JPO-ODE' + +# SMTP REQUIRED VARIABLES +SMTP_SERVER_IP = '' +SMTP_USERNAME = '' +SMTP_PASSWORD = '' +SMTP_EMAIL = '' +# Multiple emails can be delimited by a ',' +SMTP_EMAIL_RECIPIENTS = 'test1@gmail.com,test2@gmail.com' + +# If ENABLE_EMAILER is 'False', set the following environment variables + +COUNT_MESSAGE_TYPES = 'bsm' +ODE_KAFKA_BROKERS = {DOCKER_HOST_IP}:9092 + +# EITHER "MONGODB" or "BIGQUERY" +COUNT_DESTINATION_DB = 'MONGODB' + +# MONGODB REQUIRED VARIABLES +INPUT_COUNTS_MONGO_COLLECTION_NAME = '' +OUTPUT_COUNTS_MONGO_COLLECTION_NAME = '' + +# BIGQUERY REQUIRED VARIABLES +KAFKA_BIGQUERY_TABLENAME = '' +# --------------------------------------------------------------------- + +# Firmware Manager Addon: +BLOB_STORAGE_PROVIDER=DOCKER +BLOB_STORAGE_BUCKET= +## Docker volume mount point for BLOB storage (if using Docker) +HOST_BLOB_STORAGE_DIRECTORY=./local_blob_storage +# --------------------------------------------------------------------- + +# Geo-spatial message query Addon: +GEO_INPUT_COLLECTIONS='OdeBsmJson,OdePsmJson' +# TTL duration in days: +GEO_TTL_DURATION=90 +# --------------------------------------------------------------------- + +# ISS Health Check Addon + +# Key Storage +## Type of key storage, options: gcp, postgres +STORAGE_TYPE=postgres + +# ISS Account Authentication +ISS_API_KEY= +ISS_API_KEY_NAME= +ISS_PROJECT_ID= +ISS_SCMS_TOKEN_REST_ENDPOINT= +ISS_SCMS_VEHICLE_REST_ENDPOINT= + +## Postgres Storage (Required if STORAGE_TYPE=postgres) +### Table name to store keys +ISS_KEY_TABLE_NAME= + +# --------------------------------------------------------------------- + +# RSU Status Addon: + +# Services that can be toggled on or off +# 'True' or 'False' are the only legal values + +# Toggles monitoring of RSU online status +RSU_PING=True + +# Fetches ping data from Zabbix - alternatively the service will ping the RSUs on its own +# Only used when RSU_PING is 'True' +ZABBIX=False + +# Fetches SNMP configuration data for all RSUs +RSU_SNMP_FETCH=True + +# Zabbix endpoint and API authentication +# Only used when ZABBIX is 'True' +ZABBIX_ENDPOINT= +ZABBIX_USER= +ZABBIX_PASSWORD= + +# Customize the period at which the purger will determine a ping log is too old and will be deleted +# Number of hours +STALE_PERIOD=24 +# --------------------------------------------------------------------- + +# OBU OTA Server Addon: + +# Routeable host name for the server +OBU_OTA_SERVER_HOST = "localhost" + +# For users using GCP cloud storage +OBU_OTA_BLOB_STORAGE_BUCKET="" +OBU_OTA_BLOB_STORAGE_PATH="" + +# Nginx basic auth username and password +OTA_USERNAME = "admin" +OTA_PASSWORD = "admin" + +# Nginx encryption options: "plain", "ssl" +# Note that this just changes the config file attached as a volume to the Nginx container +NGINX_ENCRYPTION="plain" + +# SSL file name in path /docker/nginx/ssl/ +SERVER_CERT_FILE="ota_server.crt" +SERVER_KEY_FILE="ota_server.key" + +# Max number of succesfull firmware upgrades to keep in the database per device SN +MAX_COUNT = 10 + +# --------------------------------------------------------------------- + + +# Levels are "DEBUG", "INFO", "WARNING", and "ERROR" +API_LOGGING_LEVEL="INFO" +FIRMWARE_MANAGER_LOGGING_LEVEL="INFO" +GEO_LOGGING_LEVEL="INFO" +ISS_LOGGING_LEVEL="INFO" +RSU_STATUS_LOGGING_LEVEL="INFO" +COUNTS_LOGGING_LEVEL="INFO" +OBU_OTA_LOGGING_LEVEL="INFO" +# Supported log levels are "ALL", "DEBUG", "ERROR", "FATAL", "INFO", "OFF", "TRACE" and "WARN" +KC_LOGGING_LEVEL="INFO" \ No newline at end of file diff --git a/services/Dockerfile.obu_ota_server b/services/Dockerfile.obu_ota_server new file mode 100644 index 000000000..b3afbf2bb --- /dev/null +++ b/services/Dockerfile.obu_ota_server @@ -0,0 +1,11 @@ +FROM python:3.12-alpine + +WORKDIR /home + +ADD addons/images/obu_ota_server/requirements.txt . +ADD addons/images/obu_ota_server/*.py . +ADD common/*.py ./common/ + +RUN pip install --no-cache-dir --upgrade -r requirements.txt + +CMD ["uvicorn", "obu_ota_server:app", "--host", "0.0.0.0", "--port", "8085"] \ No newline at end of file diff --git a/services/addons/images/count_metric/README.md b/services/addons/images/count_metric/README.md index 5e2375f7e..71edd42ea 100644 --- a/services/addons/images/count_metric/README.md +++ b/services/addons/images/count_metric/README.md @@ -8,6 +8,8 @@ It is important to note that the count_metric service assumes Map and TIM messag Specifically includes the following message types: ["BSM", "TIM", "Map", "SPaT", "SRM", "SSM"] +Please note that the daily emailer relies on the user_email_notification PostgreSQL table to pull in the list of users that are subscribed to receive these emails. + To run this service, the following environment variables must be set: LOGGING_LEVEL: The logging level of the deployment. Options are: 'critical', 'error', 'warning', 'info' and 'debug'. If not specified, will default to 'info'. Refer to Python's documentation for more info: [Python logging](https://docs.python.org/3/howto/logging.html). @@ -36,8 +38,6 @@ To run this service, the following environment variables must be set: SMTP_EMAIL: The origin email that the count_metric will send the email from. This is usually associated with the SMTP server authentication. -SMTP_EMAIL_RECIPIENTS: Recipient emails, delimited by ','. - ## Daily Counter (MongoDB) The daily counter is a feature that aggregates JPO-ODE mongoDB message type counts for BSM, PSM, TIM, Map, SPaT, SRM and SSM and inserts them into a new collection in mongoDB. This new collection is named "CVCounts". This new collection is useful for the CV Manager to query the message counts in a performant manner. This script runs on a cron every 24 hours. diff --git a/services/addons/images/count_metric/daily_emailer.py b/services/addons/images/count_metric/daily_emailer.py index 5f3dcb8ec..4d3fc2069 100644 --- a/services/addons/images/count_metric/daily_emailer.py +++ b/services/addons/images/count_metric/daily_emailer.py @@ -3,6 +3,7 @@ import gen_email from common.emailSender import EmailSender import common.pgquery as pgquery +from common.email_util import get_email_list from datetime import datetime, timedelta from pymongo import MongoClient @@ -41,16 +42,9 @@ def query_mongo_in_counts(rsu_dict, start_dt, end_dt, mongo_db): logging.debug(f"{type.title()} In count received for {rsu_ip}: {count}") - # If a RSU that is not in PostgreSQL has counts recorded, add it to the rsu_dict and populate zeroes - if rsu_ip not in rsu_dict: - rsu_dict[rsu_ip] = { - "primary_route": "Unknown", - "counts": {}, - } - for t in message_types: - rsu_dict[rsu_ip]["counts"][t] = {"in": 0, "out": 0} - - rsu_dict[rsu_ip]["counts"][type]["in"] = count + # If the RSU is a part of the organization, add it to the rsu_dict + if rsu_ip in rsu_dict: + rsu_dict[rsu_ip]["counts"][type]["in"] = count # Modify the rsu_dict with the specified date range's mongoDB "out" counts for each message type @@ -85,25 +79,20 @@ def query_mongo_out_counts(rsu_dict, start_dt, end_dt, mongo_db): logging.debug(f"{type.title()} Out count received for {rsu_ip}: {count}") - # If a RSU that is not in PostgreSQL has counts recorded, add it to the rsu_dict and populate zeroes - if rsu_ip not in rsu_dict: - rsu_dict[rsu_ip] = { - "primary_route": "Unknown", - "counts": {}, - } - for t in message_types: - rsu_dict[rsu_ip]["counts"][t] = {"in": 0, "out": 0} - - rsu_dict[rsu_ip]["counts"][type]["out"] = count + # If the RSU is a part of the organization, add it to the rsu_dict + if rsu_ip in rsu_dict: + rsu_dict[rsu_ip]["counts"][type]["out"] = count -def prepare_rsu_dict(): +def prepare_org_rsu_dict(): query = ( "SELECT to_jsonb(row) " "FROM (" - "SELECT ipv4_address, primary_route " - "FROM public.rsus " - "ORDER BY primary_route ASC, milepost ASC" + "SELECT o.name org_name, r.ipv4_address, r.primary_route " + "FROM public.rsu_organization ro " + "JOIN public.organizations o ON ro.organization_id = o.organization_id " + "JOIN public.rsus r ON ro.rsu_id = r.rsu_id " + "ORDER BY o.name, r.primary_route ASC, r.milepost ASC" ") as row" ) @@ -113,21 +102,30 @@ def prepare_rsu_dict(): rsu_dict = {} for row in data: row = dict(row[0]) - rsu_dict[row["ipv4_address"]] = { + # If the organization name is new to the dictionary, make a new empty object + if row["org_name"] not in rsu_dict: + rsu_dict[row["org_name"]] = {} + + rsu_dict[row["org_name"]][row["ipv4_address"]] = { "primary_route": row["primary_route"], "counts": {}, } + for type in message_types: - rsu_dict[row["ipv4_address"]]["counts"][type] = {"in": 0, "out": 0} + rsu_dict[row["org_name"]][row["ipv4_address"]]["counts"][type] = { + "in": 0, + "out": 0, + } + logging.debug(f"Created RSU dictionary: {rsu_dict}") return rsu_dict -def email_daily_counts(email_body): +def email_daily_counts(org_name, email_body): logging.info("Attempting to send the count emails...") try: - email_addresses = os.environ["SMTP_EMAIL_RECIPIENTS"].split(",") + email_addresses = get_email_list("Daily Message Counts", org_name) for email_address in email_addresses: emailSender = EmailSender( @@ -137,7 +135,7 @@ def email_daily_counts(email_body): emailSender.send( sender=os.environ["SMTP_EMAIL"], recipient=email_address, - subject=f"{str(os.environ['DEPLOYMENT_TITLE']).upper()} Counts", + subject=f"{org_name} {str(os.environ['DEPLOYMENT_TITLE'])} Counts", message=email_body, replyEmail="", username=os.environ["SMTP_USERNAME"], @@ -149,7 +147,8 @@ def email_daily_counts(email_body): def run_daily_emailer(): - rsu_dict = prepare_rsu_dict() + client = MongoClient(os.getenv("MONGO_DB_URI")) + mongo_db = client[os.getenv("MONGO_DB_NAME")] # Grab today's date and yesterday's date for a 24 hour range start_dt = (datetime.now() - timedelta(1)).replace( @@ -157,17 +156,19 @@ def run_daily_emailer(): ) end_dt = (datetime.now()).replace(hour=0, minute=0, second=0, microsecond=0) - client = MongoClient(os.getenv("MONGO_DB_URI")) - mongo_db = client[os.getenv("MONGO_DB_NAME")] - # Populate rsu_dict with counts from mongoDB - query_mongo_in_counts(rsu_dict, start_dt, end_dt, mongo_db) - query_mongo_out_counts(rsu_dict, start_dt, end_dt, mongo_db) + # Grab the RSU dictionary for each CV Manager organization to build separate reports + org_rsu_dict = prepare_org_rsu_dict() - # Generate the email content with the populated rsu_dict - email_body = gen_email.generate_email_body( - rsu_dict, start_dt, end_dt, message_types - ) - email_daily_counts(email_body) + for org_name, rsu_dict in org_rsu_dict.items(): + # Populate rsu_dict with counts from mongoDB + query_mongo_in_counts(rsu_dict, start_dt, end_dt, mongo_db) + query_mongo_out_counts(rsu_dict, start_dt, end_dt, mongo_db) + + # Generate the email content with the populated rsu_dict + email_body = gen_email.generate_email_body( + org_name, rsu_dict, start_dt, end_dt, message_types + ) + email_daily_counts(org_name, email_body) if __name__ == "__main__": diff --git a/services/addons/images/count_metric/gen_email.py b/services/addons/images/count_metric/gen_email.py index 955647b19..5988ac3b0 100644 --- a/services/addons/images/count_metric/gen_email.py +++ b/services/addons/images/count_metric/gen_email.py @@ -77,14 +77,14 @@ def generate_count_table(rsu_dict, message_type_list): return html -def generate_email_body(rsu_dict, start_dt, end_dt, message_type_list): +def generate_email_body(org_name, rsu_dict, start_dt, end_dt, message_type_list): start = datetime.strftime(start_dt, "%Y-%m-%d 00:00:00") end = datetime.strftime(end_dt, "%Y-%m-%d 00:00:00") # DEPLOYMENT_TITLE is a contextual title for where these counts apply. ie. "GCP prod" # This is generalized to support any deployment environment html = ( - f'

{str(os.environ["DEPLOYMENT_TITLE"]).upper()} Count Report {start} UTC - {end} UTC

' + f'

{org_name} {str(os.environ["DEPLOYMENT_TITLE"])} Count Report {start} UTC - {end} UTC

' "

This is an automated email to report yesterday's ODE message counts for J2735 messages going in and out of the ODE. " "In counts are the number of encoded messages received by the ODE from the load balancer. " "Out counts are the number of decoded messages that have come out of the ODE in JSON form and " diff --git a/services/addons/images/count_metric/mongo_counter.py b/services/addons/images/count_metric/mongo_counter.py index bb18a49ee..2d64a3ece 100644 --- a/services/addons/images/count_metric/mongo_counter.py +++ b/services/addons/images/count_metric/mongo_counter.py @@ -6,45 +6,58 @@ message_types = ["BSM", "TIM", "Map", "SPaT", "SRM", "SSM", "PSM"] def write_counts(mongo_db, counts): - output_collection = mongo_db["CVCounts"] - output_collection.insert_many(counts) + try: + if not counts: + logging.info("Counts list is empty") + else: + output_collection = mongo_db["CVCounts"] + output_collection.insert_many(counts) + logging.debug(f"Inserted {len(counts)} records into CVCounts collection") + except Exception as e: + logging.error(f"Error writing counts to MongoDB: {e}") def count_query(mongo_db, message_type, start_dt, end_dt): collection = mongo_db[f"Ode{message_type.capitalize()}Json"] - # Perform mongoDB aggregate query - agg_result = collection.aggregate( - [ - { - "$match": { - "recordGeneratedAt": { - "$gte": start_dt, - "$lt": end_dt, + logging.debug(f"Counting {message_type} messages in {collection.name}") + counts = [] + try: + # Perform mongoDB aggregate query + agg_result = collection.aggregate( + [ + { + "$match": { + "recordGeneratedAt": { + "$gte": start_dt, + "$lt": end_dt, + } } - } - }, - { - "$group": { - "_id": "$metadata.originIp", - "count": {"$sum": 1}, - } - }, - ] - ) + }, + { + "$group": { + "_id": "$metadata.originIp", + "count": {"$sum": 1}, + } + }, + ] + ) - counts = [] - for record in agg_result: - if not record["_id"]: - continue - count_record = { - "messageType": message_type, - "rsuIp": record["_id"], - "timestamp": start_dt, - "count": record["count"], - } - counts.append(count_record) + for record in agg_result: + if not record["_id"]: + continue + count_record = { + "messageType": message_type, + "rsuIp": record["_id"], + "timestamp": start_dt, + "count": record["count"], + } + counts.append(count_record) - return counts + logging.debug(f"Found {len(counts)} {message_type} records") + return counts + except Exception as e: + logging.error(f"Error counting {message_type} messages: {e}") + return counts def run_mongo_counter(mongo_db): diff --git a/services/addons/images/count_metric/sample.env b/services/addons/images/count_metric/sample.env index f266b3fd4..4927c0ff9 100644 --- a/services/addons/images/count_metric/sample.env +++ b/services/addons/images/count_metric/sample.env @@ -21,8 +21,6 @@ SMTP_SERVER_IP = '' SMTP_USERNAME = '' SMTP_PASSWORD = '' SMTP_EMAIL = '' -# Multiple emails can be delimited by a ',' -SMTP_EMAIL_RECIPIENTS = 'test1@gmail.com,test2@gmail.com' # --------------------------------------------------------------------- # If ENABLE_EMAILER is 'False', set the following environment variables diff --git a/services/addons/images/firmware_manager/README.md b/services/addons/images/firmware_manager/README.md index 8842cfd08..ee6721dd0 100644 --- a/services/addons/images/firmware_manager/README.md +++ b/services/addons/images/firmware_manager/README.md @@ -57,12 +57,12 @@ The firmware_manager microservice expects the following environment variables to - LOGGING_LEVEL (optional, defaults to 'info') The Firmware Manager is capable of sending an email to the support team in the event that an online RSU experiences a firmware upgrade failure. +This functionality relies on the user_email_notification PostgreSQL table to pull in the list of users that are subscribed to receive these emails. To do so the following environment variables must be set: - SMTP_EMAIL - Email to send from. - SMTP_USERNAME - SMTP username for SMTP_EMAIL. - SMTP_PASSWORD - SMTP password for SMTP_EMAIL. -- FW_EMAIL_RECIPIENTS - Comma-separated list of emails to send failure notifications to. - SMTP_SERVER_IP - Address of the SMTP server. GCP Required environment variables: @@ -71,6 +71,7 @@ GCP Required environment variables: - GOOGLE_APPLICATION_CREDENTIALS - Service account location. Recommended to attach as a volume. Docker volume required environment variables: + - HOST_BLOB_STORAGE_DIRECTORY - Directory mounted as a docker volume for firmware storage. A relative path can be specified here. ## Vendor Specific Requirements diff --git a/services/addons/images/firmware_manager/commsignia_upgrader.py b/services/addons/images/firmware_manager/commsignia_upgrader.py index e3b572a4b..f702b2bc5 100644 --- a/services/addons/images/firmware_manager/commsignia_upgrader.py +++ b/services/addons/images/firmware_manager/commsignia_upgrader.py @@ -22,7 +22,7 @@ def upgrade(self): self.download_blob() # Make connection with the target device - logging.info("Making SSH connection with the device...") + logging.info("Making SSH connection with " + self.rsu_ip + "...") ssh = SSHClient() ssh.set_missing_host_key_policy(WarningPolicy) ssh.connect( @@ -34,13 +34,13 @@ def upgrade(self): ) # Make SCP client to copy over the firmware installation package to the /tmp/ directory on the remote device - logging.info("Copying installation package to the device...") + logging.info("Copying installation package to " + self.rsu_ip + "...") scp = SCPClient(ssh.get_transport()) scp.put(self.local_file_name, remote_path="/tmp/") scp.close() # Run firmware upgrade and reboot - logging.info("Running firmware upgrade...") + logging.info("Running firmware upgrade for " + self.rsu_ip + "...") _stdin, _stdout, _stderr = ssh.exec_command( f"signedUpgrade.sh /tmp/{self.install_package}" ) @@ -65,7 +65,7 @@ def upgrade(self): self.notify_firmware_manager(success=True) except Exception as err: # If something goes wrong, cleanup anything left and report failure if possible - logging.error(f"Failed to perform firmware upgrade: {err}") + logging.error(f"Failed to perform firmware upgrade for {self.rsu_ip}: {err}") self.cleanup() self.notify_firmware_manager(success=False) # send email to support team with the rsu and error @@ -73,11 +73,11 @@ def upgrade(self): def post_upgrade(self): if self.wait_until_online() == -1: - raise Exception("RSU offline for too long after firmware upgrade") + raise Exception("RSU " + self.rsu_ip + " offline for too long after firmware upgrade") try: time.sleep(60) # Make connection with the target device - logging.info("Making SSH connection with the device...") + logging.info("Making SSH connection with " + self.rsu_ip + "...") ssh = SSHClient() ssh.set_missing_host_key_policy(WarningPolicy) ssh.connect( @@ -89,13 +89,13 @@ def post_upgrade(self): ) # Make SCP client to copy over the post upgrade script to the /tmp/ directory on the remote device - logging.info("Copying post upgrade script to the device...") + logging.info("Copying post upgrade script to " + self.rsu_ip + "...") scp = SCPClient(ssh.get_transport()) scp.put(self.post_upgrade_file_name, remote_path="/tmp/") scp.close() # Change permissions and execute post upgrade script - logging.info("Running post upgrade script...") + logging.info("Running post upgrade script for " + self.rsu_ip + "...") ssh.exec_command( f"chmod +x /tmp/post_upgrade.sh" ) diff --git a/services/addons/images/firmware_manager/download_blob.py b/services/addons/images/firmware_manager/download_blob.py index 36901273d..97894b5ad 100644 --- a/services/addons/images/firmware_manager/download_blob.py +++ b/services/addons/images/firmware_manager/download_blob.py @@ -1,32 +1,6 @@ -from google.cloud import storage import logging import os - - -def download_gcp_blob(blob_name, destination_file_name): - """Download a file from a GCP Bucket Storage bucket to a local file. - - Args: - blob_name (str): The name of the file in the bucket. - destination_file_name (str): The name of the local file to download the bucket file to. - """ - - if not validate_file_type(blob_name): - return False - - gcp_project = os.environ.get("GCP_PROJECT") - bucket_name = os.environ.get("BLOB_STORAGE_BUCKET") - storage_client = storage.Client(gcp_project) - bucket = storage_client.get_bucket(bucket_name) - blob = bucket.blob(blob_name) - - if blob.exists(): - blob.download_to_filename(destination_file_name) - logging.info( - f"Downloaded storage object {blob_name} from bucket {bucket_name} to local file {destination_file_name}." - ) - return True - return False +from common.util import validate_file_type def download_docker_blob(blob_name, destination_file_name): @@ -47,23 +21,3 @@ def download_docker_blob(blob_name, destination_file_name): f"Copied storage object {blob_name} from directory {directory} to local file {destination_file_name}." ) return True - - -def validate_file_type(file_name): - """Validate the file type of the file to be downloaded. - - Args: - file_name (str): The name of the file to be downloaded. - """ - if not file_name.endswith(".tar"): - logging.error( - f"Unsupported file type for storage object {file_name}. Only .tar files are supported." - ) - return False - return True - - -class UnsupportedFileTypeException(Exception): - def __init__(self, message="Unsupported file type. Only .tar files are supported."): - self.message = message - super().__init__(self.message) diff --git a/services/addons/images/firmware_manager/firmware_manager.py b/services/addons/images/firmware_manager/firmware_manager.py index e390bbbc5..733f92652 100644 --- a/services/addons/images/firmware_manager/firmware_manager.py +++ b/services/addons/images/firmware_manager/firmware_manager.py @@ -14,8 +14,6 @@ log_level = os.environ.get("LOGGING_LEVEL", "INFO") logging.basicConfig(format="%(levelname)s:%(message)s", level=log_level) -ACTIVE_UPGRADE_LIMIT = os.environ.get("ACTIVE_UPGRADE_LIMIT", 20) - manufacturer_upgrade_scripts = { "Commsignia": "commsignia_upgrader.py", "Yunex": "yunex_upgrader.py", @@ -38,6 +36,13 @@ upgrade_queue_info = {} active_upgrades_lock = Lock() +# Changed from a constant to a function to help with unit testing +def get_upgrade_limit() -> int: + try: + upgrade_limit = int(os.environ.get("ACTIVE_UPGRADE_LIMIT", "1")) + return upgrade_limit + except ValueError: + raise ValueError("The environment variable 'ACTIVE_UPGRADE_LIMIT' must be an integer.") # Function to query the CV Manager PostgreSQL database for RSUs that have: # - A different target version than their current version @@ -71,7 +76,7 @@ def get_rsu_upgrade_data(rsu_ip="all"): def start_tasks_from_queue(): # Start the next process in the queue if there are less than ACTIVE_UPGRADE_LIMIT number of active upgrades occurring - while len(active_upgrades) < ACTIVE_UPGRADE_LIMIT and len(upgrade_queue) > 0: + while len(active_upgrades) < get_upgrade_limit() and len(upgrade_queue) > 0: rsu_to_upgrade = upgrade_queue.popleft() try: rsu_upgrade_info = upgrade_queue_info[rsu_to_upgrade] diff --git a/services/addons/images/firmware_manager/requirements.txt b/services/addons/images/firmware_manager/requirements.txt index 0484c7a7d..8411b9977 100644 --- a/services/addons/images/firmware_manager/requirements.txt +++ b/services/addons/images/firmware_manager/requirements.txt @@ -6,4 +6,6 @@ pg8000==1.30.2 requests==2.31.0 scp==0.14.5 sqlalchemy==2.0.21 -waitress==2.1.2 \ No newline at end of file +waitress==2.1.2 +python-dateutil==2.8.2 +pytz==2023.3.post1 diff --git a/services/addons/images/firmware_manager/sample.env b/services/addons/images/firmware_manager/sample.env index 8f045a07a..2d8d8069e 100644 --- a/services/addons/images/firmware_manager/sample.env +++ b/services/addons/images/firmware_manager/sample.env @@ -18,7 +18,6 @@ GCP_PROJECT="" GOOGLE_APPLICATION_CREDENTIALS="" # For sending failure emails -FW_EMAIL_RECIPIENTS= SMTP_SERVER_IP= SMTP_EMAIL= SMTP_USERNAME= diff --git a/services/addons/images/firmware_manager/upgrader.py b/services/addons/images/firmware_manager/upgrader.py index 88d871ad6..eca612486 100644 --- a/services/addons/images/firmware_manager/upgrader.py +++ b/services/addons/images/firmware_manager/upgrader.py @@ -2,12 +2,14 @@ import abc import subprocess import time -import download_blob +from common import gcs_utils import logging import os import requests import shutil from common.emailSender import EmailSender +from common.email_util import get_email_list_from_rsu +import download_blob class UpgraderAbstractClass(abc.ABC): @@ -44,7 +46,7 @@ def download_blob(self, blob_name=None, local_file_name=None): "BLOB_STORAGE_PROVIDER", "DOCKER" ).casefold() if bspCaseInsensitive == "gcp": - return download_blob.download_gcp_blob(blob_name, local_file_name) + return gcs_utils.download_gcp_blob(blob_name, local_file_name) elif bspCaseInsensitive == "docker": return download_blob.download_docker_blob(blob_name, local_file_name) else: @@ -55,7 +57,7 @@ def download_blob(self, blob_name=None, local_file_name=None): # success is a boolean def notify_firmware_manager(self, success): status = "success" if success else "fail" - logging.info(f"Firmware upgrade script completed with status: {status}") + logging.info(f"Firmware upgrade script completed for {self.rsu_ip} with status: {status}") url = "http://127.0.0.1:8080/firmware_upgrade_completed" body = {"rsu_ip": self.rsu_ip, "status": status} @@ -96,7 +98,9 @@ def check_online(self): def send_error_email(self, type="Firmware Upgrader", err=""): try: - email_addresses = os.environ.get("FW_EMAIL_RECIPIENTS").split(",") + email_addresses = get_email_list_from_rsu( + "Firmware Upgrade Failures", self.rsu_ip + ) subject = ( f"{self.rsu_ip} Firmware Upgrader Failure" diff --git a/services/addons/images/firmware_manager/yunex_upgrader.py b/services/addons/images/firmware_manager/yunex_upgrader.py index 2c520734d..7b42e870f 100644 --- a/services/addons/images/firmware_manager/yunex_upgrader.py +++ b/services/addons/images/firmware_manager/yunex_upgrader.py @@ -26,7 +26,7 @@ def run_xfer_upgrade(self, file_name): # If the command ends with a non-successful status code, return -1 if code != 0: - logging.error("Firmware not successful: " + stderr.decode("utf-8")) + logging.error("Firmware not successful for " + self.rsu_ip + ": " + stderr.decode("utf-8")) return -1 output_lines = stdout.decode("utf-8").split("\n")[:-1] @@ -35,7 +35,7 @@ def run_xfer_upgrade(self, file_name): 'TEXT: {"success":{"upload":"Processing OK. Rebooting now ..."}}' not in output_lines ): - logging.error("Firmware not successful: " + stderr.decode("utf-8")) + logging.error("Firmware not successful for " + self.rsu_ip + ": " + stderr.decode("utf-8")) return -1 # If everything goes as expected, the XFER upgrade was complete @@ -52,7 +52,7 @@ def upgrade(self): # - SDK upgrade file # - Application provision file # - upgrade_info.json which defines the files as a single JSON object - logging.info("Unpacking TAR file...") + logging.info("Unpacking TAR file prior to upgrading " + self.rsu_ip + "...") with tarfile.open(self.local_file_name, "r") as tar: tar.extractall(self.root_path) @@ -62,7 +62,7 @@ def upgrade(self): upgrade_info = json.load(json_file) # Run Core upgrade - logging.info("Running Core firmware upgrade...") + logging.info("Running Core firmware upgrade for " + self.rsu_ip + "...") code = self.run_xfer_upgrade(f"{self.root_path}/{upgrade_info['core']}") if code == -1: raise Exception("Yunex RSU Core upgrade failed") @@ -72,7 +72,7 @@ def upgrade(self): time.sleep(60) # Run SDK upgrade - logging.info("Running SDK firmware upgrade...") + logging.info("Running SDK firmware upgrade for " + self.rsu_ip + "...") code = self.run_xfer_upgrade(f"{self.root_path}/{upgrade_info['sdk']}") if code == -1: raise Exception("Yunex RSU SDK upgrade failed") @@ -82,7 +82,7 @@ def upgrade(self): time.sleep(60) # Run application provision image - logging.info("Running application provisioning...") + logging.info("Running application provisioning for " + self.rsu_ip + "...") code = self.run_xfer_upgrade( f"{self.root_path}/{upgrade_info['provision']}" ) @@ -96,7 +96,7 @@ def upgrade(self): # If something goes wrong, cleanup anything left and report failure if possible. # Yunex RSUs can handle having the same firmware upgraded over again. # There is no issue with starting from the beginning even with a partially complete upgrade. - logging.error(f"Failed to perform firmware upgrade: {err}") + logging.error(f"Failed to perform firmware upgrade for {self.rsu_ip}: {err}") self.cleanup() self.notify_firmware_manager(success=False) # send email to support team with the rsu and error diff --git a/services/addons/images/iss_health_check/iss_health_checker.py b/services/addons/images/iss_health_check/iss_health_checker.py index ec2d5a3d4..71dd6c8fe 100644 --- a/services/addons/images/iss_health_check/iss_health_checker.py +++ b/services/addons/images/iss_health_check/iss_health_checker.py @@ -11,6 +11,7 @@ # Set up logging logger = logging.getLogger(__name__) + @dataclass class RsuDataWrapper: rsu_data: Dict[str, Dict[str, str]] = field(default_factory=dict) @@ -23,7 +24,7 @@ def get_dict(self): def set_provisioner_company(self, scms_id, provisioner_company): self.rsu_data[scms_id]["provisionerCompany"] = provisioner_company - + def set_entity_type(self, scms_id, entity_type): self.rsu_data[scms_id]["entityType"] = entity_type @@ -39,7 +40,7 @@ def set_expiration(self, scms_id, expiration): def get_rsu_data() -> RsuDataWrapper: """Get RSU data from PostgreSQL and return it in a wrapper object""" - + result = {} query = ( "SELECT jsonb_build_object('rsu_id', rsu_id, 'iss_scms_id', iss_scms_id) " @@ -89,14 +90,21 @@ def get_scms_status_data(): for enrollment_status in enrollment_list: es_id = enrollment_status["_id"] if es_id in rsu_data.get_dict(): - rsu_data.set_provisioner_company(es_id, enrollment_status["provisionerCompany_id"]) + rsu_data.set_provisioner_company( + es_id, enrollment_status["provisionerCompany_id"] + ) rsu_data.set_entity_type(es_id, enrollment_status["entityType"]) rsu_data.set_project_id(es_id, enrollment_status["project_id"]) rsu_data.set_device_health(es_id, enrollment_status["deviceHealth"]) # If the device has yet to download its first set of certs, set the expiration time to when it was enrolled if "authorizationCertInfo" in enrollment_status["enrollments"][0]: - rsu_data.set_expiration(es_id, enrollment_status["enrollments"][0]["authorizationCertInfo"]["expireTimeOfLatestDownloadedCert"]) + rsu_data.set_expiration( + es_id, + enrollment_status["enrollments"][0]["authorizationCertInfo"][ + "expireTimeOfLatestDownloadedCert" + ], + ) else: rsu_data.set_expiration(es_id, None) @@ -119,24 +127,34 @@ def insert_scms_data(data): if validate_scms_data(value) is False: continue - health = "1" if value["deviceHealth"] == "Healthy" else "0" - if value["expiration"]: - query = ( - query - + f" ('{now_ts}', '{health}', '{value['expiration']}', {value['rsu_id']})," - ) + # If deviceHealth isn't included in the device's SCMS profile, assume unhealthy + if "deviceHealth" in value: + health = "1" if value["deviceHealth"] == "Healthy" else "0" else: - query = query + f" ('{now_ts}', '{health}', NULL, {value['rsu_id']})," + health = "0" + + # If expiration isn't included in the device's SCMS profile, assume None + if "expiration" in value: + # Check if the expiration field is None + if value["expiration"]: + expiration = f"'{value["expiration"]}'" + else: + expiration = "NULL" + else: + expiration = "NULL" + + query = query + f" ('{now_ts}', '{health}', {expiration}, {value['rsu_id']})," - query = query[:-1] # remove comma + query = query[:-1] # remove comma pgquery.write_db(query) logger.info( "SCMS data inserted {} messages into PostgreSQL...".format(len(data.values())) ) + def validate_scms_data(value): """Validate the SCMS data - + Args: value (dict): SCMS data """ @@ -144,21 +162,31 @@ def validate_scms_data(value): try: value["rsu_id"] except KeyError as e: - logger.warning("rsu_id not found in data, is it real data? exception: {}".format(e)) + logger.warning( + "rsu_id not found in data, is it real data? exception: {}".format(e) + ) return False try: value["deviceHealth"] except KeyError as e: - logger.warning("deviceHealth not found in data for RSU with id {}, is it real data? exception: {}".format(value["rsu_id"], e)) + logger.warning( + "deviceHealth not found in data for RSU with id {}, is it real data? exception: {}".format( + value["rsu_id"], e + ) + ) return False try: value["expiration"] except KeyError as e: - logger.warning("expiration not found in data for RSU with id {}, is it real data? exception: {}".format(value["rsu_id"], e)) + logger.warning( + "expiration not found in data for RSU with id {}, is it real data? exception: {}".format( + value["rsu_id"], e + ) + ) return False - + return True @@ -170,4 +198,4 @@ def validate_scms_data(value): logging.basicConfig(format="%(levelname)s:%(message)s", level=log_level) scms_statuses = get_scms_status_data() - insert_scms_data(scms_statuses) \ No newline at end of file + insert_scms_data(scms_statuses) diff --git a/services/addons/images/obu_ota_server/README.md b/services/addons/images/obu_ota_server/README.md new file mode 100644 index 000000000..65b5529f3 --- /dev/null +++ b/services/addons/images/obu_ota_server/README.md @@ -0,0 +1,79 @@ +# OBU OTA Server + +## Table of Contents + +- [OBU OTA Server](#obu-ota-server) + - [Table of Contents](#table-of-contents) + - [About ](#about-) + - [Requirements ](#requirements-) + - [Common required variables ](#common-required-variables-) + - [GCP required variables ](#gcp-required-variables-) + - [Local Required variables ](#local-required-variables-) + +## About + +This directory contains a microservice that runs within the CV Manager GKE Cluster. This service can take either local or GCP stored firmware files and serves them for OBU devices to receive Over the Air (OTA) updates. OBU devices will query the OTA server for a manifest of available firmware files and will send another request for the full firmware file if it has a newer version number. For local deployments the OBU OTA server is deployed behind a NGINX proxy to allow for TLS encryption. In k8's an ingress resource is used to handle certificates and TLS. + +List of currently supported vendors: + +- Commsignia + +Available REST endpoints: + +- / [ **GET** ] + - Used as a health check path for K8 deployment. This path is not secured with basic authentication +- /firmwares/commsignia [ **GET** ] + - Secured with basic authentication. + - Firmware file name must comply with the following regex naming filter: + `(?P(?Pob4|rs4)-generic(?:-.*)?)-(?:(?Prw)|ro)(?P-secureboot)?-(?P.*).tar.sig` + - Will either query GCS or the specified local path for a latest list of firmware files. Generates a manifest that includes details about each firmware file along with a `href` field that the OBU uses to generate the download request. Here is a sample response: + `{"content":[{"id":"","name":"ob4-generic-ro-secureboot-y20.48.2-b228647.tar.sig","variant":"ob4-generic","releaseVersion":"y20.48.2-b228647","type":"OBU","writableSystemPartition":false,"secure":true,"uploadedAt":"2024-05-29T22:12:33Z","size":135055616,"links":[{"rel":"local-file","href":"localhost/firmwares/commsignia/ob4-generic-ro-secureboot-y20.48.2-b228647.tar.sig","type":"application/octet-stream"}]}],"pageable":{"sort":{"empty":false,"unsorted":false,"sorted":true},"offset":0,"pageNumber":0,"pageSize":32,"paged":true,"unpaged":false},"last":true,"totalPages":1,"totalElements":1,"size":32,"number":0,"sort":{"empty":false,"unsorted":false,"sorted":true},"numberOfElements":1,"first":true,"empty":false}` +- /firmwares/commsignia/{firmware_id} [ **GET** ] + - Secured with basic authentication. + - Used as an endpoint for the OBU to download a firmware file from. + - Supports a range header to allow for partial downloads of files. + - NOTE: Commsignia currently doesn't send these range headers so as of now this functionality has not be tested. + +## Requirements + +The following environmental variables must be set: + +### Common required variables + +LOGGING_LEVEL: The logging level of the deployment. Options are: 'critical', 'error', 'warning', 'info' and 'debug'. If not specified, will default to 'info'. Refer to Python's documentation for more info: [Python logging](https://docs.python.org/3/howto/logging.html). + +SERVER_HOST: The base URL of the OTA server, this must be resolvable from the OBU. Generally this should be set to the IP address of the server or the DNS name. + +BLOB_STORAGE_PROVIDER: Set to either "DOCKER" or "GCP" depending on deployment environment. + +OTA_USERNAME: Username to be used with basic authentication. + +OTA_PASSWORD: Password to be used with basic authentication + +PG_DB_USER: PostgreSQL access username. + +PG_DB_PASS: PostgreSQL access password. + +PG_DB_NAME: PostgreSQL database name. + +PG_DB_HOST: PostgreSQL hostname, make sure to include port number. + +MAX_COUNT: Max number of succesfull firmware upgrades to keep in the database per device SN. + +### GCP required variables + +BLOB_STORAGE_BUCKET: Cloud blob storage bucket for firmware storage. + +BLOB_STORAGE_PATH: Path to firmware files directory within the storage bucket. + +GCP_PROJECT: GCP project for the firmware cloud storage bucket. + +GOOGLE_APPLICATION_CREDENTIALS: Service account location. Recommended to attach as a volume. + +### Local Required variables + +NGINX_ENCRYPTION: Used for the NGINX proxy configuration, set to "plain" or "ssl" depending on if you want to secure traffic with TLS. + +SERVER_CERT_FILE: Path to the server cert file if using SSL. + +SERVER_KEY_FILE: Path to the server key file if using SSL. diff --git a/services/addons/images/obu_ota_server/__init__.py b/services/addons/images/obu_ota_server/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/services/addons/images/obu_ota_server/commsignia_manifest.py b/services/addons/images/obu_ota_server/commsignia_manifest.py new file mode 100644 index 000000000..7558a6753 --- /dev/null +++ b/services/addons/images/obu_ota_server/commsignia_manifest.py @@ -0,0 +1,71 @@ +import os +import datetime +import re +from typing import List +import os +import copy + +document = { + "content": [], + "pageable": { + "sort": {"empty": False, "unsorted": False, "sorted": True}, + "offset": 0, + "pageNumber": 0, + "pageSize": 32, + "paged": True, + "unpaged": False, + }, + "last": True, + "totalPages": 1, + "totalElements": 0, + "size": 32, + "number": 0, + "sort": {"empty": False, "unsorted": False, "sorted": True}, + "numberOfElements": 0, + "first": True, + "empty": False, +} + + +magic_regex = re.compile( + "(?P(?Pob4|rs4)-generic(?:-.*)?)-(?:(?Prw)|ro)(?P-secureboot)?-(?P.*).tar.sig" +) + + +def add_contents(server: str, firmware_list: List) -> dict: + manifest = copy.deepcopy(document) + + for firmware in firmware_list: + + fname = firmware.split("/")[-1] + info = magic_regex.match(fname) + if not info: + continue + + content = {} + + content["id"] = "" + content["name"] = fname + content["variant"] = info["variant"] + content["releaseVersion"] = info["release"] + content["type"] = "RSU" if info["type"] == "rs4" else "OBU" + content["writableSystemPartition"] = bool(info["writable"]) + content["secure"] = bool(info["secure"]) + content["uploadedAt"] = datetime.datetime.fromtimestamp( + os.path.getmtime(firmware) + ).strftime("%Y-%m-%dT%H:%M:%SZ") + content["size"] = os.stat(firmware).st_size + content["links"] = [ + { + "rel": "local-file", + "href": server + "/firmwares/commsignia/" + fname, + "type": "application/octet-stream", + } + ] + manifest["content"].append(content) + manifest["totalElements"] += 1 + manifest["numberOfElements"] += 1 + + if manifest["size"] <= manifest["totalElements"]: + raise AttributeError("Maximum number of firmwares is:", manifest["size"]) + return manifest diff --git a/services/addons/images/obu_ota_server/obu_ota_server.py b/services/addons/images/obu_ota_server/obu_ota_server.py new file mode 100644 index 000000000..4a6669ac6 --- /dev/null +++ b/services/addons/images/obu_ota_server/obu_ota_server.py @@ -0,0 +1,193 @@ +from typing import Any +from fastapi import FastAPI, Request, Response, HTTPException, Depends +from fastapi.security import HTTPBasic, HTTPBasicCredentials +from common import gcs_utils, pgquery +import commsignia_manifest +import os +import glob +import aiofiles +from starlette.responses import Response +import logging +from datetime import datetime +import asyncio + +app = FastAPI() +log_level = "INFO" if "LOGGING_LEVEL" not in os.environ else os.environ["LOGGING_LEVEL"] +logging.basicConfig(format="%(levelname)s:%(message)s", level=log_level) +security = HTTPBasic() + + +def authenticate_user(credentials: HTTPBasicCredentials = Depends(security)) -> str: + correct_username = os.getenv("OTA_USERNAME") + correct_password = os.getenv("OTA_PASSWORD") + if ( + credentials.username != correct_username + or credentials.password != correct_password + ): + raise HTTPException( + status_code=401, + detail="Incorrect username or password", + headers={"WWW-Authenticate": "Basic"}, + ) + return credentials.username + + +@app.get("/") +async def read_root(request: Request): + return { + "message": "obu ota server healthcheck", + "root_path": request.scope.get("root_path"), + } + + +def get_firmware_list() -> list: + blob_storage_provider = os.getenv("BLOB_STORAGE_PROVIDER", "DOCKER") + files = [] + file_extension = ".tar.sig" + if blob_storage_provider.upper() == "DOCKER": + files = glob.glob(f"/firmwares/*{file_extension}") + elif blob_storage_provider.upper() == "GCP": + blob_storage_path = os.getenv("BLOB_STORAGE_PATH", "DOCKER") + files = gcs_utils.list_gcs_blobs(blob_storage_path, file_extension) + return files + + +@app.get("/firmwares/commsignia", dependencies=[Depends(authenticate_user)]) +async def get_manifest(request: Request) -> dict[str, Any]: + try: + files = get_firmware_list() + logging.debug(f"get_manifest :: Files: {files}") + host_name = os.getenv("SERVER_HOST", "localhost") + response_manifest = commsignia_manifest.add_contents(host_name, files) + return response_manifest + except Exception as e: + raise HTTPException(status_code=500, detail=str(e)) + + +def get_firmware(firmware_id: str, local_file_path: str) -> bool: + try: + blob_storage_provider = os.getenv("BLOB_STORAGE_PROVIDER", "DOCKER") + # checks if firmware exists locally + if not os.path.exists(local_file_path): + # If configured to only use local storage, return False as firmware does not exist + if blob_storage_provider.upper() == "DOCKER": + return False + # If configured to use GCP storage, download the firmware from GCP + elif blob_storage_provider.upper() == "GCP": + # Download blob will attempt to download the firmware and return True if successful + return gcs_utils.download_gcp_blob(firmware_id, local_file_path) + return True + except Exception as e: + logging.error(f"parse_range_header: Error getting firmware: {e}") + raise HTTPException(status_code=500, detail="Error getting firmware") + + +def parse_range_header(range_header: str) -> tuple[int, int | None]: + start, end = 0, None + try: + if range_header: + start_end = range_header.partition("=")[2].split("-") + start = int(start_end[0]) + end = int(start_end[1]) if start_end[1] else None + except ValueError: + raise HTTPException(status_code=400, detail="Invalid Range header") + if end is not None and start > end: + raise HTTPException( + status_code=400, + detail="Invalid Range header: start cannot be greater than end", + ) + return start, end + + +async def read_file( + file_path: str, start: int, end: int | None +) -> tuple[bytes, int, int]: + try: + async with aiofiles.open(file_path, mode="rb") as file: + file_size = os.path.getsize(file_path) + if end is None: + end = file_size + await file.seek(start) + data = await file.read(end - start) + return data, file_size, end + except Exception as e: + logging.error(f"read_file: Error reading file: {e}") + raise HTTPException(status_code=500, detail="Error reading file") + + +def removed_old_logs(serialnum: str): + try: + max_count = int(os.getenv("MAX_COUNT", 10)) + success_count = pgquery.query_db( + f"SELECT COUNT(*) FROM public.obu_ota_requests WHERE obu_sn = '{serialnum}' AND error_status = B'0'" + ) + if success_count[0][0] > max_count: + excess_count = success_count[0][0] - max_count + oldest_entries = pgquery.query_db( + f"SELECT request_id FROM public.obu_ota_requests WHERE obu_sn = '{serialnum}' AND error_status = B'0' ORDER BY request_datetime ASC LIMIT {excess_count}" + ) + oldest_ids = [entry[0] for entry in oldest_entries] + pgquery.write_db( + f"DELETE FROM public.obu_ota_requests WHERE request_id IN ({','.join(map(str, oldest_ids))})" + ) + logging.debug( + f"removed_old_logs: Removed {excess_count} old logs for serialnum: {serialnum}" + ) + except Exception as e: + logging.error(f"removed_old_logs: Error removing old entry: {e}") + + +async def log_request( + manufacturer: int, + request: Request, + firmware_id: str, + error_status: int, + error_message: str, +): + try: + query_params = request.query_params + serialnum = query_params.get("serialnum") + version = query_params.get("version") + + origin_ip = request.client.host + + current_dt = datetime.now().strftime("%Y-%m-%d %H:%M:%S") + query = f"INSERT INTO public.obu_ota_requests (obu_sn, manufacturer, request_datetime, origin_ip, obu_firmware_version, requested_firmware_version, error_status, error_message) VALUES\ + ('{serialnum}', {manufacturer}, '{current_dt}', '{origin_ip}', '{version}', '{firmware_id}', B'{error_status}', '{error_message}')" + logging.debug(f"Logging request to postgres with insert query: \n{query}") + pgquery.write_db(query) + removed_old_logs(serialnum) + except Exception as e: + logging.error(f"log_request: Error logging request: {e} with query: {query}") + + +@app.get( + "/firmwares/commsignia/{firmware_id}", dependencies=[Depends(authenticate_user)] +) +async def get_fw(request: Request, firmware_id: str): + try: + file_path = f"/firmwares/{firmware_id}" + + # Checks if firmware exists locally or downloads it from GCS + if not get_firmware(firmware_id, file_path): + raise HTTPException(status_code=404, detail="Firmware not found") + + header_start, header_end = parse_range_header(request.headers.get("Range")) + data, file_size, end = await read_file(file_path, header_start, header_end) + + headers = { + "Content-Range": f"bytes {header_start}-{end-1}/{file_size}", + "Content-Length": str(end - header_start), + "Accept-Ranges": "bytes", + } + + asyncio.create_task(log_request(1, request, firmware_id, 0, "")) + return Response( + content=data, media_type="application/octet-stream", headers=headers + ) + except Exception as e: + asyncio.create_task(log_request(1, request, firmware_id, 1, e.detail)) + logging.error( + f"get_fw: Error responding with firmware with error: {e} for firmware_id: {firmware_id}" + ) + raise diff --git a/services/addons/images/obu_ota_server/requirements.txt b/services/addons/images/obu_ota_server/requirements.txt new file mode 100644 index 000000000..682ac15b6 --- /dev/null +++ b/services/addons/images/obu_ota_server/requirements.txt @@ -0,0 +1,9 @@ +fastapi==0.110.0 +pydantic==2.6.2 +uvicorn==0.27.1 +aiofiles==23.2.1 +google-cloud-storage==2.14.0 +python-dateutil==2.8.2 +pytz==2023.3.post1 +sqlalchemy==2.0.21 +pg8000==1.30.2 diff --git a/services/addons/images/obu_ota_server/sample.env b/services/addons/images/obu_ota_server/sample.env new file mode 100644 index 000000000..d96f532d6 --- /dev/null +++ b/services/addons/images/obu_ota_server/sample.env @@ -0,0 +1,37 @@ +# Python logging ptions: "INFO", "DEBUG", "WARN", "ERROR" +LOGGING_LEVEL="INFO" + +# Routeable host name for the server +SERVER_HOST = "localhost" + +# Blob storage variables +# For local deployments set the BLOB_STORAGE_PROVIDER to "DOCKER" +BLOB_STORAGE_PROVIDER="DOCKER" + +# For users using GCP cloud storage +BLOB_STORAGE_BUCKET="" +BLOB_STORAGE_PATH="" +GCP_PROJECT="" +GOOGLE_APPLICATION_CREDENTIALS="" + + +# Nginx basic auth username and password +OTA_USERNAME = "admin" +OTA_PASSWORD = "admin" + +# Nginx encryption options: "plain", "ssl" +# Note that this just changes the config file attached as a volume to the Nginx container +NGINX_ENCRYPTION="plain" + +# SSL file name in path /docker/nginx/ssl/ +SERVER_CERT_FILE="ota_server.crt" +SERVER_KEY_FILE="ota_server.key" + +# Max number of succesfull firmware upgrades to keep in the database per device SN +MAX_COUNT = 10 + +# PostgreSQL database variables +PG_DB_HOST="" +PG_DB_NAME="" +PG_DB_USER="" +PG_DB_PASS="" \ No newline at end of file diff --git a/services/addons/images/rsu_status_check/rsu_pinger.py b/services/addons/images/rsu_status_check/rsu_pinger.py index 76c839cc2..4f06334ce 100644 --- a/services/addons/images/rsu_status_check/rsu_pinger.py +++ b/services/addons/images/rsu_status_check/rsu_pinger.py @@ -23,7 +23,7 @@ def ping_rsu_ips(rsu_list): for rsu in rsu_list: # id: rsu_id # key: process pinging the RSU's ipv4_address - p[rsu[0]] = Popen(["ping", "-n", "-w5", "-c3", rsu[1]], stdout=DEVNULL) + p[rsu[0]] = Popen(["ping", "-n", "-w20", "-c1", rsu[1]], stdout=DEVNULL) ping_data = {} while p: diff --git a/services/addons/tests/count_metric/test_daily_emailer.py b/services/addons/tests/count_metric/test_daily_emailer.py index 5de38639d..707136109 100644 --- a/services/addons/tests/count_metric/test_daily_emailer.py +++ b/services/addons/tests/count_metric/test_daily_emailer.py @@ -51,8 +51,7 @@ def test_query_mongo_in_counts(): ] ) assert rsu_dict["10.0.0.1"]["counts"]["BSM"]["in"] == 5 - assert rsu_dict["10.0.0.2"]["counts"]["BSM"]["in"] == 25 - assert rsu_dict["10.0.0.2"]["primary_route"] == "Unknown" + assert len(rsu_dict) == 1 daily_emailer.message_types = ["BSM", "TIM", "Map", "SPaT", "SRM", "SSM"] @@ -134,8 +133,7 @@ def test_query_mongo_out_counts(): ] ) assert rsu_dict["10.0.0.1"]["counts"]["BSM"]["out"] == 5 - assert rsu_dict["10.0.0.2"]["counts"]["BSM"]["out"] == 25 - assert rsu_dict["10.0.0.2"]["primary_route"] == "Unknown" + assert len(rsu_dict) == 1 daily_emailer.message_types = ["BSM", "TIM", "Map", "SPaT", "SRM", "SSM"] @@ -171,17 +169,28 @@ def test_query_mongo_out_counts_no_id(): @patch("addons.images.count_metric.daily_emailer.pgquery.query_db") -def test_prepare_rsu_dict(mock_query_db): +def test_prepare_org_rsu_dict(mock_query_db): mock_query_db.return_value = [ - ({"ipv4_address": "10.0.0.1", "primary_route": "Route 1"},), + ( + { + "org_name": "Test Org", + "ipv4_address": "10.0.0.1", + "primary_route": "Route 1", + }, + ), ] daily_emailer.message_types = ["BSM"] # run - result = daily_emailer.prepare_rsu_dict() + result = daily_emailer.prepare_org_rsu_dict() expected_result = { - "10.0.0.1": {"primary_route": "Route 1", "counts": {"BSM": {"in": 0, "out": 0}}} + "Test Org": { + "10.0.0.1": { + "primary_route": "Route 1", + "counts": {"BSM": {"in": 0, "out": 0}}, + } + } } mock_query_db.assert_called_once() assert result == expected_result @@ -197,19 +206,20 @@ def test_prepare_rsu_dict(mock_query_db): "SMTP_USERNAME": "username", "SMTP_PASSWORD": "password", "SMTP_EMAIL": "test@gmail.com", - "SMTP_EMAIL_RECIPIENTS": "bob@gmail.com", }, ) @patch("addons.images.count_metric.daily_emailer.EmailSender") -def test_email_daily_counts(mock_emailsender): +@patch("addons.images.count_metric.daily_emailer.get_email_list") +def test_email_daily_counts(mock_email_list, mock_emailsender): + mock_email_list.return_value = ["bob@gmail.com"] emailsender_obj = mock_emailsender.return_value - daily_emailer.email_daily_counts("test") + daily_emailer.email_daily_counts("Test Org", "test") emailsender_obj.send.assert_called_once_with( sender="test@gmail.com", recipient="bob@gmail.com", - subject="TEST Counts", + subject="Test Org Test Counts", message="test", replyEmail="", username="username", @@ -230,17 +240,18 @@ def test_email_daily_counts(mock_emailsender): @patch("addons.images.count_metric.daily_emailer.email_daily_counts") @patch("addons.images.count_metric.daily_emailer.query_mongo_out_counts") @patch("addons.images.count_metric.daily_emailer.query_mongo_in_counts") -@patch("addons.images.count_metric.daily_emailer.prepare_rsu_dict") +@patch("addons.images.count_metric.daily_emailer.prepare_org_rsu_dict") def test_run_daily_emailer( - mock_prepare_rsu_dict, + mock_prepare_org_rsu_dict, mock_query_mongo_in_counts, mock_query_mongo_out_counts, mock_email_daily_counts, mock_gen_email, ): + mock_prepare_org_rsu_dict.return_value = {"Test Org": {}} daily_emailer.run_daily_emailer() - mock_prepare_rsu_dict.assert_called_once() + mock_prepare_org_rsu_dict.assert_called_once() mock_query_mongo_in_counts.assert_called_once() mock_query_mongo_out_counts.assert_called_once() mock_email_daily_counts.assert_called_once() diff --git a/services/addons/tests/count_metric/test_gen_email.py b/services/addons/tests/count_metric/test_gen_email.py index dd0eb1508..cc0af6571 100644 --- a/services/addons/tests/count_metric/test_gen_email.py +++ b/services/addons/tests/count_metric/test_gen_email.py @@ -138,12 +138,14 @@ def test_generate_email_body(mock_generate_count_table): ) end_dt = (datetime.now()).replace(hour=0, minute=0, second=0, microsecond=0) - result = gen_email.generate_email_body(rsu_dict, start_dt, end_dt, message_types) + result = gen_email.generate_email_body( + "Test Org", rsu_dict, start_dt, end_dt, message_types + ) expected_start_string = datetime.strftime(start_dt, "%Y-%m-%d 00:00:00") expected_end_string = datetime.strftime(end_dt, "%Y-%m-%d 00:00:00") expected = ( - f"

TEST Count Report {expected_start_string} UTC - {expected_end_string} UTC

" + f"

Test Org Test Count Report {expected_start_string} UTC - {expected_end_string} UTC

" "

This is an automated email to report yesterday's ODE message counts for J2735 messages going in and out of the ODE. " "In counts are the number of encoded messages received by the ODE from the load balancer. " "Out counts are the number of decoded messages that have come out of the ODE in JSON form and " diff --git a/services/addons/tests/count_metric/test_mongo_counter.py b/services/addons/tests/count_metric/test_mongo_counter.py index acacacb7f..377be9670 100644 --- a/services/addons/tests/count_metric/test_mongo_counter.py +++ b/services/addons/tests/count_metric/test_mongo_counter.py @@ -13,6 +13,15 @@ def test_write_counts(): mock_collection.insert_many.assert_called_with(["test"]) +def test_write_counts_empty(): + mock_collection = MagicMock() + mock_mongo_db = {"CVCounts": mock_collection} + + mongo_counter.write_counts(mock_mongo_db, []) + + mock_collection.insert_many.assert_not_called() + + @patch.dict(os.environ, {"MONGO_DB_URI": "uri", "MONGO_DB_NAME": "name"}) def test_count_query_bsm(): mock_collection = MagicMock() diff --git a/services/addons/tests/firmware_manager/test_commsignia_upgrader.py b/services/addons/tests/firmware_manager/test_commsignia_upgrader.py index b738a05d6..cf107fc89 100644 --- a/services/addons/tests/firmware_manager/test_commsignia_upgrader.py +++ b/services/addons/tests/firmware_manager/test_commsignia_upgrader.py @@ -31,9 +31,10 @@ def test_commsignia_upgrader_init(): assert test_commsignia_upgrader.ssh_password == "test-psw" +@patch("addons.images.firmware_manager.commsignia_upgrader.logging") @patch("addons.images.firmware_manager.commsignia_upgrader.SCPClient") @patch("addons.images.firmware_manager.commsignia_upgrader.SSHClient") -def test_commsignia_upgrader_upgrade_success_no_post_update(mock_sshclient, mock_scpclient): +def test_commsignia_upgrader_upgrade_success_no_post_update(mock_sshclient, mock_scpclient, mock_logging): # Mock SSH Client and successful firmware upgrade return value sshclient_obj = mock_sshclient.return_value _stdout = MagicMock() @@ -78,10 +79,22 @@ def test_commsignia_upgrader_upgrade_success_no_post_update(mock_sshclient, mock # Assert notified success value notify.assert_called_with(success=True) + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Making SSH connection with 8.8.8.8..."), + call("Copying installation package to 8.8.8.8..."), + call("Running firmware upgrade for 8.8.8.8..."), + call("ALL OK") + ] + ) + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.commsignia_upgrader.logging") @patch("addons.images.firmware_manager.commsignia_upgrader.SCPClient") @patch("addons.images.firmware_manager.commsignia_upgrader.SSHClient") @patch("addons.images.firmware_manager.commsignia_upgrader.time") -def test_commsignia_upgrader_upgrade_success_post_update(mock_time, mock_sshclient, mock_scpclient): +def test_commsignia_upgrader_upgrade_success_post_update(mock_time, mock_sshclient, mock_scpclient, mock_logging): # Mock SSH Client and successful firmware upgrade return value sshclient_obj = mock_sshclient.return_value _stdout = MagicMock() @@ -135,6 +148,22 @@ def test_commsignia_upgrader_upgrade_success_post_update(mock_time, mock_sshclie # Assert notified success value notify.assert_called_with(success=True) + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Making SSH connection with 8.8.8.8..."), + call("Copying installation package to 8.8.8.8..."), + call("Running firmware upgrade for 8.8.8.8..."), + call("ALL OK"), + call("Making SSH connection with 8.8.8.8..."), + call("Copying post upgrade script to 8.8.8.8..."), + call("Running post upgrade script for 8.8.8.8..."), + call("ALL OK"), + call("Post upgrade script executed successfully for rsu: 8.8.8.8.") + ] + ) + mock_logging.error.assert_not_called() + @patch("addons.images.firmware_manager.commsignia_upgrader.SCPClient") @patch("addons.images.firmware_manager.commsignia_upgrader.SSHClient") @patch("addons.images.firmware_manager.commsignia_upgrader.time") @@ -192,13 +221,29 @@ def test_commsignia_upgrader_upgrade_post_update_fail(mock_logging, mock_time, m ] ) sshclient_obj.close.assert_called_with() + + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Making SSH connection with 8.8.8.8..."), + call("Copying installation package to 8.8.8.8..."), + call("Running firmware upgrade for 8.8.8.8..."), + call("ALL OK"), + call("Making SSH connection with 8.8.8.8..."), + call("Copying post upgrade script to 8.8.8.8..."), + call("Running post upgrade script for 8.8.8.8..."), + call("NOT OK TEST"), + ] + ) mock_logging.error.assert_called_with("Failed to execute post upgrade script for rsu 8.8.8.8: NOT OK TEST") + # Assert notified success value notify.assert_called_with(success=True) +@patch("addons.images.firmware_manager.commsignia_upgrader.logging") @patch("addons.images.firmware_manager.commsignia_upgrader.SCPClient") @patch("addons.images.firmware_manager.commsignia_upgrader.SSHClient") -def test_commsignia_upgrader_upgrade_fail(mock_sshclient, mock_scpclient): +def test_commsignia_upgrader_upgrade_fail(mock_sshclient, mock_scpclient, mock_logging): # Mock SSH Client and failed firmware upgrade return value sshclient_obj = mock_sshclient.return_value _stdout = MagicMock() @@ -240,6 +285,17 @@ def test_commsignia_upgrader_upgrade_fail(mock_sshclient, mock_scpclient): ) sshclient_obj.close.assert_called_with() + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Making SSH connection with 8.8.8.8..."), + call("Copying installation package to 8.8.8.8..."), + call("Running firmware upgrade for 8.8.8.8..."), + call("NOT OK TEST") + ] + ) + mock_logging.error.assert_not_called() + # Assert notified success value notify.assert_called_with(success=False) @@ -280,9 +336,10 @@ def test_commsignia_upgrader_upgrade_exception( # Assert SSH firmware upgrade run doesn't occur sshclient_obj.exec_command.assert_not_called() + # Assert logging + mock_logging.info.assert_called_with("Making SSH connection with 8.8.8.8...") + mock_logging.error.assert_called_with("Failed to perform firmware upgrade for 8.8.8.8: Exception occurred during upgrade") + # Assert exception was cleaned up and firmware manager was notified of upgrade failure - mock_logging.error.assert_called_with( - "Failed to perform firmware upgrade: Exception occurred during upgrade" - ) cleanup.assert_called_with() notify.assert_called_with(success=False) diff --git a/services/addons/tests/firmware_manager/test_download_blob.py b/services/addons/tests/firmware_manager/test_download_blob.py index 970ec8f97..a266c44d4 100644 --- a/services/addons/tests/firmware_manager/test_download_blob.py +++ b/services/addons/tests/firmware_manager/test_download_blob.py @@ -3,52 +3,6 @@ import pytest from addons.images.firmware_manager import download_blob -from addons.images.firmware_manager.download_blob import UnsupportedFileTypeException - - -@patch.dict( - os.environ, {"GCP_PROJECT": "test-project", "BLOB_STORAGE_BUCKET": "test-bucket"} -) -@patch("addons.images.firmware_manager.download_blob.logging") -@patch("addons.images.firmware_manager.download_blob.storage.Client") -def test_download_gcp_blob(mock_storage_client, mock_logging): - # mock - mock_client = mock_storage_client.return_value - mock_bucket = mock_client.get_bucket.return_value - mock_blob = mock_bucket.blob.return_value - - # run - download_blob.download_gcp_blob( - blob_name="test.tar", destination_file_name="/home/test/" - ) - - # validate - mock_storage_client.assert_called_with("test-project") - mock_client.get_bucket.assert_called_with("test-bucket") - mock_bucket.blob.assert_called_with("test.tar") - mock_blob.download_to_filename.assert_called_with("/home/test/") - mock_logging.info.assert_called_with( - "Downloaded storage object test.tar from bucket test-bucket to local file /home/test/." - ) - - -@patch.dict( - os.environ, {"GCP_PROJECT": "test-project", "BLOB_STORAGE_BUCKET": "test-bucket"} -) -@patch("addons.images.firmware_manager.download_blob.logging") -def test_download_gcp_blob_unsupported_file_type(mock_logging): - # prepare - blob_name = "test.blob" - destination_file_name = "/home/test/" - - # run - result = download_blob.download_gcp_blob(blob_name, destination_file_name) - - # validate - mock_logging.error.assert_called_with( - f"Unsupported file type for storage object {blob_name}. Only .tar files are supported." - ) - assert result == False @patch("addons.images.firmware_manager.download_blob.logging") @@ -70,7 +24,7 @@ def test_download_docker_blob(mock_logging): ) -@patch("addons.images.firmware_manager.download_blob.logging") +@patch("common.util.logging") def test_download_docker_blob_unsupported_file_type(mock_logging): # prepare os.system = MagicMock() @@ -82,6 +36,6 @@ def test_download_docker_blob_unsupported_file_type(mock_logging): # validate mock_logging.error.assert_called_with( - f"Unsupported file type for storage object {blob_name}. Only .tar files are supported." + f'Unsupported file type for storage object {blob_name}. Only ".tar" files are supported.' ) assert result == False diff --git a/services/addons/tests/firmware_manager/test_firmware_manager.py b/services/addons/tests/firmware_manager/test_firmware_manager.py index 11b19b5f3..bd760a322 100644 --- a/services/addons/tests/firmware_manager/test_firmware_manager.py +++ b/services/addons/tests/firmware_manager/test_firmware_manager.py @@ -1,8 +1,8 @@ -from unittest.mock import patch, MagicMock +from unittest.mock import call, patch, MagicMock from subprocess import DEVNULL from collections import deque import test_firmware_manager_values as fmv - +import pytest from addons.images.firmware_manager import firmware_manager @@ -72,11 +72,15 @@ def test_start_tasks_from_queue_popen_fail(mock_popen, mock_logging): ["python3", f"/home/commsignia_upgrader.py", expected_json_str], stdout=DEVNULL, ) + + # Assert logging + mock_logging.info.assert_not_called() mock_logging.error.assert_called_with( f"Encountered error of type {Exception} while starting automatic upgrade process for 8.8.8.8: Process failed to start" ) +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch("addons.images.firmware_manager.firmware_manager.active_upgrades", {}) @patch( "addons.images.firmware_manager.firmware_manager.upgrade_queue", deque(["8.8.8.8"]) @@ -97,7 +101,7 @@ def test_start_tasks_from_queue_popen_fail(mock_popen, mock_logging): }, ) @patch("addons.images.firmware_manager.firmware_manager.Popen") -def test_start_tasks_from_queue_popen_success(mock_popen): +def test_start_tasks_from_queue_popen_success(mock_popen, mock_logging): mock_popen_obj = mock_popen.return_value firmware_manager.start_tasks_from_queue() @@ -115,12 +119,16 @@ def test_start_tasks_from_queue_popen_success(mock_popen): # Assert the process reference is successfully tracked in the active_upgrades dictionary assert firmware_manager.active_upgrades["8.8.8.8"]["process"] == mock_popen_obj + mock_logging.info.assert_not_called() + mock_logging.error.assert_not_called() + # init_firmware_upgrade tests +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch("addons.images.firmware_manager.firmware_manager.active_upgrades", {}) -def test_init_firmware_upgrade_missing_rsu_ip(): +def test_init_firmware_upgrade_missing_rsu_ip(mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = {} mock_flask_jsonify = MagicMock() @@ -138,11 +146,15 @@ def test_init_firmware_upgrade_missing_rsu_ip(): ) assert code == 400 + mock_logging.info.assert_not_called() + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch( "addons.images.firmware_manager.firmware_manager.active_upgrades", {"8.8.8.8": {}} ) -def test_init_firmware_upgrade_already_running(): +def test_init_firmware_upgrade_already_running(mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = {"rsu_ip": "8.8.8.8"} mock_flask_jsonify = MagicMock() @@ -162,13 +174,18 @@ def test_init_firmware_upgrade_already_running(): ) assert code == 500 + # Assert logging + mock_logging.info.assert_called_with("Checking if existing upgrade is running or queued for '8.8.8.8'") + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch("addons.images.firmware_manager.firmware_manager.active_upgrades", {}) @patch( "addons.images.firmware_manager.firmware_manager.get_rsu_upgrade_data", MagicMock(return_value=[]), ) -def test_init_firmware_upgrade_no_eligible_upgrade(): +def test_init_firmware_upgrade_no_eligible_upgrade(mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = {"rsu_ip": "8.8.8.8"} mock_flask_jsonify = MagicMock() @@ -188,14 +205,24 @@ def test_init_firmware_upgrade_no_eligible_upgrade(): ) assert code == 500 + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Checking if existing upgrade is running or queued for '8.8.8.8'"), + call("Querying RSU data for '8.8.8.8'") + ] + ) + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch("addons.images.firmware_manager.firmware_manager.active_upgrades", {}) @patch( "addons.images.firmware_manager.firmware_manager.get_rsu_upgrade_data", MagicMock(return_value=[fmv.rsu_info]), ) @patch("addons.images.firmware_manager.firmware_manager.start_tasks_from_queue") -def test_init_firmware_upgrade_success(mock_stfq): +def test_init_firmware_upgrade_success(mock_stfq, mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = {"rsu_ip": "8.8.8.8"} mock_flask_jsonify = MagicMock() @@ -220,14 +247,25 @@ def test_init_firmware_upgrade_success(mock_stfq): ) assert code == 201 + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Checking if existing upgrade is running or queued for '8.8.8.8'"), + call("Querying RSU data for '8.8.8.8'"), + call("Adding '8.8.8.8' to the firmware manager upgrade queue") + ] + ) + mock_logging.error.assert_not_called() + firmware_manager.upgrade_queue = deque([]) # firmware_upgrade_completed tests +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch("addons.images.firmware_manager.firmware_manager.active_upgrades", {}) -def test_firmware_upgrade_completed_missing_rsu_ip(): +def test_firmware_upgrade_completed_missing_rsu_ip(mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = {} mock_flask_jsonify = MagicMock() @@ -245,9 +283,14 @@ def test_firmware_upgrade_completed_missing_rsu_ip(): ) assert code == 400 + # Assert logging + mock_logging.info.assert_not_called() + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch("addons.images.firmware_manager.firmware_manager.active_upgrades", {}) -def test_firmware_upgrade_completed_unknown_process(): +def test_firmware_upgrade_completed_unknown_process(mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = { "rsu_ip": "8.8.8.8", @@ -270,12 +313,17 @@ def test_firmware_upgrade_completed_unknown_process(): ) assert code == 400 + # Assert logging + mock_logging.info.assert_not_called() + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch( "addons.images.firmware_manager.firmware_manager.active_upgrades", {"8.8.8.8": fmv.upgrade_info}, ) -def test_firmware_upgrade_completed_missing_status(): +def test_firmware_upgrade_completed_missing_status(mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = {"rsu_ip": "8.8.8.8"} mock_flask_jsonify = MagicMock() @@ -293,12 +341,17 @@ def test_firmware_upgrade_completed_missing_status(): ) assert code == 400 + # Assert logging + mock_logging.info.assert_not_called() + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch( "addons.images.firmware_manager.firmware_manager.active_upgrades", {"8.8.8.8": fmv.upgrade_info}, ) -def test_firmware_upgrade_completed_illegal_status(): +def test_firmware_upgrade_completed_illegal_status(mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = {"rsu_ip": "8.8.8.8", "status": "frog"} mock_flask_jsonify = MagicMock() @@ -318,12 +371,17 @@ def test_firmware_upgrade_completed_illegal_status(): ) assert code == 400 + # Assert logging + mock_logging.info.assert_not_called() + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch( "addons.images.firmware_manager.firmware_manager.active_upgrades", {"8.8.8.8": fmv.upgrade_info}, ) -def test_firmware_upgrade_completed_fail_status(): +def test_firmware_upgrade_completed_fail_status(mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = {"rsu_ip": "8.8.8.8", "status": "fail"} mock_flask_jsonify = MagicMock() @@ -342,13 +400,18 @@ def test_firmware_upgrade_completed_fail_status(): ) assert code == 204 + # Assert logging + mock_logging.info.assert_called_with("Marking firmware upgrade as complete for '8.8.8.8'") + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch( "addons.images.firmware_manager.firmware_manager.active_upgrades", {"8.8.8.8": fmv.upgrade_info}, ) @patch("addons.images.firmware_manager.firmware_manager.pgquery.write_db") -def test_firmware_upgrade_completed_success_status(mock_writedb): +def test_firmware_upgrade_completed_success_status(mock_writedb, mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = { "rsu_ip": "8.8.8.8", @@ -373,7 +436,12 @@ def test_firmware_upgrade_completed_success_status(mock_writedb): ) assert code == 204 + # Assert logging + mock_logging.info.assert_called_with("Marking firmware upgrade as complete for '8.8.8.8'") + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch( "addons.images.firmware_manager.firmware_manager.active_upgrades", {"8.8.8.8": fmv.upgrade_info}, @@ -382,7 +450,7 @@ def test_firmware_upgrade_completed_success_status(mock_writedb): "addons.images.firmware_manager.firmware_manager.pgquery.write_db", side_effect=Exception("Failure to query PostgreSQL"), ) -def test_firmware_upgrade_completed_success_status_exception(mock_writedb): +def test_firmware_upgrade_completed_success_status_exception(mock_writedb, mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = { "rsu_ip": "8.8.8.8", @@ -408,15 +476,21 @@ def test_firmware_upgrade_completed_success_status_exception(mock_writedb): ) assert code == 500 + + # Assert logging + mock_logging.info.assert_not_called() + mock_logging.error.assert_called_with("Encountered error of type while querying the PostgreSQL database: Failure to query PostgreSQL") + # list_active_upgrades tests +@patch("addons.images.firmware_manager.firmware_manager.logging") @patch( "addons.images.firmware_manager.firmware_manager.active_upgrades", {"8.8.8.8": fmv.upgrade_info}, ) -def test_list_active_upgrades(): +def test_list_active_upgrades(mock_logging): mock_flask_request = MagicMock() mock_flask_request.get_json.return_value = { "rsu_ip": "8.8.8.8", @@ -446,24 +520,29 @@ def test_list_active_upgrades(): ) assert code == 200 + # Assert logging + mock_logging.info.assert_not_called() + mock_logging.error.assert_not_called() # check_for_upgrades tests @patch( "addons.images.firmware_manager.firmware_manager.active_upgrades", - {"8.8.8.8": fmv.upgrade_info}, + {}, ) @patch( "addons.images.firmware_manager.firmware_manager.get_rsu_upgrade_data", - MagicMock(return_value=fmv.multi_rsu_info), + MagicMock(return_value=fmv.single_rsu_info), ) @patch("addons.images.firmware_manager.firmware_manager.logging") @patch( "addons.images.firmware_manager.firmware_manager.Popen", side_effect=Exception("Process failed to start"), ) -def test_check_for_upgrades_exception(mock_popen, mock_logging): +@patch("addons.images.firmware_manager.firmware_manager.get_upgrade_limit") +def test_check_for_upgrades_exception(mock_upgrade_limit, mock_popen, mock_logging): + mock_upgrade_limit.return_value = 5 firmware_manager.check_for_upgrades() # Assert firmware upgrade process was started with expected arguments @@ -478,6 +557,13 @@ def test_check_for_upgrades_exception(mock_popen, mock_logging): # Assert the process reference is successfully tracked in the active_upgrades dictionary assert "9.9.9.9" not in firmware_manager.active_upgrades + mock_logging.info.assert_has_calls( + [ + call("Checking PostgreSQL DB for RSUs with new target firmware"), + call("Adding '9.9.9.9' to the firmware manager upgrade queue"), + call("Firmware upgrade successfully started for '9.9.9.9'") + ] + ) mock_logging.error.assert_called_with( f"Encountered error of type {Exception} while starting automatic upgrade process for 9.9.9.9: Process failed to start" ) @@ -485,7 +571,7 @@ def test_check_for_upgrades_exception(mock_popen, mock_logging): @patch( "addons.images.firmware_manager.firmware_manager.active_upgrades", - {"8.8.8.8": fmv.upgrade_info}, + {}, ) @patch( "addons.images.firmware_manager.firmware_manager.get_rsu_upgrade_data", @@ -493,14 +579,25 @@ def test_check_for_upgrades_exception(mock_popen, mock_logging): ) @patch("addons.images.firmware_manager.firmware_manager.logging") @patch("addons.images.firmware_manager.firmware_manager.start_tasks_from_queue") -def test_check_for_upgrades(mock_stfq, mock_logging): +@patch("addons.images.firmware_manager.firmware_manager.get_upgrade_limit") +def test_check_for_upgrades(mock_upgrade_limit, mock_stfq, mock_logging): + mock_upgrade_limit.return_value = 5 firmware_manager.check_for_upgrades() # Assert firmware upgrade process was started with expected arguments mock_stfq.assert_called_once_with() # Assert the process reference is successfully tracked in the active_upgrades dictionary - assert firmware_manager.upgrade_queue[0] == "9.9.9.9" + assert firmware_manager.upgrade_queue[1] == "9.9.9.9" + mock_logging.info.assert_has_calls( + [ + call("Checking PostgreSQL DB for RSUs with new target firmware"), + call("Adding '8.8.8.8' to the firmware manager upgrade queue"), + call("Firmware upgrade successfully started for '8.8.8.8'"), + call("Adding '9.9.9.9' to the firmware manager upgrade queue"), + call("Firmware upgrade successfully started for '9.9.9.9'") + ] + ) mock_logging.info.assert_called_with( "Firmware upgrade successfully started for '9.9.9.9'" ) @@ -526,3 +623,23 @@ def test_init_background_task(mock_bgscheduler): firmware_manager.check_for_upgrades, "cron", minute="0" ) mock_bgscheduler_obj.start.assert_called_with() + + +def test_get_upgrade_limit_no_env(): + limit = firmware_manager.get_upgrade_limit() + assert limit == 1 + + +@patch.dict("os.environ", {"ACTIVE_UPGRADE_LIMIT": "5"}) +def test_get_upgrade_limit_with_env(): + limit = firmware_manager.get_upgrade_limit() + assert limit == 5 + + +@patch.dict("os.environ", {"ACTIVE_UPGRADE_LIMIT": "bad_value"}) +def test_get_upgrade_limit_with_bad_env(): + with pytest.raises( + ValueError, + match="The environment variable 'ACTIVE_UPGRADE_LIMIT' must be an integer.", + ): + firmware_manager.get_upgrade_limit() diff --git a/services/addons/tests/firmware_manager/test_firmware_manager_values.py b/services/addons/tests/firmware_manager/test_firmware_manager_values.py index f1f3870ca..34648f0ca 100644 --- a/services/addons/tests/firmware_manager/test_firmware_manager_values.py +++ b/services/addons/tests/firmware_manager/test_firmware_manager_values.py @@ -65,6 +65,19 @@ }, ] +single_rsu_info = [ + { + "ipv4_address": "9.9.9.9", + "manufacturer": "Commsignia", + "model": "ITS-RS4-M", + "ssh_username": "user", + "ssh_password": "psw", + "target_firmware_id": 2, + "target_firmware_version": "y20.39.0", + "install_package": "install_package.tar", + }, +] + upgrade_info = { "process": MagicMock(), "manufacturer": "Commsignia", diff --git a/services/addons/tests/firmware_manager/test_upgrader.py b/services/addons/tests/firmware_manager/test_upgrader.py index d273b4e81..7b85a3233 100644 --- a/services/addons/tests/firmware_manager/test_upgrader.py +++ b/services/addons/tests/firmware_manager/test_upgrader.py @@ -73,7 +73,7 @@ def test_cleanup_not_exist(mock_Path, mock_shutil): @patch.dict(os.environ, {"BLOB_STORAGE_PROVIDER": "GCP"}) -@patch("addons.images.firmware_manager.upgrader.download_blob.download_gcp_blob") +@patch("common.gcs_utils.download_gcp_blob") @patch("addons.images.firmware_manager.upgrader.Path") def test_download_blob_gcp(mock_Path, mock_download_gcp_blob): mock_path_obj = mock_Path.return_value @@ -105,7 +105,7 @@ def test_download_blob_docker(mock_Path, mock_download_docker_blob): @patch.dict(os.environ, {"BLOB_STORAGE_PROVIDER": "Test"}) @patch("addons.images.firmware_manager.upgrader.logging") -@patch("addons.images.firmware_manager.upgrader.download_blob.download_gcp_blob") +@patch("common.gcs_utils.download_gcp_blob") @patch("addons.images.firmware_manager.upgrader.Path") def test_download_blob_not_supported(mock_Path, mock_download_gcp_blob, mock_logging): mock_path_obj = mock_Path.return_value @@ -129,8 +129,9 @@ def test_notify_firmware_manager_success(mock_requests, mock_logging): expected_url = "http://127.0.0.1:8080/firmware_upgrade_completed" expected_body = {"rsu_ip": "8.8.8.8", "status": "success"} mock_logging.info.assert_called_with( - "Firmware upgrade script completed with status: success" + "Firmware upgrade script completed for 8.8.8.8 with status: success" ) + mock_logging.error.assert_not_called() mock_requests.post.assert_called_with(expected_url, json=expected_body) @@ -144,8 +145,9 @@ def test_notify_firmware_manager_fail(mock_requests, mock_logging): expected_url = "http://127.0.0.1:8080/firmware_upgrade_completed" expected_body = {"rsu_ip": "8.8.8.8", "status": "fail"} mock_logging.info.assert_called_with( - "Firmware upgrade script completed with status: fail" + "Firmware upgrade script completed for 8.8.8.8 with status: fail" ) + mock_logging.error.assert_not_called() mock_requests.post.assert_called_with(expected_url, json=expected_body) @@ -161,6 +163,7 @@ def test_notify_firmware_manager_exception(mock_requests, mock_logging): "Failed to connect to the Firmware Manager API for '8.8.8.8': Exception occurred during upgrade" ) + @patch("addons.images.firmware_manager.upgrader.time") @patch("addons.images.firmware_manager.upgrader.subprocess") def test_upgrader_wait_until_online_success(mock_subprocess, mock_time): @@ -186,4 +189,4 @@ def test_upgrader_wait_until_online_timeout(mock_subprocess, mock_time): code = test_upgrader.wait_until_online() assert code == -1 - assert mock_time.sleep.call_count == 180 \ No newline at end of file + assert mock_time.sleep.call_count == 180 diff --git a/services/addons/tests/firmware_manager/test_yunex_upgrader.py b/services/addons/tests/firmware_manager/test_yunex_upgrader.py index 0108779c3..e1dc8624e 100644 --- a/services/addons/tests/firmware_manager/test_yunex_upgrader.py +++ b/services/addons/tests/firmware_manager/test_yunex_upgrader.py @@ -34,8 +34,9 @@ def test_yunex_upgrader_init(): assert test_yunex_upgrader.ssh_password == "test-psw" +@patch("addons.images.firmware_manager.yunex_upgrader.logging") @patch("addons.images.firmware_manager.yunex_upgrader.subprocess") -def test_yunex_upgrader_run_xfer_upgrade_success(mock_subprocess): +def test_yunex_upgrader_run_xfer_upgrade_success(mock_subprocess, mock_logging): run_response_obj = MagicMock() run_response_obj.returncode = 0 stdout_obj = MagicMock() @@ -49,13 +50,19 @@ def test_yunex_upgrader_run_xfer_upgrade_success(mock_subprocess): assert code == 0 + # Assert logging + mock_logging.info.assert_not_called() + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.yunex_upgrader.logging") @patch("addons.images.firmware_manager.yunex_upgrader.subprocess") -def test_yunex_upgrader_run_xfer_upgrade_fail_code(mock_subprocess): +def test_yunex_upgrader_run_xfer_upgrade_fail_code(mock_subprocess, mock_logging): run_response_obj = MagicMock() run_response_obj.returncode = 2 run_response_obj.stdout = MagicMock() run_response_obj.stderr = MagicMock() + run_response_obj.stderr.decode.return_value = "test-error" mock_subprocess.run.return_value = run_response_obj test_yunex_upgrader = YunexUpgrader(test_upgrade_info) @@ -63,15 +70,21 @@ def test_yunex_upgrader_run_xfer_upgrade_fail_code(mock_subprocess): assert code == -1 + # Assert logging + mock_logging.info.assert_not_called() + mock_logging.error.assert_called_with("Firmware not successful for 8.8.8.8: test-error") + +@patch("addons.images.firmware_manager.yunex_upgrader.logging") @patch("addons.images.firmware_manager.yunex_upgrader.subprocess") -def test_yunex_upgrader_run_xfer_upgrade_fail_output(mock_subprocess): +def test_yunex_upgrader_run_xfer_upgrade_fail_output(mock_subprocess, mock_logging): run_response_obj = MagicMock() run_response_obj.returncode = 0 stdout_obj = MagicMock() stdout_obj.decode.return_value = "\ntest\ntest\ntest\n" run_response_obj.stdout = stdout_obj run_response_obj.stderr = MagicMock() + run_response_obj.stderr.decode.return_value = "test-error" mock_subprocess.run.return_value = run_response_obj test_yunex_upgrader = YunexUpgrader(test_upgrade_info) @@ -79,7 +92,13 @@ def test_yunex_upgrader_run_xfer_upgrade_fail_output(mock_subprocess): assert code == -1 + # Assert logging + mock_logging.info.assert_not_called() + mock_logging.error.assert_called_with("Firmware not successful for 8.8.8.8: test-error") + + +@patch("addons.images.firmware_manager.yunex_upgrader.logging") @patch("addons.images.firmware_manager.yunex_upgrader.time") @patch("addons.images.firmware_manager.yunex_upgrader.json") @patch("builtins.open", new_callable=mock_open, read_data="data") @@ -88,7 +107,7 @@ def test_yunex_upgrader_run_xfer_upgrade_fail_output(mock_subprocess): return_value=MagicMock(), ) def test_yunex_upgrader_upgrade_success( - mock_tarfile_open, mock_open, mock_json, mock_time + mock_tarfile_open, mock_open, mock_json, mock_time, mock_logging ): taropen_obj = mock_tarfile_open.return_value.__enter__.return_value mock_json.load.return_value = test_upgrade_info_json @@ -124,7 +143,19 @@ def test_yunex_upgrader_upgrade_success( # Assert notified success value notify.assert_called_with(success=True) + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Unpacking TAR file prior to upgrading 8.8.8.8..."), + call("Running Core firmware upgrade for 8.8.8.8..."), + call("Running SDK firmware upgrade for 8.8.8.8..."), + call("Running application provisioning for 8.8.8.8...") + ] + ) + mock_logging.error.assert_not_called() + +@patch("addons.images.firmware_manager.yunex_upgrader.logging") @patch("addons.images.firmware_manager.yunex_upgrader.time") @patch("addons.images.firmware_manager.yunex_upgrader.json") @patch("builtins.open", new_callable=mock_open, read_data="data") @@ -133,7 +164,7 @@ def test_yunex_upgrader_upgrade_success( return_value=MagicMock(), ) def test_yunex_upgrader_core_upgrade_fail( - mock_tarfile_open, mock_open, mock_json, mock_time + mock_tarfile_open, mock_open, mock_json, mock_time, mock_logging ): taropen_obj = mock_tarfile_open.return_value.__enter__.return_value mock_json.load.return_value = test_upgrade_info_json @@ -165,7 +196,17 @@ def test_yunex_upgrader_core_upgrade_fail( # Assert notified success value notify.assert_called_with(success=False) + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Unpacking TAR file prior to upgrading 8.8.8.8..."), + call("Running Core firmware upgrade for 8.8.8.8...") + ] + ) + mock_logging.error.assert_called_with("Failed to perform firmware upgrade for 8.8.8.8: Yunex RSU Core upgrade failed") + +@patch("addons.images.firmware_manager.yunex_upgrader.logging") @patch("addons.images.firmware_manager.yunex_upgrader.time") @patch("addons.images.firmware_manager.yunex_upgrader.json") @patch("builtins.open", new_callable=mock_open, read_data="data") @@ -174,7 +215,7 @@ def test_yunex_upgrader_core_upgrade_fail( return_value=MagicMock(), ) def test_yunex_upgrader_core_ping_fail( - mock_tarfile_open, mock_open, mock_json, mock_time + mock_tarfile_open, mock_open, mock_json, mock_time, mock_logging ): taropen_obj = mock_tarfile_open.return_value.__enter__.return_value mock_json.load.return_value = test_upgrade_info_json @@ -206,7 +247,17 @@ def test_yunex_upgrader_core_ping_fail( # Assert notified success value notify.assert_called_with(success=False) + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Unpacking TAR file prior to upgrading 8.8.8.8..."), + call("Running Core firmware upgrade for 8.8.8.8...") + ] + ) + mock_logging.error.assert_called_with("Failed to perform firmware upgrade for 8.8.8.8: RSU offline for too long after Core upgrade") + +@patch("addons.images.firmware_manager.yunex_upgrader.logging") @patch("addons.images.firmware_manager.yunex_upgrader.time") @patch("addons.images.firmware_manager.yunex_upgrader.json") @patch("builtins.open", new_callable=mock_open, read_data="data") @@ -215,7 +266,7 @@ def test_yunex_upgrader_core_ping_fail( return_value=MagicMock(), ) def test_yunex_upgrader_sdk_upgrade_fail( - mock_tarfile_open, mock_open, mock_json, mock_time + mock_tarfile_open, mock_open, mock_json, mock_time, mock_logging ): taropen_obj = mock_tarfile_open.return_value.__enter__.return_value mock_json.load.return_value = test_upgrade_info_json @@ -247,7 +298,18 @@ def test_yunex_upgrader_sdk_upgrade_fail( # Assert notified success value notify.assert_called_with(success=False) + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Unpacking TAR file prior to upgrading 8.8.8.8..."), + call("Running Core firmware upgrade for 8.8.8.8..."), + call("Running SDK firmware upgrade for 8.8.8.8...") + ] + ) + mock_logging.error.assert_called_with("Failed to perform firmware upgrade for 8.8.8.8: Yunex RSU SDK upgrade failed") + +@patch("addons.images.firmware_manager.yunex_upgrader.logging") @patch("addons.images.firmware_manager.yunex_upgrader.time") @patch("addons.images.firmware_manager.yunex_upgrader.json") @patch("builtins.open", new_callable=mock_open, read_data="data") @@ -256,7 +318,7 @@ def test_yunex_upgrader_sdk_upgrade_fail( return_value=MagicMock(), ) def test_yunex_upgrader_sdk_ping_fail( - mock_tarfile_open, mock_open, mock_json, mock_time + mock_tarfile_open, mock_open, mock_json, mock_time, mock_logging ): taropen_obj = mock_tarfile_open.return_value.__enter__.return_value mock_json.load.return_value = test_upgrade_info_json @@ -288,7 +350,18 @@ def test_yunex_upgrader_sdk_ping_fail( # Assert notified success value notify.assert_called_with(success=False) + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Unpacking TAR file prior to upgrading 8.8.8.8..."), + call("Running Core firmware upgrade for 8.8.8.8..."), + call("Running SDK firmware upgrade for 8.8.8.8...") + ] + ) + mock_logging.error.assert_called_with("Failed to perform firmware upgrade for 8.8.8.8: RSU offline for too long after SDK upgrade") + +@patch("addons.images.firmware_manager.yunex_upgrader.logging") @patch("addons.images.firmware_manager.yunex_upgrader.time") @patch("addons.images.firmware_manager.yunex_upgrader.json") @patch("builtins.open", new_callable=mock_open, read_data="data") @@ -297,7 +370,7 @@ def test_yunex_upgrader_sdk_ping_fail( return_value=MagicMock(), ) def test_yunex_upgrader_provision_upgrade_fail( - mock_tarfile_open, mock_open, mock_json, mock_time + mock_tarfile_open, mock_open, mock_json, mock_time, mock_logging ): taropen_obj = mock_tarfile_open.return_value.__enter__.return_value mock_json.load.return_value = test_upgrade_info_json @@ -332,3 +405,14 @@ def test_yunex_upgrader_provision_upgrade_fail( # Assert notified success value notify.assert_called_with(success=False) + + # Assert logging + mock_logging.info.assert_has_calls( + [ + call("Unpacking TAR file prior to upgrading 8.8.8.8..."), + call("Running Core firmware upgrade for 8.8.8.8..."), + call("Running SDK firmware upgrade for 8.8.8.8..."), + call("Running application provisioning for 8.8.8.8...") + ] + ) + mock_logging.error.assert_called_with("Failed to perform firmware upgrade for 8.8.8.8: Yunex RSU application provisioning upgrade failed") diff --git a/services/addons/tests/iss_health_check/test_iss_token.py b/services/addons/tests/iss_health_check/test_iss_token.py index 37c73eaa5..348f388f4 100644 --- a/services/addons/tests/iss_health_check/test_iss_token.py +++ b/services/addons/tests/iss_health_check/test_iss_token.py @@ -8,6 +8,7 @@ # --------------------- Storage Type tests --------------------- + @patch.dict( os.environ, { @@ -63,18 +64,14 @@ def test_get_storage_type_invalid(): iss_token.get_storage_type() -@patch.dict( - os.environ, - { - - }, -) +@patch.dict(os.environ, {}, clear=True) def test_get_storage_type_unset(): with pytest.raises(SystemExit): iss_token.get_storage_type() + # --------------------- end of Storage Type tests --------------------- - + # --------------------- GCP tests --------------------- @patch( @@ -303,20 +300,20 @@ def test_get_token_secret_exists( # Assert final value assert actual_value == expected_value + # --------------------- end of GCP tests --------------------- - + # --------------------- Postgres tests --------------------- + @patch( "addons.images.iss_health_check.iss_token.pgquery", ) def test_check_if_data_exists_true(mock_pgquery): mock_pgquery.query_db.return_value = [(1,)] actual_value = iss_token.check_if_data_exists("test-table-name") - expected_query = ( - "SELECT * FROM test-table-name" - ) + expected_query = "SELECT * FROM test-table-name" mock_pgquery.query_db.assert_called_with(expected_query) assert actual_value == True @@ -327,9 +324,7 @@ def test_check_if_data_exists_true(mock_pgquery): def test_check_if_data_exists_false(mock_pgquery): mock_pgquery.query_db.return_value = [] actual_value = iss_token.check_if_data_exists("test-table-name") - expected_query = ( - "SELECT * FROM test-table-name" - ) + expected_query = "SELECT * FROM test-table-name" mock_pgquery.query_db.assert_called_with(expected_query) assert actual_value == False @@ -352,9 +347,7 @@ def test_add_data(mock_pgquery): def test_get_latest_data(mock_pgquery): mock_pgquery.query_db.return_value = [(1, "test-common-name", "test-token")] actual_value = iss_token.get_latest_data("test-table-name") - expected_query = ( - "SELECT * FROM test-table-name ORDER BY iss_key_id DESC LIMIT 1" - ) + expected_query = "SELECT * FROM test-table-name ORDER BY iss_key_id DESC LIMIT 1" mock_pgquery.query_db.assert_called_with(expected_query) assert actual_value == {"id": 1, "name": "test-common-name", "token": "test-token"} @@ -437,7 +430,7 @@ def test_get_token_data_exists( ): # Mock every major dependency mock_check_if_data_exists.return_value = True - mock_get_latest_data.return_value = { + mock_get_latest_data.return_value = { "id": 1, "name": "test-api-key-name_01234", "token": "old-token", @@ -475,4 +468,5 @@ def test_get_token_data_exists( # Assert final value assert result == "new-iss-token" -# --------------------- end of Postgres tests --------------------- \ No newline at end of file + +# --------------------- end of Postgres tests --------------------- diff --git a/services/addons/tests/obu_ota_server/test_commsignia_manifest.py b/services/addons/tests/obu_ota_server/test_commsignia_manifest.py new file mode 100644 index 000000000..f15add07e --- /dev/null +++ b/services/addons/tests/obu_ota_server/test_commsignia_manifest.py @@ -0,0 +1,58 @@ +import pytest +import unittest.mock as mock +from addons.images.obu_ota_server.commsignia_manifest import add_contents + + +def test_add_contents(): + # Mock server and firmware_list + server = "http://localhost" + firmware_list = [ + "/path/to/ob4-generic-ro-secureboot-yZZ.XX.YY-b012345.tar.sig", + "/path/to/ob4-generic-ro-secureboot-yZZ.XX.YY-b012346.tar.sig", + "/path/to/bad-firmware-file-name.tar.sig", + ] + + # Mock os.path and os.stat + with mock.patch("os.path.getmtime", return_value=1633022452), mock.patch( + "os.stat", return_value=mock.Mock(st_size=1024) + ): + + # Call the function with the mock data + manifest = add_contents(server, firmware_list) + + # Check the manifest content + assert manifest["totalElements"] == 2 + assert manifest["numberOfElements"] == 2 + assert len(manifest["content"]) == 2 + + # Check the content of the first firmware + assert ( + manifest["content"][0]["name"] + == "ob4-generic-ro-secureboot-yZZ.XX.YY-b012345.tar.sig" + ) + assert manifest["content"][0]["size"] == 1024 + + # Check the content of the second firmware + assert ( + manifest["content"][1]["name"] + == "ob4-generic-ro-secureboot-yZZ.XX.YY-b012346.tar.sig" + ) + assert manifest["content"][1]["size"] == 1024 + + +def test_add_contents_max_firmwares(): + # Mock server and firmware_list with more firmwares than the size of the manifest + server = "http://localhost" + firmware_list = [ + f"/path/to/ob4-generic-ro-secureboot-yZZ.XX.YY-b{i}.tar.sig" + for i in range(1, 35) + ] + + # Mock os.path and os.stat + with mock.patch("os.path.getmtime", return_value=1633022452), mock.patch( + "os.stat", return_value=mock.Mock(st_size=1024) + ): + + # Call the function with the mock data and check if it raises an AttributeError + with pytest.raises(AttributeError): + add_contents(server, firmware_list) diff --git a/services/addons/tests/obu_ota_server/test_obu_ota_server.py b/services/addons/tests/obu_ota_server/test_obu_ota_server.py new file mode 100644 index 000000000..ea41e3cc6 --- /dev/null +++ b/services/addons/tests/obu_ota_server/test_obu_ota_server.py @@ -0,0 +1,322 @@ +import pytest +import tempfile +import os +from httpx import AsyncClient, BasicAuth +from fastapi import HTTPException, Request +from unittest.mock import patch, MagicMock +from datetime import datetime + +from addons.images.obu_ota_server.obu_ota_server import ( + get_firmware_list, + get_firmware, + parse_range_header, + read_file, + log_request, + removed_old_logs, + app, +) + + +@patch("os.getenv") +@patch("glob.glob") +def test_get_firmware_list_local(mock_glob, mock_getenv): + mock_getenv.return_value = "DOCKER" + mock_glob.return_value = ["/firmwares/test1.tar.sig", "/firmwares/test2.tar.sig"] + + result = get_firmware_list() + + mock_getenv.assert_called_once_with("BLOB_STORAGE_PROVIDER", "DOCKER") + mock_glob.assert_called_once_with("/firmwares/*.tar.sig") + assert result == ["/firmwares/test1.tar.sig", "/firmwares/test2.tar.sig"] + + +@patch("os.getenv") +@patch("common.gcs_utils.list_gcs_blobs") +def test_get_firmware_list_gcs(mock_list_gcs_blobs, mock_getenv): + mock_getenv.return_value = "GCP" + mock_list_gcs_blobs.return_value = [ + "/firmwares/test1.tar.sig", + "/firmwares/test2.tar.sig", + ] + + result = get_firmware_list() + + # mock_getenv.assert_called_once_with("BLOB_STORAGE_PROVIDER", "DOCKER") + mock_list_gcs_blobs.assert_called_once_with("GCP", ".tar.sig") + assert result == ["/firmwares/test1.tar.sig", "/firmwares/test2.tar.sig"] + + +@patch("os.getenv") +@patch("os.path.exists") +@patch("common.gcs_utils.list_gcs_blobs") +def test_get_firmware_local_fail(mock_gcs_utils, mock_os_path_exists, mock_os_getenv): + mock_os_getenv.return_value = "DOCKER" + mock_os_path_exists.return_value = False + + firmware_id = "test_firmware_id" + local_file_path = "test_local_file_path" + result = get_firmware(firmware_id, local_file_path) + + mock_os_getenv.assert_called_once_with("BLOB_STORAGE_PROVIDER", "DOCKER") + mock_os_path_exists.assert_called_once_with(local_file_path) + mock_gcs_utils.assert_not_called() + + assert result == False + + +@patch("os.getenv") +@patch("os.path.exists") +@patch("common.gcs_utils.list_gcs_blobs") +def test_get_firmware_local_success( + mock_gcs_utils, mock_os_path_exists, mock_os_getenv +): + mock_os_getenv.return_value = "DOCKER" + mock_os_path_exists.return_value = True + + firmware_id = "test_firmware_id" + local_file_path = "test_local_file_path" + result = get_firmware(firmware_id, local_file_path) + + mock_os_getenv.assert_called_once_with("BLOB_STORAGE_PROVIDER", "DOCKER") + mock_os_path_exists.assert_called_once_with(local_file_path) + mock_gcs_utils.assert_not_called() + + assert result == True + + +@patch("os.getenv") +@patch("os.path.exists") +@patch("common.gcs_utils.download_gcp_blob") +def test_get_firmware_gcs_success( + mock_download_gcp_blob, mock_os_path_exists, mock_os_getenv +): + mock_os_getenv.return_value = "GCP" + mock_os_path_exists.return_value = False + mock_download_gcp_blob.return_value = True + + firmware_id = "test_firmware_id" + local_file_path = "test_local_file_path" + result = get_firmware(firmware_id, local_file_path) + + mock_os_getenv.assert_called_with("BLOB_STORAGE_PROVIDER", "DOCKER") + mock_os_path_exists.assert_called_with(local_file_path) + mock_download_gcp_blob.assert_called_once_with(firmware_id, local_file_path) + + assert result == True + + +@patch("os.getenv") +@patch("os.path.exists") +@patch("common.gcs_utils.download_gcp_blob") +def test_get_firmware_gcs_failure( + mock_download_gcp_blob, mock_os_path_exists, mock_os_getenv +): + mock_os_getenv.return_value = "GCP" + mock_os_path_exists.return_value = False + mock_download_gcp_blob.return_value = False + + firmware_id = "test_firmware_id" + local_file_path = "test_local_file_path" + result = get_firmware(firmware_id, local_file_path) + + mock_os_getenv.assert_called_with("BLOB_STORAGE_PROVIDER", "DOCKER") + mock_os_path_exists.assert_called_with(local_file_path) + mock_download_gcp_blob.assert_called_once_with(firmware_id, local_file_path) + + assert result == False + + +def test_parse_range_header_valid(): + assert parse_range_header(None) == (0, None) + assert parse_range_header("bytes=0-499") == (0, 499) + assert parse_range_header("bytes=500-") == (500, None) + + +def test_parse_range_header_invalid(): + with pytest.raises(HTTPException) as excinfo: + parse_range_header("invalid range header") + assert str(excinfo.value) == "400: Invalid Range header" + + with pytest.raises(HTTPException) as excinfo: + parse_range_header("bytes=0-abc") + assert str(excinfo.value) == "400: Invalid Range header" + + with pytest.raises(HTTPException) as excinfo: + parse_range_header("bytes=-500") + assert str(excinfo.value) == "400: Invalid Range header" + + with pytest.raises(HTTPException) as excinfo: + parse_range_header("bytes=500-499") + assert ( + str(excinfo.value) + == "400: Invalid Range header: start cannot be greater than end" + ) + + +@pytest.mark.asyncio +async def test_read_file(): + with tempfile.NamedTemporaryFile(delete=False) as temp: + temp.write(b"Test data") + temp_path = temp.name + + data, file_size, end = await read_file(temp_path, 0, 9) + + assert data == b"Test data" + assert file_size == 9 + assert end == 9 + + # Clean up the temporary file + os.remove(temp_path) + + +@pytest.mark.asyncio +async def test_read_file_failure(): + with pytest.raises(HTTPException) as excinfo: + data, file_size, end = await read_file("fake_path", 0, 9) + assert str(excinfo.value) == "500: Error reading file" + + +@pytest.mark.asyncio +async def test_read_file_no_end_range(): + with tempfile.NamedTemporaryFile(delete=False) as temp: + temp.write(b"Test data") + temp_path = temp.name + + data, file_size, end = await read_file(temp_path, 0, None) + + assert data == b"Test data" + assert file_size == 9 + assert end == 9 + + # Clean up the temporary file + os.remove(temp_path) + + +@patch.dict("os.environ", {"OTA_USERNAME": "username", "OTA_PASSWORD": "password"}) +@pytest.mark.anyio +async def test_read_root(): + async with AsyncClient(app=app, base_url="http://test") as ac: + response = await ac.get("/") + assert response.status_code == 200 + assert response.json() == {"message": "obu ota server healthcheck", "root_path": ""} + + +@patch.dict("os.environ", {"OTA_USERNAME": "username", "OTA_PASSWORD": "password"}) +@pytest.mark.anyio +@patch("addons.images.obu_ota_server.obu_ota_server.get_firmware_list") +@patch("addons.images.obu_ota_server.obu_ota_server.commsignia_manifest.add_contents") +async def test_get_manifest(mock_commsignia_manifest, mock_get_firmware_list): + mock_get_firmware_list.return_value = [ + "/firmwares/test1.tar.sig", + "/firmwares/test2.tar.sig", + ] + mock_commsignia_manifest.return_value = {"json": "data"} + async with AsyncClient(app=app, base_url="http://test") as ac: + response = await ac.get( + "/firmwares/commsignia", auth=BasicAuth("username", "password") + ) + assert response.status_code == 200 + assert response.json() == {"json": "data"} + + +@patch.dict("os.environ", {"OTA_USERNAME": "username", "OTA_PASSWORD": "password"}) +@pytest.mark.anyio +@patch("addons.images.obu_ota_server.obu_ota_server.get_firmware") +@patch("addons.images.obu_ota_server.obu_ota_server.parse_range_header") +@patch("addons.images.obu_ota_server.obu_ota_server.read_file") +async def test_get_fw(mock_read_file, mock_parse_range_header, mock_get_firmware): + mock_get_firmware.return_value = True + mock_parse_range_header.return_value = 0, 100 + mock_read_file.return_value = b"Test data", 100, 100 + async with AsyncClient(app=app, base_url="http://test") as ac: + response = await ac.get( + "/firmwares/commsignia/test_firmware_id", + auth=BasicAuth("username", "password"), + ) + assert response.status_code == 200 + assert response.content == b"Test data" + assert response.headers["Content-Length"] == "100" + + +@pytest.mark.asyncio +@patch("addons.images.obu_ota_server.obu_ota_server.pgquery") +@patch("addons.images.obu_ota_server.obu_ota_server.datetime") +@patch("addons.images.obu_ota_server.obu_ota_server.removed_old_logs") +async def test_log_request(mock_removed_old_logs, mock_datetime, mock_pgquery): + fixed_datetime = datetime(2024, 7, 30, 0, 0, 0) + mock_datetime.now.return_value = fixed_datetime + mock_datetime.strftime = datetime.strftime + # Create a mock request object + mock_request = MagicMock(spec=Request) + mock_request.query_params = { + "serialnum": "111111111111", + "version": "y11.11.1-b11111", + } + mock_request.client.host = "127.0.0.1" + + # Call the log_request function + manufacturer = 1 + firmware_id = "test_firmware" + error_status = 0 + error_message = "" + + await log_request( + manufacturer, mock_request, firmware_id, error_status, error_message + ) + + # Verify the query passed to write_db + expected_query = ( + f"INSERT INTO public.obu_ota_requests (obu_sn, manufacturer, request_datetime, origin_ip, obu_firmware_version, requested_firmware_version, error_status, error_message) VALUES" + f"('{mock_request.query_params['serialnum']}', {manufacturer}, '{fixed_datetime.strftime('%Y-%m-%d %H:%M:%S')}', '{mock_request.client.host}', '{mock_request.query_params['version']}', '{firmware_id}', B'{error_status}', '{error_message}')" + ).replace(" ", "") + + actual_query = mock_pgquery.write_db.call_args[0][0].replace(" ", "") + + assert expected_query == actual_query + + mock_removed_old_logs.assert_called_once_with( + mock_request.query_params["serialnum"] + ) + + +@patch.dict("os.environ", {"MAX_COUNT": "10"}) +@patch("addons.images.obu_ota_server.obu_ota_server.pgquery") +def test_removed_old_logs_no_removal(mock_pgquery): + mock_pgquery.query_db.side_effect = [ + [(5,)], # success_count + ] + + serialnum = "test_serialnum" + removed_old_logs(serialnum) + + mock_pgquery.query_db.assert_called_once_with( + f"SELECT COUNT(*) FROM public.obu_ota_requests WHERE obu_sn = '{serialnum}' AND error_status = B'0'" + ) + mock_pgquery.write_db.assert_not_called() + + +@patch.dict("os.environ", {"MAX_COUNT": "5"}) +@patch("addons.images.obu_ota_server.obu_ota_server.pgquery") +def test_removed_old_logs_with_removal(mock_pgquery): + mock_pgquery.query_db.side_effect = [ + [(10,)], # success_count + [(1,), (2,), (3,), (4,), (5,)], # oldest_entries + ] + + serialnum = "test_serialnum" + removed_old_logs(serialnum) + + assert mock_pgquery.query_db.call_count == 2 + mock_pgquery.query_db.assert_any_call( + f"SELECT COUNT(*) FROM public.obu_ota_requests WHERE obu_sn = '{serialnum}' AND error_status = B'0'" + ) + mock_pgquery.query_db.assert_any_call( + f"SELECT request_id FROM public.obu_ota_requests WHERE obu_sn = '{serialnum}' AND error_status = B'0' ORDER BY request_datetime ASC LIMIT 5" + ) + mock_pgquery.write_db.assert_called_once_with( + "DELETE FROM public.obu_ota_requests WHERE request_id IN (1,2,3,4,5)" + ) + + +if __name__ == "__main__": + pytest.main() diff --git a/services/addons/tests/rsu_status_check/test_rsu_pinger.py b/services/addons/tests/rsu_status_check/test_rsu_pinger.py index 1066fb02e..b056dfbab 100644 --- a/services/addons/tests/rsu_status_check/test_rsu_pinger.py +++ b/services/addons/tests/rsu_status_check/test_rsu_pinger.py @@ -36,8 +36,8 @@ def test_ping_rsu_ips_online(mock_Popen): expected_result = {1: "1", 2: "1"} mock_Popen.assert_has_calls( [ - call(["ping", "-n", "-w5", "-c3", "1.1.1.1"], stdout=DEVNULL), - call(["ping", "-n", "-w5", "-c3", "2.2.2.2"], stdout=DEVNULL), + call(["ping", "-n", "-w20", "-c1", "1.1.1.1"], stdout=DEVNULL), + call(["ping", "-n", "-w20", "-c1", "2.2.2.2"], stdout=DEVNULL), ] ) assert mock_p.poll.call_count == len(rsu_list) # 2 @@ -59,8 +59,8 @@ def test_ping_rsu_ips_offline(mock_Popen): expected_result = {1: "0", 2: "0"} mock_Popen.assert_has_calls( [ - call(["ping", "-n", "-w5", "-c3", "1.1.1.1"], stdout=DEVNULL), - call(["ping", "-n", "-w5", "-c3", "2.2.2.2"], stdout=DEVNULL), + call(["ping", "-n", "-w20", "-c1", "1.1.1.1"], stdout=DEVNULL), + call(["ping", "-n", "-w20", "-c1", "2.2.2.2"], stdout=DEVNULL), ] ) assert mock_p.poll.call_count == len(rsu_list) # 2 diff --git a/services/api/README.md b/services/api/README.md index ba1ad8c68..d85b9a9b3 100644 --- a/services/api/README.md +++ b/services/api/README.md @@ -32,6 +32,11 @@ Example return value: - {"name": "John Doe", "email": "jdoe@gmail.com", "role": "admin"} +### /contact-support (POST) + +Sends a support request email to all users subscribed to 'Support Requests' in the cv-manager. Please note that this functionality +relies on the user_email_notification table in PostgreSQL to pull in all users subscribed to receive these notifications. + ### /rsuinfo (GET) Returns all basic data for RSUs in the GCP Cloud SQL database. It performs a basic select all query from a table named "RsuData" that is located in a database specified by the environments variables. Returns single JSON object. @@ -168,7 +173,6 @@ body example: "first_name": "John", "last_name": "Doe", "super_user": True, - "receive_error_emails": True, "organizations": [ {"name": "Test Org", "role": "operator"} ] @@ -197,7 +201,6 @@ body example: "first_name": "John", "last_name": "Doe", "super_user": True, - "receive_error_emails": True, "organizations_to_add": [ {"name": "Test Org3", "role": "admin"} ], @@ -312,7 +315,6 @@ HTTP URL Arguments: - CSM_EMAIL_TO_SEND_FROM: Origin email address for the API. - CSM_EMAIL_APP_USERNAME: Username for the SMTP server. - CSM_EMAIL_APP_PASSWORD: Password for the SMTP server. -- CSM_EMAILS_TO_SEND_TO: Destination email list. - CSM_TARGET_SMTP_SERVER_ADDRESS: Destination SMTP server address. - CSM_TARGET_SMTP_SERVER_PORT: Destination SMTP server port. - WZDX_ENDPOINT: WZDX datafeed enpoint. diff --git a/services/api/sample.env b/services/api/sample.env index c42114959..298d32dfb 100644 --- a/services/api/sample.env +++ b/services/api/sample.env @@ -50,14 +50,14 @@ WZDX_ENDPOINT = CSM_EMAIL_TO_SEND_FROM= CSM_EMAIL_APP_USERNAME= CSM_EMAIL_APP_PASSWORD= -CSM_EMAILS_TO_SEND_TO= CSM_TARGET_SMTP_SERVER_ADDRESS= CSM_TARGET_SMTP_SERVER_PORT= +CSM_TLS_ENABLED=true +CSM_AUTH_ENABLED=true # Error Email Contact Configuration LOGS_LINK= #URL to logs for api, included in error email. Example: https://console.cloud.google.com/run/detail/us-central1/rsu-manager-cloud-run-api/logs?authuser=1&project=cdot-oim-cv-dev ENVIRONMENT_NAME= #Environment name, just to display in email. Example: cdot-oim-cv-dev -ERROR_EMAIL_UNSUBSCRIBE_LINK= #URL to unsubscribe user, as Python format string to insert {email}. Example: https://...api.../unsubscribe-error-emails/{email}>\ # Python timezone for the CV Manager (You can list pytz timezones with the command 'pytz.all_timezones') TIMEZONE="US/Mountain" diff --git a/services/api/src/admin_email_notification.py b/services/api/src/admin_email_notification.py new file mode 100644 index 000000000..627be56b4 --- /dev/null +++ b/services/api/src/admin_email_notification.py @@ -0,0 +1,181 @@ +import logging +import common.pgquery as pgquery +import sqlalchemy +import os + + +def get_notification_data(user_email): + query = ( + "SELECT to_jsonb(row) " + "FROM (" + "SELECT u.email, u.first_name, u.last_name, e.email_type " + "FROM public.user_email_notification " + "JOIN public.users AS u ON u.user_id = user_email_notification.user_id " + "JOIN public.email_type AS e ON e.email_type_id = user_email_notification.email_type_id " + f"WHERE user_email_notification.user_id IN (SELECT user_id FROM public.users WHERE email = '{user_email}')" + ") as row" + ) + + data = pgquery.query_db(query) + + notification_dict = {} + for row in data: + row = dict(row[0]) + notification_dict[row["email_type"]] = { + "email": row["email"], + "first_name": row["first_name"], + "last_name": row["last_name"], + "email_type": row["email_type"], + } + + notification_list = list(notification_dict.values()) + # If list is empty and a single user was requested, return empty object + if len(notification_list) == 0: + return [] + else: + return notification_list + + +def get_modify_notification_data(user_email): + modify_notification_obj = {} + modify_notification_obj["notification_data"] = get_notification_data(user_email) + return modify_notification_obj + + +def check_safe_input(notification_spec): + special_characters = "!\"#$%&'()*+,./:;<=>?@[\\]^`{|}~" + special_characters_email = "!\"#$%&'()*+,/:;<=>?[\\]^`{|}~" + # Check all string based fields for special characters + if ( + any(c in special_characters_email for c in notification_spec["email"]) + or "--" in notification_spec["email"] + ): + return False + if ( + any(c in special_characters for c in notification_spec["old_email_type"]) + or "--" in notification_spec["old_email_type"] + ): + return False + if ( + any(c in special_characters for c in notification_spec["new_email_type"]) + or "--" in notification_spec["new_email_type"] + ): + return False + return True + + +def modify_notification(notification_spec): + # Check for special characters for potential SQL injection + if not check_safe_input(notification_spec): + return { + "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\\]^`{|}~. No sequences of '-' characters are allowed" + }, 500 + + try: + # Modify the existing user data + query = ( + "UPDATE public.user_email_notification SET " + f"email_type_id = (SELECT email_type_id FROM public.email_type WHERE email_type = '{notification_spec['new_email_type']}') " + f"WHERE user_id = (SELECT user_id FROM public.users WHERE email = '{notification_spec['email']}') " + f"AND email_type_id = (SELECT email_type_id FROM public.email_type WHERE email_type = '{notification_spec['old_email_type']}')" + ) + pgquery.write_db(query) + + except sqlalchemy.exc.IntegrityError as e: + failed_value = e.orig.args[0]["D"] + failed_value = failed_value.replace("(", '"') + failed_value = failed_value.replace(")", '"') + failed_value = failed_value.replace("=", " = ") + logging.error(f"Exception encountered: {failed_value}") + return {"message": failed_value}, 500 + except Exception as e: + logging.error(f"Exception encountered: {e}") + return {"message": "Encountered unknown issue"}, 500 + + return {"message": "Email notification successfully modified"}, 200 + + +def delete_notification(user_email, email_type): + notification_remove_query = ( + "DELETE FROM public.user_email_notification WHERE " + f"user_id IN (SELECT user_id FROM public.users WHERE email = '{user_email}') " + f"AND email_type_id IN (SELECT email_type_id FROM public.email_type WHERE email_type = '{email_type}')" + ) + pgquery.write_db(notification_remove_query) + + return {"message": "Email notification successfully deleted"} + + +# REST endpoint resource class +from flask import request, abort +from flask_restful import Resource +from marshmallow import Schema, fields +import urllib.request + + +class AdminNotificationGetSchema(Schema): + user_email = fields.Str(required=True) + + +class AdminNotificationDeleteSchema(Schema): + email = fields.Str(required=True) + email_type = fields.Str(required=True) + + +class AdminNotificationPatchSchema(Schema): + email = fields.Str(required=True) + old_email_type = fields.Str(required=True) + new_email_type = fields.Str(required=True) + + +class AdminNotification(Resource): + options_headers = { + "Access-Control-Allow-Origin": os.environ["CORS_DOMAIN"], + "Access-Control-Allow-Headers": "Content-Type,Authorization", + "Access-Control-Allow-Methods": "GET,PATCH,DELETE", + "Access-Control-Max-Age": "3600", + } + + headers = { + "Access-Control-Allow-Origin": os.environ["CORS_DOMAIN"], + "Content-Type": "application/json", + } + + def options(self): + # CORS support + return ("", 204, self.options_headers) + + def get(self): + logging.debug("AdminNotification GET requested") + schema = AdminNotificationGetSchema() + errors = schema.validate(request.args) + if errors: + logging.error(errors) + abort(400, errors) + + user_email = urllib.request.unquote(request.args["user_email"]) + return (get_modify_notification_data(user_email), 200, self.headers) + + def patch(self): + logging.debug("AdminUser PATCH requested") + # Check for main body values + schema = AdminNotificationPatchSchema() + errors = schema.validate(request.json) + if errors: + logging.error(str(errors)) + abort(400, str(errors)) + + data, code = modify_notification(request.json) + return (data, code, self.headers) + + def delete(self): + logging.debug("AdminNotification DELETE requested") + schema = AdminNotificationDeleteSchema() + errors = schema.validate(request.args) + if errors: + logging.error(errors) + abort(400, errors) + + user_email = urllib.request.unquote(request.args["email"]) + email_type = urllib.request.unquote(request.args["email_type"]) + return (delete_notification(user_email, email_type), 200, self.headers) diff --git a/services/api/src/admin_new_email_notification.py b/services/api/src/admin_new_email_notification.py new file mode 100644 index 000000000..db9cb719e --- /dev/null +++ b/services/api/src/admin_new_email_notification.py @@ -0,0 +1,128 @@ +import logging +import common.pgquery as pgquery +import sqlalchemy +import os + + +def query_and_return_list(query): + data = pgquery.query_db(query) + return_list = [] + for row in data: + return_list.append(" ".join(row)) + return return_list + + +def get_allowed_types(user_email): + allowed = {} + + email_types_query = ( + "SELECT email_type FROM public.email_type WHERE email_type_id NOT IN (" + "SELECT email_type_id FROM public.user_email_notification WHERE user_id =" + f"(SELECT user_id FROM public.users WHERE email = '{user_email}'))" + ) + + allowed["email_types"] = query_and_return_list(email_types_query) + + return allowed + + +def check_safe_input(notification_spec): + special_characters = "!\"#$%&'()*+,./:;<=>?@[\\]^`{|}~" + special_characters_email = "!\"#$%&'()*+,/:;<=>?[\\]^`{|}~" + # Check all string based fields for special characters + if ( + any(c in special_characters_email for c in notification_spec["email"]) + or "--" in notification_spec["email"] + ): + return False + if ( + any(c in special_characters for c in notification_spec["email_type"]) + or "--" in notification_spec["email_type"] + ): + return False + return True + + +def add_notification(notification_spec): + # Check for special characters for potential SQL injection + if not check_safe_input(notification_spec): + return { + "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\\]^`{|}~. No sequences of '-' characters are allowed" + }, 500 + try: + notification_insert_query = ( + "INSERT into public.user_email_notification(user_id, email_type_id) VALUES (" + f"(SELECT user_id FROM public.users WHERE email='{notification_spec['email']}'), " + f"(SELECT email_type_id FROM public.email_type WHERE email_type='{notification_spec['email_type']}'))" + ) + pgquery.write_db(notification_insert_query) + + except sqlalchemy.exc.IntegrityError as e: + failed_value = e.orig.args[0]["D"] + failed_value = failed_value.replace("(", '"') + failed_value = failed_value.replace(")", '"') + failed_value = failed_value.replace("=", " = ") + logging.error(f"Exception encountered: {failed_value}") + return {"message": failed_value}, 500 + except Exception as e: + logging.error(f"Exception encountered: {e}") + return {"message": "Encountered unknown issue"}, 500 + + return {"message": "New email notification successfully added"}, 200 + + +# REST endpoint resource class +from flask import request, abort +from flask_restful import Resource +from marshmallow import Schema, fields +import urllib.request + + +class AdminNewNotificationSchema(Schema): + email = fields.Str(required=True) + email_type = fields.Str(required=True) + + +class AdminGetNotificationSchema(Schema): + user_email = fields.Str(required=True) + + +class AdminNewNotification(Resource): + options_headers = { + "Access-Control-Allow-Origin": os.environ["CORS_DOMAIN"], + "Access-Control-Allow-Headers": "Content-Type,Authorization", + "Access-Control-Allow-Methods": "GET,POST", + "Access-Control-Max-Age": "3600", + } + + headers = { + "Access-Control-Allow-Origin": os.environ["CORS_DOMAIN"], + "Content-Type": "application/json", + } + + def options(self): + # CORS support + return ("", 204, self.options_headers) + + def get(self): + logging.debug("AdminNewNotification GET requested") + # Check for main body values + schema = AdminGetNotificationSchema() + errors = schema.validate(request.args) + if errors: + logging.error(str(errors)) + abort(400, str(errors)) + user_email = urllib.request.unquote(request.args["user_email"]) + return (get_allowed_types(user_email), 200, self.headers) + + def post(self): + logging.debug("AdminNewNotification POST requested") + # Check for main body values + schema = AdminNewNotificationSchema() + errors = schema.validate(request.json) + if errors: + logging.error(str(errors)) + abort(400, str(errors)) + + data, code = add_notification(request.json) + return (data, code, self.headers) diff --git a/services/api/src/admin_new_org.py b/services/api/src/admin_new_org.py index 24ec3b209..38ad7f883 100644 --- a/services/api/src/admin_new_org.py +++ b/services/api/src/admin_new_org.py @@ -2,10 +2,11 @@ import common.pgquery as pgquery import sqlalchemy import os +import admin_new_user def check_safe_input(org_spec): - special_characters = "!\"#$%&'()*@-+,./:;<=>?[\]^`{|}~" + special_characters = "!\"#$%&'()*@-+,./:;<=>?[\\]^`{|}~" # Check all string based fields for special characters if any(c in special_characters for c in org_spec["name"]): return False @@ -16,12 +17,19 @@ def add_organization(org_spec): # Check for special characters for potential SQL injection if not check_safe_input(org_spec): return { - "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\]^`{|}~. No sequences of '-' characters are allowed" + "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\\]^`{|}~. No sequences of '-' characters are allowed" }, 500 + if org_spec["email"]: + if org_spec["email"] != "" and not admin_new_user.check_email( + org_spec["email"] + ): + return {"message": "Organization email is not valid"}, 500 + try: org_insert_query = ( - "INSERT INTO public.organizations(name) " f"VALUES ('{org_spec['name']}')" + "INSERT INTO public.organizations(name, email) " + f"VALUES ('{org_spec['name']}', '{org_spec['email']}')" ) pgquery.write_db(org_insert_query) except sqlalchemy.exc.IntegrityError as e: @@ -46,6 +54,7 @@ def add_organization(org_spec): class AdminNewOrgSchema(Schema): name = fields.Str(required=True) + email = fields.Str(required=True, allow_none=True) class AdminNewOrg(Resource): diff --git a/services/api/src/admin_new_rsu.py b/services/api/src/admin_new_rsu.py index 0b3d890ff..7c8f0658f 100644 --- a/services/api/src/admin_new_rsu.py +++ b/services/api/src/admin_new_rsu.py @@ -50,7 +50,7 @@ def get_allowed_selections(): def check_safe_input(rsu_spec): - special_characters = "!\"#$%&'()*+,./:;<=>?@[\]^`{|}~" + special_characters = "!\"#$%&'()*+,./:;<=>?@[\\]^`{|}~" # Check all string based fields for special characters if ( any(c in special_characters for c in rsu_spec["primary_route"]) @@ -89,7 +89,7 @@ def add_rsu(rsu_spec): # Check for special characters for potential SQL injection if not check_safe_input(rsu_spec): return { - "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\]^`{|}~. No sequences of '-' characters are allowed" + "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\\]^`{|}~. No sequences of '-' characters are allowed" }, 500 # Parse model out of the "Manufacturer Model" string diff --git a/services/api/src/admin_new_user.py b/services/api/src/admin_new_user.py index 3590d006b..cd2e68013 100644 --- a/services/api/src/admin_new_user.py +++ b/services/api/src/admin_new_user.py @@ -32,7 +32,7 @@ def check_email(email): "%%", "&&", "''", - "\\", + "\\\\", "**", "++", "--", @@ -65,7 +65,7 @@ def check_email(email): def check_safe_input(user_spec): - special_characters = "!\"#$%&'()*@-+,./:;<=>?[\]^`{|}~" + special_characters = "!\"#$%&'()*@-+,./:;<=>?[\\]^`{|}~" # Check all string based fields for special characters if any(c in special_characters for c in user_spec["first_name"]): return False @@ -85,13 +85,13 @@ def add_user(user_spec): return {"message": "Email is not valid"}, 500 if not check_safe_input(user_spec): return { - "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\]^`{|}~. No sequences of '-' characters are allowed" + "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\\]^`{|}~. No sequences of '-' characters are allowed" }, 500 try: user_insert_query = ( - "INSERT INTO public.users(email, first_name, last_name, super_user, receive_error_emails) " - f"VALUES ('{user_spec['email']}', '{user_spec['first_name']}', '{user_spec['last_name']}', '{'1' if user_spec['super_user'] else '0'}', '{'1' if user_spec['receive_error_emails'] else '0'}')" + "INSERT INTO public.users(email, first_name, last_name, super_user) " + f"VALUES ('{user_spec['email']}', '{user_spec['first_name']}', '{user_spec['last_name']}', '{'1' if user_spec['super_user'] else '0'}')" ) pgquery.write_db(user_insert_query) @@ -136,7 +136,6 @@ class AdminNewUserSchema(Schema): first_name = fields.Str(required=True) last_name = fields.Str(required=True) super_user = fields.Bool(required=True) - receive_error_emails = fields.Bool(required=True) organizations = fields.List( fields.Nested(UserOrganizationSchema), required=True, diff --git a/services/api/src/admin_org.py b/services/api/src/admin_org.py index 28227c158..d668b603b 100644 --- a/services/api/src/admin_org.py +++ b/services/api/src/admin_org.py @@ -9,7 +9,7 @@ def get_all_orgs(): query = ( "SELECT to_jsonb(row) " "FROM (" - "SELECT org.name, " + "SELECT org.name, org.email, " "(SELECT COUNT(*) FROM public.user_organization uo WHERE uo.organization_id = org.organization_id) num_users, " "(SELECT COUNT(*) FROM public.rsu_organization ro WHERE ro.organization_id = org.organization_id) num_rsus " "FROM public.organizations org" @@ -22,6 +22,7 @@ def get_all_orgs(): row = dict(row[0]) org_obj = {} org_obj["name"] = row["name"] + org_obj["email"] = row["email"] org_obj["user_count"] = row["num_users"] org_obj["rsu_count"] = row["num_rsus"] return_obj.append(org_obj) @@ -106,12 +107,17 @@ def get_modify_org_data(org_name): def check_safe_input(org_spec): - special_characters = "!\"#$%&'()*@-+,/:;<=>?[\]^`{|}~" + special_characters = "!\"#$%&'()*@-+,/:;<=>?[\\]^`{|}~" # Check all string based fields for special characters if any(c in special_characters for c in org_spec["orig_name"]): return False if any(c in special_characters for c in org_spec["name"]): return False + if org_spec["email"]: + if org_spec["email"] != "" and not admin_new_user.check_email( + org_spec["email"] + ): + return False for user in org_spec["users_to_add"]: if not admin_new_user.check_email(user["email"]): return False @@ -134,14 +140,15 @@ def modify_org(org_spec): # Check for special characters for potential SQL injection if not check_safe_input(org_spec): return { - "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\]^`{|}~. No sequences of '-' characters are allowed" + "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\\]^`{|}~. No sequences of '-' characters are allowed" }, 500 try: # Modify the existing organization data query = ( "UPDATE public.organizations SET " - f"name = '{org_spec['name']}' " + f"name = '{org_spec['name']}', " + f"email = '{org_spec['email']}' " f"WHERE name = '{org_spec['orig_name']}'" ) pgquery.write_db(query) @@ -217,6 +224,17 @@ def modify_org(org_spec): def delete_org(org_name): + + if check_orphan_rsus(org_name): + return { + "message": "Cannot delete organization that has one or more RSUs only associated with this organization" + }, 400 + + if check_orphan_users(org_name): + return { + "message": "Cannot delete organization that has one or more users only associated with this organization" + }, 400 + # Delete user-to-organization relationships user_org_remove_query = ( "DELETE FROM public.user_organization WHERE " @@ -235,7 +253,35 @@ def delete_org(org_name): org_remove_query = "DELETE FROM public.organizations WHERE " f"name = '{org_name}'" pgquery.write_db(org_remove_query) - return {"message": "Organization successfully deleted"} + return {"message": "Organization successfully deleted"}, 200 + + +def check_orphan_rsus(org): + rsu_query = ( + "SELECT to_jsonb(row) " + "FROM (SELECT rsu_id, count(organization_id) count FROM rsu_organization WHERE rsu_id IN (SELECT rsu_id FROM rsu_organization WHERE organization_id = " + f"(SELECT organization_id FROM organizations WHERE name = '{org}')) GROUP BY rsu_id) as row" + ) + rsu_count = pgquery.query_db(rsu_query) + for row in rsu_count: + rsu = dict(row[0]) + if rsu["count"] == 1: + return True + return False + + +def check_orphan_users(org): + user_query = ( + "SELECT to_jsonb(row) " + "FROM (SELECT user_id, count(organization_id) count FROM user_organization WHERE user_id IN (SELECT user_id FROM user_organization WHERE organization_id = " + f"(SELECT organization_id FROM organizations WHERE name = '{org}')) GROUP BY user_id) as row" + ) + user_count = pgquery.query_db(user_query) + for row in user_count: + user = dict(row[0]) + if user["count"] == 1: + return True + return False # REST endpoint resource class @@ -257,6 +303,7 @@ class UserRoleSchema(Schema): class AdminOrgPatchSchema(Schema): orig_name = fields.Str(required=True) name = fields.Str(required=True) + email = fields.Str(required=True, allow_none=True) users_to_add = fields.List(fields.Nested(UserRoleSchema), required=True) users_to_modify = fields.List(fields.Nested(UserRoleSchema), required=True) users_to_remove = fields.List(fields.Nested(UserRoleSchema), required=True) @@ -313,4 +360,5 @@ def delete(self): abort(400, errors) org_name = urllib.request.unquote(request.args["org_name"]) - return (delete_org(org_name), 200, self.headers) + message, code = delete_org(org_name) + return (message, code, self.headers) diff --git a/services/api/src/admin_rsu.py b/services/api/src/admin_rsu.py index 937db08d4..526913107 100644 --- a/services/api/src/admin_rsu.py +++ b/services/api/src/admin_rsu.py @@ -72,7 +72,7 @@ def modify_rsu(rsu_spec): # Check for special characters for potential SQL injection if not admin_new_rsu.check_safe_input(rsu_spec): return { - "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\]^`{|}~. No sequences of '-' characters are allowed" + "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\\]^`{|}~. No sequences of '-' characters are allowed" }, 500 # Parse model out of the "Manufacturer Model" string @@ -156,6 +156,13 @@ def delete_rsu(rsu_ip): ) pgquery.write_db(scms_remove_query) + # Delete snmp message forward config data + msg_config_remove_query = ( + "DELETE FROM public.snmp_msgfwd_config WHERE " + f"rsu_id=(SELECT rsu_id FROM public.rsus WHERE ipv4_address = '{rsu_ip}')" + ) + pgquery.write_db(msg_config_remove_query) + # Delete RSU data rsu_remove_query = "DELETE FROM public.rsus WHERE " f"ipv4_address = '{rsu_ip}'" pgquery.write_db(rsu_remove_query) diff --git a/services/api/src/admin_user.py b/services/api/src/admin_user.py index 0e7366a0b..07807f6be 100644 --- a/services/api/src/admin_user.py +++ b/services/api/src/admin_user.py @@ -9,14 +9,14 @@ def get_user_data(user_email): query = ( "SELECT to_jsonb(row) " "FROM (" - "SELECT email, first_name, last_name, super_user, receive_error_emails, org.name, roles.name AS role " - "FROM public.users " - "JOIN public.user_organization AS uo ON uo.user_id = users.user_id " + "SELECT u.email, u.first_name, u.last_name, u.super_user, org.name, roles.name AS role " + "FROM public.users u " + "JOIN public.user_organization AS uo ON uo.user_id = u.user_id " "JOIN public.organizations AS org ON org.organization_id = uo.organization_id " "JOIN public.roles ON roles.role_id = uo.role_id" ) if user_email != "all": - query += f" WHERE email = '{user_email}'" + query += f" WHERE u.email = '{user_email}'" query += ") as row" data = pgquery.query_db(query) @@ -30,9 +30,6 @@ def get_user_data(user_email): "first_name": row["first_name"], "last_name": row["last_name"], "super_user": True if row["super_user"] == "1" else False, - "receive_error_emails": True - if row["receive_error_emails"] == "1" - else False, "organizations": [], } user_dict[row["email"]]["organizations"].append( @@ -59,7 +56,7 @@ def get_modify_user_data(user_email): def check_safe_input(user_spec): - special_characters = "!\"#$%&'()*@-+,./:;<=>?[\]^`{|}~" + special_characters = "!\"#$%&'()*@-+,./:;<=>?[\\]^`{|}~" # Check all string based fields for special characters if any(c in special_characters for c in user_spec["first_name"]): return False @@ -91,7 +88,7 @@ def modify_user(user_spec): return {"message": "Email is not valid"}, 500 if not check_safe_input(user_spec): return { - "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\]^`{|}~. No sequences of '-' characters are allowed" + "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\\]^`{|}~. No sequences of '-' characters are allowed" }, 500 try: @@ -101,8 +98,7 @@ def modify_user(user_spec): f"email='{user_spec['email']}', " f"first_name='{user_spec['first_name']}', " f"last_name='{user_spec['last_name']}', " - f"super_user='{'1' if user_spec['super_user'] else '0'}', " - f"receive_error_emails='{'1' if user_spec['receive_error_emails'] else '0'}' " + f"super_user='{'1' if user_spec['super_user'] else '0'}' " f"WHERE email = '{user_spec['orig_email']}'" ) pgquery.write_db(query) @@ -190,7 +186,6 @@ class AdminUserPatchSchema(Schema): first_name = fields.Str(required=True) last_name = fields.Str(required=True) super_user = fields.Bool(required=True) - receive_error_emails = fields.Bool(required=True) organizations_to_add = fields.List( fields.Nested(UserOrganizationSchema), required=True ) diff --git a/services/api/src/contact_support.py b/services/api/src/contact_support.py index 2db2d4fcc..0a4f55917 100644 --- a/services/api/src/contact_support.py +++ b/services/api/src/contact_support.py @@ -6,6 +6,7 @@ from marshmallow import fields from common.emailSender import EmailSender +from common.email_util import get_email_list class ContactSupportSchema(Schema): @@ -31,28 +32,20 @@ class ContactSupportResource(Resource): def __init__(self): self.CSM_EMAIL_TO_SEND_FROM = os.environ.get("CSM_EMAIL_TO_SEND_FROM") - self.CSM_EMAIL_APP_USERNAME = os.environ.get("CSM_EMAIL_APP_USERNAME") - self.CSM_EMAIL_APP_PASSWORD = os.environ.get("CSM_EMAIL_APP_PASSWORD") - self.CSM_EMAILS_TO_SEND_TO = os.environ.get("CSM_EMAILS_TO_SEND_TO") self.CSM_TARGET_SMTP_SERVER_ADDRESS = os.environ.get( "CSM_TARGET_SMTP_SERVER_ADDRESS" ) self.CSM_TARGET_SMTP_SERVER_PORT = int( os.environ.get("CSM_TARGET_SMTP_SERVER_PORT") ) + self.CSM_TLS_ENABLED = os.environ.get("CSM_TLS_ENABLED", "true") + self.CSM_AUTH_ENABLED = os.environ.get("CSM_AUTH_ENABLED", "true") + self.CSM_EMAIL_APP_USERNAME = os.environ.get("CSM_EMAIL_APP_USERNAME") + self.CSM_EMAIL_APP_PASSWORD = os.environ.get("CSM_EMAIL_APP_PASSWORD") if not self.CSM_EMAIL_TO_SEND_FROM: logging.error("CSM_EMAIL_TO_SEND_FROM environment variable not set") abort(500) - if not self.CSM_EMAIL_APP_USERNAME: - logging.error("CSM_EMAIL_APP_USERNAME environment variable not set") - abort(500) - if not self.CSM_EMAIL_APP_PASSWORD: - logging.error("CSM_EMAIL_APP_PASSWORD environment variable not set") - abort(500) - if not self.CSM_EMAILS_TO_SEND_TO: - logging.error("CSM_EMAILS_TO_SEND_TO environment variable not set") - abort(500) if not self.CSM_TARGET_SMTP_SERVER_ADDRESS: logging.error("CSM_TARGET_SMTP_SERVER_ADDRESS environment variable not set") abort(500) @@ -60,6 +53,14 @@ def __init__(self): logging.error("CSM_TARGET_SMTP_SERVER_PORT environment variable not set") abort(500) + if self.CSM_AUTH_ENABLED == "true": + if not self.CSM_EMAIL_APP_USERNAME: + logging.error("CSM_EMAIL_APP_USERNAME environment variable not set") + abort(500) + if not self.CSM_EMAIL_APP_PASSWORD: + logging.error("CSM_EMAIL_APP_PASSWORD environment variable not set") + abort(500) + def options(self): # CORS support return ("", 204, self.options_headers) @@ -78,7 +79,7 @@ def post(self): subject = request.json["subject"] message = request.json["message"] - email_addresses = self.CSM_EMAILS_TO_SEND_TO.split(",") + email_addresses = get_email_list("Support Requests") for email_address in email_addresses: emailSender = EmailSender( self.CSM_TARGET_SMTP_SERVER_ADDRESS, @@ -92,6 +93,9 @@ def post(self): replyEmail, self.CSM_EMAIL_APP_USERNAME, self.CSM_EMAIL_APP_PASSWORD, + False, + self.CSM_TLS_ENABLED, + self.CSM_AUTH_ENABLED, ) except Exception as e: logging.error(f"Exception encountered: {e}") diff --git a/services/api/src/error_email/error_email_template.html b/services/api/src/error_email/error_email_template.html index 666e2225a..22d3e2163 100644 --- a/services/api/src/error_email/error_email_template.html +++ b/services/api/src/error_email/error_email_template.html @@ -36,9 +36,7 @@ -

- You are receiving this email because your user is marked to receive error emails on the CV Manager Admin page. -

+

You are receiving this email because you have been included in the CV Manager developer group.


This error originated in the ##_ENVIRONMENT_## environment CV Manager API


@@ -47,11 +45,5 @@

Error occurred at: ##_ERROR_TIME_##


View this error in Logs: rsu-manager-api logs

-
-

--

-

- If you no longer wish to receive these emails, please uncheck the "receive error emails" checkbox on the CV - manager portal Admin page, or use this link to unsubscribe: unsubscribe -

diff --git a/services/api/src/main.py b/services/api/src/main.py index ad3b6e6ea..b15f6d5db 100644 --- a/services/api/src/main.py +++ b/services/api/src/main.py @@ -5,6 +5,8 @@ # Custom script imports from middleware import Middleware +from admin_email_notification import AdminNotification +from admin_new_email_notification import AdminNewNotification from userauth import UserAuth from healthcheck import HealthCheck from rsuinfo import RsuInfo @@ -25,7 +27,6 @@ from admin_new_org import AdminNewOrg from admin_org import AdminOrg from contact_support import ContactSupportResource -from unsub_error_emails import UnsubErrorEmails import smtp_error_handler log_level = os.environ.get("LOGGING_LEVEL", "INFO") @@ -57,8 +58,9 @@ api.add_resource(AdminUser, "/admin-user") api.add_resource(AdminNewOrg, "/admin-new-org") api.add_resource(AdminOrg, "/admin-org") +api.add_resource(AdminNotification, "/admin-notification") +api.add_resource(AdminNewNotification, "/admin-new-notification") api.add_resource(ContactSupportResource, "/contact-support") -api.add_resource(UnsubErrorEmails, "/unsubscribe-error-emails/") if __name__ == "__main__": app.run(host="0.0.0.0", port=5000) diff --git a/services/api/src/middleware.py b/services/api/src/middleware.py index 9c8d0b0b3..97858c4c1 100644 --- a/services/api/src/middleware.py +++ b/services/api/src/middleware.py @@ -59,6 +59,8 @@ def get_user_role(token): "/admin-new-org": False, "/admin-org": False, "/rsu-geo-query": True, + "/admin-new-notification": False, + "/admin-notification": False, } diff --git a/services/api/src/smtp_error_handler.py b/services/api/src/smtp_error_handler.py index 56c204632..9f281f113 100644 --- a/services/api/src/smtp_error_handler.py +++ b/services/api/src/smtp_error_handler.py @@ -10,28 +10,10 @@ import ssl import os -import common.pgquery as pgquery - def get_subscribed_users(): - query = "SELECT email FROM public.users WHERE receive_error_emails = '1'" - - data = pgquery.query_db(query) - - return [point["email"] for point in data] - - -def unsubscribe_user(email: str): - pre_check = f"SELECT receive_error_emails FROM public.users WHERE email = '{email}'" - pre_check_results = pgquery.query_db(pre_check) - if not pre_check_results: - return 400 - - query = f"UPDATE public.users SET receive_error_emails='0' WHERE email = '{email}'" - - pgquery.write_db(query) - - return 200 + emails = os.environ["CSM_EMAILS_TO_SEND_TO"].split(",") + return emails def configure_error_emails(app): @@ -101,10 +83,6 @@ def emit(self, record): message["From"] = self.fromaddr message["To"] = email - EMAIL_KEYS["UNSUBSCRIBE_LINK"] = os.environ[ - "ERROR_EMAIL_UNSUBSCRIBE_LINK" - ].format(email=email) - for key, value in EMAIL_KEYS.items(): body_content = body_content.replace(f"##_{key}_##", value) message.attach(MIMEText(body_content, "html")) diff --git a/services/api/src/unsub_error_emails.py b/services/api/src/unsub_error_emails.py deleted file mode 100644 index 957e2e42e..000000000 --- a/services/api/src/unsub_error_emails.py +++ /dev/null @@ -1,44 +0,0 @@ -import logging - -from flask_restful import Resource -import logging -import os -import smtp_error_handler - - -def unsubscribe_user(email: str): - return smtp_error_handler.unsubscribe_user(email) - - -# REST endpoint resource class -class UnsubErrorEmails(Resource): - options_headers = { - "Access-Control-Allow-Origin": os.environ["CORS_DOMAIN"], - "Access-Control-Allow-Headers": "Content-Type,Authorization", - "Access-Control-Allow-Methods": "GET", - "Access-Control-Max-Age": "3600", - } - - headers = { - "Access-Control-Allow-Origin": os.environ["CORS_DOMAIN"], - "Content-Type": "application/json", - } - - def options(self): - # CORS support - return ("", 204, self.options_headers) - - def get(self, email): - logging.debug("UnsubErrorEmails GET requested") - if email: - resp_code = unsubscribe_user(email) - - if resp_code == 400: - return (f"User with email {email} does not exist", 400, self.headers) - else: - return ( - f"User {email} was successfully unsubscribed!", - 200, - self.headers, - ) - return ("No unsubscribe email was specified", 400, self.headers) diff --git a/services/api/tests/data/admin_new_notification_data.py b/services/api/tests/data/admin_new_notification_data.py new file mode 100644 index 000000000..3a7ad4b3f --- /dev/null +++ b/services/api/tests/data/admin_new_notification_data.py @@ -0,0 +1,17 @@ +import multidict + +##################################### request_data ########################################### + +request_params_good = multidict.MultiDict([]) + +request_json_good = {"email": "email@email.com", "email_type": "some type"} + +request_json_bad = {} + +##################################### test_data ########################################### + +good_input = {"email": "email@email.com", "email_type": "some type"} + +bad_input = {"email": "email@email.com", "email_type": "some type^@^&!"} + +notification_insert_query = "INSERT into public.user_email_notification(user_id, email_type_id) VALUES ((SELECT user_id FROM public.users WHERE email='email@email.com'), (SELECT email_type_id FROM public.email_type WHERE email_type='some type'))" diff --git a/services/api/tests/data/admin_new_org_data.py b/services/api/tests/data/admin_new_org_data.py index 77e07e443..08b4f3a09 100644 --- a/services/api/tests/data/admin_new_org_data.py +++ b/services/api/tests/data/admin_new_org_data.py @@ -4,14 +4,17 @@ request_params_good = multidict.MultiDict([]) -request_json_good = {"name": "new org"} +request_json_good = {"name": "new org", "email": "new@email.com"} request_json_bad = {} ##################################### test_data ########################################### -good_input = {"name": "new org"} +good_input = {"name": "new org", "email": "new email"} -bad_input = {"name": "new--^@^&! org"} +bad_input = {"name": "new--^@^&! org", "email": "bad@email@com"} -org_insert_query = "INSERT INTO public.organizations(name) " "VALUES ('new org')" +org_insert_query = ( + "INSERT INTO public.organizations(name, email) " + "VALUES ('new org', 'new@email.com')" +) diff --git a/services/api/tests/data/admin_new_user_data.py b/services/api/tests/data/admin_new_user_data.py index 8086471e8..cd6ffb8bd 100644 --- a/services/api/tests/data/admin_new_user_data.py +++ b/services/api/tests/data/admin_new_user_data.py @@ -9,7 +9,6 @@ "first_name": "John", "last_name": "Doe", "super_user": True, - "receive_error_emails": True, "organizations": [{"name": "Test Org", "role": "operator"}], } @@ -18,7 +17,6 @@ "first_name": "John", "last_name": "Doe", "super_user": True, - "receive_error_emails": True, "organizations": ["Test Org"], } @@ -29,7 +27,6 @@ "first_name": "John", "last_name": "Doe", "super_user": True, - "receive_error_emails": True, "organizations": [{"name": "Test Org", "role": "operator"}], } @@ -38,13 +35,12 @@ "first_name": "John--", "last_name": "Doe@#", "super_user": True, - "receive_error_emails": True, "organizations": [{"name": "Test Org##", "role": "operator"}], } user_insert_query = ( - "INSERT INTO public.users(email, first_name, last_name, super_user, receive_error_emails) " - "VALUES ('jdoe@example.com', 'John', 'Doe', '1', '1')" + "INSERT INTO public.users(email, first_name, last_name, super_user) " + "VALUES ('jdoe@example.com', 'John', 'Doe', '1')" ) user_org_insert_query = ( diff --git a/services/api/tests/data/admin_notification_data.py b/services/api/tests/data/admin_notification_data.py new file mode 100644 index 000000000..ac86df95a --- /dev/null +++ b/services/api/tests/data/admin_notification_data.py @@ -0,0 +1,60 @@ +import multidict + +##################################### request data ########################################### + +request_environ = multidict.MultiDict([]) + +request_args_good = {"user_email": "email@email.com"} + +request_args_delete_good = {"email": "email@email.com", "email_type": "old"} + +request_args_bad = {"user_email": 14} + +request_json_good = { + "email": "email@email.com", + "old_email_type": "old", + "new_email_type": "new", +} + +request_json_bad = { + "email": "email@email.com", + "new_email_type": "new", +} + +request_json_unsafe_input = { + "email": "email@email.com!", + "email_type": "type", +} + +##################################### function data ########################################### + +# get_notification_data + +get_notification_data_pgdb_return = [ + ({"email": "email@email.com", "first_name": "first", "last_name": "last", "email_type": "test type"},), +] + +get_notification_data_result = [{"email": "email@email.com", "first_name": "first", "last_name": "last", "email_type": "test type"}] + +get_notification_data_sql = ( +"SELECT to_jsonb(row) FROM (SELECT u.email, u.first_name, u.last_name, " +"e.email_type FROM public.user_email_notification JOIN public.users AS u " +"ON u.user_id = user_email_notification.user_id JOIN public.email_type " +"AS e ON e.email_type_id = user_email_notification.email_type_id WHERE" +" user_email_notification.user_id IN (SELECT user_id FROM public.users" +" WHERE email = 'email@email.com')) as row" +) + +# modify_notification + +modify_notification_sql = ( + "UPDATE public.user_email_notification SET email_type_id = " + "(SELECT email_type_id FROM public.email_type WHERE email_type = 'new') " + "WHERE user_id = (SELECT user_id FROM public.users WHERE email = " + "'email@email.com') AND email_type_id = (SELECT email_type_id " + "FROM public.email_type WHERE email_type = 'old')" +) + +# delete_notification + +delete_notification_call = "DELETE FROM public.user_email_notification WHERE user_id IN (SELECT user_id FROM public.users WHERE email = 'email@email.com') AND email_type_id IN (SELECT email_type_id FROM public.email_type WHERE email_type = 'test type')" diff --git a/services/api/tests/data/admin_org_data.py b/services/api/tests/data/admin_org_data.py index 0312929e7..bb692f881 100644 --- a/services/api/tests/data/admin_org_data.py +++ b/services/api/tests/data/admin_org_data.py @@ -11,6 +11,7 @@ request_json_good = { "orig_name": "test org", "name": "test org", + "email": "test@email.com", "users_to_add": [{"email": "test1@email.com", "role": "admin"}], "users_to_modify": [{"email": "test2@email.com", "role": "user"}], "users_to_remove": [{"email": "test3@email.com", "role": "user"}], @@ -21,6 +22,7 @@ request_json_bad = { "orig_name": "test org", "name": "test org", + "email": "test@email.com", "users_to_add": [{"email": "test1@email.com", "role": "admin"}], "users_to_modify": [{"email": "test2@email.com", "role": "user"}], "rsus_to_add": ["10.0.0.2"], @@ -30,6 +32,7 @@ request_json_unsafe_input = { "orig_name": "test org", "name": "test org", + "email": "test@email.com", "users_to_add": [{"email": "test1@email.com", "role": "admin"}], "users_to_modify": [{"email": "tes@t2@email.com", "role": "user"}], "users_to_remove": [{"email": "test3@email.com", "role": "operator"}], @@ -42,15 +45,17 @@ # get_all_orgs get_all_orgs_pgdb_return = [ - ({"name": "test org", "num_users": 12, "num_rsus": 30},), + ({"name": "test org", "email": "test@email.com", "num_users": 12, "num_rsus": 30},), ] -get_all_orgs_result = [{"name": "test org", "user_count": 12, "rsu_count": 30}] +get_all_orgs_result = [ + {"name": "test org", "email": "test@email.com", "user_count": 12, "rsu_count": 30} +] get_all_orgs_sql = ( "SELECT to_jsonb(row) " "FROM (" - "SELECT org.name, " + "SELECT org.name, org.email, " "(SELECT COUNT(*) FROM public.user_organization uo WHERE uo.organization_id = org.organization_id) num_users, " "(SELECT COUNT(*) FROM public.rsu_organization ro WHERE ro.organization_id = org.organization_id) num_rsus " "FROM public.organizations org" @@ -131,7 +136,10 @@ # modify_org modify_org_sql = ( - "UPDATE public.organizations SET " "name = 'test org' " "WHERE name = 'test org'" + "UPDATE public.organizations SET " + "name = 'test org', " + "email = 'test@email.com' " + "WHERE name = 'test org'" ) modify_org_add_user_sql = ( diff --git a/services/api/tests/data/admin_rsu_data.py b/services/api/tests/data/admin_rsu_data.py index 353d1b232..72b86ff30 100644 --- a/services/api/tests/data/admin_rsu_data.py +++ b/services/api/tests/data/admin_rsu_data.py @@ -146,5 +146,6 @@ "DELETE FROM public.rsu_organization WHERE rsu_id=(SELECT rsu_id FROM public.rsus WHERE ipv4_address = '10.11.81.12')", "DELETE FROM public.ping WHERE rsu_id=(SELECT rsu_id FROM public.rsus WHERE ipv4_address = '10.11.81.12')", "DELETE FROM public.scms_health WHERE rsu_id=(SELECT rsu_id FROM public.rsus WHERE ipv4_address = '10.11.81.12')", + "DELETE FROM public.snmp_msgfwd_config WHERE rsu_id=(SELECT rsu_id FROM public.rsus WHERE ipv4_address = '10.11.81.12')", "DELETE FROM public.rsus WHERE ipv4_address = '10.11.81.12'", ] diff --git a/services/api/tests/data/admin_user_data.py b/services/api/tests/data/admin_user_data.py index 42640267e..c49ba8615 100644 --- a/services/api/tests/data/admin_user_data.py +++ b/services/api/tests/data/admin_user_data.py @@ -14,7 +14,6 @@ "first_name": "test", "last_name": "test", "super_user": True, - "receive_error_emails": True, "organizations_to_add": [{"name": "Test Org3", "role": "admin"}], "organizations_to_modify": [{"name": "Test Org2", "role": "user"}], "organizations_to_remove": [{"name": "Test Org1", "role": "user"}], @@ -26,7 +25,6 @@ "first_name": "test", "last_name": "test", "super_user": True, - "receive_error_emails": True, "organizations_to_add": [{"name": "Test Org3", "role": "admin"}], "organizations_to_remove": [{"name": "Test Org1", "role": "user"}], } @@ -37,7 +35,6 @@ "first_name": "test", "last_name": "tes--t", "super_user": True, - "receive_error_emails": True, "organizations_to_add": [{"name": "Test Org3#@", "role": "adm#!in"}], "organizations_to_modify": [{"name": "Test O%@!rg2", "role": "user"}], "organizations_to_remove": [{"name": "Test O!##rg1", "role": "!#user"}], @@ -52,7 +49,6 @@ "first_name": "test", "last_name": "test", "super_user": "1", - "receive_error_emails": "1", "name": "test org", "role": "admin", }, @@ -65,7 +61,6 @@ "first_name": "test", "last_name": "test", "super_user": True, - "receive_error_emails": True, "organizations": [{"name": "test org", "role": "admin"}], } ] @@ -73,9 +68,9 @@ expected_get_user_query = ( "SELECT to_jsonb(row) " "FROM (" - "SELECT email, first_name, last_name, super_user, receive_error_emails, org.name, roles.name AS role " - "FROM public.users " - "JOIN public.user_organization AS uo ON uo.user_id = users.user_id " + "SELECT u.email, u.first_name, u.last_name, u.super_user, org.name, roles.name AS role " + "FROM public.users u " + "JOIN public.user_organization AS uo ON uo.user_id = u.user_id " "JOIN public.organizations AS org ON org.organization_id = uo.organization_id " "JOIN public.roles ON roles.role_id = uo.role_id" ") as row" @@ -84,12 +79,12 @@ expected_get_user_query_one = ( "SELECT to_jsonb(row) " "FROM (" - "SELECT email, first_name, last_name, super_user, receive_error_emails, org.name, roles.name AS role " - "FROM public.users " - "JOIN public.user_organization AS uo ON uo.user_id = users.user_id " + "SELECT u.email, u.first_name, u.last_name, u.super_user, org.name, roles.name AS role " + "FROM public.users u " + "JOIN public.user_organization AS uo ON uo.user_id = u.user_id " "JOIN public.organizations AS org ON org.organization_id = uo.organization_id " "JOIN public.roles ON roles.role_id = uo.role_id" - " WHERE email = 'test@email.com'" + " WHERE u.email = 'test@email.com'" ") as row" ) @@ -98,8 +93,7 @@ "email='test@email.com', " "first_name='test', " "last_name='test', " - "super_user='1', " - "receive_error_emails='1' " + "super_user='1' " "WHERE email = 'test@email.com'" ) diff --git a/services/api/tests/data/contact_support_data.py b/services/api/tests/data/contact_support_data.py index ff66ca72d..d21948da1 100644 --- a/services/api/tests/data/contact_support_data.py +++ b/services/api/tests/data/contact_support_data.py @@ -1,5 +1,4 @@ CSM_EMAIL_TO_SEND_FROM = "test@test.com" -CSM_EMAILS_TO_SEND_TO = "bob@test.com" CSM_EMAIL_APP_USERNAME = "testusername" CSM_EMAIL_APP_PASSWORD = "testpassword" diff --git a/services/api/tests/src/test_admin_email_notification.py b/services/api/tests/src/test_admin_email_notification.py new file mode 100644 index 000000000..35d63b56c --- /dev/null +++ b/services/api/tests/src/test_admin_email_notification.py @@ -0,0 +1,228 @@ +from unittest.mock import patch, MagicMock, call +import pytest +import api.src.admin_email_notification as admin_notification +import api.tests.data.admin_notification_data as admin_notification_data +import sqlalchemy +from werkzeug.exceptions import HTTPException + +###################################### Testing Requests ########################################## + +# OPTIONS endpoint test + + +def test_request_options(): + info = admin_notification.AdminNotification() + (body, code, headers) = info.options() + assert body == "" + assert code == 204 + assert headers["Access-Control-Allow-Methods"] == "GET,PATCH,DELETE" + + +# GET endpoint tests + + +@patch("api.src.admin_email_notification.get_modify_notification_data") +def test_entry_get(mock_get_modify_notification_data): + req = MagicMock() + req.environ = admin_notification_data.request_environ + req.args = admin_notification_data.request_args_good + mock_get_modify_notification_data.return_value = {} + with patch("api.src.admin_email_notification.request", req): + status = admin_notification.AdminNotification() + (body, code, headers) = status.get() + + mock_get_modify_notification_data.assert_called_once_with( + admin_notification_data.request_args_good["user_email"] + ) + assert code == 200 + assert headers["Access-Control-Allow-Origin"] == "test.com" + assert body == {} + + +# Test schema for string value +def test_entry_get_schema_str(): + req = MagicMock() + req.environ = admin_notification_data.request_environ + req.args = admin_notification_data.request_args_bad + with patch("api.src.admin_email_notification.request", req): + status = admin_notification.AdminNotification() + with pytest.raises(HTTPException): + status.get() + + +# PATCH endpoint tests + + +@patch("api.src.admin_email_notification.modify_notification") +def test_entry_patch(mock_modify_notification): + req = MagicMock() + req.environ = admin_notification_data.request_environ + req.json = admin_notification_data.request_json_good + mock_modify_notification.return_value = {}, 200 + with patch("api.src.admin_email_notification.request", req): + status = admin_notification.AdminNotification() + (body, code, headers) = status.patch() + + mock_modify_notification.assert_called_once() + assert code == 200 + assert headers["Access-Control-Allow-Origin"] == "test.com" + assert body == {} + + +def test_entry_patch_schema(): + req = MagicMock() + req.environ = admin_notification_data.request_environ + req.json = admin_notification_data.request_json_bad + with patch("api.src.admin_email_notification.request", req): + status = admin_notification.AdminNotification() + with pytest.raises(HTTPException): + status.patch() + + +# DELETE endpoint tests + + +@patch("api.src.admin_email_notification.delete_notification") +def test_entry_delete_user(mock_delete_notification): + req = MagicMock() + req.environ = admin_notification_data.request_environ + req.args = admin_notification_data.request_args_delete_good + mock_delete_notification.return_value = {} + with patch("api.src.admin_email_notification.request", req): + status = admin_notification.AdminNotification() + (body, code, headers) = status.delete() + + + + mock_delete_notification.assert_called_once_with( + admin_notification_data.request_args_delete_good["email"], + admin_notification_data.request_args_delete_good["email_type"], + ) + assert code == 200 + assert headers["Access-Control-Allow-Origin"] == "test.com" + assert body == {} + + +def test_entry_delete_schema(): + req = MagicMock() + req.environ = admin_notification_data.request_environ + req.args = admin_notification_data.request_args_bad + with patch("api.src.admin_email_notification.request", req): + status = admin_notification.AdminNotification() + with pytest.raises(HTTPException): + status.delete() + + +###################################### Testing Functions ########################################## + +# get_notification_data + + +@patch("api.src.admin_email_notification.pgquery.query_db") +def test_get_all_notifications(mock_query_db): + mock_query_db.return_value = admin_notification_data.get_notification_data_pgdb_return + expected_result = admin_notification_data.get_notification_data_result + expected_query = admin_notification_data.get_notification_data_sql + actual_result = admin_notification.get_notification_data("email@email.com") + + mock_query_db.assert_called_with(expected_query) + assert actual_result == expected_result + + +# get_modify_notification_data + + +@patch("api.src.admin_email_notification.get_notification_data") +def test_get_modify_notification_data_all(mock_get_notification_data): + mock_get_notification_data.return_value = [ + {"email": "email@email.com", "first_name": "first", "last_name": "last", "email_type": "test type"} + ] + expected_notification_data = {"notification_data": [{"email": "email@email.com", "first_name": "first", "last_name": "last", "email_type": "test type"}]} + actual_result = admin_notification.get_modify_notification_data("email@email.com") + + assert actual_result == expected_notification_data + + +# check_safe_input + + +def test_check_safe_input(): + expected_result = True + actual_result = admin_notification.check_safe_input(admin_notification_data.request_json_good) + assert actual_result == expected_result + + +def test_check_safe_input_bad(): + expected_result = False + actual_result = admin_notification.check_safe_input(admin_notification_data.request_json_unsafe_input) + assert actual_result == expected_result + + +# modify_notification + + +@patch("api.src.admin_email_notification.check_safe_input") +@patch("api.src.admin_email_notification.pgquery.write_db") +def test_modify_notification_success(mock_pgquery, mock_check_safe_input): + mock_check_safe_input.return_value = True + expected_msg, expected_code = {"message": "Email notification successfully modified"}, 200 + actual_msg, actual_code = admin_notification.modify_notification(admin_notification_data.request_json_good) + + calls = [ + call(admin_notification_data.modify_notification_sql) + ] + mock_pgquery.assert_has_calls(calls) + assert actual_msg == expected_msg + assert actual_code == expected_code + + +@patch("api.src.admin_email_notification.check_safe_input") +@patch("api.src.admin_email_notification.pgquery.write_db") +def test_modify_notification_check_fail(mock_pgquery, mock_check_safe_input): + mock_check_safe_input.return_value = False + expected_msg, expected_code = { + "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\\]^`{|}~. No sequences of '-' characters are allowed" + }, 500 + actual_msg, actual_code = admin_notification.modify_notification(admin_notification_data.request_json_good) + + calls = [] + mock_pgquery.assert_has_calls(calls) + assert actual_msg == expected_msg + assert actual_code == expected_code + + +@patch("api.src.admin_email_notification.check_safe_input") +@patch("api.src.admin_email_notification.pgquery.write_db") +def test_modify_notification_generic_exception(mock_pgquery, mock_check_safe_input): + mock_check_safe_input.return_value = True + mock_pgquery.side_effect = Exception("Test") + expected_msg, expected_code = {"message": "Encountered unknown issue"}, 500 + actual_msg, actual_code = admin_notification.modify_notification(admin_notification_data.request_json_good) + + assert actual_msg == expected_msg + assert actual_code == expected_code + + +@patch("api.src.admin_email_notification.check_safe_input") +@patch("api.src.admin_email_notification.pgquery.write_db") +def test_modify_notification_sql_exception(mock_pgquery, mock_check_safe_input): + mock_check_safe_input.return_value = True + orig = MagicMock() + orig.args = ({"D": "SQL issue encountered"},) + mock_pgquery.side_effect = sqlalchemy.exc.IntegrityError("", {}, orig) + expected_msg, expected_code = {"message": "SQL issue encountered"}, 500 + actual_msg, actual_code = admin_notification.modify_notification(admin_notification_data.request_json_good) + + assert actual_msg == expected_msg + assert actual_code == expected_code + + +# delete_notification + + +@patch("api.src.admin_email_notification.pgquery.write_db") +def test_delete_notification(mock_write_db): + expected_result = {"message": "Email notification successfully deleted"} + actual_result = admin_notification.delete_notification("email@email.com", "test type") + mock_write_db.assert_called_with(admin_notification_data.delete_notification_call) + assert actual_result == expected_result diff --git a/services/api/tests/src/test_admin_new_email_notification.py b/services/api/tests/src/test_admin_new_email_notification.py new file mode 100644 index 000000000..111a30700 --- /dev/null +++ b/services/api/tests/src/test_admin_new_email_notification.py @@ -0,0 +1,121 @@ +from unittest.mock import patch, MagicMock, call +import pytest +import api.src.admin_new_email_notification as admin_new_notification +import api.tests.data.admin_new_notification_data as admin_new_notification_data +import sqlalchemy +from werkzeug.exceptions import HTTPException + +###################################### Testing Requests ########################################## + + +def test_request_options(): + info = admin_new_notification.AdminNewNotification() + (body, code, headers) = info.options() + assert body == "" + assert code == 204 + assert headers["Access-Control-Allow-Methods"] == "GET,POST" + + +@patch("api.src.admin_new_email_notification.add_notification") +def test_entry_post(mock_add_notification): + req = MagicMock() + req.environ = admin_new_notification_data.request_params_good + req.json = admin_new_notification_data.request_json_good + mock_add_notification.return_value = {}, 200 + with patch("api.src.admin_new_email_notification.request", req): + status = admin_new_notification.AdminNewNotification() + (body, code, headers) = status.post() + + mock_add_notification.assert_called_once() + assert code == 200 + assert headers["Access-Control-Allow-Origin"] == "test.com" + assert body == {} + + +def test_entry_post_schema(): + req = MagicMock() + req.environ = admin_new_notification_data.request_params_good + req.json = admin_new_notification_data.request_json_bad + with patch("api.src.admin_new_email_notification.request", req): + status = admin_new_notification.AdminNewNotification() + with pytest.raises(HTTPException): + status.post() + + +###################################### Testing Functions ########################################## + + +def test_check_safe_input(): + expected_result = True + actual_result = admin_new_notification.check_safe_input(admin_new_notification_data.good_input) + assert actual_result == expected_result + + +def test_check_safe_input_bad(): + expected_result = False + actual_result = admin_new_notification.check_safe_input(admin_new_notification_data.bad_input) + assert actual_result == expected_result + + +@patch("api.src.admin_new_email_notification.check_safe_input") +@patch("api.src.admin_new_email_notification.pgquery.write_db") +def test_add_notification_success(mock_pgquery, mock_check_safe_input): + mock_check_safe_input.return_value = True + expected_msg, expected_code = { + "message": "New email notification successfully added" + }, 200 + actual_msg, actual_code = admin_new_notification.add_notification( + admin_new_notification_data.request_json_good + ) + + calls = [call(admin_new_notification_data.notification_insert_query)] + mock_pgquery.assert_has_calls(calls) + assert actual_msg == expected_msg + assert actual_code == expected_code + + +@patch("api.src.admin_new_email_notification.check_safe_input") +@patch("api.src.admin_new_email_notification.pgquery.write_db") +def test_add_notification_safety_fail(mock_pgquery, mock_check_safe_input): + mock_check_safe_input.return_value = False + expected_msg, expected_code = { + "message": "No special characters are allowed: !\"#$%&'()*+,./:;<=>?@[\\]^`{|}~. No sequences of '-' characters are allowed" + }, 500 + actual_msg, actual_code = admin_new_notification.add_notification( + admin_new_notification_data.request_json_good + ) + + calls = [] + mock_pgquery.assert_has_calls(calls) + assert actual_msg == expected_msg + assert actual_code == expected_code + + +@patch("api.src.admin_new_email_notification.check_safe_input") +@patch("api.src.admin_new_email_notification.pgquery.write_db") +def test_add_notification_generic_exception(mock_pgquery, mock_check_safe_input): + mock_check_safe_input.return_value = True + mock_pgquery.side_effect = Exception("Test") + expected_msg, expected_code = {"message": "Encountered unknown issue"}, 500 + actual_msg, actual_code = admin_new_notification.add_notification( + admin_new_notification_data.request_json_good + ) + + assert actual_msg == expected_msg + assert actual_code == expected_code + + +@patch("api.src.admin_new_email_notification.check_safe_input") +@patch("api.src.admin_new_email_notification.pgquery.write_db") +def test_add_notification_sql_exception(mock_pgquery, mock_check_safe_input): + mock_check_safe_input.return_value = True + orig = MagicMock() + orig.args = ({"D": "SQL issue encountered"},) + mock_pgquery.side_effect = sqlalchemy.exc.IntegrityError("", {}, orig) + expected_msg, expected_code = {"message": "SQL issue encountered"}, 500 + actual_msg, actual_code = admin_new_notification.add_notification( + admin_new_notification_data.request_json_good + ) + + assert actual_msg == expected_msg + assert actual_code == expected_code diff --git a/services/api/tests/src/test_admin_org.py b/services/api/tests/src/test_admin_org.py index 2f32f22eb..ae9af46c7 100644 --- a/services/api/tests/src/test_admin_org.py +++ b/services/api/tests/src/test_admin_org.py @@ -87,7 +87,7 @@ def test_entry_delete_user(mock_delete_org): req = MagicMock() req.environ = admin_org_data.request_environ req.args = admin_org_data.request_args_good - mock_delete_org.return_value = {} + mock_delete_org.return_value = {"message": "Organization successfully deleted"}, 200 with patch("api.src.admin_org.request", req): status = admin_org.AdminOrg() (body, code, headers) = status.delete() @@ -97,7 +97,7 @@ def test_entry_delete_user(mock_delete_org): ) assert code == 200 assert headers["Access-Control-Allow-Origin"] == "test.com" - assert body == {} + assert body == {"message": "Organization successfully deleted"} def test_entry_delete_schema(): @@ -268,8 +268,10 @@ def test_modify_org_sql_exception(mock_pgquery, mock_check_safe_input): @patch("api.src.admin_org.pgquery.write_db") -def test_delete_org(mock_write_db): - expected_result = {"message": "Organization successfully deleted"} +@patch("api.src.admin_org.pgquery.query_db") +def test_delete_org(mock_query_db, mock_write_db): + mock_query_db.return_value = [] + expected_result = {"message": "Organization successfully deleted"}, 200 actual_result = admin_org.delete_org("test org") calls = [ @@ -279,3 +281,21 @@ def test_delete_org(mock_write_db): ] mock_write_db.assert_has_calls(calls) assert actual_result == expected_result + +@patch("api.src.admin_org.pgquery.query_db") +def test_delete_org_failure_orphan_rsu(mock_query_db): + mock_query_db.return_value = [[{"user_id": 1, "count": 2}], [{"user_id": 2, "count": 1}]] + expected_result = {"message": "Cannot delete organization that has one or more RSUs only associated with this organization"}, 400 + actual_result = admin_org.delete_org("test org") + + assert actual_result == expected_result + +@patch("api.src.admin_org.pgquery.query_db") +@patch("api.src.admin_org.check_orphan_rsus") +def test_delete_org_failure_orphan_user(mock_orphan_rsus, mock_query_db): + mock_orphan_rsus.return_value = False + mock_query_db.return_value = [[{"user_id": 1, "count": 2}], [{"user_id": 2, "count": 1}]] + expected_result = {"message": "Cannot delete organization that has one or more users only associated with this organization"}, 400 + actual_result = admin_org.delete_org("test org") + + assert actual_result == expected_result \ No newline at end of file diff --git a/services/api/tests/src/test_admin_rsu.py b/services/api/tests/src/test_admin_rsu.py index 0cc0c2555..5dd4a8713 100644 --- a/services/api/tests/src/test_admin_rsu.py +++ b/services/api/tests/src/test_admin_rsu.py @@ -279,6 +279,7 @@ def test_delete_rsu(mock_write_db): call(admin_rsu_data.delete_rsu_calls[1]), call(admin_rsu_data.delete_rsu_calls[2]), call(admin_rsu_data.delete_rsu_calls[3]), + call(admin_rsu_data.delete_rsu_calls[4]) ] mock_write_db.assert_has_calls(calls) assert actual_result == expected_result diff --git a/services/api/tests/src/test_contact_support.py b/services/api/tests/src/test_contact_support.py index cb4635db7..4b4b6b0f4 100644 --- a/services/api/tests/src/test_contact_support.py +++ b/services/api/tests/src/test_contact_support.py @@ -46,11 +46,12 @@ def test_contact_support_resource_initialization_success(): os.environ["CSM_EMAIL_TO_SEND_FROM"] = contact_support_data.CSM_EMAIL_TO_SEND_FROM os.environ["CSM_EMAIL_APP_USERNAME"] = contact_support_data.CSM_EMAIL_APP_USERNAME os.environ["CSM_EMAIL_APP_PASSWORD"] = contact_support_data.CSM_EMAIL_APP_PASSWORD - os.environ["CSM_EMAILS_TO_SEND_TO"] = contact_support_data.CSM_EMAILS_TO_SEND_TO - os.environ[ - "CSM_TARGET_SMTP_SERVER_ADDRESS" - ] = DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] = ( + DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + ) os.environ["CSM_TARGET_SMTP_SERVER_PORT"] = str(DEFAULT_CSM_TARGET_SMTP_SERVER_PORT) + os.environ["CSM_TLS_ENABLED"] = "true" + os.environ["CSM_AUTH_ENABLED"] = "true" # execute contactSupportResource = contact_support.ContactSupportResource() @@ -64,29 +65,27 @@ def test_contact_support_resource_initialization_success(): contactSupportResource.CSM_EMAIL_APP_PASSWORD == contact_support_data.CSM_EMAIL_APP_PASSWORD ) - assert ( - contactSupportResource.CSM_EMAILS_TO_SEND_TO - == contact_support_data.CSM_EMAILS_TO_SEND_TO - ) # cleanup del os.environ["CSM_EMAIL_TO_SEND_FROM"] del os.environ["CSM_EMAIL_APP_USERNAME"] del os.environ["CSM_EMAIL_APP_PASSWORD"] - del os.environ["CSM_EMAILS_TO_SEND_TO"] del os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] del os.environ["CSM_TARGET_SMTP_SERVER_PORT"] + del os.environ["CSM_TLS_ENABLED"] + del os.environ["CSM_AUTH_ENABLED"] def test_contact_support_resource_initialization_no_CSM_EMAIL_TO_SEND_FROM(): # prepare os.environ["CSM_EMAIL_APP_USERNAME"] = contact_support_data.CSM_EMAIL_APP_USERNAME os.environ["CSM_EMAIL_APP_PASSWORD"] = contact_support_data.CSM_EMAIL_APP_PASSWORD - os.environ["CSM_EMAILS_TO_SEND_TO"] = contact_support_data.CSM_EMAILS_TO_SEND_TO - os.environ[ - "CSM_TARGET_SMTP_SERVER_ADDRESS" - ] = DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] = ( + DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + ) os.environ["CSM_TARGET_SMTP_SERVER_PORT"] = str(DEFAULT_CSM_TARGET_SMTP_SERVER_PORT) + os.environ["CSM_TLS_ENABLED"] = "true" + os.environ["CSM_AUTH_ENABLED"] = "true" # execute exceptionOccurred = False @@ -101,48 +100,22 @@ def test_contact_support_resource_initialization_no_CSM_EMAIL_TO_SEND_FROM(): # cleanup del os.environ["CSM_EMAIL_APP_USERNAME"] del os.environ["CSM_EMAIL_APP_PASSWORD"] - del os.environ["CSM_EMAILS_TO_SEND_TO"] del os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] del os.environ["CSM_TARGET_SMTP_SERVER_PORT"] + del os.environ["CSM_TLS_ENABLED"] + del os.environ["CSM_AUTH_ENABLED"] def test_contact_support_resource_initialization_no_CSM_EMAIL_APP_PASSWORD(): # prepare os.environ["CSM_EMAIL_TO_SEND_FROM"] = contact_support_data.CSM_EMAIL_TO_SEND_FROM - os.environ["CSM_EMAILS_TO_SEND_TO"] = contact_support_data.CSM_EMAILS_TO_SEND_TO os.environ["CSM_EMAIL_APP_USERNAME"] = contact_support_data.CSM_EMAIL_APP_USERNAME - os.environ[ - "CSM_TARGET_SMTP_SERVER_ADDRESS" - ] = DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS - os.environ["CSM_TARGET_SMTP_SERVER_PORT"] = str(DEFAULT_CSM_TARGET_SMTP_SERVER_PORT) - - # execute - exceptionOccurred = False - try: - contactSupportResource = contact_support.ContactSupportResource() - except Exception as e: - exceptionOccurred = True - - # assert - assert exceptionOccurred - - # cleanup - del os.environ["CSM_EMAIL_TO_SEND_FROM"] - del os.environ["CSM_EMAILS_TO_SEND_TO"] - del os.environ["CSM_EMAIL_APP_USERNAME"] - del os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] - del os.environ["CSM_TARGET_SMTP_SERVER_PORT"] - - -def test_contact_support_resource_initialization_no_CSM_EMAILS_TO_SEND_TO(): - # prepare - os.environ["CSM_EMAIL_TO_SEND_FROM"] = contact_support_data.CSM_EMAIL_TO_SEND_FROM - os.environ["CSM_EMAIL_APP_USERNAME"] = contact_support_data.CSM_EMAIL_APP_USERNAME - os.environ["CSM_EMAIL_APP_PASSWORD"] = contact_support_data.CSM_EMAIL_APP_PASSWORD - os.environ[ - "CSM_TARGET_SMTP_SERVER_ADDRESS" - ] = DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] = ( + DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + ) os.environ["CSM_TARGET_SMTP_SERVER_PORT"] = str(DEFAULT_CSM_TARGET_SMTP_SERVER_PORT) + os.environ["CSM_TLS_ENABLED"] = "true" + os.environ["CSM_AUTH_ENABLED"] = "true" # execute exceptionOccurred = False @@ -157,21 +130,23 @@ def test_contact_support_resource_initialization_no_CSM_EMAILS_TO_SEND_TO(): # cleanup del os.environ["CSM_EMAIL_TO_SEND_FROM"] del os.environ["CSM_EMAIL_APP_USERNAME"] - del os.environ["CSM_EMAIL_APP_PASSWORD"] del os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] del os.environ["CSM_TARGET_SMTP_SERVER_PORT"] + del os.environ["CSM_TLS_ENABLED"] + del os.environ["CSM_AUTH_ENABLED"] def test_options(): # prepare os.environ["CSM_EMAIL_TO_SEND_FROM"] = contact_support_data.CSM_EMAIL_TO_SEND_FROM + os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] = ( + DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + ) + os.environ["CSM_TARGET_SMTP_SERVER_PORT"] = str(DEFAULT_CSM_TARGET_SMTP_SERVER_PORT) + os.environ["CSM_TLS_ENABLED"] = "true" + os.environ["CSM_AUTH_ENABLED"] = "true" os.environ["CSM_EMAIL_APP_USERNAME"] = contact_support_data.CSM_EMAIL_APP_USERNAME os.environ["CSM_EMAIL_APP_PASSWORD"] = contact_support_data.CSM_EMAIL_APP_PASSWORD - os.environ["CSM_EMAILS_TO_SEND_TO"] = contact_support_data.CSM_EMAILS_TO_SEND_TO - os.environ[ - "CSM_TARGET_SMTP_SERVER_ADDRESS" - ] = DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS - os.environ["CSM_TARGET_SMTP_SERVER_PORT"] = str(DEFAULT_CSM_TARGET_SMTP_SERVER_PORT) contactSupportResource = contact_support.ContactSupportResource() # execute @@ -184,9 +159,10 @@ def test_options(): del os.environ["CSM_EMAIL_TO_SEND_FROM"] del os.environ["CSM_EMAIL_APP_USERNAME"] del os.environ["CSM_EMAIL_APP_PASSWORD"] - del os.environ["CSM_EMAILS_TO_SEND_TO"] del os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] del os.environ["CSM_TARGET_SMTP_SERVER_PORT"] + del os.environ["CSM_TLS_ENABLED"] + del os.environ["CSM_AUTH_ENABLED"] def test_post_success(): @@ -194,11 +170,12 @@ def test_post_success(): os.environ["CSM_EMAIL_TO_SEND_FROM"] = contact_support_data.CSM_EMAIL_TO_SEND_FROM os.environ["CSM_EMAIL_APP_USERNAME"] = contact_support_data.CSM_EMAIL_APP_USERNAME os.environ["CSM_EMAIL_APP_PASSWORD"] = contact_support_data.CSM_EMAIL_APP_PASSWORD - os.environ["CSM_EMAILS_TO_SEND_TO"] = contact_support_data.CSM_EMAILS_TO_SEND_TO - os.environ[ - "CSM_TARGET_SMTP_SERVER_ADDRESS" - ] = DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] = ( + DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + ) os.environ["CSM_TARGET_SMTP_SERVER_PORT"] = str(DEFAULT_CSM_TARGET_SMTP_SERVER_PORT) + os.environ["CSM_TLS_ENABLED"] = "true" + os.environ["CSM_AUTH_ENABLED"] = "true" contactSupportResource = contact_support.ContactSupportResource() contactSupportResource.validate_input = MagicMock() contactSupportResource.send = MagicMock() @@ -215,9 +192,10 @@ def test_post_success(): del os.environ["CSM_EMAIL_TO_SEND_FROM"] del os.environ["CSM_EMAIL_APP_USERNAME"] del os.environ["CSM_EMAIL_APP_PASSWORD"] - del os.environ["CSM_EMAILS_TO_SEND_TO"] del os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] del os.environ["CSM_TARGET_SMTP_SERVER_PORT"] + del os.environ["CSM_TLS_ENABLED"] + del os.environ["CSM_AUTH_ENABLED"] def test_post_no_json_body(): @@ -225,11 +203,12 @@ def test_post_no_json_body(): os.environ["CSM_EMAIL_TO_SEND_FROM"] = contact_support_data.CSM_EMAIL_TO_SEND_FROM os.environ["CSM_EMAIL_APP_USERNAME"] = contact_support_data.CSM_EMAIL_APP_USERNAME os.environ["CSM_EMAIL_APP_PASSWORD"] = contact_support_data.CSM_EMAIL_APP_PASSWORD - os.environ["CSM_EMAILS_TO_SEND_TO"] = contact_support_data.CSM_EMAILS_TO_SEND_TO - os.environ[ - "CSM_TARGET_SMTP_SERVER_ADDRESS" - ] = DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] = ( + DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + ) os.environ["CSM_TARGET_SMTP_SERVER_PORT"] = str(DEFAULT_CSM_TARGET_SMTP_SERVER_PORT) + os.environ["CSM_TLS_ENABLED"] = "true" + os.environ["CSM_AUTH_ENABLED"] = "true" contactSupportResource = contact_support.ContactSupportResource() contactSupportResource.validate_input = MagicMock() contactSupportResource.send = MagicMock() @@ -248,9 +227,10 @@ def test_post_no_json_body(): del os.environ["CSM_EMAIL_TO_SEND_FROM"] del os.environ["CSM_EMAIL_APP_USERNAME"] del os.environ["CSM_EMAIL_APP_PASSWORD"] - del os.environ["CSM_EMAILS_TO_SEND_TO"] del os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] del os.environ["CSM_TARGET_SMTP_SERVER_PORT"] + del os.environ["CSM_TLS_ENABLED"] + del os.environ["CSM_AUTH_ENABLED"] def test_validate_input(): @@ -258,11 +238,12 @@ def test_validate_input(): os.environ["CSM_EMAIL_TO_SEND_FROM"] = contact_support_data.CSM_EMAIL_TO_SEND_FROM os.environ["CSM_EMAIL_APP_USERNAME"] = contact_support_data.CSM_EMAIL_APP_USERNAME os.environ["CSM_EMAIL_APP_PASSWORD"] = contact_support_data.CSM_EMAIL_APP_PASSWORD - os.environ["CSM_EMAILS_TO_SEND_TO"] = contact_support_data.CSM_EMAILS_TO_SEND_TO - os.environ[ - "CSM_TARGET_SMTP_SERVER_ADDRESS" - ] = DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] = ( + DEFAULT_CSM_TARGET_SMTP_SERVER_ADDRESS + ) os.environ["CSM_TARGET_SMTP_SERVER_PORT"] = str(DEFAULT_CSM_TARGET_SMTP_SERVER_PORT) + os.environ["CSM_TLS_ENABLED"] = "true" + os.environ["CSM_AUTH_ENABLED"] = "true" contactSupportResource = contact_support.ContactSupportResource() # execute @@ -277,9 +258,10 @@ def test_validate_input(): del os.environ["CSM_EMAIL_TO_SEND_FROM"] del os.environ["CSM_EMAIL_APP_USERNAME"] del os.environ["CSM_EMAIL_APP_PASSWORD"] - del os.environ["CSM_EMAILS_TO_SEND_TO"] del os.environ["CSM_TARGET_SMTP_SERVER_ADDRESS"] del os.environ["CSM_TARGET_SMTP_SERVER_PORT"] + del os.environ["CSM_TLS_ENABLED"] + del os.environ["CSM_AUTH_ENABLED"] # end of tests for ContactSupportResource class --- diff --git a/services/api/tests/src/test_rsu_geo_msg_query.py b/services/api/tests/src/test_rsu_geo_msg_query.py index 106cfdb7a..e17a00332 100644 --- a/services/api/tests/src/test_rsu_geo_msg_query.py +++ b/services/api/tests/src/test_rsu_geo_msg_query.py @@ -10,7 +10,13 @@ def test_geo_hash(): @patch.dict( - os.environ, {"MONGO_DB_URI": "uri", "MONGO_DB_NAME": "name", "GEO_DB_NAME": "col"} + os.environ, + { + "MONGO_DB_URI": "uri", + "MONGO_DB_NAME": "name", + "GEO_DB_NAME": "col", + "MAX_GEO_QUERY_RECORDS": "10000", + }, ) @patch("api.src.rsu_geo_msg_query.MongoClient") def test_query_geo_data_mongo(mock_mongo): @@ -37,7 +43,13 @@ def test_query_geo_data_mongo(mock_mongo): @patch.dict( - os.environ, {"MONGO_DB_URI": "uri", "MONGO_DB_NAME": "name", "GEO_DB_NAME": "col"} + os.environ, + { + "MONGO_DB_URI": "uri", + "MONGO_DB_NAME": "name", + "GEO_DB_NAME": "col", + "MAX_GEO_QUERY_RECORDS": "10000", + }, ) @patch("api.src.rsu_geo_msg_query.MongoClient") def test_query_geo_data_mongo_filter_failed(mock_mongo): diff --git a/services/api/tests/src/test_smtp_error_handler.py b/services/api/tests/src/test_smtp_error_handler.py index ea8308d77..b76fd1b68 100644 --- a/services/api/tests/src/test_smtp_error_handler.py +++ b/services/api/tests/src/test_smtp_error_handler.py @@ -23,47 +23,17 @@ def test_get_environment_name_fail(): ###################################### Testing Functions ########################################## -@patch("api.src.smtp_error_handler.pgquery.query_db") -def test_get_subscribed_users_success(mock_query_db): +@patch.dict( + os.environ, + {"CSM_EMAILS_TO_SEND_TO": "test@gmail.com,test2@gmail.com"}, + clear=True, +) +def test_get_subscribed_users_success(): expected = ["test@gmail.com", "test2@gmail.com"] - mock_query_db.return_value = smtp_error_handler_data.get_subscribed_users_query_resp actual = smtp_error_handler.get_subscribed_users() - - calls = [ - call(smtp_error_handler_data.get_subscribed_users_query), - ] - mock_query_db.assert_has_calls(calls) assert actual == expected -@patch("api.src.smtp_error_handler.pgquery.query_db") -@patch("api.src.smtp_error_handler.pgquery.write_db") -def test_unsubscribe_user_success(mock_write_db, mock_query_db): - mock_query_db.return_value = ["test@gmail.com"] - expected_code = 200 - actual_code = smtp_error_handler.unsubscribe_user("test@gmail.com") - - calls = [call(smtp_error_handler_data.get_unsubscribe_user_query)] - mock_query_db.assert_has_calls(calls) - calls = [call(smtp_error_handler_data.get_unsubscribe_user_remove_query)] - mock_write_db.assert_has_calls(calls) - assert actual_code == expected_code - - -@patch("api.src.smtp_error_handler.pgquery.query_db") -@patch("api.src.smtp_error_handler.pgquery.write_db") -def test_unsubscribe_user_failure(mock_write_db, mock_query_db): - mock_query_db.return_value = [] - expected_code = 400 - actual_code = smtp_error_handler.unsubscribe_user("test@gmail.com") - - calls = [call(smtp_error_handler_data.get_unsubscribe_user_query)] - mock_query_db.assert_has_calls(calls) - calls = [] - mock_write_db.assert_has_calls(calls) - assert actual_code == expected_code - - EMAIL_TO_SEND_FROM = "test@test.test" EMAIL_APP_USERNAME = "test" EMAIL_APP_PASSWORD = "test" diff --git a/services/api/tests/src/test_unsub_error_emails.py b/services/api/tests/src/test_unsub_error_emails.py deleted file mode 100644 index f6dbc0204..000000000 --- a/services/api/tests/src/test_unsub_error_emails.py +++ /dev/null @@ -1,68 +0,0 @@ -from unittest.mock import patch, MagicMock, call -import pytest -import api.src.unsub_error_emails as unsub_error_emails -import api.tests.data.unsub_error_emails_data as unsub_error_emails_data -import sqlalchemy -from werkzeug.exceptions import HTTPException - -###################################### Testing Requests ########################################## - - -def test_request_options(): - info = unsub_error_emails.UnsubErrorEmails() - (body, code, headers) = info.options() - assert body == "" - assert code == 204 - assert headers["Access-Control-Allow-Methods"] == "GET" - - -@patch("api.src.unsub_error_emails.unsubscribe_user") -def test_unsubscribe_user_success(mock_unsubscribe_user): - email = "test@gmail.com" - mock_unsubscribe_user.return_value = 200 - status = unsub_error_emails.UnsubErrorEmails() - (body, code, headers) = status.get(email) - - mock_unsubscribe_user.assert_called_once() - mock_unsubscribe_user.assert_called_with(email) - assert code == 200 - assert headers["Access-Control-Allow-Origin"] == "test.com" - assert body == f"User {email} was successfully unsubscribed!" - - -@patch("api.src.unsub_error_emails.unsubscribe_user") -def test_unsubscribe_user_400(mock_unsubscribe_user): - email = None - mock_unsubscribe_user.return_value = 200 - status = unsub_error_emails.UnsubErrorEmails() - (body, code, headers) = status.get(email) - - mock_unsubscribe_user.assert_not_called() - assert code == 400 - assert headers["Access-Control-Allow-Origin"] == "test.com" - assert body == f"No unsubscribe email was specified" - - -@patch("api.src.unsub_error_emails.unsubscribe_user") -def test_unsubscribe_user_404(mock_unsubscribe_user): - email = "test@gmail.com" - mock_unsubscribe_user.return_value = 400 - status = unsub_error_emails.UnsubErrorEmails() - (body, code, headers) = status.get(email) - - mock_unsubscribe_user.assert_called_once() - mock_unsubscribe_user.assert_called_with(email) - assert code == 400 - assert headers["Access-Control-Allow-Origin"] == "test.com" - assert body == f"User with email {email} does not exist" - - -###################################### Testing Functions ########################################## -@patch("api.src.unsub_error_emails.smtp_error_handler.unsubscribe_user") -def test_unsubscribe_user(mock_unsubscribe_user): - mock_unsubscribe_user.return_value = "unsub_user_return" - expected_result = "unsub_user_return" - actual_result = unsub_error_emails.unsubscribe_user("test@gmail.com") - - mock_unsubscribe_user.assert_called_with("test@gmail.com") - assert actual_result == expected_result diff --git a/services/common/emailSender.py b/services/common/emailSender.py index a1c85fde8..db450065c 100644 --- a/services/common/emailSender.py +++ b/services/common/emailSender.py @@ -21,22 +21,22 @@ def send( username, password, pretty=False, + tlsEnabled="true", + authEnabled="true", ): try: # prepare email toSend = "" if pretty: - toSend = self.preparePrettyEmailToSend( - sender, recipient, subject, message - ) + toSend = self.formatPretty(sender, recipient, subject, message) else: - toSend = self.prepareEmailToSend( - sender, recipient, subject, message, replyEmail - ) + toSend = self.format(recipient, subject, message, replyEmail) - self.server.starttls(context=self.context) # start TLS encryption - self.server.ehlo() # say hello - self.server.login(username, password) + if tlsEnabled == "true": + self.server.starttls(context=self.context) # start TLS encryption + self.server.ehlo() # say hello + if authEnabled == "true": + self.server.login(username, password) # send email self.server.sendmail(sender, recipient, toSend) @@ -46,19 +46,23 @@ def send( finally: self.server.quit() - def prepareEmailToSend(self, sender, recipient, subject, message, replyEmail): - emailHeaders = "From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n" % ( - sender, + def format(self, recipient, subject, message, replyEmail): + toReturn = """From: User +To: Support <%s> +Subject: %s + +%s + +Please reply to %s. +""" % ( recipient, subject, + message, + replyEmail, ) - if not replyEmail: - toSend = emailHeaders + message - else: - toSend = emailHeaders + message + "\r\n\r\nReply-To: " + replyEmail - return toSend + return toReturn - def preparePrettyEmailToSend(self, sender, recipient, subject, html_message): + def formatPretty(self, sender, recipient, subject, html_message): toSend = MIMEMultipart() toSend["Subject"] = subject toSend["From"] = sender diff --git a/services/common/email_util.py b/services/common/email_util.py new file mode 100644 index 000000000..f76e550e7 --- /dev/null +++ b/services/common/email_util.py @@ -0,0 +1,102 @@ +from common.pgquery import query_db + + +def build_user_email_list(msg_type, org_name): + # Build the user email query based on the availability of an organization name + email_query = ( + "SELECT to_jsonb(row) FROM (" + "SELECT email FROM public.users " + "WHERE user_id IN (" + "SELECT user_id FROM public.user_email_notification " + "WHERE email_type_id = (" + f"SELECT email_type_id FROM public.email_type WHERE email_type = '{msg_type}'" + "))" + ) + if org_name: + email_query += ( + " AND user_id IN (" + "SELECT user_id FROM public.user_organization " + "WHERE organization_id = (" + f"SELECT organization_id FROM public.organizations WHERE name = '{org_name}'" + "))" + ) + email_query += ") as row" + + data = query_db(email_query) + + email_list = [] + for row in data: + row = dict(row[0]) + email_list.append(row["email"]) + return email_list + + +def build_org_email_list(org_name): + email_query = ( + "SELECT to_jsonb(row) FROM (" + f"SELECT email FROM public.organizations WHERE name = '{org_name}'" + ") as row" + ) + + data = query_db(email_query) + + email_list = [] + for row in data: + row = dict(row[0]) + email = row["email"] + if email: + if email.strip() != "": + email_list.append(row["email"]) + return email_list + + +def get_email_list(msg_type, org_name=None): + email_list = [] + + # Verify presence of organization email if org_name is provided + if org_name: + email_list = build_org_email_list(org_name) + + # Generate the email list based off of user email preferences if no organization email is configured + if len(email_list) == 0: + email_list = build_user_email_list(msg_type, org_name) + + # Only return unique emails + return list(set(email_list)) + + +def get_email_list_from_rsu(msg_type, rsu_ip): + email_query = ( + "SELECT to_jsonb(row) FROM (" + "SELECT name, email FROM public.organizations " + "WHERE organization_id IN (" + "SELECT organization_id FROM public.rsu_organization " + "WHERE rsu_id IN (" + f"SELECT rsu_id FROM public.rsus WHERE ipv4_address = '{rsu_ip}'" + "))) as row" + ) + + data = query_db(email_query) + + org_email_list = {} + # Grab the organization emails if they are configured with a non-None or empty string + for row in data: + row = dict(row[0]) + org_email_list[row["name"]] = [] + email = row["email"] + + if email: + if email.strip() != "": + org_email_list[row["name"]].append(row["email"]) + + email_list = [] + # Combine all of the emails into one email list + for org_name, org_emails in org_email_list.items(): + # If an organization email isn't configured, grab the configured user emails based on org_name + if len(org_emails) == 0: + email_list = email_list + build_user_email_list(msg_type, org_name) + else: + email_list = email_list + org_emails + + # Only return unique emails + return list(set(email_list)) diff --git a/services/common/gcs_utils.py b/services/common/gcs_utils.py new file mode 100644 index 000000000..6af6653ca --- /dev/null +++ b/services/common/gcs_utils.py @@ -0,0 +1,58 @@ +from google.cloud import storage +from common.util import validate_file_type +import logging +import os + + +def download_gcp_blob(blob_name, destination_file_name): + """Download a file from a GCP Bucket Storage bucket to a local file. + + Args: + blob_name (str): The name of the file in the bucket. + destination_file_name (str): The name of the local file to download the bucket file to. + """ + + if not validate_file_type(blob_name): + return False + + gcp_project = os.environ.get("GCP_PROJECT") + bucket_name = os.environ.get("BLOB_STORAGE_BUCKET") + storage_client = storage.Client(gcp_project) + bucket = storage_client.get_bucket(bucket_name) + blob = bucket.blob(blob_name) + + if blob.exists(): + blob.download_to_filename(destination_file_name) + logging.info( + f"Downloaded storage object {blob_name} from bucket {bucket_name} to local file {destination_file_name}." + ) + return True + return False + + +def list_gcs_blobs(gcs_prefix, file_extension): + files = [] + gcp_project = os.environ.get("GCP_PROJECT") + bucket_name = os.environ.get("BLOB_STORAGE_BUCKET") + logging.debug(f"Listing blobs in bucket {bucket_name} with prefix {gcs_prefix}.") + storage_client = storage.Client(gcp_project) + blobs = storage_client.list_blobs(bucket_name, prefix=gcs_prefix, delimiter="/") + blob_count = 0 + download_count = 0 + for blob in blobs: + logging.debug(f"Blob: {blob.name}") + if validate_file_type(blob.name, file_extension): + path = f"/firmwares/{blob.name.split(gcs_prefix)[-1]}" + files.append(path) + if not os.path.exists(path): + blob.download_to_filename(path) + logging.debug(f"Downloaded blob {blob.name} to {path}") + download_count += 1 + else: + logging.debug(f"File {path} already exists, skipping download.") + else: + logging.debug(f"Blob {blob.name} does not end with {file_extension}") + blob_count += 1 + logging.debug(f"Found {blob_count} blobs, and downloaded {download_count} files.") + logging.debug(f"Found {len(files)} files with extension {file_extension}.") + return files diff --git a/services/common/pgquery.py b/services/common/pgquery.py index 7b4f5ed3f..84d542eb8 100644 --- a/services/common/pgquery.py +++ b/services/common/pgquery.py @@ -22,7 +22,7 @@ def init_tcp_connection_engine(db_user, db_pass, db_name, db_hostname, db_port): logging.info(f"Creating DB pool") - logging.info(f"{db_user},{db_pass},{db_name},{db_hostname},{db_port}") + logging.debug(f"{db_user},{db_name},{db_hostname},{db_port}") pool = sqlalchemy.create_engine( # Equivalent URL: # postgresql+pg8000://:@:/ diff --git a/services/common/rsufwdsnmpset.py b/services/common/rsufwdsnmpset.py index 4501ff208..7ee833731 100644 --- a/services/common/rsufwdsnmpset.py +++ b/services/common/rsufwdsnmpset.py @@ -493,7 +493,7 @@ def config_init( "47900", index, "8003", - raw=True + raw=True, ) else: return ( @@ -502,6 +502,7 @@ def config_init( ) elif snmp_version == "1218": # Based on message type, choose the right port + # rsu_ip, snmp_creds, dest_ip, udp_port, rsu_index, psid, tx if msg_type.lower() == "bsm": return config_txrxmsg( rsu_ip, snmp_creds, dest_ip, "46800", index, "20", False @@ -524,7 +525,7 @@ def config_init( ) if msg_type.lower() == "tim": return config_txrxmsg( - rsu_ip, snmp_creds, dest_ip, "47900", index, "8003", False + rsu_ip, snmp_creds, dest_ip, "47900", index, "8003", True ) else: return ( diff --git a/services/common/tests/test_emailSender.py b/services/common/tests/test_emailSender.py index 7eee56c74..0677f5f27 100644 --- a/services/common/tests/test_emailSender.py +++ b/services/common/tests/test_emailSender.py @@ -13,7 +13,7 @@ DEFAULT_TARGET_SMTP_SERVER_PORT = 587 -def test_send(): +def test_send_with_tls_and_auth(): # prepare emailSender = EmailSender( DEFAULT_TARGET_SMTP_SERVER_ADDRESS, DEFAULT_TARGET_SMTP_SERVER_PORT @@ -34,6 +34,9 @@ def test_send(): EMAIL_REPLY_EMAIL, EMAIL_APP_USERNAME, EMAIL_APP_PASSWORD, + False, + "true", # tlsEnabled + "true", # authEnabled ) # assert @@ -42,3 +45,105 @@ def test_send(): emailSender.server.login.assert_called_once() emailSender.server.sendmail.assert_called_once() emailSender.server.quit.assert_called_once() + + +def test_send_with_tls_and_no_auth(): + # prepare + emailSender = EmailSender( + DEFAULT_TARGET_SMTP_SERVER_ADDRESS, DEFAULT_TARGET_SMTP_SERVER_PORT + ) + emailSender.server = MagicMock() + emailSender.server.starttls = MagicMock() + emailSender.server.ehlo = MagicMock() + emailSender.server.login = MagicMock() + emailSender.server.sendmail = MagicMock() + emailSender.server.quit = MagicMock() + + # execute + emailSender.send( + EMAIL_TO_SEND_FROM, + EMAILS_TO_SEND_TO, + EMAIL_SUBJECT, + EMAIL_MESSAGE, + EMAIL_REPLY_EMAIL, + EMAIL_APP_USERNAME, + EMAIL_APP_PASSWORD, + False, + "true", # tlsEnabled + "false", # authEnabled + ) + + # assert + emailSender.server.starttls.assert_called_once() + emailSender.server.ehlo.assert_called_once() + emailSender.server.login.assert_not_called() + emailSender.server.sendmail.assert_called_once() + emailSender.server.quit.assert_called_once() + + +def test_send_with_no_tls_and_auth(): + # prepare + emailSender = EmailSender( + DEFAULT_TARGET_SMTP_SERVER_ADDRESS, DEFAULT_TARGET_SMTP_SERVER_PORT + ) + emailSender.server = MagicMock() + emailSender.server.starttls = MagicMock() + emailSender.server.ehlo = MagicMock() + emailSender.server.login = MagicMock() + emailSender.server.sendmail = MagicMock() + emailSender.server.quit = MagicMock() + + # execute + emailSender.send( + EMAIL_TO_SEND_FROM, + EMAILS_TO_SEND_TO, + EMAIL_SUBJECT, + EMAIL_MESSAGE, + EMAIL_REPLY_EMAIL, + EMAIL_APP_USERNAME, + EMAIL_APP_PASSWORD, + False, + "false", # tlsEnabled + "true", # authEnabled + ) + + # assert + emailSender.server.starttls.assert_not_called() + emailSender.server.ehlo.assert_not_called() + emailSender.server.login.assert_called_once() + emailSender.server.sendmail.assert_called_once() + emailSender.server.quit.assert_called_once() + + +def test_send_with_no_tls_and_no_auth(): + # prepare + emailSender = EmailSender( + DEFAULT_TARGET_SMTP_SERVER_ADDRESS, DEFAULT_TARGET_SMTP_SERVER_PORT + ) + emailSender.server = MagicMock() + emailSender.server.starttls = MagicMock() + emailSender.server.ehlo = MagicMock() + emailSender.server.login = MagicMock() + emailSender.server.sendmail = MagicMock() + emailSender.server.quit = MagicMock() + + # execute + emailSender.send( + EMAIL_TO_SEND_FROM, + EMAILS_TO_SEND_TO, + EMAIL_SUBJECT, + EMAIL_MESSAGE, + EMAIL_REPLY_EMAIL, + EMAIL_APP_USERNAME, + EMAIL_APP_PASSWORD, + False, + "false", # tlsEnabled + "false", # authEnabled + ) + + # assert + emailSender.server.starttls.assert_not_called() + emailSender.server.ehlo.assert_not_called() + emailSender.server.login.assert_not_called() + emailSender.server.sendmail.assert_called_once() + emailSender.server.quit.assert_called_once() \ No newline at end of file diff --git a/services/common/tests/test_email_util.py b/services/common/tests/test_email_util.py new file mode 100644 index 000000000..7931e76d4 --- /dev/null +++ b/services/common/tests/test_email_util.py @@ -0,0 +1,47 @@ +from mock import patch +from common import email_util + + +@patch("common.email_util.query_db") +def test_get_email_list_no_org(mock_query_db): + mock_query_db.return_value = [ + [ + {"email": "bob@gmail.com"}, + ], + [{"email": "bob2@gmail.com"}], + ] + email_list = email_util.get_email_list("msg_type") + assert "bob@gmail.com" in email_list + assert "bob2@gmail.com" in email_list + assert len(email_list) == 2 + + +@patch("common.email_util.query_db") +@patch("common.email_util.build_org_email_list") +def test_get_email_list_org(mock_build_org_email_list, mock_query_db): + mock_query_db.return_value = [ + [ + {"email": "bob@gmail.com"}, + ], + [{"email": "bob2@gmail.com"}], + ] + mock_build_org_email_list.return_value = ["org@gmail.com"] + email_list = email_util.get_email_list("msg_type", "org") + assert "org@gmail.com" in email_list + assert len(email_list) == 1 + + +@patch("common.email_util.query_db") +@patch("common.email_util.build_user_email_list") +def test_get_email_list_from_rsu(mock_build_user_email_list, mock_query_db): + mock_query_db.return_value = [ + [{"name": "Test Org", "email": "bob@gmail.com"}], + [{"name": "Test Org2", "email": None}], + [{"name": "Test Org3", "email": ""}], + ] + mock_build_user_email_list.return_value = ["org2@gmail.com", "org3@gmail.com"] + email_list = email_util.get_email_list_from_rsu("msg_type", "127.0.0.1") + assert "org3@gmail.com" in email_list + assert "org2@gmail.com" in email_list + assert "bob@gmail.com" in email_list + assert len(email_list) == 3 diff --git a/services/common/tests/test_gcs_utils.py b/services/common/tests/test_gcs_utils.py new file mode 100644 index 000000000..9d462634b --- /dev/null +++ b/services/common/tests/test_gcs_utils.py @@ -0,0 +1,83 @@ +from unittest.mock import patch, MagicMock +import os +from common import gcs_utils + + +@patch.dict( + os.environ, {"GCP_PROJECT": "test-project", "BLOB_STORAGE_BUCKET": "test-bucket"} +) +@patch("common.gcs_utils.logging") +@patch("common.gcs_utils.storage.Client") +def test_download_gcp_blob(mock_storage_client, mock_logging): + # mock + mock_client = mock_storage_client.return_value + mock_bucket = mock_client.get_bucket.return_value + mock_blob = mock_bucket.blob.return_value + + # run + gcs_utils.download_gcp_blob( + blob_name="test.tar", destination_file_name="/home/test/" + ) + + # validate + mock_storage_client.assert_called_with("test-project") + mock_client.get_bucket.assert_called_with("test-bucket") + mock_bucket.blob.assert_called_with("test.tar") + mock_blob.download_to_filename.assert_called_with("/home/test/") + mock_logging.info.assert_called_with( + "Downloaded storage object test.tar from bucket test-bucket to local file /home/test/." + ) + + +@patch.dict( + os.environ, {"GCP_PROJECT": "test-project", "BLOB_STORAGE_BUCKET": "test-bucket"} +) +@patch("common.gcs_utils.storage.Client") +def test_list_gcs_blobs(mock_storage_client): + # mock + mock_client = mock_storage_client.return_value + # mock_bucket = mock_client.get_bucket.return_value + mock_blobs = [] + for filename in ["file1.txt", "file2.jpg", "file3.txt"]: + mock_blob = MagicMock() + mock_blob.name = filename + mock_blobs.append(mock_blob) + + mock_client.list_blobs.return_value = mock_blobs + + # run + result = gcs_utils.list_gcs_blobs( + gcs_prefix="path/to/files/", file_extension=".txt" + ) + + # validate + mock_storage_client.assert_called_with("test-project") + mock_client.list_blobs.assert_called_with( + "test-bucket", prefix="path/to/files/", delimiter="/" + ) + assert result == ["/firmwares/file1.txt", "/firmwares/file3.txt"] + + +@patch.dict( + os.environ, {"GCP_PROJECT": "test-project", "BLOB_STORAGE_BUCKET": "test-bucket"} +) +@patch("common.gcs_utils.storage.Client") +def test_list_gcs_blobs_empty(mock_storage_client): + # mock + mock_client = mock_storage_client.return_value + # mock_bucket = mock_client.get_bucket.return_value + mock_blobs = [] + + mock_client.list_blobs.return_value = mock_blobs + + # run + result = gcs_utils.list_gcs_blobs( + gcs_prefix="path/to/files/", file_extension=".txt" + ) + + # validate + mock_storage_client.assert_called_with("test-project") + mock_client.list_blobs.assert_called_with( + "test-bucket", prefix="path/to/files/", delimiter="/" + ) + assert result == [] diff --git a/services/common/tests/test_util.py b/services/common/tests/test_util.py index 2f1bf9523..b665d9300 100644 --- a/services/common/tests/test_util.py +++ b/services/common/tests/test_util.py @@ -47,3 +47,23 @@ def test_utc2tz_failure(): assert util.utc2tz(d) == None d = None assert util.utc2tz(d) == None + + +def test_validation_file_type(): + file_name = "test.tar" + file_extension = ".tar" + validation = util.validate_file_type(file_name, file_extension) + assert validation == True + + +def test_validation_file_type_no_extension(): + file_name = "test.tar" + validation = util.validate_file_type(file_name) + assert validation == True + + +def test_validation_file_type_failure(): + file_name = "test.blob" + file_extension = ".tar" + validation = util.validate_file_type(file_name, file_extension) + assert validation == False diff --git a/services/common/util.py b/services/common/util.py index b5dd4f545..92405210f 100644 --- a/services/common/util.py +++ b/services/common/util.py @@ -1,6 +1,7 @@ from dateutil.parser import parse import pytz import os +import logging # expects datetime string @@ -42,3 +43,18 @@ def utc2tz(d): return None tz_d = d.astimezone(pytz.timezone(os.getenv("TIMEZONE", "America/Denver"))) return tz_d + + +def validate_file_type(file_name, extension=".tar"): + """Validate the file type of the file to be downloaded. + + Args: + file_name (str): The name of the file to be downloaded. + extension (str): The file extension to validate against. + """ + if not file_name.endswith(extension): + logging.error( + f'Unsupported file type for storage object {file_name}. Only "{extension}" files are supported.' + ) + return False + return True diff --git a/services/pytest.ini b/services/pytest.ini index 0a2f782e9..463b4c366 100644 --- a/services/pytest.ini +++ b/services/pytest.ini @@ -5,7 +5,10 @@ pythonpath = . addons/images/firmware_manager addons/images/iss_health_check addons/images/rsu_status_check + addons/images/obu_ota_server api/src common +asyncio_mode=auto env = - CORS_DOMAIN=test.com \ No newline at end of file + CORS_DOMAIN=test.com + diff --git a/services/requirements.txt b/services/requirements.txt index 46501ebfb..a70888602 100644 --- a/services/requirements.txt +++ b/services/requirements.txt @@ -29,3 +29,9 @@ fabric==3.2.2 paramiko==3.3.1 scp==0.14.5 waitress==2.1.2 +fastapi==0.110.0 +pydantic==2.6.2 +uvicorn==0.27.1 +pytest-asyncio==0.23.3 +aiofiles==23.2.1 +httpx==0.27.0 \ No newline at end of file diff --git a/webapp/Dockerfile b/webapp/Dockerfile index 0f89e0da0..c0838860d 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -33,6 +33,12 @@ ENV REACT_APP_MAPBOX_INIT_LONGITUDE $MAPBOX_INIT_LONGITUDE ARG MAPBOX_INIT_ZOOM ENV REACT_APP_MAPBOX_INIT_ZOOM $MAPBOX_INIT_ZOOM +ARG CVIZ_API_SERVER_URL +ENV REACT_APP_CVIZ_API_SERVER_URL $CVIZ_API_SERVER_URL + +ARG CVIZ_API_WS_URL +ENV REACT_APP_CVIZ_API_WS_URL $CVIZ_API_WS_URL + RUN npm ci RUN npm run build diff --git a/webapp/README.md b/webapp/README.md index 5e022334b..23a1d3224 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -12,6 +12,12 @@ This is a web application that is made with React JS that is a front-end for int - Download instructions: https://docs.npmjs.com/downloading-and-installing-node-js-and-npm - Nodejs - Download instructions: https://nodejs.org/en/download/ +- jpo-conflictvisualizer api (modified to connect with the jpo-cvmanager keycloak server) + - Repository: https://github.com/usdot-jpo-ode/jpo-conflictvisualizer + - Follow the instructions in the README to build/deploy the api +- jpo-conflictmonitor (required to have data for the conflict visualizer) + - Repository: https://github.com/usdot-jpo-ode/jpo-conflictmonitor + - Follow the instructions in the README to build/deploy the tool ## Building The Application @@ -106,6 +112,14 @@ Re-factoring RSU manager to utilize Redux Toolkit for state management - References - WzdxMap.js - read and load WZDx data +## ConflictVisualizer Integration + +The usdot [jpo-conflictvisualizer](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer) is a tool that can be used to visualize the conflicts between Basic Safety Messages (BSMs), Signal Phase and Timing (SPaT) messages, and MAP messages. The CV Manager Web Application has been integrated with the ConflictVisualizer tool to allow users to view data directly from a [jpo-conflictmonitor](https://github.com/usdot-jpo-ode/jpo-conflictmonitor) instance. This integration currently requires an additional jpo-conflictvisualizer api to be deployed alongside the jpo-cvmanager api. This allows the webapp to make authenticated requests to the jpo-conflictvisualizer api to retrieve the conflict monitor data. + +### Changes Made + +These changes were tested running locally in docker. These changes require a jpo-conflictvisualizer api to be running, and to be connected to the cvmanager keycloak server (and cvmanager keycloak realm). This API also requires the jpo-conflictmonitor and jpo-geojsonconverter to be running, so that there is data available. Once the jpo-conflictmonitor, jpo-geojsonconverter, and jpo-ode, then a jpo-conflictvisualizer api should be deployed, which should be modified to authenticate with the cvmanager keycloak realm (see the conflictvisualizer-map-page branch), and the port should be specified in the environment file (REACT_APP_CVIZ_API_SERVER_URL). Once all of these components are deployed, then the cvmanager webapp can be run! + ## Unit Testing The unit tests for this repository are written using Jest. These tests can be run with the following command: diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 150013f5b..b24810131 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -8,29 +8,37 @@ "name": "cv-manager", "version": "1.2.0-SNAPSHOT", "dependencies": { - "@emotion/react": "^11.10.5", - "@emotion/styled": "^11.10.5", + "@date-io/date-fns": "^2.15.0", + "@emotion/react": "^11.11.4", + "@emotion/styled": "^11.11.5", "@hookform/error-message": "^2.0.1", "@material-table/core": "^6.1.6", "@material-ui/core": "^4.12.3", - "@mui/icons-material": "^5.11.9", - "@mui/material": "^5.11.9", + "@mui/icons-material": "^5.15.19", + "@mui/material": "^5.15.19", "@mui/styled-engine-sc": "^5.11.9", + "@mui/styles": "^5.15.19", "@mui/x-date-pickers": "^5.0.15", "@react-keycloak/web": "3.4.0", "@react-oauth/google": "^0.2.8", "@reduxjs/toolkit": "^1.9.1", + "@stomp/stompjs": "^7.0.0", "@syncfusion/ej2-react-calendars": "^19.4.56", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^12.1.2", + "@turf/turf": "^6.5.0", "@types/react-tabs": "^5.0.5", "abort-controller": "^3.0.0", "axios": "^1.6.5", + "color": "^4.2.3", "dayjs": "^1.11.7", "env-cmd": "^10.1.0", "fbjs": "^3.0.4", + "file-saver": "^2.0.5", + "formik": "^2.4.6", "isomorphic-fetch": "^3.0.0", "jest-fetch-mock": "^3.0.3", + "jszip": "^3.10.1", "keycloak-js": "21.1.1", "luxon": "^2.3.2", "mapbox-gl": "^2.9.1", @@ -40,8 +48,10 @@ "react-confirm-alert": "^2.8.0", "react-dom": "^17.0.2", "react-hook-form": "^7.41.5", + "react-hot-toast": "^2.4.1", "react-icons": "^4.3.1", "react-map-gl": "^7.0.21", + "react-perfect-scrollbar": "^1.5.8", "react-redux": "^8.0.5", "react-router-dom": "^6.2.2", "react-scripts": "^5.0.0", @@ -52,8 +62,10 @@ "react-tabs": "^4.2.1", "react-widgets": "5.8.4", "reactstrap": "^9.2.2", + "recharts": "^2.12.6", "styled-components": "^5.3.6", "worker-loader": "^3.0.8", + "yup": "^1.4.0", "zustand": "4.3.1" }, "devDependencies": { @@ -1946,9 +1958,9 @@ "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==" }, "node_modules/@babel/runtime": { - "version": "7.23.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.8.tgz", - "integrity": "sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz", + "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -2299,9 +2311,25 @@ } }, "node_modules/@date-io/core": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.16.0.tgz", - "integrity": "sha512-DYmSzkr+jToahwWrsiRA2/pzMEtz9Bq1euJwoOuYwuwIYXnZFtHajY2E6a1VNVDc9jP8YUXK1BvnZH9mmT19Zg==" + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.17.0.tgz", + "integrity": "sha512-+EQE8xZhRM/hsY0CDTVyayMDDY5ihc4MqXCrPxooKw19yAzUIC6uUqsZeaOFNL9YKTNxYKrJP5DFgE8o5xRCOw==" + }, + "node_modules/@date-io/date-fns": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-2.17.0.tgz", + "integrity": "sha512-L0hWZ/mTpy3Gx/xXJ5tq5CzHo0L7ry6KEO9/w/JWiFWFLZgiNVo3ex92gOl3zmzjHqY/3Ev+5sehAr8UnGLEng==", + "dependencies": { + "@date-io/core": "^2.17.0" + }, + "peerDependencies": { + "date-fns": "^2.0.0" + }, + "peerDependenciesMeta": { + "date-fns": { + "optional": true + } + } }, "node_modules/@date-io/dayjs": { "version": "2.16.0", @@ -2352,31 +2380,27 @@ } }, "node_modules/@emotion/babel-plugin": { - "version": "11.10.5", - "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz", - "integrity": "sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==", + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.11.0.tgz", + "integrity": "sha512-m4HEDZleaaCH+XgDDsPF15Ht6wTLsgDTeR3WYj9Q/k76JtWhrJjcP4+/XlG8LGT/Rol9qUfOIztXeA84ATpqPQ==", "dependencies": { "@babel/helper-module-imports": "^7.16.7", - "@babel/plugin-syntax-jsx": "^7.17.12", "@babel/runtime": "^7.18.3", - "@emotion/hash": "^0.9.0", - "@emotion/memoize": "^0.8.0", - "@emotion/serialize": "^1.1.1", + "@emotion/hash": "^0.9.1", + "@emotion/memoize": "^0.8.1", + "@emotion/serialize": "^1.1.2", "babel-plugin-macros": "^3.1.0", "convert-source-map": "^1.5.0", "escape-string-regexp": "^4.0.0", "find-root": "^1.1.0", "source-map": "^0.5.7", - "stylis": "4.1.3" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" + "stylis": "4.2.0" } }, "node_modules/@emotion/babel-plugin/node_modules/@emotion/hash": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz", - "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==" + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz", + "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==" }, "node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": { "version": "4.0.0", @@ -2390,15 +2414,15 @@ } }, "node_modules/@emotion/cache": { - "version": "11.10.5", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz", - "integrity": "sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==", + "version": "11.11.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz", + "integrity": "sha512-P34z9ssTCBi3e9EI1ZsWpNHcfY1r09ZO0rZbRO2ob3ZQMnFI35jB536qoXbkdesr5EUhYi22anuEJuyxifaqAQ==", "dependencies": { - "@emotion/memoize": "^0.8.0", - "@emotion/sheet": "^1.2.1", - "@emotion/utils": "^1.2.0", - "@emotion/weak-memoize": "^0.3.0", - "stylis": "4.1.3" + "@emotion/memoize": "^0.8.1", + "@emotion/sheet": "^1.2.2", + "@emotion/utils": "^1.2.1", + "@emotion/weak-memoize": "^0.3.1", + "stylis": "4.2.0" } }, "node_modules/@emotion/core": { @@ -2412,93 +2436,85 @@ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" }, "node_modules/@emotion/is-prop-valid": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz", - "integrity": "sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz", + "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==", "dependencies": { - "@emotion/memoize": "^0.8.0" + "@emotion/memoize": "^0.8.1" } }, "node_modules/@emotion/memoize": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz", - "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", + "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" }, "node_modules/@emotion/react": { - "version": "11.10.5", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz", - "integrity": "sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==", + "version": "11.11.4", + "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.11.4.tgz", + "integrity": "sha512-t8AjMlF0gHpvvxk5mAtCqR4vmxiGHCeJBaQO6gncUSdklELOgtwjerNY2yuJNfwnc6vi16U/+uMF+afIawJ9iw==", "dependencies": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.10.5", - "@emotion/cache": "^11.10.5", - "@emotion/serialize": "^1.1.1", - "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", - "@emotion/utils": "^1.2.0", - "@emotion/weak-memoize": "^0.3.0", + "@emotion/babel-plugin": "^11.11.0", + "@emotion/cache": "^11.11.0", + "@emotion/serialize": "^1.1.3", + "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", + "@emotion/utils": "^1.2.1", + "@emotion/weak-memoize": "^0.3.1", "hoist-non-react-statics": "^3.3.1" }, "peerDependencies": { - "@babel/core": "^7.0.0", "react": ">=16.8.0" }, "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, "@types/react": { "optional": true } } }, "node_modules/@emotion/serialize": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz", - "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.4.tgz", + "integrity": "sha512-RIN04MBT8g+FnDwgvIUi8czvr1LU1alUMI05LekWB5DGyTm8cCBMCRpq3GqaiyEDRptEXOyXnvZ58GZYu4kBxQ==", "dependencies": { - "@emotion/hash": "^0.9.0", - "@emotion/memoize": "^0.8.0", - "@emotion/unitless": "^0.8.0", - "@emotion/utils": "^1.2.0", + "@emotion/hash": "^0.9.1", + "@emotion/memoize": "^0.8.1", + "@emotion/unitless": "^0.8.1", + "@emotion/utils": "^1.2.1", "csstype": "^3.0.2" } }, "node_modules/@emotion/serialize/node_modules/@emotion/hash": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz", - "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==" + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz", + "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==" }, "node_modules/@emotion/serialize/node_modules/csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/@emotion/sheet": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz", - "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.2.tgz", + "integrity": "sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==" }, "node_modules/@emotion/styled": { - "version": "11.10.5", - "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.5.tgz", - "integrity": "sha512-8EP6dD7dMkdku2foLoruPCNkRevzdcBaY6q0l0OsbyJK+x8D9HWjX27ARiSIKNF634hY9Zdoedh8bJCiva8yZw==", + "version": "11.11.5", + "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.11.5.tgz", + "integrity": "sha512-/ZjjnaNKvuMPxcIiUkf/9SHoG4Q196DRl1w82hQ3WCsjo1IUR8uaGWrC6a87CrYAW0Kb/pK7hk8BnLgLRi9KoQ==", "dependencies": { "@babel/runtime": "^7.18.3", - "@emotion/babel-plugin": "^11.10.5", - "@emotion/is-prop-valid": "^1.2.0", - "@emotion/serialize": "^1.1.1", - "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", - "@emotion/utils": "^1.2.0" + "@emotion/babel-plugin": "^11.11.0", + "@emotion/is-prop-valid": "^1.2.2", + "@emotion/serialize": "^1.1.4", + "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", + "@emotion/utils": "^1.2.1" }, "peerDependencies": { - "@babel/core": "^7.0.0", "@emotion/react": "^11.0.0-rc.0", "react": ">=16.8.0" }, "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, "@types/react": { "optional": true } @@ -2510,27 +2526,27 @@ "integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==" }, "node_modules/@emotion/unitless": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz", - "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==" + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", + "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==" }, "node_modules/@emotion/use-insertion-effect-with-fallbacks": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz", - "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz", + "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==", "peerDependencies": { "react": ">=16.8.0" } }, "node_modules/@emotion/utils": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz", - "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.1.tgz", + "integrity": "sha512-Y2tGf3I+XVnajdItskUCn6LX+VUDmP6lTL4fcqsXAv43dnlbZiuW4MWQW38rW/BVWSE7Q/7+XQocmpnRYILUmg==" }, "node_modules/@emotion/weak-memoize": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz", - "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg==" + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz", + "integrity": "sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==" }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", @@ -2617,6 +2633,40 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@floating-ui/core": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.2.tgz", + "integrity": "sha512-+2XpQV9LLZeanU4ZevzRnGFg2neDeKHgFLjP6YLW+tly0IvrhqT4u8enLGjLH3qeh85g19xY5rsAusfwTdn5lg==", + "dependencies": { + "@floating-ui/utils": "^0.2.0" + } + }, + "node_modules/@floating-ui/dom": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.5.tgz", + "integrity": "sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==", + "dependencies": { + "@floating-ui/core": "^1.0.0", + "@floating-ui/utils": "^0.2.0" + } + }, + "node_modules/@floating-ui/react-dom": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.0.tgz", + "integrity": "sha512-lNzj5EQmEKn5FFKc04+zasr09h/uX8RtJRNj5gUXsSQIXHVWTVh+hVAg1vOMCexkX8EgvemMvIFpQfkosnVNyA==", + "dependencies": { + "@floating-ui/dom": "^1.0.0" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/@floating-ui/utils": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.2.tgz", + "integrity": "sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==" + }, "node_modules/@hello-pangea/dnd": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/@hello-pangea/dnd/-/dnd-16.2.0.tgz", @@ -4982,22 +5032,6 @@ "react-dom": ">=16.8.0" } }, - "node_modules/@material-table/core/node_modules/@date-io/date-fns": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-2.16.0.tgz", - "integrity": "sha512-bfm5FJjucqlrnQcXDVU5RD+nlGmL3iWgkHTq3uAZWVIuBu6dDmGa3m8a6zo2VQQpu8ambq9H22UyUpn7590joA==", - "dependencies": { - "@date-io/core": "^2.16.0" - }, - "peerDependencies": { - "date-fns": "^2.0.0" - }, - "peerDependenciesMeta": { - "date-fns": { - "optional": true - } - } - }, "node_modules/@material-table/core/node_modules/date-fns": { "version": "2.29.3", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz", @@ -5024,15 +5058,16 @@ } }, "node_modules/@material-ui/core": { - "version": "4.12.3", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.3.tgz", - "integrity": "sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw==", + "version": "4.12.4", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz", + "integrity": "sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==", + "deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.", "dependencies": { "@babel/runtime": "^7.4.4", - "@material-ui/styles": "^4.11.4", - "@material-ui/system": "^4.12.1", + "@material-ui/styles": "^4.11.5", + "@material-ui/system": "^4.12.2", "@material-ui/types": "5.1.0", - "@material-ui/utils": "^4.11.2", + "@material-ui/utils": "^4.11.3", "@types/react-transition-group": "^4.2.0", "clsx": "^1.0.4", "hoist-non-react-statics": "^3.3.2", @@ -5059,7 +5094,7 @@ } } }, - "node_modules/@material-ui/core/node_modules/@material-ui/styles": { + "node_modules/@material-ui/styles": { "version": "4.11.5", "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz", "integrity": "sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==", @@ -5100,7 +5135,7 @@ } } }, - "node_modules/@material-ui/core/node_modules/@material-ui/system": { + "node_modules/@material-ui/system": { "version": "4.12.2", "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.12.2.tgz", "integrity": "sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==", @@ -5159,25 +5194,24 @@ } }, "node_modules/@mui/base": { - "version": "5.0.0-alpha.119", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.119.tgz", - "integrity": "sha512-XA5zhlYfXi67u613eIF0xRmktkatx6ERy3h+PwrMN5IcWFbgiL1guz8VpdXON+GWb8+G7B8t5oqTFIaCqaSAeA==", - "dependencies": { - "@babel/runtime": "^7.21.0", - "@emotion/is-prop-valid": "^1.2.0", - "@mui/types": "^7.2.3", - "@mui/utils": "^5.11.11", - "@popperjs/core": "^2.11.6", - "clsx": "^1.2.1", - "prop-types": "^15.8.1", - "react-is": "^18.2.0" + "version": "5.0.0-beta.40", + "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.40.tgz", + "integrity": "sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@floating-ui/react-dom": "^2.0.8", + "@mui/types": "^7.2.14", + "@mui/utils": "^5.15.14", + "@popperjs/core": "^2.11.8", + "clsx": "^2.1.0", + "prop-types": "^15.8.1" }, "engines": { "node": ">=12.0.0" }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@types/react": "^17.0.0 || ^18.0.0", @@ -5190,33 +5224,36 @@ } } }, - "node_modules/@mui/base/node_modules/react-is": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + "node_modules/@mui/base/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "engines": { + "node": ">=6" + } }, "node_modules/@mui/core-downloads-tracker": { - "version": "5.11.12", - "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.12.tgz", - "integrity": "sha512-LHh8HZQ5nPVcW5QnyLwkAZ40txc/S2bzKMQ3bTO+5mjuwAJ2AzQrjZINLVy1geY7ei1pHXVqO1hcWHg/QdT44w==", + "version": "5.15.19", + "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.19.tgz", + "integrity": "sha512-tCHSi/Tomez9ERynFhZRvFO6n9ATyrPs+2N80DMDzp6xDVirbBjEwhPcE+x7Lj+nwYw0SqFkOxyvMP0irnm55w==", "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" } }, "node_modules/@mui/icons-material": { - "version": "5.11.11", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.11.11.tgz", - "integrity": "sha512-Eell3ADmQVE8HOpt/LZ3zIma8JSvPh3XgnhwZLT0k5HRqZcd6F/QDHc7xsWtgz09t+UEFvOYJXjtrwKmLdwwpw==", + "version": "5.15.19", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.19.tgz", + "integrity": "sha512-RsEiRxA5azN9b8gI7JRqekkgvxQUlitoBOtZglflb8cUDyP12/cP4gRwhb44Ea1/zwwGGjAj66ZJpGHhKfibNA==", "dependencies": { - "@babel/runtime": "^7.21.0" + "@babel/runtime": "^7.23.9" }, "engines": { "node": ">=12.0.0" }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@mui/material": "^5.0.0", @@ -5230,19 +5267,19 @@ } }, "node_modules/@mui/material": { - "version": "5.11.12", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.11.12.tgz", - "integrity": "sha512-M6BiIeJjySeEzWeiFJQ9pIjJy6mx5mHPWeMT99wjQdAmA2GxCQhE9A0fh6jQP4jMmYzxhOIhjsGcp0vSdpseXg==", - "dependencies": { - "@babel/runtime": "^7.21.0", - "@mui/base": "5.0.0-alpha.119", - "@mui/core-downloads-tracker": "^5.11.12", - "@mui/system": "^5.11.12", - "@mui/types": "^7.2.3", - "@mui/utils": "^5.11.12", - "@types/react-transition-group": "^4.4.5", - "clsx": "^1.2.1", - "csstype": "^3.1.1", + "version": "5.15.19", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.15.19.tgz", + "integrity": "sha512-lp5xQBbcRuxNtjpWU0BWZgIrv2XLUz4RJ0RqFXBdESIsKoGCQZ6P3wwU5ZPuj5TjssNiKv9AlM+vHopRxZhvVQ==", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@mui/base": "5.0.0-beta.40", + "@mui/core-downloads-tracker": "^5.15.19", + "@mui/system": "^5.15.15", + "@mui/types": "^7.2.14", + "@mui/utils": "^5.15.14", + "@types/react-transition-group": "^4.4.10", + "clsx": "^2.1.0", + "csstype": "^3.1.3", "prop-types": "^15.8.1", "react-is": "^18.2.0", "react-transition-group": "^4.4.5" @@ -5252,7 +5289,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@emotion/react": "^11.5.0", @@ -5273,10 +5310,18 @@ } } }, + "node_modules/@mui/material/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "engines": { + "node": ">=6" + } + }, "node_modules/@mui/material/node_modules/csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/@mui/material/node_modules/react-is": { "version": "18.2.0", @@ -5284,12 +5329,12 @@ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" }, "node_modules/@mui/private-theming": { - "version": "5.11.12", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.12.tgz", - "integrity": "sha512-hnJ0svNI1TPeWZ18E6DvES8PB4NyMLwal6EyXf69rTrYqT6wZPLjB+HiCYfSOCqU/fwArhupSqIIkQpDs8CkAw==", + "version": "5.15.14", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.15.14.tgz", + "integrity": "sha512-UH0EiZckOWcxiXLX3Jbb0K7rC8mxTr9L9l6QhOZxYc4r8FHUkefltV9VDGLrzCaWh30SQiJvAEd7djX3XXY6Xw==", "dependencies": { - "@babel/runtime": "^7.21.0", - "@mui/utils": "^5.11.12", + "@babel/runtime": "^7.23.9", + "@mui/utils": "^5.15.14", "prop-types": "^15.8.1" }, "engines": { @@ -5297,7 +5342,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@types/react": "^17.0.0 || ^18.0.0", @@ -5310,13 +5355,13 @@ } }, "node_modules/@mui/styled-engine": { - "version": "5.11.11", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.11.11.tgz", - "integrity": "sha512-wV0UgW4lN5FkDBXefN8eTYeuE9sjyQdg5h94vtwZCUamGQEzmCOtir4AakgmbWMy0x8OLjdEUESn9wnf5J9MOg==", + "version": "5.15.14", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.15.14.tgz", + "integrity": "sha512-RILkuVD8gY6PvjZjqnWhz8fu68dVkqhM5+jYWfB5yhlSQKg+2rHkmEwm75XIeAqI3qwOndK6zELK5H6Zxn4NHw==", "dependencies": { - "@babel/runtime": "^7.21.0", - "@emotion/cache": "^11.10.5", - "csstype": "^3.1.1", + "@babel/runtime": "^7.23.9", + "@emotion/cache": "^11.11.0", + "csstype": "^3.1.3", "prop-types": "^15.8.1" }, "engines": { @@ -5324,7 +5369,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@emotion/react": "^11.4.1", @@ -5366,22 +5411,80 @@ } }, "node_modules/@mui/styled-engine/node_modules/csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" + }, + "node_modules/@mui/styles": { + "version": "5.15.19", + "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.15.19.tgz", + "integrity": "sha512-WOYjZT6DL/StJv/vFR/tJPJuHC98lwWza7Gzj2RWZk123eCcSJ+3ruc62/ZyXaCx4PKCbE849mVl+CWhA2ecmw==", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@emotion/hash": "^0.9.1", + "@mui/private-theming": "^5.15.14", + "@mui/types": "^7.2.14", + "@mui/utils": "^5.15.14", + "clsx": "^2.1.0", + "csstype": "^3.1.3", + "hoist-non-react-statics": "^3.3.2", + "jss": "^10.10.0", + "jss-plugin-camel-case": "^10.10.0", + "jss-plugin-default-unit": "^10.10.0", + "jss-plugin-global": "^10.10.0", + "jss-plugin-nested": "^10.10.0", + "jss-plugin-props-sort": "^10.10.0", + "jss-plugin-rule-value-function": "^10.10.0", + "jss-plugin-vendor-prefixer": "^10.10.0", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mui-org" + }, + "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0", + "react": "^17.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@mui/styles/node_modules/@emotion/hash": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.1.tgz", + "integrity": "sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==" + }, + "node_modules/@mui/styles/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/@mui/styles/node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/@mui/system": { - "version": "5.11.12", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.11.12.tgz", - "integrity": "sha512-sYjsXkiwKpZDC3aS6O/6KTjji0jGINLQcrD5EJ5NTkIDiLf19I4HJhnufgKqlTWNfoDBlRohuTf3TzfM06c4ug==", - "dependencies": { - "@babel/runtime": "^7.21.0", - "@mui/private-theming": "^5.11.12", - "@mui/styled-engine": "^5.11.11", - "@mui/types": "^7.2.3", - "@mui/utils": "^5.11.12", - "clsx": "^1.2.1", - "csstype": "^3.1.1", + "version": "5.15.15", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.15.15.tgz", + "integrity": "sha512-aulox6N1dnu5PABsfxVGOZffDVmlxPOVgj56HrUnJE8MCSh8lOvvkd47cebIVQQYAjpwieXQXiDPj5pwM40jTQ==", + "dependencies": { + "@babel/runtime": "^7.23.9", + "@mui/private-theming": "^5.15.14", + "@mui/styled-engine": "^5.15.14", + "@mui/types": "^7.2.14", + "@mui/utils": "^5.15.14", + "clsx": "^2.1.0", + "csstype": "^3.1.3", "prop-types": "^15.8.1" }, "engines": { @@ -5389,7 +5492,7 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { "@emotion/react": "^11.5.0", @@ -5409,17 +5512,25 @@ } } }, + "node_modules/@mui/system/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "engines": { + "node": ">=6" + } + }, "node_modules/@mui/system/node_modules/csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/@mui/types": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.3.tgz", - "integrity": "sha512-tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw==", + "version": "7.2.14", + "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.14.tgz", + "integrity": "sha512-MZsBZ4q4HfzBsywtXgM1Ksj6HDThtiwmOKUXH1pKYISI9gAVXCNHNpo7TlGoGrBaYWZTdNoirIN7JsQcQUjmQQ==", "peerDependencies": { - "@types/react": "*" + "@types/react": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -5428,13 +5539,12 @@ } }, "node_modules/@mui/utils": { - "version": "5.11.12", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.11.12.tgz", - "integrity": "sha512-5vH9B/v8pzkpEPO2HvGM54ToXV6cFdAn8UrvdN8TMEEwpn/ycW0jLiyBcgUlPsQ+xha7hqXCPQYHaYFDIcwaiw==", + "version": "5.15.14", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.15.14.tgz", + "integrity": "sha512-0lF/7Hh/ezDv5X7Pry6enMsbYyGKjADzvHyo3Qrc/SSlTsQ1VkbDMbH0m2t3OR5iIVLwMoxwM7yGd+6FCMtTFA==", "dependencies": { - "@babel/runtime": "^7.21.0", - "@types/prop-types": "^15.7.5", - "@types/react-is": "^16.7.1 || ^17.0.0", + "@babel/runtime": "^7.23.9", + "@types/prop-types": "^15.7.11", "prop-types": "^15.8.1", "react-is": "^18.2.0" }, @@ -5443,10 +5553,16 @@ }, "funding": { "type": "opencollective", - "url": "https://opencollective.com/mui" + "url": "https://opencollective.com/mui-org" }, "peerDependencies": { + "@types/react": "^17.0.0 || ^18.0.0", "react": "^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } }, "node_modules/@mui/utils/node_modules/react-is": { @@ -5512,22 +5628,6 @@ } } }, - "node_modules/@mui/x-date-pickers/node_modules/@date-io/date-fns": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-2.16.0.tgz", - "integrity": "sha512-bfm5FJjucqlrnQcXDVU5RD+nlGmL3iWgkHTq3uAZWVIuBu6dDmGa3m8a6zo2VQQpu8ambq9H22UyUpn7590joA==", - "dependencies": { - "@date-io/core": "^2.16.0" - }, - "peerDependencies": { - "date-fns": "^2.0.0" - }, - "peerDependenciesMeta": { - "date-fns": { - "optional": true - } - } - }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { "version": "5.1.1-v1", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", @@ -5655,9 +5755,9 @@ } }, "node_modules/@popperjs/core": { - "version": "2.11.6", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", - "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -5878,6 +5978,11 @@ "@sinonjs/commons": "^1.7.0" } }, + "node_modules/@stomp/stompjs": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@stomp/stompjs/-/stompjs-7.0.0.tgz", + "integrity": "sha512-fGdq4wPDnSV/KyOsjq4P+zLc8MFWC3lMmP5FBgLWKPJTYcuCbAIrnRGjB7q2jHZdYCOD5vxLuFoKIYLy5/u8Pw==" + }, "node_modules/@surma/rollup-plugin-off-main-thread": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz", @@ -6407,97 +6512,1715 @@ "node": ">=10.13.0" } }, - "node_modules/@types/aria-query": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz", - "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==" - }, - "node_modules/@types/babel__core": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", - "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", + "node_modules/@turf/along": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/along/-/along-6.5.0.tgz", + "integrity": "sha512-LLyWQ0AARqJCmMcIEAXF4GEu8usmd4Kbz3qk1Oy5HoRNpZX47+i5exQtmIWKdqJ1MMhW26fCTXgpsEs5zgJ5gw==", "dependencies": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" + "@turf/bearing": "^6.5.0", + "@turf/destination": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" } }, - "node_modules/@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "node_modules/@turf/angle": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/angle/-/angle-6.5.0.tgz", + "integrity": "sha512-4pXMbWhFofJJAOvTMCns6N4C8CMd5Ih4O2jSAG9b3dDHakj3O4yN1+Zbm+NUei+eVEZ9gFeVp9svE3aMDenIkw==", "dependencies": { - "@babel/types": "^7.0.0" + "@turf/bearing": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/rhumb-bearing": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" } }, - "node_modules/@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "node_modules/@turf/area": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/area/-/area-6.5.0.tgz", + "integrity": "sha512-xCZdiuojokLbQ+29qR6qoMD89hv+JAgWjLrwSEWL+3JV8IXKeNFl6XkEJz9HGkVpnXvQKJoRz4/liT+8ZZ5Jyg==", "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" } }, - "node_modules/@types/babel__traverse": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", - "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "node_modules/@turf/bbox": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-6.5.0.tgz", + "integrity": "sha512-RBbLaao5hXTYyyg577iuMtDB8ehxMlUqHEJiMs8jT1GHkFhr6sYre3lmLsPeYEi/ZKj5TP5tt7fkzNdJ4GIVyw==", "dependencies": { - "@babel/types": "^7.3.0" + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" } }, - "node_modules/@types/body-parser": { - "version": "1.19.5", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", - "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", + "node_modules/@turf/bbox-clip": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/bbox-clip/-/bbox-clip-6.5.0.tgz", + "integrity": "sha512-F6PaIRF8WMp8EmgU/Ke5B1Y6/pia14UAYB5TiBC668w5rVVjy5L8rTm/m2lEkkDMHlzoP9vNY4pxpNthE7rLcQ==", "dependencies": { - "@types/connect": "*", - "@types/node": "*" + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" } }, - "node_modules/@types/bonjour": { - "version": "3.5.13", - "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", - "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", + "node_modules/@turf/bbox-polygon": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/bbox-polygon/-/bbox-polygon-6.5.0.tgz", + "integrity": "sha512-+/r0NyL1lOG3zKZmmf6L8ommU07HliP4dgYToMoTxqzsWzyLjaj/OzgQ8rBmv703WJX+aS6yCmLuIhYqyufyuw==", "dependencies": { - "@types/node": "*" + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" } }, - "node_modules/@types/classnames": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz", - "integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==", - "deprecated": "This is a stub types definition. classnames provides its own type definitions, so you do not need this installed.", + "node_modules/@turf/bearing": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/bearing/-/bearing-6.5.0.tgz", + "integrity": "sha512-dxINYhIEMzgDOztyMZc20I7ssYVNEpSv04VbMo5YPQsqa80KO3TFvbuCahMsCAW5z8Tncc8dwBlEFrmRjJG33A==", "dependencies": { - "classnames": "*" + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" } }, - "node_modules/@types/connect": { - "version": "3.4.38", - "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", - "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "node_modules/@turf/bezier-spline": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/bezier-spline/-/bezier-spline-6.5.0.tgz", + "integrity": "sha512-vokPaurTd4PF96rRgGVm6zYYC5r1u98ZsG+wZEv9y3kJTuJRX/O3xIY2QnTGTdbVmAJN1ouOsD0RoZYaVoXORQ==", "dependencies": { - "@types/node": "*" + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" } }, - "node_modules/@types/connect-history-api-fallback": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz", - "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==", + "node_modules/@turf/boolean-clockwise": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-clockwise/-/boolean-clockwise-6.5.0.tgz", + "integrity": "sha512-45+C7LC5RMbRWrxh3Z0Eihsc8db1VGBO5d9BLTOAwU4jR6SgsunTfRWR16X7JUwIDYlCVEmnjcXJNi/kIU3VIw==", "dependencies": { - "@types/express-serve-static-core": "*", - "@types/node": "*" + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" } }, - "node_modules/@types/eslint": { - "version": "8.21.1", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.1.tgz", - "integrity": "sha512-rc9K8ZpVjNcLs8Fp0dkozd5Pt2Apk1glO4Vgz8ix1u6yFByxfqo5Yavpy65o+93TAe24jr7v+eSBtFLvOQtCRQ==", + "node_modules/@turf/boolean-contains": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-contains/-/boolean-contains-6.5.0.tgz", + "integrity": "sha512-4m8cJpbw+YQcKVGi8y0cHhBUnYT+QRfx6wzM4GI1IdtYH3p4oh/DOBJKrepQyiDzFDaNIjxuWXBh0ai1zVwOQQ==", "dependencies": { - "@types/estree": "*", + "@turf/bbox": "^6.5.0", + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/boolean-point-on-line": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-crosses": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-crosses/-/boolean-crosses-6.5.0.tgz", + "integrity": "sha512-gvshbTPhAHporTlQwBJqyfW+2yV8q/mOTxG6PzRVl6ARsqNoqYQWkd4MLug7OmAqVyBzLK3201uAeBjxbGw0Ng==", + "dependencies": { + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/line-intersect": "^6.5.0", + "@turf/polygon-to-line": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-disjoint": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-disjoint/-/boolean-disjoint-6.5.0.tgz", + "integrity": "sha512-rZ2ozlrRLIAGo2bjQ/ZUu4oZ/+ZjGvLkN5CKXSKBcu6xFO6k2bgqeM8a1836tAW+Pqp/ZFsTA5fZHsJZvP2D5g==", + "dependencies": { + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/line-intersect": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/polygon-to-line": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-equal": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-equal/-/boolean-equal-6.5.0.tgz", + "integrity": "sha512-cY0M3yoLC26mhAnjv1gyYNQjn7wxIXmL2hBmI/qs8g5uKuC2hRWi13ydufE3k4x0aNRjFGlg41fjoYLwaVF+9Q==", + "dependencies": { + "@turf/clean-coords": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "geojson-equality": "0.1.6" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-intersects": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-intersects/-/boolean-intersects-6.5.0.tgz", + "integrity": "sha512-nIxkizjRdjKCYFQMnml6cjPsDOBCThrt+nkqtSEcxkKMhAQj5OO7o2CecioNTaX8EayqwMGVKcsz27oP4mKPTw==", + "dependencies": { + "@turf/boolean-disjoint": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-overlap": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-overlap/-/boolean-overlap-6.5.0.tgz", + "integrity": "sha512-8btMIdnbXVWUa1M7D4shyaSGxLRw6NjMcqKBcsTXcZdnaixl22k7ar7BvIzkaRYN3SFECk9VGXfLncNS3ckQUw==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/line-intersect": "^6.5.0", + "@turf/line-overlap": "^6.5.0", + "@turf/meta": "^6.5.0", + "geojson-equality": "0.1.6" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-parallel": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-parallel/-/boolean-parallel-6.5.0.tgz", + "integrity": "sha512-aSHJsr1nq9e5TthZGZ9CZYeXklJyRgR5kCLm5X4urz7+MotMOp/LsGOsvKvK9NeUl9+8OUmfMn8EFTT8LkcvIQ==", + "dependencies": { + "@turf/clean-coords": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/line-segment": "^6.5.0", + "@turf/rhumb-bearing": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-point-in-polygon": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz", + "integrity": "sha512-DtSuVFB26SI+hj0SjrvXowGTUCHlgevPAIsukssW6BG5MlNSBQAo70wpICBNJL6RjukXg8d2eXaAWuD/CqL00A==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-point-on-line": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-point-on-line/-/boolean-point-on-line-6.5.0.tgz", + "integrity": "sha512-A1BbuQ0LceLHvq7F/P7w3QvfpmZqbmViIUPHdNLvZimFNLo4e6IQunmzbe+8aSStH9QRZm3VOflyvNeXvvpZEQ==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/boolean-within": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/boolean-within/-/boolean-within-6.5.0.tgz", + "integrity": "sha512-YQB3oU18Inx35C/LU930D36RAVe7LDXk1kWsQ8mLmuqYn9YdPsDQTMTkLJMhoQ8EbN7QTdy333xRQ4MYgToteQ==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/boolean-point-on-line": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/buffer": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/buffer/-/buffer-6.5.0.tgz", + "integrity": "sha512-qeX4N6+PPWbKqp1AVkBVWFerGjMYMUyencwfnkCesoznU6qvfugFHNAngNqIBVnJjZ5n8IFyOf+akcxnrt9sNg==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/center": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/projection": "^6.5.0", + "d3-geo": "1.7.1", + "turf-jsts": "*" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/center": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/center/-/center-6.5.0.tgz", + "integrity": "sha512-T8KtMTfSATWcAX088rEDKjyvQCBkUsLnK/Txb6/8WUXIeOZyHu42G7MkdkHRoHtwieLdduDdmPLFyTdG5/e7ZQ==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/center-mean": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/center-mean/-/center-mean-6.5.0.tgz", + "integrity": "sha512-AAX6f4bVn12pTVrMUiB9KrnV94BgeBKpyg3YpfnEbBpkN/znfVhL8dG8IxMAxAoSZ61Zt9WLY34HfENveuOZ7Q==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/center-median": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/center-median/-/center-median-6.5.0.tgz", + "integrity": "sha512-dT8Ndu5CiZkPrj15PBvslpuf01ky41DEYEPxS01LOxp5HOUHXp1oJxsPxvc+i/wK4BwccPNzU1vzJ0S4emd1KQ==", + "dependencies": { + "@turf/center-mean": "^6.5.0", + "@turf/centroid": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/center-of-mass": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/center-of-mass/-/center-of-mass-6.5.0.tgz", + "integrity": "sha512-EWrriU6LraOfPN7m1jZi+1NLTKNkuIsGLZc2+Y8zbGruvUW+QV7K0nhf7iZWutlxHXTBqEXHbKue/o79IumAsQ==", + "dependencies": { + "@turf/centroid": "^6.5.0", + "@turf/convex": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/centroid": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/centroid/-/centroid-6.5.0.tgz", + "integrity": "sha512-MwE1oq5E3isewPprEClbfU5pXljIK/GUOMbn22UM3IFPDJX0KeoyLNwghszkdmFp/qMGL/M13MMWvU+GNLXP/A==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/circle": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/circle/-/circle-6.5.0.tgz", + "integrity": "sha512-oU1+Kq9DgRnoSbWFHKnnUdTmtcRUMmHoV9DjTXu9vOLNV5OWtAAh1VZ+mzsioGGzoDNT/V5igbFOkMfBQc0B6A==", + "dependencies": { + "@turf/destination": "^6.5.0", + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/clean-coords": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/clean-coords/-/clean-coords-6.5.0.tgz", + "integrity": "sha512-EMX7gyZz0WTH/ET7xV8MyrExywfm9qUi0/MY89yNffzGIEHuFfqwhcCqZ8O00rZIPZHUTxpmsxQSTfzJJA1CPw==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/clone": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/clone/-/clone-6.5.0.tgz", + "integrity": "sha512-mzVtTFj/QycXOn6ig+annKrM6ZlimreKYz6f/GSERytOpgzodbQyOgkfwru100O1KQhhjSudKK4DsQ0oyi9cTw==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/clusters": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/clusters/-/clusters-6.5.0.tgz", + "integrity": "sha512-Y6gfnTJzQ1hdLfCsyd5zApNbfLIxYEpmDibHUqR5z03Lpe02pa78JtgrgUNt1seeO/aJ4TG1NLN8V5gOrHk04g==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/clusters-dbscan": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/clusters-dbscan/-/clusters-dbscan-6.5.0.tgz", + "integrity": "sha512-SxZEE4kADU9DqLRiT53QZBBhu8EP9skviSyl+FGj08Y01xfICM/RR9ACUdM0aEQimhpu+ZpRVcUK+2jtiCGrYQ==", + "dependencies": { + "@turf/clone": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0", + "density-clustering": "1.3.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/clusters-kmeans": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/clusters-kmeans/-/clusters-kmeans-6.5.0.tgz", + "integrity": "sha512-DwacD5+YO8kwDPKaXwT9DV46tMBVNsbi1IzdajZu1JDSWoN7yc7N9Qt88oi+p30583O0UPVkAK+A10WAQv4mUw==", + "dependencies": { + "@turf/clone": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "skmeans": "0.9.7" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/collect": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/collect/-/collect-6.5.0.tgz", + "integrity": "sha512-4dN/T6LNnRg099m97BJeOcTA5fSI8cu87Ydgfibewd2KQwBexO69AnjEFqfPX3Wj+Zvisj1uAVIZbPmSSrZkjg==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/helpers": "^6.5.0", + "rbush": "2.x" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/combine": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/combine/-/combine-6.5.0.tgz", + "integrity": "sha512-Q8EIC4OtAcHiJB3C4R+FpB4LANiT90t17uOd851qkM2/o6m39bfN5Mv0PWqMZIHWrrosZqRqoY9dJnzz/rJxYQ==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/concave": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/concave/-/concave-6.5.0.tgz", + "integrity": "sha512-I/sUmUC8TC5h/E2vPwxVht+nRt+TnXIPRoztDFvS8/Y0+cBDple9inLSo9nnPXMXidrBlGXZ9vQx/BjZUJgsRQ==", + "dependencies": { + "@turf/clone": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/tin": "^6.5.0", + "topojson-client": "3.x", + "topojson-server": "3.x" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/convex": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/convex/-/convex-6.5.0.tgz", + "integrity": "sha512-x7ZwC5z7PJB0SBwNh7JCeCNx7Iu+QSrH7fYgK0RhhNop13TqUlvHMirMLRgf2db1DqUetrAO2qHJeIuasquUWg==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0", + "concaveman": "*" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/destination": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/destination/-/destination-6.5.0.tgz", + "integrity": "sha512-4cnWQlNC8d1tItOz9B4pmJdWpXqS0vEvv65bI/Pj/genJnsL7evI0/Xw42RvEGROS481MPiU80xzvwxEvhQiMQ==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/difference": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/difference/-/difference-6.5.0.tgz", + "integrity": "sha512-l8iR5uJqvI+5Fs6leNbhPY5t/a3vipUF/3AeVLpwPQcgmedNXyheYuy07PcMGH5Jdpi5gItOiTqwiU/bUH4b3A==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "polygon-clipping": "^0.15.3" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/dissolve": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/dissolve/-/dissolve-6.5.0.tgz", + "integrity": "sha512-WBVbpm9zLTp0Bl9CE35NomTaOL1c4TQCtEoO43YaAhNEWJOOIhZMFJyr8mbvYruKl817KinT3x7aYjjCMjTAsQ==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "polygon-clipping": "^0.15.3" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/distance": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/distance/-/distance-6.5.0.tgz", + "integrity": "sha512-xzykSLfoURec5qvQJcfifw/1mJa+5UwByZZ5TZ8iaqjGYN0vomhV9aiSLeYdUGtYRESZ+DYC/OzY+4RclZYgMg==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/distance-weight": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/distance-weight/-/distance-weight-6.5.0.tgz", + "integrity": "sha512-a8qBKkgVNvPKBfZfEJZnC3DV7dfIsC3UIdpRci/iap/wZLH41EmS90nM+BokAJflUHYy8PqE44wySGWHN1FXrQ==", + "dependencies": { + "@turf/centroid": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/ellipse": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/ellipse/-/ellipse-6.5.0.tgz", + "integrity": "sha512-kuXtwFviw/JqnyJXF1mrR/cb496zDTSbGKtSiolWMNImYzGGkbsAsFTjwJYgD7+4FixHjp0uQPzo70KDf3AIBw==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/rhumb-destination": "^6.5.0", + "@turf/transform-rotate": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/envelope": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/envelope/-/envelope-6.5.0.tgz", + "integrity": "sha512-9Z+FnBWvOGOU4X+fMZxYFs1HjFlkKqsddLuMknRaqcJd6t+NIv5DWvPtDL8ATD2GEExYDiFLwMdckfr1yqJgHA==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/bbox-polygon": "^6.5.0", + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/explode": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/explode/-/explode-6.5.0.tgz", + "integrity": "sha512-6cSvMrnHm2qAsace6pw9cDmK2buAlw8+tjeJVXMfMyY+w7ZUi1rprWMsY92J7s2Dar63Bv09n56/1V7+tcj52Q==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/flatten": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/flatten/-/flatten-6.5.0.tgz", + "integrity": "sha512-IBZVwoNLVNT6U/bcUUllubgElzpMsNoCw8tLqBw6dfYg9ObGmpEjf9BIYLr7a2Yn5ZR4l7YIj2T7kD5uJjZADQ==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/flip": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/flip/-/flip-6.5.0.tgz", + "integrity": "sha512-oyikJFNjt2LmIXQqgOGLvt70RgE2lyzPMloYWM7OR5oIFGRiBvqVD2hA6MNw6JewIm30fWZ8DQJw1NHXJTJPbg==", + "dependencies": { + "@turf/clone": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/great-circle": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/great-circle/-/great-circle-6.5.0.tgz", + "integrity": "sha512-7ovyi3HaKOXdFyN7yy1yOMa8IyOvV46RC1QOQTT+RYUN8ke10eyqExwBpL9RFUPvlpoTzoYbM/+lWPogQlFncg==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/helpers": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-6.5.0.tgz", + "integrity": "sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw==", + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/hex-grid": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/hex-grid/-/hex-grid-6.5.0.tgz", + "integrity": "sha512-Ln3tc2tgZT8etDOldgc6e741Smg1CsMKAz1/Mlel+MEL5Ynv2mhx3m0q4J9IB1F3a4MNjDeVvm8drAaf9SF33g==", + "dependencies": { + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/intersect": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/interpolate": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/interpolate/-/interpolate-6.5.0.tgz", + "integrity": "sha512-LSH5fMeiGyuDZ4WrDJNgh81d2DnNDUVJtuFryJFup8PV8jbs46lQGfI3r1DJ2p1IlEJIz3pmAZYeTfMMoeeohw==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/centroid": "^6.5.0", + "@turf/clone": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/hex-grid": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/point-grid": "^6.5.0", + "@turf/square-grid": "^6.5.0", + "@turf/triangle-grid": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/intersect": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/intersect/-/intersect-6.5.0.tgz", + "integrity": "sha512-2legGJeKrfFkzntcd4GouPugoqPUjexPZnOvfez+3SfIMrHvulw8qV8u7pfVyn2Yqs53yoVCEjS5sEpvQ5YRQg==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "polygon-clipping": "^0.15.3" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/invariant": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz", + "integrity": "sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/isobands": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/isobands/-/isobands-6.5.0.tgz", + "integrity": "sha512-4h6sjBPhRwMVuFaVBv70YB7eGz+iw0bhPRnp+8JBdX1UPJSXhoi/ZF2rACemRUr0HkdVB/a1r9gC32vn5IAEkw==", + "dependencies": { + "@turf/area": "^6.5.0", + "@turf/bbox": "^6.5.0", + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/explode": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "object-assign": "*" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/isolines": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/isolines/-/isolines-6.5.0.tgz", + "integrity": "sha512-6ElhiLCopxWlv4tPoxiCzASWt/jMRvmp6mRYrpzOm3EUl75OhHKa/Pu6Y9nWtCMmVC/RcWtiiweUocbPLZLm0A==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "object-assign": "*" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/kinks": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/kinks/-/kinks-6.5.0.tgz", + "integrity": "sha512-ViCngdPt1eEL7hYUHR2eHR662GvCgTc35ZJFaNR6kRtr6D8plLaDju0FILeFFWSc+o8e3fwxZEJKmFj9IzPiIQ==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/length": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/length/-/length-6.5.0.tgz", + "integrity": "sha512-5pL5/pnw52fck3oRsHDcSGrj9HibvtlrZ0QNy2OcW8qBFDNgZ4jtl6U7eATVoyWPKBHszW3dWETW+iLV7UARig==", + "dependencies": { + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-arc": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/line-arc/-/line-arc-6.5.0.tgz", + "integrity": "sha512-I6c+V6mIyEwbtg9P9zSFF89T7QPe1DPTG3MJJ6Cm1MrAY0MdejwQKOpsvNl8LDU2ekHOlz2kHpPVR7VJsoMllA==", + "dependencies": { + "@turf/circle": "^6.5.0", + "@turf/destination": "^6.5.0", + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-chunk": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/line-chunk/-/line-chunk-6.5.0.tgz", + "integrity": "sha512-i1FGE6YJaaYa+IJesTfyRRQZP31QouS+wh/pa6O3CC0q4T7LtHigyBSYjrbjSLfn2EVPYGlPCMFEqNWCOkC6zg==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/length": "^6.5.0", + "@turf/line-slice-along": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-intersect": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/line-intersect/-/line-intersect-6.5.0.tgz", + "integrity": "sha512-CS6R1tZvVQD390G9Ea4pmpM6mJGPWoL82jD46y0q1KSor9s6HupMIo1kY4Ny+AEYQl9jd21V3Scz20eldpbTVA==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/line-segment": "^6.5.0", + "@turf/meta": "^6.5.0", + "geojson-rbush": "3.x" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-offset": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/line-offset/-/line-offset-6.5.0.tgz", + "integrity": "sha512-CEXZbKgyz8r72qRvPchK0dxqsq8IQBdH275FE6o4MrBkzMcoZsfSjghtXzKaz9vvro+HfIXal0sTk2mqV1lQTw==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-overlap": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/line-overlap/-/line-overlap-6.5.0.tgz", + "integrity": "sha512-xHOaWLd0hkaC/1OLcStCpfq55lPHpPNadZySDXYiYjEz5HXr1oKmtMYpn0wGizsLwrOixRdEp+j7bL8dPt4ojQ==", + "dependencies": { + "@turf/boolean-point-on-line": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/line-segment": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/nearest-point-on-line": "^6.5.0", + "deep-equal": "1.x", + "geojson-rbush": "3.x" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-segment": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/line-segment/-/line-segment-6.5.0.tgz", + "integrity": "sha512-jI625Ho4jSuJESNq66Mmi290ZJ5pPZiQZruPVpmHkUw257Pew0alMmb6YrqYNnLUuiVVONxAAKXUVeeUGtycfw==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-slice": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/line-slice/-/line-slice-6.5.0.tgz", + "integrity": "sha512-vDqJxve9tBHhOaVVFXqVjF5qDzGtKWviyjbyi2QnSnxyFAmLlLnBfMX8TLQCAf2GxHibB95RO5FBE6I2KVPRuw==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/nearest-point-on-line": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-slice-along": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/line-slice-along/-/line-slice-along-6.5.0.tgz", + "integrity": "sha512-KHJRU6KpHrAj+BTgTNqby6VCTnDzG6a1sJx/I3hNvqMBLvWVA2IrkR9L9DtsQsVY63IBwVdQDqiwCuZLDQh4Ng==", + "dependencies": { + "@turf/bearing": "^6.5.0", + "@turf/destination": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-split": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/line-split/-/line-split-6.5.0.tgz", + "integrity": "sha512-/rwUMVr9OI2ccJjw7/6eTN53URtGThNSD5I0GgxyFXMtxWiloRJ9MTff8jBbtPWrRka/Sh2GkwucVRAEakx9Sw==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/line-intersect": "^6.5.0", + "@turf/line-segment": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/nearest-point-on-line": "^6.5.0", + "@turf/square": "^6.5.0", + "@turf/truncate": "^6.5.0", + "geojson-rbush": "3.x" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/line-to-polygon": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/line-to-polygon/-/line-to-polygon-6.5.0.tgz", + "integrity": "sha512-qYBuRCJJL8Gx27OwCD1TMijM/9XjRgXH/m/TyuND4OXedBpIWlK5VbTIO2gJ8OCfznBBddpjiObLBrkuxTpN4Q==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/clone": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/mask": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/mask/-/mask-6.5.0.tgz", + "integrity": "sha512-RQha4aU8LpBrmrkH8CPaaoAfk0Egj5OuXtv6HuCQnHeGNOQt3TQVibTA3Sh4iduq4EPxnZfDjgsOeKtrCA19lg==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "polygon-clipping": "^0.15.3" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/meta": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz", + "integrity": "sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/midpoint": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/midpoint/-/midpoint-6.5.0.tgz", + "integrity": "sha512-MyTzV44IwmVI6ec9fB2OgZ53JGNlgOpaYl9ArKoF49rXpL84F9rNATndbe0+MQIhdkw8IlzA6xVP4lZzfMNVCw==", + "dependencies": { + "@turf/bearing": "^6.5.0", + "@turf/destination": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/moran-index": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/moran-index/-/moran-index-6.5.0.tgz", + "integrity": "sha512-ItsnhrU2XYtTtTudrM8so4afBCYWNaB0Mfy28NZwLjB5jWuAsvyV+YW+J88+neK/ougKMTawkmjQqodNJaBeLQ==", + "dependencies": { + "@turf/distance-weight": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/nearest-point": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/nearest-point/-/nearest-point-6.5.0.tgz", + "integrity": "sha512-fguV09QxilZv/p94s8SMsXILIAMiaXI5PATq9d7YWijLxWUj6Q/r43kxyoi78Zmwwh1Zfqz9w+bCYUAxZ5+euA==", + "dependencies": { + "@turf/clone": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/nearest-point-on-line": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/nearest-point-on-line/-/nearest-point-on-line-6.5.0.tgz", + "integrity": "sha512-WthrvddddvmymnC+Vf7BrkHGbDOUu6Z3/6bFYUGv1kxw8tiZ6n83/VG6kHz4poHOfS0RaNflzXSkmCi64fLBlg==", + "dependencies": { + "@turf/bearing": "^6.5.0", + "@turf/destination": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/line-intersect": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/nearest-point-to-line": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/nearest-point-to-line/-/nearest-point-to-line-6.5.0.tgz", + "integrity": "sha512-PXV7cN0BVzUZdjj6oeb/ESnzXSfWmEMrsfZSDRgqyZ9ytdiIj/eRsnOXLR13LkTdXVOJYDBuf7xt1mLhM4p6+Q==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/point-to-line-distance": "^6.5.0", + "object-assign": "*" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/planepoint": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/planepoint/-/planepoint-6.5.0.tgz", + "integrity": "sha512-R3AahA6DUvtFbka1kcJHqZ7DMHmPXDEQpbU5WaglNn7NaCQg9HB0XM0ZfqWcd5u92YXV+Gg8QhC8x5XojfcM4Q==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/point-grid": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/point-grid/-/point-grid-6.5.0.tgz", + "integrity": "sha512-Iq38lFokNNtQJnOj/RBKmyt6dlof0yhaHEDELaWHuECm1lIZLY3ZbVMwbs+nXkwTAHjKfS/OtMheUBkw+ee49w==", + "dependencies": { + "@turf/boolean-within": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/point-on-feature": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/point-on-feature/-/point-on-feature-6.5.0.tgz", + "integrity": "sha512-bDpuIlvugJhfcF/0awAQ+QI6Om1Y1FFYE8Y/YdxGRongivix850dTeXCo0mDylFdWFPGDo7Mmh9Vo4VxNwW/TA==", + "dependencies": { + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/center": "^6.5.0", + "@turf/explode": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/nearest-point": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/point-to-line-distance": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/point-to-line-distance/-/point-to-line-distance-6.5.0.tgz", + "integrity": "sha512-opHVQ4vjUhNBly1bob6RWy+F+hsZDH9SA0UW36pIRzfpu27qipU18xup0XXEePfY6+wvhF6yL/WgCO2IbrLqEA==", + "dependencies": { + "@turf/bearing": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/projection": "^6.5.0", + "@turf/rhumb-bearing": "^6.5.0", + "@turf/rhumb-distance": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/points-within-polygon": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/points-within-polygon/-/points-within-polygon-6.5.0.tgz", + "integrity": "sha512-YyuheKqjliDsBDt3Ho73QVZk1VXX1+zIA2gwWvuz8bR1HXOkcuwk/1J76HuFMOQI3WK78wyAi+xbkx268PkQzQ==", + "dependencies": { + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/polygon-smooth": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/polygon-smooth/-/polygon-smooth-6.5.0.tgz", + "integrity": "sha512-LO/X/5hfh/Rk4EfkDBpLlVwt3i6IXdtQccDT9rMjXEP32tRgy0VMFmdkNaXoGlSSKf/1mGqLl4y4wHd86DqKbg==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/polygon-tangents": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/polygon-tangents/-/polygon-tangents-6.5.0.tgz", + "integrity": "sha512-sB4/IUqJMYRQH9jVBwqS/XDitkEfbyqRy+EH/cMRJURTg78eHunvJ708x5r6umXsbiUyQU4eqgPzEylWEQiunw==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/boolean-within": "^6.5.0", + "@turf/explode": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/nearest-point": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/polygon-to-line": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/polygon-to-line/-/polygon-to-line-6.5.0.tgz", + "integrity": "sha512-5p4n/ij97EIttAq+ewSnKt0ruvuM+LIDzuczSzuHTpq4oS7Oq8yqg5TQ4nzMVuK41r/tALCk7nAoBuw3Su4Gcw==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/polygonize": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/polygonize/-/polygonize-6.5.0.tgz", + "integrity": "sha512-a/3GzHRaCyzg7tVYHo43QUChCspa99oK4yPqooVIwTC61npFzdrmnywMv0S+WZjHZwK37BrFJGFrZGf6ocmY5w==", + "dependencies": { + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/envelope": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/projection": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/projection/-/projection-6.5.0.tgz", + "integrity": "sha512-/Pgh9mDvQWWu8HRxqpM+tKz8OzgauV+DiOcr3FCjD6ubDnrrmMJlsf6fFJmggw93mtVPrZRL6yyi9aYCQBOIvg==", + "dependencies": { + "@turf/clone": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/random": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/random/-/random-6.5.0.tgz", + "integrity": "sha512-8Q25gQ/XbA7HJAe+eXp4UhcXM9aOOJFaxZ02+XSNwMvY8gtWSCBLVqRcW4OhqilgZ8PeuQDWgBxeo+BIqqFWFQ==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/rectangle-grid": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/rectangle-grid/-/rectangle-grid-6.5.0.tgz", + "integrity": "sha512-yQZ/1vbW68O2KsSB3OZYK+72aWz/Adnf7m2CMKcC+aq6TwjxZjAvlbCOsNUnMAuldRUVN1ph6RXMG4e9KEvKvg==", + "dependencies": { + "@turf/boolean-intersects": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/rewind": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/rewind/-/rewind-6.5.0.tgz", + "integrity": "sha512-IoUAMcHWotBWYwSYuYypw/LlqZmO+wcBpn8ysrBNbazkFNkLf3btSDZMkKJO/bvOzl55imr/Xj4fi3DdsLsbzQ==", + "dependencies": { + "@turf/boolean-clockwise": "^6.5.0", + "@turf/clone": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/rhumb-bearing": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/rhumb-bearing/-/rhumb-bearing-6.5.0.tgz", + "integrity": "sha512-jMyqiMRK4hzREjQmnLXmkJ+VTNTx1ii8vuqRwJPcTlKbNWfjDz/5JqJlb5NaFDcdMpftWovkW5GevfnuzHnOYA==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/rhumb-destination": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/rhumb-destination/-/rhumb-destination-6.5.0.tgz", + "integrity": "sha512-RHNP1Oy+7xTTdRrTt375jOZeHceFbjwohPHlr9Hf68VdHHPMAWgAKqiX2YgSWDcvECVmiGaBKWus1Df+N7eE4Q==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/rhumb-distance": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/rhumb-distance/-/rhumb-distance-6.5.0.tgz", + "integrity": "sha512-oKp8KFE8E4huC2Z1a1KNcFwjVOqa99isxNOwfo4g3SUABQ6NezjKDDrnvC4yI5YZ3/huDjULLBvhed45xdCrzg==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/sample": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/sample/-/sample-6.5.0.tgz", + "integrity": "sha512-kSdCwY7el15xQjnXYW520heKUrHwRvnzx8ka4eYxX9NFeOxaFITLW2G7UtXb6LJK8mmPXI8Aexv23F2ERqzGFg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/sector": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/sector/-/sector-6.5.0.tgz", + "integrity": "sha512-cYUOkgCTWqa23SOJBqxoFAc/yGCUsPRdn/ovbRTn1zNTm/Spmk6hVB84LCKOgHqvSF25i0d2kWqpZDzLDdAPbw==", + "dependencies": { + "@turf/circle": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/line-arc": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/shortest-path": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/shortest-path/-/shortest-path-6.5.0.tgz", + "integrity": "sha512-4de5+G7+P4hgSoPwn+SO9QSi9HY5NEV/xRJ+cmoFVRwv2CDsuOPDheHKeuIAhKyeKDvPvPt04XYWbac4insJMg==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/bbox-polygon": "^6.5.0", + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/clean-coords": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/transform-scale": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/simplify": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/simplify/-/simplify-6.5.0.tgz", + "integrity": "sha512-USas3QqffPHUY184dwQdP8qsvcVH/PWBYdXY5am7YTBACaQOMAlf6AKJs9FT8jiO6fQpxfgxuEtwmox+pBtlOg==", + "dependencies": { + "@turf/clean-coords": "^6.5.0", + "@turf/clone": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/square": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/square/-/square-6.5.0.tgz", + "integrity": "sha512-BM2UyWDmiuHCadVhHXKIx5CQQbNCpOxB6S/aCNOCLbhCeypKX5Q0Aosc5YcmCJgkwO5BERCC6Ee7NMbNB2vHmQ==", + "dependencies": { + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/square-grid": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/square-grid/-/square-grid-6.5.0.tgz", + "integrity": "sha512-mlR0ayUdA+L4c9h7p4k3pX6gPWHNGuZkt2c5II1TJRmhLkW2557d6b/Vjfd1z9OVaajb1HinIs1FMSAPXuuUrA==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/rectangle-grid": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/standard-deviational-ellipse": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/standard-deviational-ellipse/-/standard-deviational-ellipse-6.5.0.tgz", + "integrity": "sha512-02CAlz8POvGPFK2BKK8uHGUk/LXb0MK459JVjKxLC2yJYieOBTqEbjP0qaWhiBhGzIxSMaqe8WxZ0KvqdnstHA==", + "dependencies": { + "@turf/center-mean": "^6.5.0", + "@turf/ellipse": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/points-within-polygon": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/tag": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/tag/-/tag-6.5.0.tgz", + "integrity": "sha512-XwlBvrOV38CQsrNfrxvBaAPBQgXMljeU0DV8ExOyGM7/hvuGHJw3y8kKnQ4lmEQcmcrycjDQhP7JqoRv8vFssg==", + "dependencies": { + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/clone": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/tesselate": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/tesselate/-/tesselate-6.5.0.tgz", + "integrity": "sha512-M1HXuyZFCfEIIKkglh/r5L9H3c5QTEsnMBoZOFQiRnGPGmJWcaBissGb7mTFX2+DKE7FNWXh4TDnZlaLABB0dQ==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "earcut": "^2.0.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/tin": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/tin/-/tin-6.5.0.tgz", + "integrity": "sha512-YLYikRzKisfwj7+F+Tmyy/LE3d2H7D4kajajIfc9mlik2+esG7IolsX/+oUz1biguDYsG0DUA8kVYXDkobukfg==", + "dependencies": { + "@turf/helpers": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/transform-rotate": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/transform-rotate/-/transform-rotate-6.5.0.tgz", + "integrity": "sha512-A2Ip1v4246ZmpssxpcL0hhiVBEf4L8lGnSPWTgSv5bWBEoya2fa/0SnFX9xJgP40rMP+ZzRaCN37vLHbv1Guag==", + "dependencies": { + "@turf/centroid": "^6.5.0", + "@turf/clone": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/rhumb-bearing": "^6.5.0", + "@turf/rhumb-destination": "^6.5.0", + "@turf/rhumb-distance": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/transform-scale": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/transform-scale/-/transform-scale-6.5.0.tgz", + "integrity": "sha512-VsATGXC9rYM8qTjbQJ/P7BswKWXHdnSJ35JlV4OsZyHBMxJQHftvmZJsFbOqVtQnIQIzf2OAly6rfzVV9QLr7g==", + "dependencies": { + "@turf/bbox": "^6.5.0", + "@turf/center": "^6.5.0", + "@turf/centroid": "^6.5.0", + "@turf/clone": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/rhumb-bearing": "^6.5.0", + "@turf/rhumb-destination": "^6.5.0", + "@turf/rhumb-distance": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/transform-translate": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/transform-translate/-/transform-translate-6.5.0.tgz", + "integrity": "sha512-NABLw5VdtJt/9vSstChp93pc6oel4qXEos56RBMsPlYB8hzNTEKYtC146XJvyF4twJeeYS8RVe1u7KhoFwEM5w==", + "dependencies": { + "@turf/clone": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/rhumb-destination": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/triangle-grid": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/triangle-grid/-/triangle-grid-6.5.0.tgz", + "integrity": "sha512-2jToUSAS1R1htq4TyLQYPTIsoy6wg3e3BQXjm2rANzw4wPQCXGOxrur1Fy9RtzwqwljlC7DF4tg0OnWr8RjmfA==", + "dependencies": { + "@turf/distance": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/intersect": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/truncate": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/truncate/-/truncate-6.5.0.tgz", + "integrity": "sha512-pFxg71pLk+eJj134Z9yUoRhIi8vqnnKvCYwdT4x/DQl/19RVdq1tV3yqOT3gcTQNfniteylL5qV1uTBDV5sgrg==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/turf": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/turf/-/turf-6.5.0.tgz", + "integrity": "sha512-ipMCPnhu59bh92MNt8+pr1VZQhHVuTMHklciQURo54heoxRzt1neNYZOBR6jdL+hNsbDGAECMuIpAutX+a3Y+w==", + "dependencies": { + "@turf/along": "^6.5.0", + "@turf/angle": "^6.5.0", + "@turf/area": "^6.5.0", + "@turf/bbox": "^6.5.0", + "@turf/bbox-clip": "^6.5.0", + "@turf/bbox-polygon": "^6.5.0", + "@turf/bearing": "^6.5.0", + "@turf/bezier-spline": "^6.5.0", + "@turf/boolean-clockwise": "^6.5.0", + "@turf/boolean-contains": "^6.5.0", + "@turf/boolean-crosses": "^6.5.0", + "@turf/boolean-disjoint": "^6.5.0", + "@turf/boolean-equal": "^6.5.0", + "@turf/boolean-intersects": "^6.5.0", + "@turf/boolean-overlap": "^6.5.0", + "@turf/boolean-parallel": "^6.5.0", + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/boolean-point-on-line": "^6.5.0", + "@turf/boolean-within": "^6.5.0", + "@turf/buffer": "^6.5.0", + "@turf/center": "^6.5.0", + "@turf/center-mean": "^6.5.0", + "@turf/center-median": "^6.5.0", + "@turf/center-of-mass": "^6.5.0", + "@turf/centroid": "^6.5.0", + "@turf/circle": "^6.5.0", + "@turf/clean-coords": "^6.5.0", + "@turf/clone": "^6.5.0", + "@turf/clusters": "^6.5.0", + "@turf/clusters-dbscan": "^6.5.0", + "@turf/clusters-kmeans": "^6.5.0", + "@turf/collect": "^6.5.0", + "@turf/combine": "^6.5.0", + "@turf/concave": "^6.5.0", + "@turf/convex": "^6.5.0", + "@turf/destination": "^6.5.0", + "@turf/difference": "^6.5.0", + "@turf/dissolve": "^6.5.0", + "@turf/distance": "^6.5.0", + "@turf/distance-weight": "^6.5.0", + "@turf/ellipse": "^6.5.0", + "@turf/envelope": "^6.5.0", + "@turf/explode": "^6.5.0", + "@turf/flatten": "^6.5.0", + "@turf/flip": "^6.5.0", + "@turf/great-circle": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/hex-grid": "^6.5.0", + "@turf/interpolate": "^6.5.0", + "@turf/intersect": "^6.5.0", + "@turf/invariant": "^6.5.0", + "@turf/isobands": "^6.5.0", + "@turf/isolines": "^6.5.0", + "@turf/kinks": "^6.5.0", + "@turf/length": "^6.5.0", + "@turf/line-arc": "^6.5.0", + "@turf/line-chunk": "^6.5.0", + "@turf/line-intersect": "^6.5.0", + "@turf/line-offset": "^6.5.0", + "@turf/line-overlap": "^6.5.0", + "@turf/line-segment": "^6.5.0", + "@turf/line-slice": "^6.5.0", + "@turf/line-slice-along": "^6.5.0", + "@turf/line-split": "^6.5.0", + "@turf/line-to-polygon": "^6.5.0", + "@turf/mask": "^6.5.0", + "@turf/meta": "^6.5.0", + "@turf/midpoint": "^6.5.0", + "@turf/moran-index": "^6.5.0", + "@turf/nearest-point": "^6.5.0", + "@turf/nearest-point-on-line": "^6.5.0", + "@turf/nearest-point-to-line": "^6.5.0", + "@turf/planepoint": "^6.5.0", + "@turf/point-grid": "^6.5.0", + "@turf/point-on-feature": "^6.5.0", + "@turf/point-to-line-distance": "^6.5.0", + "@turf/points-within-polygon": "^6.5.0", + "@turf/polygon-smooth": "^6.5.0", + "@turf/polygon-tangents": "^6.5.0", + "@turf/polygon-to-line": "^6.5.0", + "@turf/polygonize": "^6.5.0", + "@turf/projection": "^6.5.0", + "@turf/random": "^6.5.0", + "@turf/rewind": "^6.5.0", + "@turf/rhumb-bearing": "^6.5.0", + "@turf/rhumb-destination": "^6.5.0", + "@turf/rhumb-distance": "^6.5.0", + "@turf/sample": "^6.5.0", + "@turf/sector": "^6.5.0", + "@turf/shortest-path": "^6.5.0", + "@turf/simplify": "^6.5.0", + "@turf/square": "^6.5.0", + "@turf/square-grid": "^6.5.0", + "@turf/standard-deviational-ellipse": "^6.5.0", + "@turf/tag": "^6.5.0", + "@turf/tesselate": "^6.5.0", + "@turf/tin": "^6.5.0", + "@turf/transform-rotate": "^6.5.0", + "@turf/transform-scale": "^6.5.0", + "@turf/transform-translate": "^6.5.0", + "@turf/triangle-grid": "^6.5.0", + "@turf/truncate": "^6.5.0", + "@turf/union": "^6.5.0", + "@turf/unkink-polygon": "^6.5.0", + "@turf/voronoi": "^6.5.0" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/union": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/union/-/union-6.5.0.tgz", + "integrity": "sha512-igYWCwP/f0RFHIlC2c0SKDuM/ObBaqSljI3IdV/x71805QbIvY/BYGcJdyNcgEA6cylIGl/0VSlIbpJHZ9ldhw==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "polygon-clipping": "^0.15.3" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/unkink-polygon": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/unkink-polygon/-/unkink-polygon-6.5.0.tgz", + "integrity": "sha512-8QswkzC0UqKmN1DT6HpA9upfa1HdAA5n6bbuzHy8NJOX8oVizVAqfEPY0wqqTgboDjmBR4yyImsdPGUl3gZ8JQ==", + "dependencies": { + "@turf/area": "^6.5.0", + "@turf/boolean-point-in-polygon": "^6.5.0", + "@turf/helpers": "^6.5.0", + "@turf/meta": "^6.5.0", + "rbush": "^2.0.1" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@turf/voronoi": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@turf/voronoi/-/voronoi-6.5.0.tgz", + "integrity": "sha512-C/xUsywYX+7h1UyNqnydHXiun4UPjK88VDghtoRypR9cLlb7qozkiLRphQxxsCM0KxyxpVPHBVQXdAL3+Yurow==", + "dependencies": { + "@turf/helpers": "^6.5.0", + "@turf/invariant": "^6.5.0", + "d3-voronoi": "1.1.2" + }, + "funding": { + "url": "https://opencollective.com/turf" + } + }, + "node_modules/@types/aria-query": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.1.tgz", + "integrity": "sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==" + }, + "node_modules/@types/babel__core": { + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", + "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", + "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", + "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.18.3", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz", + "integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==", + "dependencies": { + "@babel/types": "^7.3.0" + } + }, + "node_modules/@types/body-parser": { + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", + "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "node_modules/@types/bonjour": { + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", + "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/classnames": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz", + "integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==", + "deprecated": "This is a stub types definition. classnames provides its own type definitions, so you do not need this installed.", + "dependencies": { + "classnames": "*" + } + }, + "node_modules/@types/connect": { + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/connect-history-api-fallback": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz", + "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==", + "dependencies": { + "@types/express-serve-static-core": "*", + "@types/node": "*" + } + }, + "node_modules/@types/d3-array": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz", + "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==" + }, + "node_modules/@types/d3-color": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz", + "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==" + }, + "node_modules/@types/d3-ease": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz", + "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==" + }, + "node_modules/@types/d3-interpolate": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", + "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", + "dependencies": { + "@types/d3-color": "*" + } + }, + "node_modules/@types/d3-path": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz", + "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==" + }, + "node_modules/@types/d3-scale": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz", + "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==", + "dependencies": { + "@types/d3-time": "*" + } + }, + "node_modules/@types/d3-shape": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz", + "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==", + "dependencies": { + "@types/d3-path": "*" + } + }, + "node_modules/@types/d3-time": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz", + "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==" + }, + "node_modules/@types/d3-timer": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz", + "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==" + }, + "node_modules/@types/eslint": { + "version": "8.21.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.1.tgz", + "integrity": "sha512-rc9K8ZpVjNcLs8Fp0dkozd5Pt2Apk1glO4Vgz8ix1u6yFByxfqo5Yavpy65o+93TAe24jr7v+eSBtFLvOQtCRQ==", + "dependencies": { + "@types/estree": "*", "@types/json-schema": "*" } }, @@ -6689,9 +8412,9 @@ "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==" }, "node_modules/@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" + "version": "15.7.12", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", + "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" }, "node_modules/@types/q": { "version": "1.5.8", @@ -6727,14 +8450,6 @@ "@types/react": "*" } }, - "node_modules/@types/react-is": { - "version": "17.0.3", - "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.3.tgz", - "integrity": "sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==", - "dependencies": { - "@types/react": "*" - } - }, "node_modules/@types/react-tabs": { "version": "5.0.5", "resolved": "https://registry.npmjs.org/@types/react-tabs/-/react-tabs-5.0.5.tgz", @@ -6745,9 +8460,9 @@ } }, "node_modules/@types/react-transition-group": { - "version": "4.4.5", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz", - "integrity": "sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==", + "version": "4.4.10", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", + "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==", "dependencies": { "@types/react": "*" } @@ -8423,13 +10138,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", - "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8801,6 +10521,18 @@ "node": ">=0.10.0" } }, + "node_modules/color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "dependencies": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + }, + "engines": { + "node": ">=12.5.0" + } + }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -8814,6 +10546,31 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "node_modules/color/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, "node_modules/colord": { "version": "2.9.3", "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", @@ -8913,6 +10670,25 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, + "node_modules/concaveman": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/concaveman/-/concaveman-1.2.1.tgz", + "integrity": "sha512-PwZYKaM/ckQSa8peP5JpVr7IMJ4Nn/MHIaWUjP4be+KoZ7Botgs8seAZGpmaOM+UZXawcdYRao/px9ycrCihHw==", + "dependencies": { + "point-in-polygon": "^1.1.0", + "rbush": "^3.0.1", + "robust-predicates": "^2.0.4", + "tinyqueue": "^2.0.3" + } + }, + "node_modules/concaveman/node_modules/rbush": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz", + "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==", + "dependencies": { + "quickselect": "^2.0.0" + } + }, "node_modules/confusing-browser-globals": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz", @@ -9551,9 +11327,148 @@ "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" }, "node_modules/csstype": { - "version": "2.6.17", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.17.tgz", - "integrity": "sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A==" + "version": "2.6.21", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", + "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" + }, + "node_modules/d3-array": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz", + "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==" + }, + "node_modules/d3-color": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", + "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-ease": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", + "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-format": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", + "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-geo": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.7.1.tgz", + "integrity": "sha512-O4AempWAr+P5qbk2bC2FuN/sDW4z+dN2wDf9QV3bxQt4M5HfOEeXLgJ/UKQW0+o1Dj8BE+L5kiDbdWUMjsmQpw==", + "dependencies": { + "d3-array": "1" + } + }, + "node_modules/d3-interpolate": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", + "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", + "dependencies": { + "d3-color": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-path": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz", + "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-scale": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz", + "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==", + "dependencies": { + "d3-array": "2.10.0 - 3", + "d3-format": "1 - 3", + "d3-interpolate": "1.2.0 - 3", + "d3-time": "2.1.1 - 3", + "d3-time-format": "2 - 4" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-scale/node_modules/d3-array": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", + "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", + "dependencies": { + "internmap": "1 - 2" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-shape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz", + "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==", + "dependencies": { + "d3-path": "^3.1.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-time": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz", + "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==", + "dependencies": { + "d3-array": "2 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-time-format": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", + "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", + "dependencies": { + "d3-time": "1 - 3" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-time/node_modules/d3-array": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", + "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", + "dependencies": { + "internmap": "1 - 2" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-timer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", + "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", + "engines": { + "node": ">=12" + } + }, + "node_modules/d3-voronoi": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.2.tgz", + "integrity": "sha512-RhGS1u2vavcO7ay7ZNAPo4xeDh/VYeGof3x5ZLJBQgYhLegxr3s5IykvWmJ94FTU6mcbtp4sloqZ54mP6R4Utw==" }, "node_modules/damerau-levenshtein": { "version": "1.0.8", @@ -9627,6 +11542,11 @@ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==" }, + "node_modules/decimal.js-light": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz", + "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==" + }, "node_modules/decode-uri-component": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", @@ -9652,6 +11572,25 @@ "node": ">=6" } }, + "node_modules/deep-equal": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz", + "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==", + "dependencies": { + "is-arguments": "^1.1.1", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.5.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -9677,16 +11616,19 @@ } }, "node_modules/define-data-property": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", - "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/define-lazy-prop": { @@ -9734,6 +11676,11 @@ "node": ">=0.4.0" } }, + "node_modules/density-clustering": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/density-clustering/-/density-clustering-1.3.0.tgz", + "integrity": "sha512-icpmBubVTwLnsaor9qH/4tG5+7+f61VcqMN3V3pm9sxxSCt2Jcs0zWOgwZW9ARJYaKD3FumIgHiMOcIMRRAzFQ==" + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -10178,6 +12125,25 @@ "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==" }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-iterator-helpers": { "version": "1.0.15", "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", @@ -11496,6 +13462,14 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, + "node_modules/fast-equals": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.0.1.tgz", + "integrity": "sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==", + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/fast-glob": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", @@ -11616,6 +13590,11 @@ "webpack": "^4.0.0 || ^5.0.0" } }, + "node_modules/file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" + }, "node_modules/filelist": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", @@ -11977,6 +13956,43 @@ "node": ">= 6" } }, + "node_modules/formik": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/formik/-/formik-2.4.6.tgz", + "integrity": "sha512-A+2EI7U7aG296q2TLGvNapDNTZp1khVt5Vk0Q/fyfSROss0V/V6+txt2aJnwEos44IxTCW/LYAi/zgWzlevj+g==", + "funding": [ + { + "type": "individual", + "url": "https://opencollective.com/formik" + } + ], + "dependencies": { + "@types/hoist-non-react-statics": "^3.3.1", + "deepmerge": "^2.1.1", + "hoist-non-react-statics": "^3.3.0", + "lodash": "^4.17.21", + "lodash-es": "^4.17.21", + "react-fast-compare": "^2.0.1", + "tiny-warning": "^1.0.2", + "tslib": "^2.0.0" + }, + "peerDependencies": { + "react": ">=16.8.0" + } + }, + "node_modules/formik/node_modules/deepmerge": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", + "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/formik/node_modules/react-fast-compare": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", + "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -12094,6 +14110,39 @@ "node": ">=6.9.0" } }, + "node_modules/geojson-equality": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/geojson-equality/-/geojson-equality-0.1.6.tgz", + "integrity": "sha512-TqG8YbqizP3EfwP5Uw4aLu6pKkg6JQK9uq/XZ1lXQntvTHD1BBKJWhNpJ2M0ax6TuWMP3oyx6Oq7FCIfznrgpQ==", + "dependencies": { + "deep-equal": "^1.0.0" + } + }, + "node_modules/geojson-rbush": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/geojson-rbush/-/geojson-rbush-3.2.0.tgz", + "integrity": "sha512-oVltQTXolxvsz1sZnutlSuLDEcQAKYC/uXt9zDzJJ6bu0W+baTI8LZBaTup5afzibEH4N3jlq2p+a152wlBJ7w==", + "dependencies": { + "@turf/bbox": "*", + "@turf/helpers": "6.x", + "@turf/meta": "6.x", + "@types/geojson": "7946.0.8", + "rbush": "^3.0.1" + } + }, + "node_modules/geojson-rbush/node_modules/@types/geojson": { + "version": "7946.0.8", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz", + "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==" + }, + "node_modules/geojson-rbush/node_modules/rbush": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz", + "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==", + "dependencies": { + "quickselect": "^2.0.0" + } + }, "node_modules/geojson-vt": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz", @@ -12108,15 +14157,19 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", - "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "hasown": "^2.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -12374,11 +14427,11 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", - "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -12848,6 +14901,11 @@ "node": ">= 4" } }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" + }, "node_modules/immer": { "version": "9.0.17", "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.17.tgz", @@ -12938,6 +14996,14 @@ "node": ">= 0.4" } }, + "node_modules/internmap": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", + "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", + "engines": { + "node": ">=12" + } + }, "node_modules/invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -12966,6 +15032,21 @@ "node": ">=0.10.0" } }, + "node_modules/is-arguments": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-array-buffer": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", @@ -17952,6 +20033,44 @@ "node": ">=4.0" } }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, + "node_modules/jszip/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + }, + "node_modules/jszip/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/jszip/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, "node_modules/kdbush": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz", @@ -18043,6 +20162,14 @@ "node": ">= 0.8.0" } }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dependencies": { + "immediate": "~3.0.5" + } + }, "node_modules/lilconfig": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", @@ -18096,6 +20223,11 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, + "node_modules/lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, "node_modules/lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -18863,6 +20995,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object-is": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", + "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -19145,6 +21292,11 @@ "node": ">=6" } }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" + }, "node_modules/param-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", @@ -19290,6 +21442,11 @@ "pbf": "bin/pbf" } }, + "node_modules/perfect-scrollbar": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz", + "integrity": "sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g==" + }, "node_modules/performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -19453,6 +21610,25 @@ "node": ">=4" } }, + "node_modules/point-in-polygon": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/point-in-polygon/-/point-in-polygon-1.1.0.tgz", + "integrity": "sha512-3ojrFwjnnw8Q9242TzgXuTD+eKiutbzyslcq1ydfu82Db2y+Ogbmyrkpv0Hgj31qwT3lbS9+QAAO/pIQM35XRw==" + }, + "node_modules/polygon-clipping": { + "version": "0.15.7", + "resolved": "https://registry.npmjs.org/polygon-clipping/-/polygon-clipping-0.15.7.tgz", + "integrity": "sha512-nhfdr83ECBg6xtqOAJab1tbksbBAOMUltN60bU+llHVOL0e5Onm1WpAXXWXVB39L8AJFssoIhEVuy/S90MmotA==", + "dependencies": { + "robust-predicates": "^3.0.2", + "splaytree": "^3.1.0" + } + }, + "node_modules/polygon-clipping/node_modules/robust-predicates": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz", + "integrity": "sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==" + }, "node_modules/popper.js": { "version": "1.16.1-lts", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz", @@ -20798,6 +22974,11 @@ "react": ">=0.14.0" } }, + "node_modules/property-expr": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.6.tgz", + "integrity": "sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==" + }, "node_modules/protocol-buffers-schema": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz", @@ -20965,6 +23146,19 @@ "node": ">=0.10.0" } }, + "node_modules/rbush": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/rbush/-/rbush-2.0.2.tgz", + "integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==", + "dependencies": { + "quickselect": "^1.0.1" + } + }, + "node_modules/rbush/node_modules/quickselect": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-1.1.1.tgz", + "integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ==" + }, "node_modules/rc-slider": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-10.1.0.tgz", @@ -21229,6 +23423,35 @@ "react": "^16.8.0 || ^17 || ^18" } }, + "node_modules/react-hot-toast": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/react-hot-toast/-/react-hot-toast-2.4.1.tgz", + "integrity": "sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==", + "dependencies": { + "goober": "^2.1.10" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "react": ">=16", + "react-dom": ">=16" + } + }, + "node_modules/react-hot-toast/node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "peer": true + }, + "node_modules/react-hot-toast/node_modules/goober": { + "version": "2.1.14", + "resolved": "https://registry.npmjs.org/goober/-/goober-2.1.14.tgz", + "integrity": "sha512-4UpC0NdGyAFqLNPnhCT2iHpza2q+RAY3GV85a/mRPdzyPQMsj0KmMMuetdIkzWRbJ+Hgau1EZztq8ImmiMGhsg==", + "peerDependencies": { + "csstype": "^3.0.10" + } + }, "node_modules/react-icons": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.3.1.tgz", @@ -21259,6 +23482,19 @@ "react": ">=16.3.0" } }, + "node_modules/react-perfect-scrollbar": { + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/react-perfect-scrollbar/-/react-perfect-scrollbar-1.5.8.tgz", + "integrity": "sha512-bQ46m70gp/HJtiBOF3gRzBISSZn8FFGNxznTdmTG8AAwpxG1bJCyn7shrgjEvGSQ5FJEafVEiosY+ccER11OSA==", + "dependencies": { + "perfect-scrollbar": "^1.5.0", + "prop-types": "^15.6.1" + }, + "peerDependencies": { + "react": ">=16.3.3", + "react-dom": ">=16.3.3" + } + }, "node_modules/react-popper": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.3.0.tgz", @@ -22653,6 +24889,20 @@ "react": "^16.0.0 || ^17.0.0 || ^18.0.0" } }, + "node_modules/react-smooth": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.1.tgz", + "integrity": "sha512-OE4hm7XqR0jNOq3Qmk9mFLyd6p2+j6bvbPJ7qlB7+oo0eNcL2l7WQzG6MBnT3EXY6xzkLMUBec3AfewJdA0J8w==", + "dependencies": { + "fast-equals": "^5.0.1", + "prop-types": "^15.8.1", + "react-transition-group": "^4.4.5" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/react-spinners": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/react-spinners/-/react-spinners-0.11.0.tgz", @@ -22897,6 +25147,44 @@ "node": ">=8.10.0" } }, + "node_modules/recharts": { + "version": "2.12.7", + "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.12.7.tgz", + "integrity": "sha512-hlLJMhPQfv4/3NBSAyq3gzGg4h2v69RJh6KU7b3pXYNNAELs9kEoXOjbkxdXpALqKBoVmVptGfLpxdaVYqjmXQ==", + "dependencies": { + "clsx": "^2.0.0", + "eventemitter3": "^4.0.1", + "lodash": "^4.17.21", + "react-is": "^16.10.2", + "react-smooth": "^4.0.0", + "recharts-scale": "^0.4.4", + "tiny-invariant": "^1.3.1", + "victory-vendor": "^36.6.8" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "react": "^16.0.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/recharts-scale": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.4.5.tgz", + "integrity": "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==", + "dependencies": { + "decimal.js-light": "^2.4.1" + } + }, + "node_modules/recharts/node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "engines": { + "node": ">=6" + } + }, "node_modules/recursive-readdir": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", @@ -23384,6 +25672,11 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/robust-predicates": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/robust-predicates/-/robust-predicates-2.0.4.tgz", + "integrity": "sha512-l4NwboJM74Ilm4VKfbAtFeGq7aEjWL+5kVFcmgFA2MrdnQWx9iE/tUGvxY5HyMI7o/WpSIUFLbC5fbeaHgSCYg==" + }, "node_modules/rollup": { "version": "2.79.1", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", @@ -24106,15 +26399,16 @@ "dev": true }, "node_modules/set-function-length": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz", - "integrity": "sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dependencies": { - "define-data-property": "^1.1.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.2", + "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.1" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -24235,11 +26529,29 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, + "node_modules/simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, + "node_modules/simple-swizzle/node_modules/is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, + "node_modules/skmeans": { + "version": "0.9.7", + "resolved": "https://registry.npmjs.org/skmeans/-/skmeans-0.9.7.tgz", + "integrity": "sha512-hNj1/oZ7ygsfmPZ7ZfN5MUBRoGg1gtpnImuJBgLO0ljQ67DtJuiQaiYdS4lUA6s0KCwnPhGivtC/WRwIZLkHyg==" + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -24591,6 +26903,11 @@ "wbuf": "^1.7.3" } }, + "node_modules/splaytree": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/splaytree/-/splaytree-3.1.2.tgz", + "integrity": "sha512-4OM2BJgC5UzrhVnnJA4BkHKGtjXNzzUfpQjCO8I05xYPsfS/VuQDwjCGGMi8rYQilHEV4j8NBqTFbls/PZEE7A==" + }, "node_modules/split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -25133,9 +27450,9 @@ } }, "node_modules/stylis": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz", - "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz", + "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==" }, "node_modules/sucrase": { "version": "3.35.0", @@ -25560,6 +27877,11 @@ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" }, + "node_modules/tiny-case": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz", + "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==" + }, "node_modules/tiny-invariant": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz", @@ -25646,6 +27968,45 @@ "node": ">=0.6" } }, + "node_modules/topojson-client": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz", + "integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==", + "dependencies": { + "commander": "2" + }, + "bin": { + "topo2geo": "bin/topo2geo", + "topomerge": "bin/topomerge", + "topoquantize": "bin/topoquantize" + } + }, + "node_modules/topojson-client/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "node_modules/topojson-server": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/topojson-server/-/topojson-server-3.0.1.tgz", + "integrity": "sha512-/VS9j/ffKr2XAOjlZ9CgyyeLmgJ9dMwq6Y0YEON8O7p/tGGk+dCWnrE03zEdu7i4L7YsFZLEPZPzCvcB7lEEXw==", + "dependencies": { + "commander": "2" + }, + "bin": { + "geo2topo": "bin/geo2topo" + } + }, + "node_modules/topojson-server/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "node_modules/toposort": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz", + "integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==" + }, "node_modules/tough-cookie": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", @@ -25743,6 +28104,11 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, + "node_modules/turf-jsts": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/turf-jsts/-/turf-jsts-1.2.3.tgz", + "integrity": "sha512-Ja03QIJlPuHt4IQ2FfGex4F4JAr8m3jpaHbFbQrgwr7s7L6U8ocrHiF3J1+wf9jzhGKxvDeaCAnGDot8OjGFyA==" + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -26231,6 +28597,38 @@ "node": ">= 0.8" } }, + "node_modules/victory-vendor": { + "version": "36.9.2", + "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.9.2.tgz", + "integrity": "sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==", + "dependencies": { + "@types/d3-array": "^3.0.3", + "@types/d3-ease": "^3.0.0", + "@types/d3-interpolate": "^3.0.1", + "@types/d3-scale": "^4.0.2", + "@types/d3-shape": "^3.1.0", + "@types/d3-time": "^3.0.0", + "@types/d3-timer": "^3.0.0", + "d3-array": "^3.1.6", + "d3-ease": "^3.0.1", + "d3-interpolate": "^3.0.1", + "d3-scale": "^4.0.2", + "d3-shape": "^3.1.0", + "d3-time": "^3.0.0", + "d3-timer": "^3.0.1" + } + }, + "node_modules/victory-vendor/node_modules/d3-array": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", + "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", + "dependencies": { + "internmap": "1 - 2" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/vt-pbf": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz", @@ -27362,6 +29760,28 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/yup": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/yup/-/yup-1.4.0.tgz", + "integrity": "sha512-wPbgkJRCqIf+OHyiTBQoJiP5PFuAXaWiJK6AmYkzQAh5/c2K9hzSApBZG5wV9KoKSePF7sAxmNSvh/13YHkFDg==", + "dependencies": { + "property-expr": "^2.0.5", + "tiny-case": "^1.0.3", + "toposort": "^2.0.2", + "type-fest": "^2.19.0" + } + }, + "node_modules/yup/node_modules/type-fest": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", + "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/zustand": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/zustand/-/zustand-4.3.1.tgz", diff --git a/webapp/package.json b/webapp/package.json index e7b6c8ba5..d744e4308 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -3,29 +3,37 @@ "version": "1.2.0-SNAPSHOT", "private": true, "dependencies": { - "@emotion/react": "^11.10.5", - "@emotion/styled": "^11.10.5", + "@date-io/date-fns": "^2.15.0", + "@emotion/react": "^11.11.4", + "@emotion/styled": "^11.11.5", "@hookform/error-message": "^2.0.1", "@material-table/core": "^6.1.6", "@material-ui/core": "^4.12.3", - "@mui/icons-material": "^5.11.9", - "@mui/material": "^5.11.9", + "@mui/icons-material": "^5.15.19", + "@mui/material": "^5.15.19", "@mui/styled-engine-sc": "^5.11.9", + "@mui/styles": "^5.15.19", "@mui/x-date-pickers": "^5.0.15", "@react-keycloak/web": "3.4.0", "@react-oauth/google": "^0.2.8", "@reduxjs/toolkit": "^1.9.1", + "@stomp/stompjs": "^7.0.0", "@syncfusion/ej2-react-calendars": "^19.4.56", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^12.1.2", + "@turf/turf": "^6.5.0", "@types/react-tabs": "^5.0.5", "abort-controller": "^3.0.0", "axios": "^1.6.5", + "color": "^4.2.3", "dayjs": "^1.11.7", "env-cmd": "^10.1.0", "fbjs": "^3.0.4", + "file-saver": "^2.0.5", + "formik": "^2.4.6", "isomorphic-fetch": "^3.0.0", "jest-fetch-mock": "^3.0.3", + "jszip": "^3.10.1", "keycloak-js": "21.1.1", "luxon": "^2.3.2", "mapbox-gl": "^2.9.1", @@ -35,8 +43,10 @@ "react-confirm-alert": "^2.8.0", "react-dom": "^17.0.2", "react-hook-form": "^7.41.5", + "react-hot-toast": "^2.4.1", "react-icons": "^4.3.1", "react-map-gl": "^7.0.21", + "react-perfect-scrollbar": "^1.5.8", "react-redux": "^8.0.5", "react-router-dom": "^6.2.2", "react-scripts": "^5.0.0", @@ -47,8 +57,10 @@ "react-tabs": "^4.2.1", "react-widgets": "5.8.4", "reactstrap": "^9.2.2", + "recharts": "^2.12.6", "styled-components": "^5.3.6", "worker-loader": "^3.0.8", + "yup": "^1.4.0", "zustand": "4.3.1" }, "scripts": { @@ -101,4 +113,4 @@ "worker-loader!mapbox-gl/dist/mapbox-gl-csp-worker": "/mocks/workerLoader.js" } } -} \ No newline at end of file +} diff --git a/webapp/public/icons/intersection_icon.png b/webapp/public/icons/intersection_icon.png new file mode 100644 index 000000000..9f6d43faa Binary files /dev/null and b/webapp/public/icons/intersection_icon.png differ diff --git a/webapp/public/icons/pause.png b/webapp/public/icons/pause.png new file mode 100644 index 000000000..5cff0b16c Binary files /dev/null and b/webapp/public/icons/pause.png differ diff --git a/webapp/public/icons/play.png b/webapp/public/icons/play.png new file mode 100644 index 000000000..09afcb463 Binary files /dev/null and b/webapp/public/icons/play.png differ diff --git a/webapp/public/icons/traffic-light-icon-green-1.png b/webapp/public/icons/traffic-light-icon-green-1.png new file mode 100644 index 000000000..912ea5be8 Binary files /dev/null and b/webapp/public/icons/traffic-light-icon-green-1.png differ diff --git a/webapp/public/icons/traffic-light-icon-green-1.svg b/webapp/public/icons/traffic-light-icon-green-1.svg new file mode 100644 index 000000000..95b13c475 --- /dev/null +++ b/webapp/public/icons/traffic-light-icon-green-1.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + diff --git a/webapp/public/icons/traffic-light-icon-proceed-with-caution.svg b/webapp/public/icons/traffic-light-icon-proceed-with-caution.svg new file mode 100644 index 000000000..d8e0580cb --- /dev/null +++ b/webapp/public/icons/traffic-light-icon-proceed-with-caution.svg @@ -0,0 +1,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/public/icons/traffic-light-icon-protected-clearance.svg b/webapp/public/icons/traffic-light-icon-protected-clearance.svg new file mode 100644 index 000000000..186926285 --- /dev/null +++ b/webapp/public/icons/traffic-light-icon-protected-clearance.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/public/icons/traffic-light-icon-protected-movement-allowed.svg b/webapp/public/icons/traffic-light-icon-protected-movement-allowed.svg new file mode 100644 index 000000000..1e36128b8 --- /dev/null +++ b/webapp/public/icons/traffic-light-icon-protected-movement-allowed.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/public/icons/traffic-light-icon-red-1.png b/webapp/public/icons/traffic-light-icon-red-1.png new file mode 100644 index 000000000..4e8a21723 Binary files /dev/null and b/webapp/public/icons/traffic-light-icon-red-1.png differ diff --git a/webapp/public/icons/traffic-light-icon-red-1.svg b/webapp/public/icons/traffic-light-icon-red-1.svg new file mode 100644 index 000000000..10eaad8fc --- /dev/null +++ b/webapp/public/icons/traffic-light-icon-red-1.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + diff --git a/webapp/public/icons/traffic-light-icon-red-flashing.png b/webapp/public/icons/traffic-light-icon-red-flashing.png new file mode 100644 index 000000000..f081820d0 Binary files /dev/null and b/webapp/public/icons/traffic-light-icon-red-flashing.png differ diff --git a/webapp/public/icons/traffic-light-icon-red-flashing.svg b/webapp/public/icons/traffic-light-icon-red-flashing.svg new file mode 100644 index 000000000..1342114ca --- /dev/null +++ b/webapp/public/icons/traffic-light-icon-red-flashing.svg @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/public/icons/traffic-light-icon-unknown.png b/webapp/public/icons/traffic-light-icon-unknown.png new file mode 100644 index 000000000..b2686fe1a Binary files /dev/null and b/webapp/public/icons/traffic-light-icon-unknown.png differ diff --git a/webapp/public/icons/traffic-light-icon-unknown.svg b/webapp/public/icons/traffic-light-icon-unknown.svg new file mode 100644 index 000000000..214b9ed86 --- /dev/null +++ b/webapp/public/icons/traffic-light-icon-unknown.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + diff --git a/webapp/public/icons/traffic-light-icon-yellow-1.png b/webapp/public/icons/traffic-light-icon-yellow-1.png new file mode 100644 index 000000000..cc6ae5c07 Binary files /dev/null and b/webapp/public/icons/traffic-light-icon-yellow-1.png differ diff --git a/webapp/public/icons/traffic-light-icon-yellow-1.svg b/webapp/public/icons/traffic-light-icon-yellow-1.svg new file mode 100644 index 000000000..1ea18850c --- /dev/null +++ b/webapp/public/icons/traffic-light-icon-yellow-1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/webapp/public/icons/traffic-light-icon-yellow-red-1.png b/webapp/public/icons/traffic-light-icon-yellow-red-1.png new file mode 100644 index 000000000..ccb82cd91 Binary files /dev/null and b/webapp/public/icons/traffic-light-icon-yellow-red-1.png differ diff --git a/webapp/public/icons/traffic-light-icon-yellow-red-1.svg b/webapp/public/icons/traffic-light-icon-yellow-red-1.svg new file mode 100644 index 000000000..947879c7b --- /dev/null +++ b/webapp/public/icons/traffic-light-icon-yellow-red-1.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + diff --git a/webapp/public/icons/traffic-light-icon-yellow-red-green.svg b/webapp/public/icons/traffic-light-icon-yellow-red-green.svg new file mode 100644 index 000000000..c65b7e4be --- /dev/null +++ b/webapp/public/icons/traffic-light-icon-yellow-red-green.svg @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webapp/sample.env.local b/webapp/sample.env.local index e12dcdab6..8d6635d1a 100644 --- a/webapp/sample.env.local +++ b/webapp/sample.env.local @@ -3,6 +3,8 @@ BUILD_PATH='./build' # mapbox access token REACT_APP_MAPBOX_TOKEN="" +REACT_APP_CVIZ_MAPBOX_TOKEN="" +REACT_APP_CVIZ_MAPBOX_STYLE_URL="" # used to swap endpoints for various environments or leave blank REACT_APP_ENV="dev" @@ -12,11 +14,15 @@ REACT_APP_GATEWAY_BASE_URL="http://cvmanager.local.com:8081" # base url or IP for keycloak REACT_APP_KEYCLOAK_URL="http://cvmanager.auth.com:8084/" +REACT_APP_KEYCLOAK_REALM="cvmanager" REACT_APP_COUNT_MESSAGE_TYPES='BSM,SSM,SPAT,SRM,MAP,PSM' REACT_APP_VIEWER_MESSAGE_TYPES='BSM,PSM' DOT_NAME="CDOT" +REACT_APP_CVIZ_API_SERVER_URL='http://localhost:8085' +REACT_APP_CVIZ_API_WS_URL='ws://localhost:8085' + # initial mapbox view REACT_APP_MAPBOX_INIT_LATITUDE="39.7392" REACT_APP_MAPBOX_INIT_LONGITUDE="-104.9903" diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx index 290ac2b0c..462f7eb4e 100644 --- a/webapp/src/App.tsx +++ b/webapp/src/App.tsx @@ -1,5 +1,4 @@ import React, { useEffect } from 'react' -import { css } from '@emotion/react' import './App.css' import { useSelector, useDispatch } from 'react-redux' import { @@ -15,7 +14,9 @@ import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom' import Dashboard from './Dashboard' import { NotFound } from './pages/404' import { theme } from './styles' -import { ThemeProvider } from '@mui/material' +import { getIntersections } from './generalSlices/intersectionSlice' +import { Toaster, ToastOptions } from 'react-hot-toast' +import { ThemeProvider, StyledEngineProvider } from '@mui/material' const App = () => { const dispatch: ThunkDispatch = useDispatch() @@ -41,22 +42,32 @@ const App = () => { // Refresh Data console.debug('Authorizing the user with the API') dispatch(getRsuData()) + dispatch(getIntersections()) }, [authLoginData, dispatch]) return ( - - - {routeNotFound ? ( - - ) : ( - - } /> - } /> - } /> - - )} - - + + + + {routeNotFound ? ( + + ) : ( + + } /> + } /> + } /> + + )} + + + + ) } diff --git a/webapp/src/Dashboard.tsx b/webapp/src/Dashboard.tsx index a472760d9..b6729d69d 100644 --- a/webapp/src/Dashboard.tsx +++ b/webapp/src/Dashboard.tsx @@ -5,7 +5,7 @@ import Header from './components/Header' import Menu from './features/menu/Menu' import Help from './components/Help' import Admin from './pages/Admin' -import Grid from '@material-ui/core/Grid' +import Grid from '@mui/material/Grid' import Tabs, { TabItem } from './components/Tabs' import Map from './pages/Map' import './App.css' @@ -14,7 +14,7 @@ import { // Actions getRsuData, } from './generalSlices/rsuSlice' -import { selectAuthLoginData, selectLoadingGlobal } from './generalSlices/userSlice' +import { selectAuthLoginData, selectLoadingGlobal, selectOrganizationName } from './generalSlices/userSlice' import { SecureStorageManager } from './managers' import { ReactKeycloakProvider } from '@react-keycloak/web' import keycloak from './keycloak-config' @@ -23,7 +23,10 @@ import { ThunkDispatch } from 'redux-thunk' import { RootState } from './store' import { AnyAction } from '@reduxjs/toolkit' import { Routes, Route, Navigate } from 'react-router-dom' +import IntersectionMapView from './pages/IntersectionMapView' +import IntersectionDashboard from './pages/IntersectionDashboard' import { NotFound } from './pages/404' +import AdminNotificationTab from './features/adminNotificationTab/AdminNotificationTab' let loginDispatched = false @@ -31,6 +34,7 @@ const Dashboard = () => { const dispatch: ThunkDispatch = useDispatch() const authLoginData = useSelector(selectAuthLoginData) const loadingGlobal = useSelector(selectLoadingGlobal) + const organizationName = useSelector(selectOrganizationName) useEffect(() => { keycloak @@ -53,7 +57,7 @@ const Dashboard = () => { dispatch(getRsuData()) }, [authLoginData, dispatch]) - console.log('Auth Role', SecureStorageManager.getUserRole()) + useEffect(() => {}, [organizationName]) return ( { <> + + {SecureStorageManager.getUserRole() !== 'admin' ? <> : } +
@@ -92,8 +99,10 @@ const Dashboard = () => { } /> - {/* } /> */} + } /> + } /> } /> + } /> } /> } /> diff --git a/webapp/src/EnvironmentVars.tsx b/webapp/src/EnvironmentVars.tsx index f4eb63468..ba6f7b2ed 100644 --- a/webapp/src/EnvironmentVars.tsx +++ b/webapp/src/EnvironmentVars.tsx @@ -1,63 +1,68 @@ -class EnvironmentVars { - static getBaseApiUrl() { - return process.env.REACT_APP_GATEWAY_BASE_URL - } - - static getMessageTypes() { - const COUNT_MESSAGE_TYPES = process.env.REACT_APP_COUNT_MESSAGE_TYPES - if (!COUNT_MESSAGE_TYPES) { - return [] - } - const messageTypes = COUNT_MESSAGE_TYPES.split(',').map((item) => item.trim()) - return messageTypes - } - - static getMessageViewerTypes() { - const VIEWER_MESSAGE_TYPES = process.env.REACT_APP_VIEWER_MESSAGE_TYPES - if (!VIEWER_MESSAGE_TYPES) { - return ['BSM'] // default to BSM if not set - } - const messageTypes = VIEWER_MESSAGE_TYPES.split(',').map((item) => item.trim()) - return messageTypes - } - - static getMapboxInitViewState() { - const MAPBOX_INIT_LATITUDE = Number(process.env.REACT_APP_MAPBOX_INIT_LATITUDE) - const MAPBOX_INIT_LONGITUDE = Number(process.env.REACT_APP_MAPBOX_INIT_LONGITUDE) - const MAPBOX_INIT_ZOOM = Number(process.env.REACT_APP_MAPBOX_INIT_ZOOM) - - const viewState = { - latitude: MAPBOX_INIT_LATITUDE, - longitude: MAPBOX_INIT_LONGITUDE, - zoom: MAPBOX_INIT_ZOOM, - } - - return viewState - } - - static MAPBOX_TOKEN = process.env.REACT_APP_MAPBOX_TOKEN - static KEYCLOAK_HOST_URL = process.env.REACT_APP_KEYCLOAK_URL - static DOT_NAME = process.env.REACT_APP_DOT_NAME - - static rsuInfoEndpoint = `${this.getBaseApiUrl()}/rsuinfo` - static rsuOnlineEndpoint = `${this.getBaseApiUrl()}/rsu-online-status` - static rsuCountsEndpoint = `${this.getBaseApiUrl()}/rsucounts` - static rsuMsgFwdQueryEndpoint = `${this.getBaseApiUrl()}/rsu-msgfwd-query` - static rsuCommandEndpoint = `${this.getBaseApiUrl()}/rsu-command` - static wzdxEndpoint = `${this.getBaseApiUrl()}/wzdx-feed` - static rsuMapInfoEndpoint = `${this.getBaseApiUrl()}/rsu-map-info` - static rsuGeoQueryEndpoint = `${this.getBaseApiUrl()}/rsu-geo-query` - static geoMsgDataEndpoint = `${this.getBaseApiUrl()}/rsu-geo-msg-data` - static issScmsStatusEndpoint = `${this.getBaseApiUrl()}/iss-scms-status` - static ssmSrmEndpoint = `${this.getBaseApiUrl()}/rsu-ssm-srm-data` - static authEndpoint = `${this.getBaseApiUrl()}/user-auth` - static adminAddRsu = `${this.getBaseApiUrl()}/admin-new-rsu` - static adminRsu = `${this.getBaseApiUrl()}/admin-rsu` - static adminAddUser = `${this.getBaseApiUrl()}/admin-new-user` - static adminUser = `${this.getBaseApiUrl()}/admin-user` - static adminAddOrg = `${this.getBaseApiUrl()}/admin-new-org` - static adminOrg = `${this.getBaseApiUrl()}/admin-org` - static contactSupport = `${this.getBaseApiUrl()}/contact-support` -} - -export default EnvironmentVars +class EnvironmentVars { + static getBaseApiUrl() { + return process.env.REACT_APP_GATEWAY_BASE_URL + } + + static getMessageTypes() { + const COUNT_MESSAGE_TYPES = process.env.REACT_APP_COUNT_MESSAGE_TYPES + if (!COUNT_MESSAGE_TYPES) { + return [] + } + const messageTypes = COUNT_MESSAGE_TYPES.split(',').map((item) => item.trim()) + return messageTypes + } + + static getMessageViewerTypes() { + const VIEWER_MESSAGE_TYPES = process.env.REACT_APP_VIEWER_MESSAGE_TYPES + if (!VIEWER_MESSAGE_TYPES) { + return ['BSM'] // default to BSM if not set + } + const messageTypes = VIEWER_MESSAGE_TYPES.split(',').map((item) => item.trim()) + return messageTypes + } + + static getMapboxInitViewState() { + const MAPBOX_INIT_LATITUDE = Number(process.env.REACT_APP_MAPBOX_INIT_LATITUDE) + const MAPBOX_INIT_LONGITUDE = Number(process.env.REACT_APP_MAPBOX_INIT_LONGITUDE) + const MAPBOX_INIT_ZOOM = Number(process.env.REACT_APP_MAPBOX_INIT_ZOOM) + + const viewState = { + latitude: MAPBOX_INIT_LATITUDE, + longitude: MAPBOX_INIT_LONGITUDE, + zoom: MAPBOX_INIT_ZOOM, + } + + return viewState + } + + static MAPBOX_TOKEN = process.env.REACT_APP_MAPBOX_TOKEN + static CVIZ_API_SERVER_URL = process.env.REACT_APP_CVIZ_API_SERVER_URL + static CVIZ_API_WS_URL = process.env.REACT_APP_CVIZ_API_WS_URL + static KEYCLOAK_HOST_URL = process.env.REACT_APP_KEYCLOAK_URL + static KEYCLOAK_REALM = process.env.REACT_APP_KEYCLOAK_REALM + static DOT_NAME = process.env.REACT_APP_DOT_NAME + + static rsuInfoEndpoint = `${this.getBaseApiUrl()}/rsuinfo` + static rsuOnlineEndpoint = `${this.getBaseApiUrl()}/rsu-online-status` + static rsuCountsEndpoint = `${this.getBaseApiUrl()}/rsucounts` + static rsuCommandEndpoint = `${this.getBaseApiUrl()}/rsu-command` + static wzdxEndpoint = `${this.getBaseApiUrl()}/wzdx-feed` + static rsuMapInfoEndpoint = `${this.getBaseApiUrl()}/rsu-map-info` + static rsuGeoQueryEndpoint = `${this.getBaseApiUrl()}/rsu-geo-query` + static rsuMsgFwdQueryEndpoint = `${this.getBaseApiUrl()}/rsu-msgfwd-query` + static geoMsgDataEndpoint = `${this.getBaseApiUrl()}/rsu-geo-msg-data` + static issScmsStatusEndpoint = `${this.getBaseApiUrl()}/iss-scms-status` + static ssmSrmEndpoint = `${this.getBaseApiUrl()}/rsu-ssm-srm-data` + static authEndpoint = `${this.getBaseApiUrl()}/user-auth` + static adminAddRsu = `${this.getBaseApiUrl()}/admin-new-rsu` + static adminRsu = `${this.getBaseApiUrl()}/admin-rsu` + static adminAddUser = `${this.getBaseApiUrl()}/admin-new-user` + static adminUser = `${this.getBaseApiUrl()}/admin-user` + static adminNotification = `${this.getBaseApiUrl()}/admin-notification` + static adminAddNotification = `${this.getBaseApiUrl()}/admin-new-notification` + static adminAddOrg = `${this.getBaseApiUrl()}/admin-new-org` + static adminOrg = `${this.getBaseApiUrl()}/admin-org` + static contactSupport = `${this.getBaseApiUrl()}/contact-support` +} + +export default EnvironmentVars diff --git a/webapp/src/__snapshots__/App.test.tsx.snap b/webapp/src/__snapshots__/App.test.tsx.snap index 520c5f1d2..4270f02c6 100644 --- a/webapp/src/__snapshots__/App.test.tsx.snap +++ b/webapp/src/__snapshots__/App.test.tsx.snap @@ -6,7 +6,7 @@ exports[`should take a snapshot 1`] = ` id="masterdiv" >
@@ -14,11 +14,11 @@ exports[`should take a snapshot 1`] = ` id="frontpage" >
Logo
+
`; diff --git a/webapp/src/apis/api-helper.ts b/webapp/src/apis/api-helper.ts index cfe4e1094..e930dc163 100644 --- a/webapp/src/apis/api-helper.ts +++ b/webapp/src/apis/api-helper.ts @@ -275,4 +275,5 @@ class ApiHelper { } } -export default new ApiHelper() +const apiHelper = new ApiHelper() +export default apiHelper diff --git a/webapp/src/apis/intersections/api-helper-cviz.ts b/webapp/src/apis/intersections/api-helper-cviz.ts new file mode 100644 index 000000000..5d440bace --- /dev/null +++ b/webapp/src/apis/intersections/api-helper-cviz.ts @@ -0,0 +1,105 @@ +import toast from 'react-hot-toast' +import EnvironmentVars from '../../EnvironmentVars' + +class CvizApiHelper { + formatQueryParams(query_params?: Record): string { + if (!query_params || Object.keys(query_params).length === 0) return '' + return `?${new URLSearchParams(query_params).toString()}` + } + + async invokeApi({ + path, + basePath, + method = 'GET', + headers = {}, + queryParams, + body, + token, + timeout, + responseType = 'json', + booleanResponse = false, + toastOnFailure = true, + toastOnSuccess = false, + successMessage = 'Successfully completed request!', + failureMessage = 'Request failed to complete', + }: { + path: string + basePath?: string + method?: string + headers?: Record + queryParams?: Record + body?: Object + token?: string + timeout?: number + responseType?: string + booleanResponse?: boolean + toastOnFailure?: boolean + toastOnSuccess?: boolean + successMessage?: string + failureMessage?: string + }): Promise { + const url = (basePath ?? EnvironmentVars.CVIZ_API_SERVER_URL!) + path + this.formatQueryParams(queryParams) + + const localHeaders: HeadersInit = { ...headers } + if (token) localHeaders['Authorization'] = `Bearer ${token}` + if (method === 'POST' && body && !('Content-Type' in localHeaders)) { + localHeaders['Content-Type'] = 'application/json' + } + + let controller: AbortController | undefined = undefined + let id: NodeJS.Timeout | undefined = undefined + if (timeout) { + controller = new AbortController() + id = setTimeout(() => controller?.abort(), timeout) + } + + const options: RequestInit = { + method: method, + headers: localHeaders, + body: body + ? localHeaders['Content-Type'] === 'application/x-www-form-urlencoded' + ? (body as string) + : JSON.stringify(body) + : undefined, + mode: 'cors', + signal: controller?.signal, + } + + console.debug('MAKING REQUEST TO ' + url + ' WITH OPTIONS', options) + + const resp = await fetch(url, options) + .then((response) => { + if (response.ok) { + if (toastOnSuccess) toast.success(successMessage) + if (booleanResponse) return true + } else { + console.error('Request failed with status code ' + response.status + ': ' + response.statusText) + if (response.status === 401) { + toast.error('Authentication failed, please sign in again') + // signIn(); + } else if (response.status === 403) { + toast.error('You are not authorized to perform this action.') + } else if (toastOnFailure) toast.error(failureMessage + ', with status code ' + response.status) + + if (booleanResponse) return false + return undefined + } + if (responseType === 'blob') { + return response.blob() + } else { + const resp = response.json() + resp.then((val) => console.debug('RESPONSE TO', url, val)) + return resp + } + }) + .catch((error: Error) => { + const errorMessage = failureMessage ?? 'Fetch request failed' + toast.error(errorMessage + '. Error: ' + error.message) + console.error(error.message) + }) + if (id) clearTimeout(id) + return resp + } +} + +export const authApiHelper = new CvizApiHelper() diff --git a/webapp/src/apis/intersections/assessments-api.ts b/webapp/src/apis/intersections/assessments-api.ts new file mode 100644 index 000000000..c0697e475 --- /dev/null +++ b/webapp/src/apis/intersections/assessments-api.ts @@ -0,0 +1,56 @@ +import { authApiHelper } from './api-helper-cviz' + +class AssessmentsApi { + async getLatestAssessment( + token: string, + eventType: string, + intersectionId: number, + roadRegulatorId: number, + startTime?: Date, + endTime?: Date + ): Promise { + const queryParams: Record = {} + queryParams['intersection_id'] = intersectionId.toString() + queryParams['road_regulator_id'] = roadRegulatorId.toString() + queryParams['latest'] = 'true' + if (startTime) queryParams['start_time_utc_millis'] = startTime.getTime().toString() + if (endTime) queryParams['end_time_utc_millis'] = endTime.getTime().toString() + + var response = + (await authApiHelper.invokeApi({ + path: `/assessments/${eventType}`, + token: token, + queryParams, + failureMessage: `Failed to retrieve assessments of type ${eventType}`, + })) ?? [] + return response.pop() + } + + async getAssessments( + token: string, + eventType: string, + intersectionId: number, + roadRegulatorId: number, + startTime?: Date, + endTime?: Date + ): Promise { + const queryParams: Record = {} + // queryParams["road_regulator_id"] = road_regulator_id; + queryParams['intersection_id'] = intersectionId.toString() + queryParams['road_regulator_id'] = roadRegulatorId.toString() + queryParams['latest'] = 'false' + if (startTime) queryParams['start_time_utc_millis'] = startTime.getTime().toString() + if (endTime) queryParams['end_time_utc_millis'] = endTime.getTime().toString() + + return ( + (await authApiHelper.invokeApi({ + path: `/assessments/${eventType}`, + token: token, + queryParams, + failureMessage: `Failed to retrieve assessments of type ${eventType}`, + })) ?? [] + ) + } +} + +export default new AssessmentsApi() diff --git a/webapp/src/apis/intersections/configuration-param-api.ts b/webapp/src/apis/intersections/configuration-param-api.ts new file mode 100644 index 000000000..f1ed5ae73 --- /dev/null +++ b/webapp/src/apis/intersections/configuration-param-api.ts @@ -0,0 +1,212 @@ +import { authApiHelper } from './api-helper-cviz' + +class ConfigParamsApi { + async getGeneralParameters(token: string): Promise { + // return ConfigParamsGeneral; + try { + var response = await authApiHelper.invokeApi({ + path: '/config/default/all', + token: token, + failureMessage: 'Failed to retrieve general parameters', + }) + return response ?? ([] as Config[]) + } catch (exception_var) { + console.error(exception_var) + return [] + } + } + + async getIntersectionParameters( + token: string, + intersectionId: number, + roadRegulatorId: number + ): Promise { + // return configParamsIntersection; + try { + var response = await authApiHelper.invokeApi({ + path: '/config/intersection/unique', + token: token, + queryParams: { intersection_id: intersectionId.toString(), road_regulator_id: roadRegulatorId.toString() }, + failureMessage: 'Failed to retrieve unique intersection parameters', + }) + return response ?? ([] as IntersectionConfig[]) + } catch (exception_var) { + console.error(exception_var) + return [] + } + } + + async getAllParameters(token: string, intersectionId: number, roadRegulatorId: number): Promise { + try { + var response = await authApiHelper.invokeApi({ + path: '/config/intersection/unique', + token: token, + queryParams: { intersection_id: intersectionId.toString(), road_regulator_id: roadRegulatorId.toString() }, + failureMessage: 'Failed to retrieve unique intersection parameters', + }) + return response ?? ([] as IntersectionConfig[]) + } catch (exception_var) { + console.error(exception_var) + return [] + } + } + + async getParameterGeneral(token: string, key: string): Promise { + try { + var response = ( + await authApiHelper.invokeApi({ + path: `/config/default/all`, + token: token, + failureMessage: `Failed to Retrieve Configuration Parameter ${key}`, + }) + ) + .filter((c) => c.key === key) + .at(-1) + return response as Config + } catch (exception_var) { + console.error(exception_var) + return undefined + } + } + + async getParameterIntersection( + token: string, + key: string, + intersectionId: number, + roadRegulatorId: number + ): Promise { + try { + var response = ( + await authApiHelper.invokeApi({ + path: `/config/intersection/all`, + token: token, + queryParams: { intersection_id: intersectionId.toString(), road_regulator_id: roadRegulatorId.toString() }, + toastOnFailure: false, + // failureMessage: `Failed to Retrieve Configuration Parameter ${key}`, + }) + ) + .filter((c) => c.key === key && c.intersectionID !== null && c.intersectionID !== 0 && c.intersectionID !== -1) + .at(-1) + return response as IntersectionConfig + } catch (exception_var) { + console.error(exception_var) + return undefined + } + } + + async getParameter( + token: string, + key: string, + intersectionId: number, + roadRegulatorId: number + ): Promise { + // try to get intersection parameter first, if not found, get general parameter + var param: Config | undefined = undefined + if (intersectionId !== -1) { + var param: Config | undefined = await this.getParameterIntersection(token, key, intersectionId, roadRegulatorId) + } + if (param == undefined) { + param = await this.getParameterGeneral(token, key) + } + return param + } + + async updateDefaultParameter(token: string, name: string, param: Config): Promise { + try { + var response = await authApiHelper.invokeApi({ + path: '/config/default', + token: token, + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: param, + toastOnSuccess: true, + successMessage: `Successfully Update Configuration Parameter ${name}`, + failureMessage: `Failed to Update Configuration Parameter ${name}`, + }) + return response as Config + } catch (exception_var) { + console.error(exception_var) + return undefined + } + } + + async updateIntersectionParameter( + token: string, + name: string, + param: IntersectionConfig + ): Promise { + try { + var response = await authApiHelper.invokeApi({ + path: '/config/intersection', + token: token, + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: param, + toastOnSuccess: true, + successMessage: `Successfully Update Intersection Configuration Parameter ${name}`, + failureMessage: `Failed to Update Intersection Configuration Parameter ${name}`, + }) + return response as IntersectionConfig + } catch (exception_var) { + console.error(exception_var) + return undefined + } + } + + async createIntersectionParameter( + token: string, + name: string, + value: Config, + intersectionId: number, + roadRegulatorId: number + ): Promise { + const param: IntersectionConfig = { + intersectionID: intersectionId, + roadRegulatorID: roadRegulatorId, + rsuID: 'rsu_1', + ...value, + } + + try { + var response = await authApiHelper.invokeApi({ + path: '/config/intersection/create/' + name, + token: token, + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: param, + toastOnSuccess: true, + successMessage: `Successfully Created Intersection Configuration Parameter ${name}`, + failureMessage: `Failed to Create Intersection Configuration Parameter ${name}`, + }) + return response as Config + } catch (exception_var) { + console.error(exception_var) + return undefined + } + } + + async removeOverriddenParameter( + token: string, + name: string, + config: IntersectionConfig + ): Promise { + try { + var response = await authApiHelper.invokeApi({ + path: '/config/intersection', + token: token, + method: 'DELETE', + headers: { 'Content-Type': 'application/json' }, + body: config, + toastOnSuccess: true, + successMessage: `Successfully Removed Intersection Configuration Parameter ${name}`, + failureMessage: `Failed to Remove Intersection Configuration Parameter ${name}`, + }) + return response as Config + } catch (exception_var) { + console.error(exception_var) + return undefined + } + } +} + +export const configParamApi = new ConfigParamsApi() diff --git a/webapp/src/apis/intersections/decoder-api.ts b/webapp/src/apis/intersections/decoder-api.ts new file mode 100644 index 000000000..cac85c616 --- /dev/null +++ b/webapp/src/apis/intersections/decoder-api.ts @@ -0,0 +1,35 @@ +import { authApiHelper } from './api-helper-cviz' + +class DecoderApi { + async getIntersections({ token }): Promise { + var response = await authApiHelper.invokeApi({ + path: '/intersection/list', + token: token, + failureMessage: 'Failed to retrieve intersection list', + }) + return response ?? [] + } + + async submitDecodeRequest({ + token, + data, + type, + }: { + token: string + data: string + type?: DECODER_MESSAGE_TYPE + }): Promise { + var response = await authApiHelper.invokeApi({ + path: '/decoder/upload', + token: token, + method: 'POST', + body: { + asn1Message: data, + type: type, + }, + }) + return response as DecoderApiResponseGeneric | undefined + } +} + +export default new DecoderApi() diff --git a/webapp/src/apis/intersections/events-api.ts b/webapp/src/apis/intersections/events-api.ts new file mode 100644 index 000000000..6456d7f97 --- /dev/null +++ b/webapp/src/apis/intersections/events-api.ts @@ -0,0 +1,103 @@ +import { authApiHelper } from './api-helper-cviz' + +interface Item { + label: string + value: string +} + +// TODO: Add processing_time_period event type when it is supported in the conflictmonitor api +const EVENT_TYPES: Item[] = [ + { label: 'ConnectionOfTravelEvent', value: 'connection_of_travel' }, + { label: 'IntersectionReferenceAlignmentEvent', value: 'intersection_reference_alignment' }, + { label: 'LaneDirectionOfTravelEvent', value: 'lane_direction_of_travel' }, + { label: 'SignalGroupAlignmentEvent', value: 'signal_group_alignment' }, + { label: 'SignalStateConflictEvent', value: 'signal_state_conflict' }, + { label: 'SignalStateEvent', value: 'signal_state' }, + { label: 'SignalStateStopEvent', value: 'signal_state_stop' }, + { label: 'TimeChangeDetailsEvent', value: 'time_change_details' }, + { label: 'MapMinimumDataEvent', value: 'map_minimum_data' }, + { label: 'SpatMinimumDataEvent', value: 'spat_minimum_data' }, + { label: 'MapBroadcastRateEvent', value: 'map_broadcast_rate' }, + { label: 'SpatBroadcastRateEvent', value: 'spat_broadcast_rate' }, +] + +class EventsApi { + async getEvents( + token: string, + eventType: string, + intersectionId: number, + roadRegulatorId: number, + startTime: Date, + endTime: Date, + { latest = false }: { latest?: boolean } = {} + ): Promise { + const queryParams = { + intersection_id: intersectionId.toString(), + road_regulator_id: roadRegulatorId.toString(), + start_time_utc_millis: startTime.getTime().toString(), + end_time_utc_millis: endTime.getTime().toString(), + latest: latest.toString(), + } + + const response = await authApiHelper.invokeApi({ + path: `/events/${eventType}`, + token: token, + queryParams: queryParams, + failureMessage: `Failed to retrieve events of type ${eventType}`, + }) + return response ?? ([] as MessageMonitor.Event[]) + } + + async getAllEvents( + token: string, + intersectionId: number, + roadRegulatorId: number, + startTime: Date, + endTime: Date + ): Promise { + const queryParams = { + intersection_id: intersectionId.toString(), + road_regulator_id: roadRegulatorId.toString(), + start_time_utc_millis: startTime.getTime().toString(), + end_time_utc_millis: endTime.getTime().toString(), + } + + const events: MessageMonitor.Event[] = [] + for (const eventTypeObj of EVENT_TYPES) { + const response: MessageMonitor.Event[] = + (await authApiHelper.invokeApi({ + path: `/events/${eventTypeObj.value}`, + token: token, + queryParams: queryParams, + failureMessage: `Failed to retrieve events of type ${eventTypeObj.value}`, + })) ?? [] + events.push(...response) + } + return events + } + + async getBsmByMinuteEvents( + token: string, + intersectionId: number, + startTime: Date, + endTime: Date, + { test = false }: { test?: boolean } = {} + ): Promise { + const queryParams = { + intersection_id: intersectionId.toString(), + start_time_utc_millis: startTime.getTime().toString(), + end_time_utc_millis: endTime.getTime().toString(), + test: test.toString(), + } + + const response = await authApiHelper.invokeApi({ + path: `/events/bsm_events_by_minute`, + token: token, + queryParams: queryParams, + failureMessage: `Failed to retrieve bsm events by minute`, + }) + return response ?? ([] as MessageMonitor.MinuteCount[]) + } +} + +export default new EventsApi() diff --git a/webapp/src/apis/intersections/graphs-api.ts b/webapp/src/apis/intersections/graphs-api.ts new file mode 100644 index 000000000..5ae6be5d8 --- /dev/null +++ b/webapp/src/apis/intersections/graphs-api.ts @@ -0,0 +1,130 @@ +import { authApiHelper } from './api-helper-cviz' + +class GraphsApi { + createGraphDataVal = (id: number, event_type: string, count: number): GraphArrayDataType => { + const val = { + id, + ConnectionOfTravelEventCount: 0, + IntersectionReferenceAlignmentEventCount: 0, + LaneDirectionOfTravelEventCount: 0, + ProcessingTimePeriodCount: 0, + SignalGroupAlignmentEventCount: 0, + SignalStateConflictEventCount: 0, + SignalStateEventCount: 0, + SignalStateStopEventCount: 0, + TimeChangeDetailsEventCount: 0, + MapMinimumDataEventCount: 0, + SpatMinimumDataEventCount: 0, + MapBroadcastRateEventCount: 0, + SpatBroadcastRateEventCount: 0, + } + switch (event_type) { + case 'connection_of_travel': + val.ConnectionOfTravelEventCount = count + break + case 'intersection_reference_alignment': + val.IntersectionReferenceAlignmentEventCount = count + break + case 'lane_direction_of_travel': + val.LaneDirectionOfTravelEventCount = count + break + case 'processing_time_period': + val.ProcessingTimePeriodCount = count + break + case 'signal_group_alignment': + val.SignalGroupAlignmentEventCount = count + break + case 'signal_state_conflict': + val.SignalStateConflictEventCount = count + break + case 'signal_state': + val.SignalStateEventCount = count + break + case 'signal_state_stop': + val.SignalStateStopEventCount = count + break + case 'time_change_details': + val.TimeChangeDetailsEventCount = count + break + case 'map_minimum_data': + val.MapMinimumDataEventCount = count + break + case 'spat_minimum_data': + val.SpatMinimumDataEventCount = count + break + case 'map_broadcast_rate': + val.MapBroadcastRateEventCount = count + break + case 'spat_broadcast_rate': + val.SpatBroadcastRateEventCount = count + break + } + return val + } + + combineGraphDataVals = (val1: GraphArrayDataType, val2: GraphArrayDataType): GraphArrayDataType => ({ + id: val1.id, + ConnectionOfTravelEventCount: val1.ConnectionOfTravelEventCount + val2.ConnectionOfTravelEventCount, + IntersectionReferenceAlignmentEventCount: + val1.IntersectionReferenceAlignmentEventCount + val2.IntersectionReferenceAlignmentEventCount, + LaneDirectionOfTravelEventCount: val1.LaneDirectionOfTravelEventCount + val2.LaneDirectionOfTravelEventCount, + ProcessingTimePeriodCount: val1.ProcessingTimePeriodCount + val2.ProcessingTimePeriodCount, + SignalGroupAlignmentEventCount: val1.SignalGroupAlignmentEventCount + val2.SignalGroupAlignmentEventCount, + SignalStateConflictEventCount: val1.SignalStateConflictEventCount + val2.SignalStateConflictEventCount, + SignalStateEventCount: val1.SignalStateEventCount + val2.SignalStateEventCount, + SignalStateStopEventCount: val1.SignalStateStopEventCount + val2.SignalStateStopEventCount, + TimeChangeDetailsEventCount: val1.TimeChangeDetailsEventCount + val2.TimeChangeDetailsEventCount, + MapMinimumDataEventCount: val1.MapMinimumDataEventCount + val2.MapMinimumDataEventCount, + SpatMinimumDataEventCount: val1.SpatMinimumDataEventCount + val2.SpatMinimumDataEventCount, + MapBroadcastRateEventCount: val1.MapBroadcastRateEventCount + val2.MapBroadcastRateEventCount, + SpatBroadcastRateEventCount: val1.SpatBroadcastRateEventCount + val2.SpatBroadcastRateEventCount, + }) + + async getGraphData({ + token, + intersectionId, + roadRegulatorId, + event_types, + startTime, + endTime, + }: { + token: string + intersectionId: number + roadRegulatorId: number + event_types: string[] + startTime: Date + endTime: Date + }): Promise> { + const queryParams: Record = {} + queryParams['intersection_id'] = intersectionId.toString() + queryParams['road_regulator_id'] = roadRegulatorId.toString() + queryParams['start_time_utc_millis'] = startTime.getTime().toString() + queryParams['end_time_utc_millis'] = endTime.getTime().toString() + + const results: { [id: string]: GraphArrayDataType } = {} + + for (const event_type of event_types) { + try { + const graphData: Array<{ id: string; count: number }> = await authApiHelper.invokeApi({ + path: `/events/${event_type}/daily_counts`, + token: token, + queryParams, + failureMessage: 'Failed to generate graph data', + }) + graphData?.forEach((data) => { + const val = this.createGraphDataVal(new Date(data.id).getTime(), event_type, data.count) + if (results[data.id] === undefined) { + results[data.id] = val + } else { + results[data.id] = this.combineGraphDataVals(results[data.id], val) + } + }) + } catch (e) { + console.error('Failed to generate graph data for event type ' + event_type, e) + } + } + return Object.values(results) + } +} + +export default new GraphsApi() diff --git a/webapp/src/apis/intersections/keycloak-api.ts b/webapp/src/apis/intersections/keycloak-api.ts new file mode 100644 index 000000000..77b0504a0 --- /dev/null +++ b/webapp/src/apis/intersections/keycloak-api.ts @@ -0,0 +1,199 @@ +import { authApiHelper } from './api-helper-cviz' +import EnvironmentVars from '../../EnvironmentVars' + +const KEYCLOAK_ADMIN_ENDPOINT = `${EnvironmentVars.KEYCLOAK_HOST_URL}/admin/realms/${EnvironmentVars.KEYCLOAK_REALM}` +const KEYCLOAK_AUTH_ENDPOINT = `${EnvironmentVars.KEYCLOAK_HOST_URL}/realms/${EnvironmentVars.KEYCLOAK_REALM}` + +class KeycloakApi { + getEmailPreferences(attributes: Record): EmailPreferences { + return { + receiveAnnouncements: attributes?.['receiveAnnouncements']?.[0] === 'true', + notificationFrequency: (attributes?.['notificationFrequency']?.[0] ?? 'NEVER') as EmailFrequency, + receiveCeaseBroadcastRecommendations: attributes?.['receiveCeaseBroadcastRecommendations']?.[0] === 'true', + receiveCriticalErrorMessages: attributes?.['receiveCriticalErrorMessages']?.[0] === 'true', + receiveNewUserRequests: attributes?.['receiveNewUserRequests']?.[0] === 'true', + } + } + + async getGroups({ token }: { token: string }): Promise { + return ( + (await authApiHelper.invokeApi({ + path: `/groups`, + basePath: KEYCLOAK_ADMIN_ENDPOINT, + token: token, + failureMessage: 'Failed to get Keycloak groups', + })) ?? [] + ).map((kRole: any) => { + return { + id: kRole.id, + name: kRole.name, + } + }) + } + + async getUserRoles({ token, id }: { token: string; id: string }): Promise { + return ( + (await authApiHelper.invokeApi({ + path: `/users/${id}/groups`, + basePath: KEYCLOAK_ADMIN_ENDPOINT, + token: token, + failureMessage: 'Failed to get user roles', + })) ?? [] + ) + .map((role: any) => role.name) + .filter((role: string) => ['ADMIN', 'USER'].includes(role)) + .pop() + } + + async getUsersList({ token }: { token: string }): Promise { + const users = + (await authApiHelper.invokeApi({ + path: `/users`, + basePath: KEYCLOAK_ADMIN_ENDPOINT, + token: token, + failureMessage: 'Failed to get users. If this failure repeats, please log out and log back in.', + })) ?? [] + return await Promise.all( + users.map(async (kUser: any) => { + const user: User = { + id: kUser.id, + email: kUser.username, + first_name: kUser.firstName, + last_name: kUser.lastName, + role: (await this.getUserRoles({ token, id: kUser.id })) ?? 'USER', + email_preference: this.getEmailPreferences(kUser.attributes), + } + return user + }) + ) + } + + async getUserInfo({ token, id }: { token: string; id: string }): Promise { + const kUser = await authApiHelper.invokeApi({ + path: `/users/${id}`, + basePath: KEYCLOAK_ADMIN_ENDPOINT, + token: token, + failureMessage: 'Failed to get user info', + }) + if (kUser) { + return { + id: kUser.id, + email: kUser.username, + first_name: kUser.firstName, + last_name: kUser.lastName, + role: (await this.getUserRoles({ token, id: kUser.id })) ?? 'USER', + email_preference: kUser.attributes?.EMAIL_FREQUENCY?.[0] ?? 'NEVER', + } + } else { + return undefined + } + } + + async removeUser({ token, id }: { token: string; id: string }): Promise { + return (await authApiHelper.invokeApi({ + path: `/users/${id}`, + basePath: KEYCLOAK_ADMIN_ENDPOINT, + method: 'DELETE', + token: token, + booleanResponse: true, + failureMessage: 'Failed to get user info', + })) as boolean + } + + async addUserToGroup({ token, id, role }: { token: string; id: string; role: UserRole }): Promise { + const groupId: string | undefined = (await this.getGroups({ token })).find((r) => r.name == role)?.id + return (await authApiHelper.invokeApi({ + path: `/users/${id}/groups/${groupId}`, + basePath: KEYCLOAK_ADMIN_ENDPOINT, + method: 'PUT', + token: token, + headers: { + 'Content-Type': 'application/json', + }, + booleanResponse: true, + failureMessage: `Failed to add user to ${role} group`, + })) as boolean + } + + async removeUserFromGroup({ token, id, role }: { token: string; id: string; role: UserRole }): Promise { + const groupId: string | undefined = (await this.getGroups({ token })).find((r) => r.name == role)?.id + return (await authApiHelper.invokeApi({ + path: `/users/${id}/groups/${groupId}`, + basePath: KEYCLOAK_ADMIN_ENDPOINT, + method: 'DELETE', + token: token, + headers: { + 'Content-Type': 'application/json', + }, + booleanResponse: true, + failureMessage: `Failed to remove user from ${role} group`, + })) as boolean + } + + async updateUserInfo({ + token, + id, + email, + first_name, + last_name, + }: { + token: string + id: string + email?: string + first_name?: string + last_name?: string + }): Promise { + const updatedParams = {} + if (email) { + updatedParams['username'] = email + updatedParams['email'] = email + updatedParams['emailVerified'] = false + } + if (first_name) { + updatedParams['firstName'] = first_name + } + if (last_name) { + updatedParams['lastName'] = last_name + } + + return (await authApiHelper.invokeApi({ + path: `/users/${id}`, + basePath: KEYCLOAK_ADMIN_ENDPOINT, + method: 'PUT', + token: token, + body: updatedParams, + headers: { + 'Content-Type': 'application/json', + }, + booleanResponse: true, + failureMessage: 'Failed to update user info', + })) as boolean + } + + async logout({ token, refresh_token }: { token?: string; refresh_token: string }): Promise { + return (await authApiHelper.invokeApi({ + path: `/protocol/openid-connect/logout`, + basePath: KEYCLOAK_AUTH_ENDPOINT, + method: 'POST', + token: token, + body: `client_id=${EnvironmentVars.KEYCLOAK_REALM}&refresh_token=${refresh_token}`, + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + }, + booleanResponse: true, + failureMessage: 'Failed to logout user', + })) as boolean + } + + async validateToken({ token }: { token?: string }): Promise { + return (await authApiHelper.invokeApi({ + path: `/protocol/openid-connect/userinfo`, + basePath: KEYCLOAK_AUTH_ENDPOINT, + method: 'GET', + token: token, + booleanResponse: true, + })) as boolean + } +} + +export default new KeycloakApi() diff --git a/webapp/src/apis/intersections/mm-api.ts b/webapp/src/apis/intersections/mm-api.ts new file mode 100644 index 000000000..fa88315eb --- /dev/null +++ b/webapp/src/apis/intersections/mm-api.ts @@ -0,0 +1,157 @@ +import { authApiHelper } from './api-helper-cviz' + +class MessageMonitorApi { + async getIntersections({ token }): Promise { + var response = await authApiHelper.invokeApi({ + path: '/intersection/list', + token: token, + failureMessage: 'Failed to retrieve intersection list', + }) + return response ?? [] + } + + async getSpatMessages({ + token, + intersectionId, + roadRegulatorId, + startTime, + endTime, + latest, + compact, + }: { + token: string + intersectionId: number + roadRegulatorId: number + startTime?: Date + endTime?: Date + latest?: boolean + compact?: boolean + }): Promise { + const queryParams: Record = {} + queryParams['intersection_id'] = intersectionId.toString() + queryParams['road_regulator_id'] = roadRegulatorId.toString() + if (startTime) queryParams['start_time_utc_millis'] = startTime.getTime().toString() + if (endTime) queryParams['end_time_utc_millis'] = endTime.getTime().toString() + if (latest) queryParams['latest'] = latest.toString() + if (compact) queryParams['compact'] = compact.toString() + + var response = await authApiHelper.invokeApi({ + path: '/spat/json', + token: token, + queryParams, + failureMessage: 'Failed to retrieve SPAT messages', + }) + return response ?? ([] as ProcessedSpat[]) + } + + async getMapMessages({ + token, + intersectionId, + roadRegulatorId, + startTime, + endTime, + latest, + }: { + token: string + intersectionId: number + roadRegulatorId?: number + startTime?: Date + endTime?: Date + latest?: boolean + }): Promise { + const queryParams: Record = {} + queryParams['intersection_id'] = intersectionId.toString() + if (roadRegulatorId !== undefined) { + queryParams['road_regulator_id'] = roadRegulatorId.toString() + } + if (startTime) queryParams['start_time_utc_millis'] = startTime.getTime().toString() + if (endTime) queryParams['end_time_utc_millis'] = endTime.getTime().toString() + if (latest !== undefined) queryParams['latest'] = latest.toString() + + var response = await authApiHelper.invokeApi({ + path: '/map/json', + token: token, + queryParams, + failureMessage: 'Failed to retrieve MAP messages', + }) + return response ?? ([] as ProcessedMap[]) + } + + async getBsmMessages({ + token, + vehicleId, + startTime, + endTime, + long, + lat, + distance, + }: { + token: string + vehicleId?: string + startTime?: Date + endTime?: Date + long?: number + lat?: number + distance?: number + }): Promise { + const queryParams: Record = {} + if (vehicleId) queryParams['origin_ip'] = vehicleId + if (startTime) queryParams['start_time_utc_millis'] = startTime.getTime().toString() + if (endTime) queryParams['end_time_utc_millis'] = endTime.getTime().toString() + if (long) queryParams['longitude'] = long.toString() + if (lat) queryParams['latitude'] = lat.toString() + if (distance) queryParams['distance'] = distance.toString() + + var response = await authApiHelper.invokeApi({ + path: '/bsm/json', + token: token, + queryParams, + failureMessage: 'Failed to retrieve BSM messages', + }) + return response ?? ([] as OdeBsmData[]) + } + + async getMessageCount( + token: string, + messageType: string, + intersectionId: number, + startTime: Date, + endTime: Date + ): Promise { + var queryParams: Record = { + start_time_utc_millis: startTime.getTime().toString(), + end_time_utc_millis: endTime.getTime().toString(), + test: 'false', + } + + if (messageType == 'bsm') { + // Call getMapMessages to get the latitude and longitude + const mapMessages = await this.getMapMessages({ + token: token, + intersectionId: intersectionId, + latest: true, + }) + const latestMapMessage = mapMessages[0] + const coordinates = latestMapMessage?.properties.refPoint + if (latestMapMessage && coordinates.latitude && coordinates.longitude) { + queryParams['latitude'] = coordinates.latitude.toString() + queryParams['longitude'] = coordinates.longitude.toString() + queryParams['distance'] = '500' + } + } + + if (intersectionId !== -1) { + queryParams['intersection_id'] = intersectionId.toString() + } + + const response = await authApiHelper.invokeApi({ + path: `/${messageType}/count`, + token: token, + queryParams: queryParams, + failureMessage: `Failed to retrieve message count for type ${messageType}`, + }) + return response + } +} + +export default new MessageMonitorApi() diff --git a/webapp/src/apis/intersections/notification-api.ts b/webapp/src/apis/intersections/notification-api.ts new file mode 100644 index 000000000..cf778a8c7 --- /dev/null +++ b/webapp/src/apis/intersections/notification-api.ts @@ -0,0 +1,103 @@ +import toast from 'react-hot-toast' +import { authApiHelper } from './api-helper-cviz' + +const NOTIFICATION_TYPES: string[] = [ + 'connection_of_travel', + 'intersection_reference_alignment', + 'lane_direction_of_travel', + 'signal_state_conflict_notification', + 'signal_group_alignment_notification', + 'map_broadcast_rate_notification', + 'spat_broadcast_rate_notification', +] + +class NotificationApi { + async getActiveNotifications({ + token, + intersectionId, + roadRegulatorId, + startTime, + endTime, + key, + }: { + token: string + intersectionId: number + roadRegulatorId: number + startTime?: Date + endTime?: Date + key?: string + }): Promise { + const queryParams: Record = {} + queryParams['intersection_id'] = intersectionId.toString() + queryParams['road_regulator_id'] = roadRegulatorId.toString() + if (startTime) queryParams['start_time_utc_millis'] = startTime.getTime().toString() + if (endTime) queryParams['end_time_utc_millis'] = endTime.getTime().toString() + if (key) queryParams['key'] = key + + const notifications = await authApiHelper.invokeApi({ + path: `/notifications/active`, + token: token, + queryParams, + failureMessage: 'Failed to retrieve active notifications', + }) + + return notifications ?? [] + } + + async dismissNotifications({ token, ids }: { token: string; ids: string[] }): Promise { + let success = true + for (const id of ids) { + success = + success && + (await authApiHelper.invokeApi({ + path: `/notifications/active`, + method: 'DELETE', + token: token, + body: id.toString(), + booleanResponse: true, + })) + } + if (success) { + toast.success(`Successfully Dismissed ${ids.length} Notifications`) + } else { + toast.error(`Failed to Dismiss some Notifications`) + } + return true + } + + async getAllNotifications({ + token, + intersectionId, + roadRegulatorId, + startTime, + endTime, + }: { + token: string + intersectionId: number + roadRegulatorId: number + startTime?: Date + endTime?: Date + }): Promise { + const queryParams: Record = {} + queryParams['intersection_id'] = intersectionId.toString() + queryParams['road_regulator_id'] = roadRegulatorId.toString() + if (startTime) queryParams['start_time_utc_millis'] = startTime.getTime().toString() + if (endTime) queryParams['end_time_utc_millis'] = endTime.getTime().toString() + + const notifications: MessageMonitor.Notification[] = [] + for (const notificationType of NOTIFICATION_TYPES) { + const resp: MessageMonitor.Notification[] = + (await authApiHelper.invokeApi({ + path: `/notifications/${notificationType}`, + token: token, + queryParams, + failureMessage: `Failed to retrieve notifications of type ${notificationType}`, + })) ?? [] + notifications.push(...resp) + } + + return notifications + } +} + +export default new NotificationApi() diff --git a/webapp/src/apis/intersections/reports-api.ts b/webapp/src/apis/intersections/reports-api.ts new file mode 100644 index 000000000..6f4396ca1 --- /dev/null +++ b/webapp/src/apis/intersections/reports-api.ts @@ -0,0 +1,90 @@ +import { authApiHelper } from './api-helper-cviz' + +export type ReportMetadata = { + reportName: string + intersectionID: number + roadRegulatorID: string + reportGeneratedAt: Date + reportStartTime: Date + reportStopTime: Date + reportContents: string[] +} + +class ReportsApi { + async generateReport({ + token, + intersectionId, + roadRegulatorId, + startTime, + endTime, + }: { + token: string + intersectionId: number + roadRegulatorId: number + startTime: Date + endTime: Date + }): Promise { + const queryParams: Record = {} + queryParams['intersection_id'] = intersectionId.toString() + queryParams['road_regulator_id'] = roadRegulatorId.toString() + if (startTime) queryParams['start_time_utc_millis'] = startTime.getTime().toString() + if (endTime) queryParams['end_time_utc_millis'] = endTime.getTime().toString() + + const pdfReport = await authApiHelper.invokeApi({ + path: `/reports/generate`, + token: token, + responseType: 'blob', + queryParams, + failureMessage: 'Failed to generate PDF report', + }) + + return pdfReport + } + + async listReports({ + token, + intersectionId, + roadRegulatorId, + startTime, + endTime, + }: { + token: string + intersectionId: number + roadRegulatorId: number + startTime: Date + endTime: Date + }): Promise { + const queryParams: Record = {} + queryParams['intersection_id'] = intersectionId.toString() + queryParams['road_regulator_id'] = roadRegulatorId.toString() + queryParams['start_time_utc_millis'] = startTime.getTime().toString() + queryParams['end_time_utc_millis'] = endTime.getTime().toString() + queryParams['latest'] = 'false' + + const pdfReport = await authApiHelper.invokeApi({ + path: `/reports/list`, + token: token, + queryParams, + failureMessage: 'Failed to list PDF reports', + }) + + return pdfReport + } + + async downloadReport({ token, reportName }: { token: string; reportName: string }): Promise { + const queryParams: Record = {} + queryParams['report_name'] = reportName + + const pdfReport = await authApiHelper.invokeApi({ + path: `/reports/download`, + token: token, + responseType: 'blob', + queryParams, + failureMessage: `Failed to download PDF report ${reportName}`, + }) + + return pdfReport + } +} + +export default new ReportsApi() diff --git a/webapp/src/apis/intersections/user-management-api.ts b/webapp/src/apis/intersections/user-management-api.ts new file mode 100644 index 000000000..d7f7b85c5 --- /dev/null +++ b/webapp/src/apis/intersections/user-management-api.ts @@ -0,0 +1,130 @@ +import { authApiHelper } from './api-helper-cviz' + +class UserManagementApi { + async createUserCreationRequest({ + email, + first_name, + last_name, + role, + }: { + email: string + first_name: string + last_name: string + role: UserRole + }): Promise { + return (await authApiHelper.invokeApi({ + path: `/users/create_user_creation_request`, + method: 'POST', + body: { + email: email, + firstName: first_name, + lastName: last_name, + role: role, + }, + booleanResponse: true, + toastOnSuccess: true, + successMessage: 'User created successfully', + failureMessage: 'Failed to create user creation request', + })) as boolean + } + + async getUserCreationRequests({ token }: { token: string }): Promise { + const creationRequests: User[] = ( + (await authApiHelper.invokeApi({ + path: `/users/find_user_creation_request`, + token: token, + method: 'GET', + failureMessage: 'Failed to get user creation requests', + })) ?? [] + ).map((user: any) => ({ + ...user, + first_name: user.firstName, + last_name: user.lastName, + role: user.role.toLowerCase(), + })) + + return creationRequests + } + + async createUser({ + token, + email, + first_name, + last_name, + role, + }: { + token: string + email: string + first_name: string + last_name: string + role: UserRole + }): Promise { + return (await authApiHelper.invokeApi({ + path: `/users/accept_user_creation_request`, + token: token, + method: 'POST', + body: { + email: email, + firstName: first_name, + lastName: last_name, + role: role, + id: '', + }, + booleanResponse: true, + toastOnSuccess: true, + successMessage: 'User created successfully', + failureMessage: 'Failed to create new user', + })) as boolean + } + + async removeUserCreationRequest({ token, email }: { token: string; email: string }): Promise { + return (await authApiHelper.invokeApi({ + path: `/users/delete_user_creation_request`, + token: token, + method: 'DELETE', + queryParams: { email }, + booleanResponse: true, + failureMessage: 'Failed to remove user creation request from database', + })) as boolean + } + + async updateUserEmailPreference({ + token, + email, + preferences, + }: { + token: string + email: string + preferences: EmailPreferences + }): Promise { + return (await authApiHelper.invokeApi({ + path: `/users/update_user_email_preference`, + token: token, + method: 'POST', + body: preferences, + booleanResponse: true, + toastOnSuccess: true, + successMessage: 'Email preferences updated successfully', + failureMessage: 'Failed to update email preferences', + })) as boolean + } + + async getUserEmailPreference({ token }: { token: string }): Promise { + return ( + (await authApiHelper.invokeApi({ + path: `/users/get_user_email_preference`, + method: 'POST', + token: token, + toastOnFailure: false, + })) ?? { + receiveAnnouncements: true, + notificationFrequency: 'ONCE_PER_DAY', + receiveCeaseBroadcastRecommendations: true, + receiveCriticalErrorMessages: true, + receiveNewUserRequests: false, + } + ) + } +} + +export default new UserManagementApi() diff --git a/webapp/src/apis/rsu-api.test.ts b/webapp/src/apis/rsu-api.test.ts index 4b3609ad5..7583f4f8a 100644 --- a/webapp/src/apis/rsu-api.test.ts +++ b/webapp/src/apis/rsu-api.test.ts @@ -1,6 +1,5 @@ import RsuApi from './rsu-api' import EnvironmentVars from '../EnvironmentVars' -import ApiHelper from './api-helper' beforeEach(() => { fetchMock.mockClear() diff --git a/webapp/src/apis/rsu-api.ts b/webapp/src/apis/rsu-api.ts index cad98272e..231924f78 100644 --- a/webapp/src/apis/rsu-api.ts +++ b/webapp/src/apis/rsu-api.ts @@ -1,5 +1,5 @@ import EnvironmentVars from '../EnvironmentVars' -import { WZDxWorkZoneFeed } from '../types/wzdx/WzdxWorkZoneFeed42' +import { WZDxWorkZoneFeed } from '../models/wzdx/WzdxWorkZoneFeed42' import apiHelper from './api-helper' import { ApiMsgRespWithCodes, diff --git a/webapp/src/components/AdminTable.tsx b/webapp/src/components/AdminTable.tsx index eed297bac..36e09829b 100644 --- a/webapp/src/components/AdminTable.tsx +++ b/webapp/src/components/AdminTable.tsx @@ -1,6 +1,6 @@ import React from 'react' import MaterialTable, { Action, Column } from '@material-table/core' -import { ThemeProvider } from '@mui/material' +import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles' import { tableTheme } from '../styles' import '../features/adminRsuTab/Admin.css' @@ -16,23 +16,25 @@ interface AdminTableProps { const AdminTable = (props: AdminTableProps) => { return (
- - - + + + + +
) } diff --git a/webapp/src/components/ContactSupportMenu.test.tsx b/webapp/src/components/ContactSupportMenu.test.tsx index aeec2fee5..7b086ada3 100644 --- a/webapp/src/components/ContactSupportMenu.test.tsx +++ b/webapp/src/components/ContactSupportMenu.test.tsx @@ -4,7 +4,7 @@ import ContactSupportMenu from './ContactSupportMenu' import { replaceChaoticIds } from '../utils/test-utils' it('should take a snapshot', () => { - const { container } = render() - - expect(replaceChaoticIds(container)).toMatchSnapshot() -}) \ No newline at end of file + const { container } = render() + + expect(replaceChaoticIds(container)).toMatchSnapshot() +}) diff --git a/webapp/src/components/ContactSupportMenu.tsx b/webapp/src/components/ContactSupportMenu.tsx index ab8918154..94f889d5d 100644 --- a/webapp/src/components/ContactSupportMenu.tsx +++ b/webapp/src/components/ContactSupportMenu.tsx @@ -6,12 +6,12 @@ import 'react-widgets/styles.css' import RsuApi from '../apis/rsu-api' import './css/ContactSupportMenu.css' +import toast from 'react-hot-toast' +import Dialog from '@mui/material/Dialog' +import { DialogActions, DialogContent, DialogTitle } from '@mui/material' const ContactSupportMenu = () => { const [hidden, setHidden] = useState(true) // hidden by default - const [successMsg, setSuccessMsg] = useState('') - const [errorState, setErrorState] = useState(false) - const [errorMessage, setErrorMessage] = useState('') const { register, handleSubmit, @@ -24,22 +24,15 @@ const ContactSupportMenu = () => { const res = await RsuApi.postContactSupport(data) const status = res.status if (status === 200) { - console.debug('Successfully sent email: ' + status) - setSuccessMsg('Successfully sent email') - setErrorState(false) + toast.success('Successfully sent email') reset() } else { - console.error('Something went wrong: ' + status) - setSuccessMsg('') - setErrorState(true) - setErrorMessage('Something went wrong, please try again later') + toast.error('Something went wrong: ' + status) } } catch (exception_var) { - console.error(exception_var) - setSuccessMsg('') - setErrorState(true) - setErrorMessage('An exception occurred, please try again later') + toast.error('An exception occurred, please try again later') } + setHidden(true) } if (hidden) { @@ -59,73 +52,64 @@ const ContactSupportMenu = () => { } return ( -
-
-
Contact Support
- - Your Email - - {errors.email && {errors.email.message}} - - - Subject - - {errors.subject && {errors.subject.message}} - - - Message - - {errors.message && {errors.message.message}} - - - {successMsg && ( -

- {successMsg} -

- )} - {errorState && ( -

- Error: {errorMessage} -

- )} -
- - -
-
- -
-
-
+ + Contact Support + +
+ + Your Email + + {errors.email && {errors.email.message}} + + + Subject + + {errors.subject && {errors.subject.message}} + + + Message + + {errors.message && {errors.message.message}} + +
+ + + + + + ) } diff --git a/webapp/src/components/Header.tsx b/webapp/src/components/Header.tsx index d38ea1843..dc78cbadb 100644 --- a/webapp/src/components/Header.tsx +++ b/webapp/src/components/Header.tsx @@ -1,6 +1,6 @@ import React, { useEffect } from 'react' -import Grid from '@material-ui/core/Grid' -import logo from '../images/logo.png' +import Grid from '@mui/material/Grid' +import logo from '../icons/logo.png' import { useSelector, useDispatch } from 'react-redux' import EnvironmentVars from '../EnvironmentVars' import { @@ -58,8 +58,6 @@ const Header = () => { keycloak?.logout() } - console.log(authLoginData, keycloak?.authenticated) - return (
{authLoginData && keycloak?.authenticated ? ( diff --git a/webapp/src/components/Help.tsx b/webapp/src/components/Help.tsx index 063c921e5..a8d6a3122 100644 --- a/webapp/src/components/Help.tsx +++ b/webapp/src/components/Help.tsx @@ -1,11 +1,11 @@ import React from 'react' import '../components/css/Help.css' -import popup from '../images/rsu_popup.PNG' -import status from '../images/rsu_status.PNG' -import table from '../images/rsu_count.PNG' -import menu from '../images/rsu_menu.PNG' -import heatmap from '../images/rsu_heatmap.PNG' -import configure from '../images/rsu_configure.PNG' +import popup from '../icons/rsu_popup.PNG' +import status from '../icons/rsu_status.PNG' +import table from '../icons/rsu_count.PNG' +import menu from '../icons/rsu_menu.PNG' +import heatmap from '../icons/rsu_heatmap.PNG' +import configure from '../icons/rsu_configure.PNG' import EnvironmentVars from '../EnvironmentVars' import ContactSupportMenu from './ContactSupportMenu' diff --git a/webapp/src/components/RsuFirmwareMenu.tsx b/webapp/src/components/RsuFirmwareMenu.tsx index 78aa48314..4dab22487 100644 --- a/webapp/src/components/RsuFirmwareMenu.tsx +++ b/webapp/src/components/RsuFirmwareMenu.tsx @@ -58,7 +58,7 @@ const RsuFirmwareMenu = (props: RsuFirmwareMenuProps) => {

Firmware Upgrade

- {props.type == 'single_rsu' && ( + {props.type === 'single_rsu' && (
{firmwareUpgradeAvailable ? (
@@ -102,7 +102,7 @@ const RsuFirmwareMenu = (props: RsuFirmwareMenuProps) => {
)} - {props.type == 'multi_rsu' && ( + {props.type === 'multi_rsu' && (

diff --git a/webapp/src/components/SnmpsetMenu.tsx b/webapp/src/components/SnmpsetMenu.tsx index 967330501..b5dc7365d 100644 --- a/webapp/src/components/SnmpsetMenu.tsx +++ b/webapp/src/components/SnmpsetMenu.tsx @@ -3,12 +3,8 @@ import React from 'react' import { useDispatch, useSelector } from 'react-redux' import { - selectChangeSuccess, - selectErrorState, selectDestIp, selectSnmpMsgType, - selectSnmpFilterMsg, - selectSnmpFilterErr, // Actions submitSnmpSet, @@ -22,22 +18,19 @@ import { selectRsuIpv4, selectRsuManufacturer } from '../generalSlices/rsuSlice' import { RootState } from '../store' import './css/SnmpwalkMenu.css' +import toast from 'react-hot-toast' -export type SnmpsetMenu = { +export type SnmpsetMenuProps = { type: string rsuIpList: string[] } -const SnmpsetMenu = (props: SnmpsetMenu) => { +const SnmpsetMenu = (props: SnmpsetMenuProps) => { const { type, rsuIpList } = props const dispatch: ThunkDispatch = useDispatch() - const changeSuccess = useSelector(selectChangeSuccess) - const errorState = useSelector(selectErrorState) const destIp = useSelector(selectDestIp) const snmpMsgType = useSelector(selectSnmpMsgType) - const snmpFilterMsg = useSelector(selectSnmpFilterMsg) - const snmpFilterErr = useSelector(selectSnmpFilterErr) const rsuIp = useSelector(selectRsuIpv4) const rsuManufacturer = useSelector(selectRsuManufacturer) @@ -63,7 +56,16 @@ const SnmpsetMenu = (props: SnmpsetMenu) => { - {type !== 'single_rsu' && ( @@ -83,15 +85,6 @@ const SnmpsetMenu = (props: SnmpsetMenu) => { )} - {changeSuccess ? ( -

-

Successful write to RSU

-
- ) : ( -

- )} - {errorState !== '' ? :
} - {type !== 'single_rsu' ? (

@@ -120,20 +113,18 @@ const SnmpsetMenu = (props: SnmpsetMenu) => { If you are configuring SPaT or MAP forwarding, apply the TX message
filter after your configuration has been applied

- - {snmpFilterMsg !== '' ? ( -
- {snmpFilterErr === true ? ( - - ) : ( -

{snmpFilterMsg}

- )} -
- ) : ( -
- )}
) : (
diff --git a/webapp/src/components/SnmpwalkMenu.tsx b/webapp/src/components/SnmpwalkMenu.tsx index 88c76b1a2..525e38452 100644 --- a/webapp/src/components/SnmpwalkMenu.tsx +++ b/webapp/src/components/SnmpwalkMenu.tsx @@ -6,7 +6,6 @@ import { Options } from './AdminDeletionOptions' import { selectRsuManufacturer, selectRsuIpv4 } from '../generalSlices/rsuSlice' import { selectMsgFwdConfig, - selectErrorState, // Actions refreshSnmpFwdConfig, @@ -19,15 +18,16 @@ import { // Actions deleteSnmpSet, } from '../generalSlices/configSlice' -import { IconButton, ThemeProvider, Tooltip, createTheme } from '@mui/material' +import { IconButton, ThemeProvider, StyledEngineProvider, Tooltip } from '@mui/material' import { AnyAction, ThunkDispatch } from '@reduxjs/toolkit' import { RootState } from '../store' +import toast from 'react-hot-toast' +import { snmpWalkMenuTheme } from '../styles' const SnmpwalkMenu = () => { const dispatch: ThunkDispatch = useDispatch() const msgFwdConfig = useSelector(selectMsgFwdConfig) - const errorState = useSelector(selectErrorState) const rsuIp = useSelector(selectRsuIpv4) const rsuManufacturer = useSelector(selectRsuManufacturer) @@ -48,7 +48,11 @@ const SnmpwalkMenu = () => { snmpMsgType: countsMsgType, destIp: ip, }) - ) + ).then((data: any) => { + data.payload.changeSuccess + ? toast.success('Successfully deleted SNMP forwarding') + : toast.error('Failed to delete SNMP forwarding: ' + data.payload.errorState) + }) }, }, { @@ -67,140 +71,93 @@ const SnmpwalkMenu = () => { return (
- -
-

Message Forwarding

- - { - dispatch(refreshSnmpFwdConfig(rsuIp)) - }} - > - - - -
+ + +
+

Message Forwarding

+ + { + dispatch(refreshSnmpFwdConfig(rsuIp)) + }} + size="medium" + > + + + +
-
- {Object.hasOwn(msgFwdConfig, 'rsuXmitMsgFwdingTable') && - Object.hasOwn(msgFwdConfig, 'rsuReceivedMsgTable') ? ( -
-

TX Forward Table

- {Object.keys(msgFwdConfig.rsuXmitMsgFwdingTable).map((index) => ( -
- - -
- ))} +
+ {Object.hasOwn(msgFwdConfig, 'rsuXmitMsgFwdingTable') && + Object.hasOwn(msgFwdConfig, 'rsuReceivedMsgTable') ? ( +
+

TX Forward Table

+ {Object.keys(msgFwdConfig.rsuXmitMsgFwdingTable).map((index) => ( +
+ + +
+ ))} -

RX Forward Table

- {Object.keys(msgFwdConfig.rsuReceivedMsgTable).map((index) => ( -
- - -
- ))} -
- ) : ( -
- {Object.keys(msgFwdConfig).map((index) => ( -
- - -
- ))} -
- )} -
- - {errorState !== '' ? ( - - ) : ( -
- )} - +

RX Forward Table

+ {Object.keys(msgFwdConfig.rsuReceivedMsgTable).map((index) => ( +
+ + +
+ ))} +
+ ) : ( +
+ {Object.keys(msgFwdConfig).map((index) => ( +
+ + +
+ ))} +
+ )} +
+ +
) } -const theme = createTheme({ - palette: { - primary: { - main: '#d16d15', - light: '#0e2052', - contrastTextColor: '#0e2052', - }, - secondary: { - main: '#d16d15', - light: '#0e2052', - contrastTextColor: '#0e2052', - }, - text: { - primary: '#ffffff', - secondary: '#ffffff', - disabled: '#ffffff', - hint: '#ffffff', - }, - action: { - disabledBackground: 'rgba(209, 109, 21, 0.2)', - disabled: '#ffffff', - }, - }, - components: { - MuiSvgIcon: { - styleOverrides: { - root: { - color: '#d16d15', - }, - }, - }, - }, - typography: { - allVariants: { - color: '#ffffff', - }, - button: { - textTransform: 'none', - }, - }, -}) - export default SnmpwalkMenu diff --git a/webapp/src/components/SsmSrmItem.tsx b/webapp/src/components/SsmSrmItem.tsx index 327b735b9..ea86d2d20 100644 --- a/webapp/src/components/SsmSrmItem.tsx +++ b/webapp/src/components/SsmSrmItem.tsx @@ -1,5 +1,5 @@ import React, { useEffect } from 'react' -import { SelectedSrm } from '../types/Srm' +import { SelectedSrm } from '../models/Srm' import './css/SsmSrmItem.css' diff --git a/webapp/src/components/VerticalTabs.tsx b/webapp/src/components/VerticalTabs.tsx new file mode 100644 index 000000000..efb1e17a5 --- /dev/null +++ b/webapp/src/components/VerticalTabs.tsx @@ -0,0 +1,136 @@ +import React, { useEffect, useState } from 'react' +import { useDispatch } from 'react-redux' +import { updateTableData as updateRsuTableData } from '../features/adminRsuTab/adminRsuTabSlice' +import { getAvailableUsers } from '../features/adminUserTab/adminUserTabSlice' + +import '../features/adminRsuTab/Admin.css' +import { AnyAction, ThunkDispatch } from '@reduxjs/toolkit' +import { RootState } from '../store' +import { Box, Tab, Tabs, Typography } from '@mui/material' +import { Link, Navigate, Route, Routes, useLocation } from 'react-router-dom' +import { NotFound } from '../pages/404' + +interface TabPanelProps { + children?: React.ReactNode +} + +function TabPanel(props: TabPanelProps) { + const { children, ...other } = props + + return ( +
+ + {children} + +
+ ) +} + +interface VerticalTabItem { + path: string + title: string + adminRequired?: boolean + child: React.ReactNode +} + +interface VerticalTabProps { + notFoundRoute: React.ReactNode + defaultTabIndex?: number + tabs: VerticalTabItem[] +} + +function VerticalTabs(props: VerticalTabProps) { + const { notFoundRoute, defaultTabIndex, tabs } = props + const dispatch: ThunkDispatch = useDispatch() + const location = useLocation() + const defaultTabKey = tabs[defaultTabIndex ?? 0]?.path + + const getSelectedTab = () => location.pathname.split('/').at(-1) || defaultTabKey + + const [value, setValue] = useState(getSelectedTab()) + + useEffect(() => { + setValue(getSelectedTab()) + }, [location.pathname]) + + const handleChange = (_e, newValue) => { + setValue(newValue) + } + + useEffect(() => { + dispatch(updateRsuTableData()) + dispatch(getAvailableUsers()) + }, [dispatch]) + + return ( + + + + {tabs.map((tab) => { + const index = tabs.indexOf(tab) + return ( + + ) + })} + + + + + } /> + {tabs.map((tab) => ( + + ))} + + + + + ) +} + +export default VerticalTabs diff --git a/webapp/src/components/__snapshots__/AdminFormManager.test.tsx.snap b/webapp/src/components/__snapshots__/AdminFormManager.test.tsx.snap index 9e105adeb..019359b82 100644 --- a/webapp/src/components/__snapshots__/AdminFormManager.test.tsx.snap +++ b/webapp/src/components/__snapshots__/AdminFormManager.test.tsx.snap @@ -147,7 +147,7 @@ exports[`snapshot organization 1`] = ` viewBox="0 0 24 24" > @@ -170,7 +170,7 @@ exports[`snapshot organization 1`] = ` viewBox="0 0 24 24" > @@ -417,7 +417,7 @@ exports[`snapshot rsu 1`] = ` viewBox="0 0 24 24" >
@@ -495,7 +495,7 @@ exports[`snapshot rsu 1`] = ` style="width: 48px;" > @@ -592,7 +592,7 @@ exports[`snapshot rsu 1`] = ` viewBox="0 0 24 24" > @@ -634,7 +634,7 @@ exports[`snapshot rsu 1`] = ` viewBox="0 0 24 24" > @@ -676,7 +676,7 @@ exports[`snapshot rsu 1`] = ` viewBox="0 0 24 24" > @@ -718,7 +718,7 @@ exports[`snapshot rsu 1`] = ` viewBox="0 0 24 24" > @@ -788,20 +788,21 @@ exports[`snapshot rsu 1`] = ` />

Rows per page:

- - -
- - Rcv Err Emails - @@ -1394,7 +1353,7 @@ exports[`snapshot user 1`] = ` > No records to display @@ -1429,20 +1388,21 @@ exports[`snapshot user 1`] = ` />

Rows per page: