diff --git a/Backend/BackendFramework.csproj b/Backend/BackendFramework.csproj index ab11905f01..a9d9f1d1c7 100644 --- a/Backend/BackendFramework.csproj +++ b/Backend/BackendFramework.csproj @@ -20,8 +20,8 @@ NU1701 - - + + diff --git a/Backend/Dockerfile b/Backend/Dockerfile index 493c55878a..e9a8b6b681 100644 --- a/Backend/Dockerfile +++ b/Backend/Dockerfile @@ -1,5 +1,5 @@ -# Docker multi-stage build using bitnami/dotnet-sdk:6.0.408-debian-11-r8 -FROM bitnami/dotnet-sdk@sha256:e9e0647da363ab10fa575e49810840e955a6a7c01f21c4d9dcbd01403b7a20cc AS builder +# Docker multi-stage build using bitnami/dotnet-sdk:6.0.408-debian-11-r11 +FROM bitnami/dotnet-sdk@sha256:63cdc71743bb0bd48f34175eea4f78f54ac66acf4ddbbef566023486f6bd8acb AS builder WORKDIR /app # Copy csproj and restore (fetch dependencies) as distinct layers. @@ -10,8 +10,8 @@ RUN dotnet restore COPY . ./ RUN dotnet publish -c Release -o build -# Build runtime image. Using bitnami/aspnet-core:6.0.16-debian-11-r6 -FROM bitnami/aspnet-core@sha256:83d7e223ade1178c9bdcf1b3f2594a95a17930df361ce9d78574372c070ed95d +# Build runtime image. Using bitnami/aspnet-core:6.0.16-debian-11-r11 +FROM bitnami/aspnet-core@sha256:d39190e77f114dfdb429333f0e329e6a3cc34ca3bcae45c112c33a057b92f69a ENV ASPNETCORE_URLS=http://+:5000 ENV COMBINE_IS_IN_CONTAINER=1 diff --git a/Dockerfile b/Dockerfile index a588b66589..d8747660ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# User guide build environment using Python 3.13.3-bullseye +# User guide build environment using Python 3.11.3-bullseye FROM python@sha256:181e49146bfdc8643ebe0f66cd06f27f42df40a0921438e96770dab09797effb AS user_guide_builder ENV PYTHONDONTWRITEBYTECODE 1 diff --git a/README.md b/README.md index 107af074da..3d00bc6d02 100644 --- a/README.md +++ b/README.md @@ -107,9 +107,9 @@ A rapid word collection tool. See the [User Guide](https://sillsdev.github.io/Th ### Prepare the Environment -1. Set the environment variable `COMBINE_JWT_SECRET_KEY` to a string **containing at least 16 characters**, such as - _This is a secret key_. Set it in your `.profile` (Linux or Mac 10.14-), your `.zprofile` (Mac 10.15+), or the - _System_ app (Windows). +1. Set the environment variable `COMBINE_JWT_SECRET_KEY` to a string **containing at least 32 characters**, such as + _This is a secret key that is longer_. Set it in your `.profile` (Linux or Mac 10.14-), your `.zprofile` (Mac + 10.15+), or the _System_ app (Windows). 2. If you want the email services to work you will need to set the following environment variables. These values must be kept secret, so ask your email administrator to supply them. diff --git a/docs/user_guide/docs/licenses/backend_licenses.txt b/docs/user_guide/docs/licenses/backend_licenses.txt index 9b0c87c67d..c8f178dbae 100644 --- a/docs/user_guide/docs/licenses/backend_licenses.txt +++ b/docs/user_guide/docs/licenses/backend_licenses.txt @@ -596,7 +596,7 @@ license Type:Apache-2.0 #################################################################################################### Package:Microsoft.IdentityModel.Abstractions -Version:6.30.0 +Version:6.30.1 project URL:https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet Description:A package containing thin abstractions for Microsoft.IdentityModel. licenseUrl:https://licenses.nuget.org/MIT @@ -612,7 +612,7 @@ license Type:MIT #################################################################################################### Package:Microsoft.IdentityModel.JsonWebTokens -Version:6.30.0 +Version:6.30.1 project URL:https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet Description:Includes types that provide support for creating, serializing and validating JSON Web Tokens. licenseUrl:https://licenses.nuget.org/MIT @@ -636,7 +636,7 @@ license Type:MIT #################################################################################################### Package:Microsoft.IdentityModel.Logging -Version:6.30.0 +Version:6.30.1 project URL:https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet Description:Includes Event Source based logging support. licenseUrl:https://licenses.nuget.org/MIT @@ -668,7 +668,7 @@ license Type:MIT #################################################################################################### Package:Microsoft.IdentityModel.Tokens -Version:6.30.0 +Version:6.30.1 project URL:https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet Description:Includes types that provide support for SecurityTokens, Cryptographic operations: Signing, Verifying Signatures, Encryption. licenseUrl:https://licenses.nuget.org/MIT @@ -1730,7 +1730,7 @@ license Type:MIT #################################################################################################### Package:System.IdentityModel.Tokens.Jwt -Version:6.30.0 +Version:6.30.1 project URL:https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet Description:Includes types that provide support for creating, serializing and validating JSON Web Tokens. licenseUrl:https://licenses.nuget.org/MIT diff --git a/docs/user_guide/docs/licenses/frontend_licenses.txt b/docs/user_guide/docs/licenses/frontend_licenses.txt index f8aaf2eee1..aba379bbd1 100644 --- a/docs/user_guide/docs/licenses/frontend_licenses.txt +++ b/docs/user_guide/docs/licenses/frontend_licenses.txt @@ -703,7 +703,7 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -@material-table/core 6.1.13 +@material-table/core 6.1.15 MIT MIT License @@ -728,7 +728,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -@matt-block/react-recaptcha-v2 2.0.0 +@matt-block/react-recaptcha-v2 2.0.1 MIT MIT License @@ -40685,7 +40685,7 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -chart.js 4.2.1 +chart.js 4.3.0 MIT The MIT License (MIT) diff --git a/package-lock.json b/package-lock.json index 475f68579e..5e3bddc24d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,8 @@ "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@loadable/component": "^5.15.0", - "@material-table/core": "^6.1.13", - "@matt-block/react-recaptcha-v2": "^2.0.0", + "@material-table/core": "^6.1.15", + "@matt-block/react-recaptcha-v2": "^2.0.1", "@microsoft/signalr": "^6.0.7", "@mui/icons-material": "^5.11.16", "@mui/material": "^5.12.3", @@ -22,7 +22,7 @@ "@reduxjs/toolkit": "^1.9.3", "@segment/analytics-next": "^1.51.6", "axios": "^0.27.2", - "chart.js": "^4.2.1", + "chart.js": "^4.3.0", "crypto-js": "^4.1.1", "dayjs": "^1.11.7", "distinct-colors": "^3.0.0", @@ -71,7 +71,7 @@ "@types/redux-mock-store": "^1.0.3", "@types/segment-analytics": "^0.0.34", "@types/uuid": "^9.0.1", - "@types/validator": "^13.7.16", + "@types/validator": "^13.7.17", "@typescript-eslint/eslint-plugin": "^5.55.0", "@typescript-eslint/parser": "^5.3.1", "eslint": "^8.40.0", @@ -3383,9 +3383,9 @@ } }, "node_modules/@material-table/core": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/@material-table/core/-/core-6.1.13.tgz", - "integrity": "sha512-/j+3ADRBZeWrZXmZ5IUNVWM4VBRRJwzBj0lMhHywlVbX+Yewm16IL3sNjpYpMI5xNlwr7xTKrhb7fvGvA8J2Pg==", + "version": "6.1.15", + "resolved": "https://registry.npmjs.org/@material-table/core/-/core-6.1.15.tgz", + "integrity": "sha512-lcqfov8HuMfzcrbYA1ljfqFP7Qc+eSr9lbD/PNXdhRfqJMUnScnzPRTy+9uQA/TZmhFupFS6tNyHANYPr74/Og==", "dependencies": { "@babel/runtime": "^7.19.0", "@date-io/core": "^2.16.0", @@ -3437,9 +3437,9 @@ } }, "node_modules/@matt-block/react-recaptcha-v2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@matt-block/react-recaptcha-v2/-/react-recaptcha-v2-2.0.0.tgz", - "integrity": "sha512-0Nr3BWtQLCr6M9ZnJZi/Rz52u5zunVTv417uomNa367K1Y2gjn87GcByHJ7IlNIsFE1ZgAmK81jYVLhLe4/lOg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@matt-block/react-recaptcha-v2/-/react-recaptcha-v2-2.0.1.tgz", + "integrity": "sha512-nQ1DjdjmfeG5dcKwqprfgBMdBO1MYlFcB4LtfMDsw8kmuxVuRsiVlAHsmARirmGutJ9zKQpvcYZqy2HbIoAH5w==", "dependencies": { "nanoid": "^3.3.4" }, @@ -8045,9 +8045,9 @@ "dev": true }, "node_modules/@types/validator": { - "version": "13.7.16", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.16.tgz", - "integrity": "sha512-VyKmLktUHYLbrSbsRi241MSUlGYomQgK/tfCNpej3Gt5qDOM10AZ3nU2aR2s5JritClXuOBu4K7MkywVW/Y6Ow==", + "version": "13.7.17", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.17.tgz", + "integrity": "sha512-aqayTNmeWrZcvnG2MG9eGYI6b7S5fl+yKgPs6bAjOTwPS316R5SxBGKvtSExfyoJU7pIeHJfsHI0Ji41RVMkvQ==", "dev": true }, "node_modules/@types/ws": { @@ -9788,14 +9788,14 @@ } }, "node_modules/chart.js": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.2.1.tgz", - "integrity": "sha512-6YbpQ0nt3NovAgOzbkSSeeAQu/3za1319dPUQTXn9WcOpywM8rGKxJHrhS8V8xEkAlk8YhEfjbuAPfUyp6jIsw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz", + "integrity": "sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==", "dependencies": { "@kurkle/color": "^0.3.0" }, "engines": { - "pnpm": "^7.0.0" + "pnpm": ">=7" } }, "node_modules/check-types": { @@ -25368,9 +25368,9 @@ } }, "@material-table/core": { - "version": "6.1.13", - "resolved": "https://registry.npmjs.org/@material-table/core/-/core-6.1.13.tgz", - "integrity": "sha512-/j+3ADRBZeWrZXmZ5IUNVWM4VBRRJwzBj0lMhHywlVbX+Yewm16IL3sNjpYpMI5xNlwr7xTKrhb7fvGvA8J2Pg==", + "version": "6.1.15", + "resolved": "https://registry.npmjs.org/@material-table/core/-/core-6.1.15.tgz", + "integrity": "sha512-lcqfov8HuMfzcrbYA1ljfqFP7Qc+eSr9lbD/PNXdhRfqJMUnScnzPRTy+9uQA/TZmhFupFS6tNyHANYPr74/Og==", "requires": { "@babel/runtime": "^7.19.0", "@date-io/core": "^2.16.0", @@ -25404,9 +25404,9 @@ } }, "@matt-block/react-recaptcha-v2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@matt-block/react-recaptcha-v2/-/react-recaptcha-v2-2.0.0.tgz", - "integrity": "sha512-0Nr3BWtQLCr6M9ZnJZi/Rz52u5zunVTv417uomNa367K1Y2gjn87GcByHJ7IlNIsFE1ZgAmK81jYVLhLe4/lOg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@matt-block/react-recaptcha-v2/-/react-recaptcha-v2-2.0.1.tgz", + "integrity": "sha512-nQ1DjdjmfeG5dcKwqprfgBMdBO1MYlFcB4LtfMDsw8kmuxVuRsiVlAHsmARirmGutJ9zKQpvcYZqy2HbIoAH5w==", "requires": { "nanoid": "^3.3.4" } @@ -27636,9 +27636,9 @@ "dev": true }, "@types/validator": { - "version": "13.7.16", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.16.tgz", - "integrity": "sha512-VyKmLktUHYLbrSbsRi241MSUlGYomQgK/tfCNpej3Gt5qDOM10AZ3nU2aR2s5JritClXuOBu4K7MkywVW/Y6Ow==", + "version": "13.7.17", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.17.tgz", + "integrity": "sha512-aqayTNmeWrZcvnG2MG9eGYI6b7S5fl+yKgPs6bAjOTwPS316R5SxBGKvtSExfyoJU7pIeHJfsHI0Ji41RVMkvQ==", "dev": true }, "@types/ws": { @@ -28922,9 +28922,9 @@ "dev": true }, "chart.js": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.2.1.tgz", - "integrity": "sha512-6YbpQ0nt3NovAgOzbkSSeeAQu/3za1319dPUQTXn9WcOpywM8rGKxJHrhS8V8xEkAlk8YhEfjbuAPfUyp6jIsw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz", + "integrity": "sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==", "requires": { "@kurkle/color": "^0.3.0" } diff --git a/package.json b/package.json index d4cd48bd73..283baa1ad4 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,8 @@ "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@loadable/component": "^5.15.0", - "@material-table/core": "^6.1.13", - "@matt-block/react-recaptcha-v2": "^2.0.0", + "@material-table/core": "^6.1.15", + "@matt-block/react-recaptcha-v2": "^2.0.1", "@microsoft/signalr": "^6.0.7", "@mui/icons-material": "^5.11.16", "@mui/material": "^5.12.3", @@ -48,7 +48,7 @@ "@reduxjs/toolkit": "^1.9.3", "@segment/analytics-next": "^1.51.6", "axios": "^0.27.2", - "chart.js": "^4.2.1", + "chart.js": "^4.3.0", "crypto-js": "^4.1.1", "dayjs": "^1.11.7", "distinct-colors": "^3.0.0", @@ -97,7 +97,7 @@ "@types/redux-mock-store": "^1.0.3", "@types/segment-analytics": "^0.0.34", "@types/uuid": "^9.0.1", - "@types/validator": "^13.7.16", + "@types/validator": "^13.7.17", "@typescript-eslint/eslint-plugin": "^5.55.0", "@typescript-eslint/parser": "^5.3.1", "eslint": "^8.40.0",