From 48a898bdf5b3004bf42e970ccabed06cebc98769 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 28 Feb 2024 11:34:05 +0000 Subject: [PATCH 1/2] Update for 2.1.1 release --- CHANGELOG.md | 20 ++++++++++++++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88553b841..de115b366 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +#### 2.1.1: Release + + - Set disableRequestedAuthnContext in SAML strategy (#3519) @knolleary + - Installation Service (#3521) @MarianRaphael + - Implement instance auto snapshots (#3507) @Steve-Mcl + - Enforce username rules on create (#3514) @hardillb + - Bump sinon from 16.1.0 to 17.0.1 (#3497) @app/dependabot + - Improve logPassthrough documentation (#3506) @hardillb + - Fix NOT NULL constraint on `ProjectSnapshots.UserId` (#3503) @Steve-Mcl + - fix device editor tunnel status indicator (#3504) @Steve-Mcl + - Bump ip from 2.0.0 to 2.0.1 (#3505) @app/dependabot + - Add bug label to template (#3502) @MarianRaphael + - Update information about local PostgreSQL (#3493) @ppawlowski + - Update docker docs to new container names (#3492) @hardillb + - docs: Kube stacks %s/flowforge/flowfuse/ (#3386) @ZJvandeWeg + - Add the broker to the CSP allowed list (#3484) @hardillb + - Add timeout failure mode to Admin Settings access control (#3491) @hardillb + - Disable housekeeper in testing (#3483) @Pezmc + - Fix link in k8s updgrade instructions (#3489) @hardillb + #### 2.1.0: Release - Implement device auto snapshot (#3481) @Steve-Mcl diff --git a/package-lock.json b/package-lock.json index d80370d55..0b446e748 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@flowfuse/flowfuse", - "version": "2.1.0", + "version": "2.1.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@flowfuse/flowfuse", - "version": "2.1.0", + "version": "2.1.1", "license": "SEE LICENSE IN ./LICENSE", "dependencies": { "@aws-sdk/client-ses": "^3.352.0", diff --git a/package.json b/package.json index 9466bae56..49fc2a1fd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@flowfuse/flowfuse", - "version": "2.1.0", + "version": "2.1.1", "description": "An open source low-code development platform", "homepage": "https://flowfuse.com", "bugs": { From f67d75b3140e9ef0332b2070c656651cd7ff1dd9 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 28 Feb 2024 11:41:07 +0000 Subject: [PATCH 2/2] Update driver-localfs --- package-lock.json | 215 ++++++++++++++++++++++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 198 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0b446e748..51ec97ffc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "@fastify/swagger": "^8.10.1", "@fastify/swagger-ui": "^2.1.0", "@fastify/websocket": "^8.1.0", - "@flowfuse/driver-localfs": "^2.1.0", + "@flowfuse/driver-localfs": "^2.1.1", "@headlessui/vue": "1.7.16", "@heroicons/vue": "1.0.6", "@immobiliarelabs/fastify-sentry": "^8.0.0", @@ -4132,11 +4132,11 @@ } }, "node_modules/@flowfuse/driver-localfs": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.1.0.tgz", - "integrity": "sha512-lVpWj/DqQBqXLtQsCyfzhbcwYhrN4ms3eVYMjblGnkswMw1/6fNrapsYPNGp4aAy8E39JIpEnlGaYsdn7Keu4w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.1.1.tgz", + "integrity": "sha512-FijNe/NSJp76eyXKj9ZnV8nVZ2vPDJEOfwdqKKTLDo55JpHVw1VVdge+gvTtQ3B2t/Sicw4btKX+ti49J+9/gQ==", "dependencies": { - "@flowfuse/nr-launcher": "^2.1.0", + "@flowfuse/nr-launcher": "^2.1.1", "got": "^11.8.5", "semver": "^7.3.8" } @@ -4178,9 +4178,9 @@ } }, "node_modules/@flowfuse/nr-launcher": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.1.0.tgz", - "integrity": "sha512-+bDFCwK5pzgf/Fvww77HuEO6VkigArQCO1qjbE2P+5MsvY/OeCa3FzeVKBu9hU3Txie5paBH8x0G2wEA8ESjmA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.1.1.tgz", + "integrity": "sha512-ntJ9+phiEKV40e0AVBhuME2Gx7EESw4I2UUoJEploS+1csjm7M4LMxzHBkdGExTwXYb2nNvSP5Kw91a2u7AfQQ==", "dependencies": { "@flowfuse/nr-file-nodes": "^0.0.5", "@flowfuse/nr-project-nodes": "^0.6.1", @@ -4188,8 +4188,10 @@ "body-parser": "^1.20.2", "command-line-args": "^5.2.1", "express": "^4.18.2", + "express-session": "^1.18.0", "got": "^11.8.6", "json-stringify-safe": "5.0.1", + "memorystore": "^1.6.7", "oauth": "^0.9.15", "parse-prometheus-text-format": "^1.1.1", "passport": "0.6.0", @@ -11284,6 +11286,50 @@ "node": ">= 0.10.0" } }, + "node_modules/express-session": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.0.tgz", + "integrity": "sha512-m93QLWr0ju+rOwApSsyso838LQwgfs44QtOP/WBiwtAgPIo/SAh1a5c6nn2BR6mFNZehTpqKDESzP+fRHVbxwQ==", + "dependencies": { + "cookie": "0.6.0", + "cookie-signature": "1.0.7", + "debug": "2.6.9", + "depd": "~2.0.0", + "on-headers": "~1.0.2", + "parseurl": "~1.3.3", + "safe-buffer": "5.2.1", + "uid-safe": "~2.1.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/express-session/node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express-session/node_modules/cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==" + }, + "node_modules/express-session/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/express-session/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -14698,6 +14744,32 @@ "node": ">= 4.0.0" } }, + "node_modules/memorystore": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/memorystore/-/memorystore-1.6.7.tgz", + "integrity": "sha512-OZnmNY/NDrKohPQ+hxp0muBcBKrzKNtHr55DbqSx9hLsYVNnomSAMRAtI7R64t3gf3ID7tHQA7mG4oL3Hu9hdw==", + "dependencies": { + "debug": "^4.3.0", + "lru-cache": "^4.0.3" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/memorystore/node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "node_modules/memorystore/node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" + }, "node_modules/memorystream": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", @@ -16477,7 +16549,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "dev": true, "engines": { "node": ">= 0.8" } @@ -18272,6 +18343,11 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, + "node_modules/pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==" + }, "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", @@ -18557,6 +18633,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/random-bytes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", + "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/random-words": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/random-words/-/random-words-2.0.0.tgz", @@ -21618,6 +21702,17 @@ "node": ">=0.8.0" } }, + "node_modules/uid-safe": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", + "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==", + "dependencies": { + "random-bytes": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/uid2": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.4.tgz", @@ -25724,11 +25819,11 @@ } }, "@flowfuse/driver-localfs": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.1.0.tgz", - "integrity": "sha512-lVpWj/DqQBqXLtQsCyfzhbcwYhrN4ms3eVYMjblGnkswMw1/6fNrapsYPNGp4aAy8E39JIpEnlGaYsdn7Keu4w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.1.1.tgz", + "integrity": "sha512-FijNe/NSJp76eyXKj9ZnV8nVZ2vPDJEOfwdqKKTLDo55JpHVw1VVdge+gvTtQ3B2t/Sicw4btKX+ti49J+9/gQ==", "requires": { - "@flowfuse/nr-launcher": "^2.1.0", + "@flowfuse/nr-launcher": "^2.1.1", "got": "^11.8.5", "semver": "^7.3.8" } @@ -25763,9 +25858,9 @@ } }, "@flowfuse/nr-launcher": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.1.0.tgz", - "integrity": "sha512-+bDFCwK5pzgf/Fvww77HuEO6VkigArQCO1qjbE2P+5MsvY/OeCa3FzeVKBu9hU3Txie5paBH8x0G2wEA8ESjmA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.1.1.tgz", + "integrity": "sha512-ntJ9+phiEKV40e0AVBhuME2Gx7EESw4I2UUoJEploS+1csjm7M4LMxzHBkdGExTwXYb2nNvSP5Kw91a2u7AfQQ==", "requires": { "@flowfuse/nr-file-nodes": "^0.0.5", "@flowfuse/nr-project-nodes": "^0.6.1", @@ -25773,8 +25868,10 @@ "body-parser": "^1.20.2", "command-line-args": "^5.2.1", "express": "^4.18.2", + "express-session": "^1.18.0", "got": "^11.8.6", "json-stringify-safe": "5.0.1", + "memorystore": "^1.6.7", "oauth": "^0.9.15", "parse-prometheus-text-format": "^1.1.1", "passport": "0.6.0", @@ -31132,6 +31229,46 @@ } } }, + "express-session": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.0.tgz", + "integrity": "sha512-m93QLWr0ju+rOwApSsyso838LQwgfs44QtOP/WBiwtAgPIo/SAh1a5c6nn2BR6mFNZehTpqKDESzP+fRHVbxwQ==", + "requires": { + "cookie": "0.6.0", + "cookie-signature": "1.0.7", + "debug": "2.6.9", + "depd": "~2.0.0", + "on-headers": "~1.0.2", + "parseurl": "~1.3.3", + "safe-buffer": "5.2.1", + "uid-safe": "~2.1.5" + }, + "dependencies": { + "cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" + }, + "cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -33664,6 +33801,31 @@ "fs-monkey": "^1.0.4" } }, + "memorystore": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/memorystore/-/memorystore-1.6.7.tgz", + "integrity": "sha512-OZnmNY/NDrKohPQ+hxp0muBcBKrzKNtHr55DbqSx9hLsYVNnomSAMRAtI7R64t3gf3ID7tHQA7mG4oL3Hu9hdw==", + "requires": { + "debug": "^4.3.0", + "lru-cache": "^4.0.3" + }, + "dependencies": { + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==" + } + } + }, "memorystream": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", @@ -35037,8 +35199,7 @@ "on-headers": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "dev": true + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" }, "once": { "version": "1.4.0", @@ -36167,6 +36328,11 @@ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==" + }, "psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", @@ -36376,6 +36542,11 @@ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==" }, + "random-bytes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", + "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==" + }, "random-words": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/random-words/-/random-words-2.0.0.tgz", @@ -38727,6 +38898,14 @@ "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", "optional": true }, + "uid-safe": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", + "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==", + "requires": { + "random-bytes": "~1.0.0" + } + }, "uid2": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.4.tgz", diff --git a/package.json b/package.json index 49fc2a1fd..53f2fe058 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@fastify/swagger": "^8.10.1", "@fastify/swagger-ui": "^2.1.0", "@fastify/websocket": "^8.1.0", - "@flowfuse/driver-localfs": "^2.1.0", + "@flowfuse/driver-localfs": "^2.1.1", "@headlessui/vue": "1.7.16", "@heroicons/vue": "1.0.6", "@immobiliarelabs/fastify-sentry": "^8.0.0",