diff --git a/requirements-dev.txt b/requirements-dev.txt index 6c791ae72..8105cd7c7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ -mypy~=1.5.0 -pre-commit~=3.4.0 +mypy~=1.6.0 +pre-commit~=3.5.0 pylint~=3.0.0 sourcery~=1.10.0 types-Pillow~=10.1.0.0 diff --git a/server/Cargo.lock b/server/Cargo.lock index 762c53b0f..e90a75621 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -1712,8 +1712,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.4", - "pem", - "ring", + "pem 1.1.1", + "ring 0.16.20", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "jsonwebtoken" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e863f95209c79b9b8b001c4b03463385f890a765dbc4e0802cb8d4177e3e410" +dependencies = [ + "base64 0.21.4", + "pem 3.0.2", + "ring 0.17.4", "serde", "serde_json", "simple_asn1", @@ -1742,9 +1756,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libm" @@ -1924,7 +1938,7 @@ dependencies = [ "isahc", "iso8601", "js-sys", - "jsonwebtoken", + "jsonwebtoken 8.3.0", "log", "meilisearch-index-setting-macro", "serde", @@ -2097,7 +2111,7 @@ dependencies = [ "chrono", "image", "imageproc", - "jsonwebtoken", + "jsonwebtoken 9.0.0", "log", "octocrab", "pretty_assertions", @@ -2297,7 +2311,7 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-timeout", - "jsonwebtoken", + "jsonwebtoken 8.3.0", "once_cell", "percent-encoding", "pin-project", @@ -2417,6 +2431,16 @@ dependencies = [ "base64 0.13.1", ] +[[package]] +name = "pem" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" +dependencies = [ + "base64 0.21.4", + "serde", +] + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -2827,11 +2851,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce3045ffa7c981a6ee93f640b538952e155f1ae3a1a02b84547fc7a56b7059a" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + [[package]] name = "rsa" version = "0.9.2" @@ -2889,7 +2927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki", "sct", ] @@ -2921,8 +2959,8 @@ version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -2988,8 +3026,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4025,6 +4063,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.1" diff --git a/server/feedback/Cargo.toml b/server/feedback/Cargo.toml index 26659ba00..bbcc2aa70 100644 --- a/server/feedback/Cargo.toml +++ b/server/feedback/Cargo.toml @@ -29,7 +29,7 @@ regex = "1.10.2" octocrab = "0.31.2" # web -jsonwebtoken = "8.3.0" +jsonwebtoken = "9.0.0" chrono= { version = "0.4.31", default-features = false } actix-governor = { version = "0.5.0", features = ["log"] } diff --git a/webclient/package-lock.json b/webclient/package-lock.json index 2fe68bcd8..753154c84 100644 --- a/webclient/package-lock.json +++ b/webclient/package-lock.json @@ -808,9 +808,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz", - "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==", + "version": "8.51.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz", + "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3870,15 +3870,15 @@ } }, "node_modules/eslint": { - "version": "8.50.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz", - "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==", + "version": "8.51.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz", + "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.50.0", + "@eslint/js": "8.51.0", "@humanwhocodes/config-array": "^0.11.11", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", diff --git a/webclient/package.json b/webclient/package.json index b97330ef3..3c6975f36 100644 --- a/webclient/package.json +++ b/webclient/package.json @@ -36,8 +36,8 @@ "@vue/eslint-config-typescript": "12.0.0", "@vue/tsconfig": "0.4.0", "@yankeeinlondon/link-builder": "1.2.1", - "cypress": "13.3.1", - "eslint": "8.50.0", + "cypress": "13.3.0", + "eslint": "8.51.0", "eslint-plugin-vue": "9.17.0", "isomorphic-fetch": "3.0.0", "npm-run-all": "4.1.5",