From 43daff29dc807bf35d1c7dd5869f060f6f5dc6a3 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 14 Dec 2022 18:04:51 +0000 Subject: [PATCH 01/32] fix: upgrade @sentry/tracing from 7.19.0 to 7.21.1 Snyk has created this PR to upgrade @sentry/tracing from 7.19.0 to 7.21.1. See this package in npm: https://www.npmjs.com/package/@sentry/tracing See this project in Snyk: https://app.snyk.io/org/maidul98/project/35057e82-ed7d-4e19-ba4d-719a42135cd6?utm_source=github&utm_medium=referral&page=upgrade-pr --- backend/package-lock.json | 120 +++++++++++++++++++------------------- backend/package.json | 2 +- 2 files changed, 60 insertions(+), 62 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index c13f138d4..4adb217b9 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@godaddy/terminus": "^4.11.2", "@sentry/node": "^7.14.0", - "@sentry/tracing": "^7.19.0", + "@sentry/tracing": "^7.21.1", "@types/crypto-js": "^4.1.1", "axios": "^1.1.3", "bigint-conversion": "^2.2.2", @@ -2602,6 +2602,19 @@ "@maxmind/geoip2-node": "^3.4.0" } }, + "node_modules/@sentry/core": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.21.1.tgz", + "integrity": "sha512-Og5wEEsy24fNvT/T7IKjcV4EvVK5ryY2kxbJzKY6GU2eX+i+aBl+n/vp7U0Es351C/AlTkS+0NOUsp2TQQFxZA==", + "dependencies": { + "@sentry/types": "7.21.1", + "@sentry/utils": "7.21.1", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@sentry/node": { "version": "7.19.0", "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.19.0.tgz", @@ -2653,46 +2666,33 @@ } }, "node_modules/@sentry/tracing": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.19.0.tgz", - "integrity": "sha512-SWY17M3TsgBePaGowUcSqBwaT0TJQzuNexVnLojuU0k6F57L9hubvP9zaoosoCfARXQ/3NypAFWnlJyf570rFQ==", + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.21.1.tgz", + "integrity": "sha512-b1BTPsRaNQpohzegoz59KGuBl+To651vEq0vMS4tCzSyIdxkYso3JCrjDdEqW/2MliQYANNVrUai2bmwmU9h1g==", "dependencies": { - "@sentry/core": "7.19.0", - "@sentry/types": "7.19.0", - "@sentry/utils": "7.19.0", + "@sentry/core": "7.21.1", + "@sentry/types": "7.21.1", + "@sentry/utils": "7.21.1", "tslib": "^1.9.3" }, "engines": { "node": ">=8" } }, - "node_modules/@sentry/tracing/node_modules/@sentry/core": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.19.0.tgz", - "integrity": "sha512-YF9cTBcAnO4R44092BJi5Wa2/EO02xn2ziCtmNgAVTN2LD31a/YVGxGBt/FDr4Y6yeuVehaqijVVvtpSmXrGJw==", - "dependencies": { - "@sentry/types": "7.19.0", - "@sentry/utils": "7.19.0", - "tslib": "^1.9.3" - }, + "node_modules/@sentry/types": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.21.1.tgz", + "integrity": "sha512-3/IKnd52Ol21amQvI+kz+WB76s8/LR5YvFJzMgIoI2S8d82smIr253zGijRXxHPEif8kMLX4Yt+36VzrLxg6+A==", "engines": { "node": ">=8" } }, - "node_modules/@sentry/tracing/node_modules/@sentry/types": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.19.0.tgz", - "integrity": "sha512-oGRAT6lfzoKrxO1mvxiSj0XHxWPd6Gd1wpPGuu6iJo03xgWDS+MIlD1h2unqL4N5fAzLjzmbC2D2lUw50Kn2pA==", - "engines": { - "node": ">=8" - } - }, - "node_modules/@sentry/tracing/node_modules/@sentry/utils": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.19.0.tgz", - "integrity": "sha512-2L6lq+c9Ol2uiRxQDdcgoapmHJp24MhMN0gIkn2alSfMJ+ls6bGXzQHx6JAIdoOiwFQXRZHKL9ecfAc8O+vItA==", + "node_modules/@sentry/utils": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.21.1.tgz", + "integrity": "sha512-F0W0AAi8tgtTx6ApZRI2S9HbXEA9ENX1phTZgdNNWcMFm1BNbc21XEwLqwXBNjub5nlA6CE8xnjXRgdZKx4kzQ==", "dependencies": { - "@sentry/types": "7.19.0", + "@sentry/types": "7.21.1", "tslib": "^1.9.3" }, "engines": { @@ -13212,6 +13212,16 @@ "@maxmind/geoip2-node": "^3.4.0" } }, + "@sentry/core": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.21.1.tgz", + "integrity": "sha512-Og5wEEsy24fNvT/T7IKjcV4EvVK5ryY2kxbJzKY6GU2eX+i+aBl+n/vp7U0Es351C/AlTkS+0NOUsp2TQQFxZA==", + "requires": { + "@sentry/types": "7.21.1", + "@sentry/utils": "7.21.1", + "tslib": "^1.9.3" + } + }, "@sentry/node": { "version": "7.19.0", "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.19.0.tgz", @@ -13253,40 +13263,28 @@ } }, "@sentry/tracing": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.19.0.tgz", - "integrity": "sha512-SWY17M3TsgBePaGowUcSqBwaT0TJQzuNexVnLojuU0k6F57L9hubvP9zaoosoCfARXQ/3NypAFWnlJyf570rFQ==", + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.21.1.tgz", + "integrity": "sha512-b1BTPsRaNQpohzegoz59KGuBl+To651vEq0vMS4tCzSyIdxkYso3JCrjDdEqW/2MliQYANNVrUai2bmwmU9h1g==", "requires": { - "@sentry/core": "7.19.0", - "@sentry/types": "7.19.0", - "@sentry/utils": "7.19.0", + "@sentry/core": "7.21.1", + "@sentry/types": "7.21.1", + "@sentry/utils": "7.21.1", + "tslib": "^1.9.3" + } + }, + "@sentry/types": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.21.1.tgz", + "integrity": "sha512-3/IKnd52Ol21amQvI+kz+WB76s8/LR5YvFJzMgIoI2S8d82smIr253zGijRXxHPEif8kMLX4Yt+36VzrLxg6+A==" + }, + "@sentry/utils": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.21.1.tgz", + "integrity": "sha512-F0W0AAi8tgtTx6ApZRI2S9HbXEA9ENX1phTZgdNNWcMFm1BNbc21XEwLqwXBNjub5nlA6CE8xnjXRgdZKx4kzQ==", + "requires": { + "@sentry/types": "7.21.1", "tslib": "^1.9.3" - }, - "dependencies": { - "@sentry/core": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.19.0.tgz", - "integrity": "sha512-YF9cTBcAnO4R44092BJi5Wa2/EO02xn2ziCtmNgAVTN2LD31a/YVGxGBt/FDr4Y6yeuVehaqijVVvtpSmXrGJw==", - "requires": { - "@sentry/types": "7.19.0", - "@sentry/utils": "7.19.0", - "tslib": "^1.9.3" - } - }, - "@sentry/types": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.19.0.tgz", - "integrity": "sha512-oGRAT6lfzoKrxO1mvxiSj0XHxWPd6Gd1wpPGuu6iJo03xgWDS+MIlD1h2unqL4N5fAzLjzmbC2D2lUw50Kn2pA==" - }, - "@sentry/utils": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.19.0.tgz", - "integrity": "sha512-2L6lq+c9Ol2uiRxQDdcgoapmHJp24MhMN0gIkn2alSfMJ+ls6bGXzQHx6JAIdoOiwFQXRZHKL9ecfAc8O+vItA==", - "requires": { - "@sentry/types": "7.19.0", - "tslib": "^1.9.3" - } - } } }, "@sinclair/typebox": { diff --git a/backend/package.json b/backend/package.json index 32ca68b19..99ca1926c 100644 --- a/backend/package.json +++ b/backend/package.json @@ -2,7 +2,7 @@ "dependencies": { "@godaddy/terminus": "^4.11.2", "@sentry/node": "^7.14.0", - "@sentry/tracing": "^7.19.0", + "@sentry/tracing": "^7.21.1", "@types/crypto-js": "^4.1.1", "axios": "^1.1.3", "bigint-conversion": "^2.2.2", From 7efdbeb78784a2c338c689bd7e4040d55fb3bb2f Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 14 Dec 2022 18:04:55 +0000 Subject: [PATCH 02/32] fix: upgrade @sentry/node from 7.19.0 to 7.21.1 Snyk has created this PR to upgrade @sentry/node from 7.19.0 to 7.21.1. See this package in npm: https://www.npmjs.com/package/@sentry/node See this project in Snyk: https://app.snyk.io/org/maidul98/project/35057e82-ed7d-4e19-ba4d-719a42135cd6?utm_source=github&utm_medium=referral&page=upgrade-pr --- backend/package-lock.json | 146 +++++++++++++++++++------------------- backend/package.json | 2 +- 2 files changed, 73 insertions(+), 75 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index c13f138d4..c85f9155d 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "dependencies": { "@godaddy/terminus": "^4.11.2", - "@sentry/node": "^7.14.0", + "@sentry/node": "^7.21.1", "@sentry/tracing": "^7.19.0", "@types/crypto-js": "^4.1.1", "axios": "^1.1.3", @@ -2602,14 +2602,27 @@ "@maxmind/geoip2-node": "^3.4.0" } }, - "node_modules/@sentry/node": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.19.0.tgz", - "integrity": "sha512-yG7Tx32WqOkEHVotFLrumCcT9qlaSDTkFNZ+yLSvZXx74ifsE781DzBA9W7K7bBdYO3op+p2YdsOKzf3nPpAyQ==", + "node_modules/@sentry/core": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.21.1.tgz", + "integrity": "sha512-Og5wEEsy24fNvT/T7IKjcV4EvVK5ryY2kxbJzKY6GU2eX+i+aBl+n/vp7U0Es351C/AlTkS+0NOUsp2TQQFxZA==", "dependencies": { - "@sentry/core": "7.19.0", - "@sentry/types": "7.19.0", - "@sentry/utils": "7.19.0", + "@sentry/types": "7.21.1", + "@sentry/utils": "7.21.1", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/node": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.21.1.tgz", + "integrity": "sha512-B+p1nQHaFWdCCRVmvqlr/+vdQCI3mGLObucNfK2YC22IQZg7+3u6tEbxJ7umITIjeSSKgf7ZoZwCxL9VfkrNXg==", + "dependencies": { + "@sentry/core": "7.21.1", + "@sentry/types": "7.21.1", + "@sentry/utils": "7.21.1", "cookie": "^0.4.1", "https-proxy-agent": "^5.0.0", "lru_map": "^0.3.3", @@ -2619,39 +2632,6 @@ "node": ">=8" } }, - "node_modules/@sentry/node/node_modules/@sentry/core": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.19.0.tgz", - "integrity": "sha512-YF9cTBcAnO4R44092BJi5Wa2/EO02xn2ziCtmNgAVTN2LD31a/YVGxGBt/FDr4Y6yeuVehaqijVVvtpSmXrGJw==", - "dependencies": { - "@sentry/types": "7.19.0", - "@sentry/utils": "7.19.0", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@sentry/node/node_modules/@sentry/types": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.19.0.tgz", - "integrity": "sha512-oGRAT6lfzoKrxO1mvxiSj0XHxWPd6Gd1wpPGuu6iJo03xgWDS+MIlD1h2unqL4N5fAzLjzmbC2D2lUw50Kn2pA==", - "engines": { - "node": ">=8" - } - }, - "node_modules/@sentry/node/node_modules/@sentry/utils": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.19.0.tgz", - "integrity": "sha512-2L6lq+c9Ol2uiRxQDdcgoapmHJp24MhMN0gIkn2alSfMJ+ls6bGXzQHx6JAIdoOiwFQXRZHKL9ecfAc8O+vItA==", - "dependencies": { - "@sentry/types": "7.19.0", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@sentry/tracing": { "version": "7.19.0", "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.19.0.tgz", @@ -2699,6 +2679,26 @@ "node": ">=8" } }, + "node_modules/@sentry/types": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.21.1.tgz", + "integrity": "sha512-3/IKnd52Ol21amQvI+kz+WB76s8/LR5YvFJzMgIoI2S8d82smIr253zGijRXxHPEif8kMLX4Yt+36VzrLxg6+A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/utils": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.21.1.tgz", + "integrity": "sha512-F0W0AAi8tgtTx6ApZRI2S9HbXEA9ENX1phTZgdNNWcMFm1BNbc21XEwLqwXBNjub5nlA6CE8xnjXRgdZKx4kzQ==", + "dependencies": { + "@sentry/types": "7.21.1", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@sinclair/typebox": { "version": "0.24.51", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", @@ -13212,44 +13212,28 @@ "@maxmind/geoip2-node": "^3.4.0" } }, - "@sentry/node": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.19.0.tgz", - "integrity": "sha512-yG7Tx32WqOkEHVotFLrumCcT9qlaSDTkFNZ+yLSvZXx74ifsE781DzBA9W7K7bBdYO3op+p2YdsOKzf3nPpAyQ==", + "@sentry/core": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.21.1.tgz", + "integrity": "sha512-Og5wEEsy24fNvT/T7IKjcV4EvVK5ryY2kxbJzKY6GU2eX+i+aBl+n/vp7U0Es351C/AlTkS+0NOUsp2TQQFxZA==", "requires": { - "@sentry/core": "7.19.0", - "@sentry/types": "7.19.0", - "@sentry/utils": "7.19.0", + "@sentry/types": "7.21.1", + "@sentry/utils": "7.21.1", + "tslib": "^1.9.3" + } + }, + "@sentry/node": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.21.1.tgz", + "integrity": "sha512-B+p1nQHaFWdCCRVmvqlr/+vdQCI3mGLObucNfK2YC22IQZg7+3u6tEbxJ7umITIjeSSKgf7ZoZwCxL9VfkrNXg==", + "requires": { + "@sentry/core": "7.21.1", + "@sentry/types": "7.21.1", + "@sentry/utils": "7.21.1", "cookie": "^0.4.1", "https-proxy-agent": "^5.0.0", "lru_map": "^0.3.3", "tslib": "^1.9.3" - }, - "dependencies": { - "@sentry/core": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.19.0.tgz", - "integrity": "sha512-YF9cTBcAnO4R44092BJi5Wa2/EO02xn2ziCtmNgAVTN2LD31a/YVGxGBt/FDr4Y6yeuVehaqijVVvtpSmXrGJw==", - "requires": { - "@sentry/types": "7.19.0", - "@sentry/utils": "7.19.0", - "tslib": "^1.9.3" - } - }, - "@sentry/types": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.19.0.tgz", - "integrity": "sha512-oGRAT6lfzoKrxO1mvxiSj0XHxWPd6Gd1wpPGuu6iJo03xgWDS+MIlD1h2unqL4N5fAzLjzmbC2D2lUw50Kn2pA==" - }, - "@sentry/utils": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.19.0.tgz", - "integrity": "sha512-2L6lq+c9Ol2uiRxQDdcgoapmHJp24MhMN0gIkn2alSfMJ+ls6bGXzQHx6JAIdoOiwFQXRZHKL9ecfAc8O+vItA==", - "requires": { - "@sentry/types": "7.19.0", - "tslib": "^1.9.3" - } - } } }, "@sentry/tracing": { @@ -13289,6 +13273,20 @@ } } }, + "@sentry/types": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.21.1.tgz", + "integrity": "sha512-3/IKnd52Ol21amQvI+kz+WB76s8/LR5YvFJzMgIoI2S8d82smIr253zGijRXxHPEif8kMLX4Yt+36VzrLxg6+A==" + }, + "@sentry/utils": { + "version": "7.21.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.21.1.tgz", + "integrity": "sha512-F0W0AAi8tgtTx6ApZRI2S9HbXEA9ENX1phTZgdNNWcMFm1BNbc21XEwLqwXBNjub5nlA6CE8xnjXRgdZKx4kzQ==", + "requires": { + "@sentry/types": "7.21.1", + "tslib": "^1.9.3" + } + }, "@sinclair/typebox": { "version": "0.24.51", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", diff --git a/backend/package.json b/backend/package.json index 32ca68b19..86c8b2b80 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,7 +1,7 @@ { "dependencies": { "@godaddy/terminus": "^4.11.2", - "@sentry/node": "^7.14.0", + "@sentry/node": "^7.21.1", "@sentry/tracing": "^7.19.0", "@types/crypto-js": "^4.1.1", "axios": "^1.1.3", From d4bc92bd5bac93a82ede8793af5e6ce4cf5a07ed Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 14 Dec 2022 18:04:59 +0000 Subject: [PATCH 03/32] fix: upgrade axios from 1.1.3 to 1.2.0 Snyk has created this PR to upgrade axios from 1.1.3 to 1.2.0. See this package in npm: https://www.npmjs.com/package/axios See this project in Snyk: https://app.snyk.io/org/maidul98/project/35057e82-ed7d-4e19-ba4d-719a42135cd6?utm_source=github&utm_medium=referral&page=upgrade-pr --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index c13f138d4..49711ba4e 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -13,7 +13,7 @@ "@sentry/node": "^7.14.0", "@sentry/tracing": "^7.19.0", "@types/crypto-js": "^4.1.1", - "axios": "^1.1.3", + "axios": "^1.2.0", "bigint-conversion": "^2.2.2", "cookie-parser": "^1.4.6", "cors": "^2.8.5", @@ -3370,9 +3370,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz", - "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz", + "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==", "dependencies": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", @@ -13822,9 +13822,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "axios": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz", - "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.0.tgz", + "integrity": "sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==", "requires": { "follow-redirects": "^1.15.0", "form-data": "^4.0.0", diff --git a/backend/package.json b/backend/package.json index 32ca68b19..9fd462b64 100644 --- a/backend/package.json +++ b/backend/package.json @@ -4,7 +4,7 @@ "@sentry/node": "^7.14.0", "@sentry/tracing": "^7.19.0", "@types/crypto-js": "^4.1.1", - "axios": "^1.1.3", + "axios": "^1.2.0", "bigint-conversion": "^2.2.2", "cookie-parser": "^1.4.6", "cors": "^2.8.5", From 59ab4bf7f902fed21f27d79c6ec7da62c75f58bc Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 14 Dec 2022 18:05:06 +0000 Subject: [PATCH 04/32] fix: upgrade mongoose from 6.7.2 to 6.7.3 Snyk has created this PR to upgrade mongoose from 6.7.2 to 6.7.3. See this package in npm: https://www.npmjs.com/package/mongoose See this project in Snyk: https://app.snyk.io/org/maidul98/project/35057e82-ed7d-4e19-ba4d-719a42135cd6?utm_source=github&utm_medium=referral&page=upgrade-pr --- backend/package-lock.json | 14 +++++++------- backend/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index c13f138d4..5d6943ef3 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -26,7 +26,7 @@ "helmet": "^5.1.1", "jsonwebtoken": "^8.5.1", "jsrp": "^0.2.4", - "mongoose": "^6.7.2", + "mongoose": "^6.7.3", "nodemailer": "^6.8.0", "posthog-node": "^2.1.0", "query-string": "^7.1.3", @@ -6478,9 +6478,9 @@ } }, "node_modules/mongoose": { - "version": "6.7.2", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.7.2.tgz", - "integrity": "sha512-lrP2V5U1qhaf+z33fiIn7aYAZZ1fVDly+TkFRjTujNBF/FIHESATj2RbgAOSlWqv32fsZXkXejXzeVfjbv35Ow==", + "version": "6.7.3", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.7.3.tgz", + "integrity": "sha512-bLC2Pt6Vpoov+1kBYvQgJXG/2DWXbfIvfK4Gh68kCdYGh6CVO31YxYuIGz70hyGwX2g4DmSzbs5IA8Px2neMCQ==", "dependencies": { "bson": "^4.7.0", "kareem": "2.4.1", @@ -16151,9 +16151,9 @@ } }, "mongoose": { - "version": "6.7.2", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.7.2.tgz", - "integrity": "sha512-lrP2V5U1qhaf+z33fiIn7aYAZZ1fVDly+TkFRjTujNBF/FIHESATj2RbgAOSlWqv32fsZXkXejXzeVfjbv35Ow==", + "version": "6.7.3", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.7.3.tgz", + "integrity": "sha512-bLC2Pt6Vpoov+1kBYvQgJXG/2DWXbfIvfK4Gh68kCdYGh6CVO31YxYuIGz70hyGwX2g4DmSzbs5IA8Px2neMCQ==", "requires": { "bson": "^4.7.0", "kareem": "2.4.1", diff --git a/backend/package.json b/backend/package.json index 32ca68b19..0b7b24791 100644 --- a/backend/package.json +++ b/backend/package.json @@ -17,7 +17,7 @@ "helmet": "^5.1.1", "jsonwebtoken": "^8.5.1", "jsrp": "^0.2.4", - "mongoose": "^6.7.2", + "mongoose": "^6.7.3", "nodemailer": "^6.8.0", "posthog-node": "^2.1.0", "query-string": "^7.1.3", From 4e14f84df9ce6dfa017427ed5216c9ee54d66c85 Mon Sep 17 00:00:00 2001 From: Vladyslav Matsiiako Date: Mon, 30 Jan 2023 21:14:22 -0800 Subject: [PATCH 05/32] Allow editing personal permissions --- frontend/src/components/basic/table/ProjectUsersTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/basic/table/ProjectUsersTable.tsx b/frontend/src/components/basic/table/ProjectUsersTable.tsx index adf1ea130..2a543c4a0 100644 --- a/frontend/src/components/basic/table/ProjectUsersTable.tsx +++ b/frontend/src/components/basic/table/ProjectUsersTable.tsx @@ -264,7 +264,7 @@ const ProjectUsersTable = ({ userData, changeData, myUser, filter }: Props) => { ? "No Access" : (row.deniedPermissions.filter((perm: any) => perm.environmentSlug === env.slug).map((perm: {ability: string}) => perm.ability).includes("write") ? "Read Only" : "Read & Write") } - disabled={myUser === row.email || myRole !== 'admin'} + disabled={myRole !== 'admin'} // onOpenChange={(open) => setIsOpen(open)} > No Access From 22a11be4e04c3976e470e61c9681d3f4518e9a21 Mon Sep 17 00:00:00 2001 From: Vladyslav Matsiiako Date: Mon, 30 Jan 2023 21:38:09 -0800 Subject: [PATCH 06/32] Update host rules for permissioning --- frontend/src/components/basic/table/ProjectUsersTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/basic/table/ProjectUsersTable.tsx b/frontend/src/components/basic/table/ProjectUsersTable.tsx index 2a543c4a0..9d278bdc4 100644 --- a/frontend/src/components/basic/table/ProjectUsersTable.tsx +++ b/frontend/src/components/basic/table/ProjectUsersTable.tsx @@ -110,7 +110,7 @@ const ProjectUsersTable = ({ userData, changeData, myUser, filter }: Props) => { denials = []; } - if (currentPlan !== plans.professional && host !== 'https://app.infisical.com') { + if (currentPlan !== plans.professional && host === 'https://app.infisical.com') { setIsUpgradeModalOpen(true); } else { const allDenials = userData[index].deniedPermissions.filter((perm: { ability: string; environmentSlug: string; }) => perm.environmentSlug !== slug).concat(denials); From 9950c5e02dc8f2f2e4192184db677cf256758afe Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 30 Jan 2023 22:15:33 -0800 Subject: [PATCH 07/32] empty commit --- cli/packages/util/constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go index 1243fb325..e8b35b52f 100644 --- a/cli/packages/util/constants.go +++ b/cli/packages/util/constants.go @@ -11,5 +11,5 @@ const ( KEYRING_SERVICE_NAME = "infisical" PERSONAL_SECRET_TYPE_NAME = "personal" SHARED_SECRET_TYPE_NAME = "shared" - CLI_VERSION = "v0.2.8" + CLI_VERSION = "v0.2.8" // ) From cb080b356c24a4108f44756ad77ef119d35d9353 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 30 Jan 2023 22:17:02 -0800 Subject: [PATCH 08/32] increase cli version --- cli/packages/util/constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go index e8b35b52f..6c21dd787 100644 --- a/cli/packages/util/constants.go +++ b/cli/packages/util/constants.go @@ -11,5 +11,5 @@ const ( KEYRING_SERVICE_NAME = "infisical" PERSONAL_SECRET_TYPE_NAME = "personal" SHARED_SECRET_TYPE_NAME = "shared" - CLI_VERSION = "v0.2.8" // + CLI_VERSION = "v0.2.9" // ) From 67119794455f7baa59ce7792ef24904aab1c9105 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Tue, 31 Jan 2023 09:24:55 -0800 Subject: [PATCH 09/32] Disallow service token creation based on permission --- .../controllers/v2/serviceTokenDataController.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/backend/src/controllers/v2/serviceTokenDataController.ts b/backend/src/controllers/v2/serviceTokenDataController.ts index 83c8fea94..780bae9a4 100644 --- a/backend/src/controllers/v2/serviceTokenDataController.ts +++ b/backend/src/controllers/v2/serviceTokenDataController.ts @@ -8,6 +8,8 @@ import { import { SALT_ROUNDS } from '../../config'; +import { userHasWorkspaceAccess } from '../../ee/helpers/checkMembershipPermissions'; +import { ABILITY_READ } from '../../variables/organization'; /** * Return service token data associated with service token on request @@ -37,6 +39,11 @@ export const createServiceTokenData = async (req: Request, res: Response) => { expiresIn } = req.body; + const hasAccess = await userHasWorkspaceAccess(req.user, workspaceId, environment, ABILITY_READ) + if (!hasAccess) { + throw UnauthorizedRequestError({ message: "You do not have the necessary permission(s) perform this action" }) + } + const secret = crypto.randomBytes(16).toString('hex'); const secretHash = await bcrypt.hash(secret, SALT_ROUNDS); @@ -100,4 +107,8 @@ export const deleteServiceTokenData = async (req: Request, res: Response) => { return res.status(200).send({ serviceTokenData }); -} \ No newline at end of file +} + +function UnauthorizedRequestError(arg0: { message: string; }) { + throw new Error('Function not implemented.'); +} From 871d80aad5e978ce1cd6cd1542ed85b0cbb3a157 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Tue, 31 Jan 2023 16:37:56 -0800 Subject: [PATCH 10/32] when login expired, do not ask to override login --- cli/packages/api/api.go | 22 ++++++++++++++++++++++ cli/packages/cmd/login.go | 4 ++-- cli/packages/util/constants.go | 5 ++++- cli/packages/util/credentials.go | 15 ++++----------- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/cli/packages/api/api.go b/cli/packages/api/api.go index a414b03d3..7417a2594 100644 --- a/cli/packages/api/api.go +++ b/cli/packages/api/api.go @@ -5,6 +5,7 @@ import ( "github.com/Infisical/infisical-merge/packages/config" "github.com/go-resty/resty/v2" + log "github.com/sirupsen/logrus" ) const USER_AGENT = "cli" @@ -144,3 +145,24 @@ func CallGetAllWorkSpacesUserBelongsTo(httpClient *resty.Client) (GetWorkSpacesR return workSpacesResponse, nil } + +func CallIsAuthenticated(httpClient *resty.Client) bool { + var workSpacesResponse GetWorkSpacesResponse + response, err := httpClient. + R(). + SetResult(&workSpacesResponse). + SetHeader("User-Agent", USER_AGENT). + Post(fmt.Sprintf("%v/v1/auth/checkAuth", config.INFISICAL_URL)) + + log.Debugln(fmt.Errorf("CallIsAuthenticated: Unsuccessful response: [response=%v]", response)) + + if err != nil { + return false + } + + if response.IsError() { + return false + } + + return true +} diff --git a/cli/packages/cmd/login.go b/cli/packages/cmd/login.go index c10f38fc4..74573c226 100644 --- a/cli/packages/cmd/login.go +++ b/cli/packages/cmd/login.go @@ -33,13 +33,13 @@ var loginCmd = &cobra.Command{ PreRun: toggleDebug, Run: func(cmd *cobra.Command, args []string) { currentLoggedInUserDetails, err := util.GetCurrentLoggedInUserDetails() - if err != nil && strings.Contains(err.Error(), "The specified item could not be found in the keyring") { // if the key can't be found allow them to override + if err != nil && (strings.Contains(err.Error(), "The specified item could not be found in the keyring") || strings.Contains(err.Error(), "unable to get key from Keyring")) { // if the key can't be found allow them to override log.Debug(err) } else if err != nil { util.HandleError(err) } - if currentLoggedInUserDetails.IsUserLoggedIn { + if currentLoggedInUserDetails.IsUserLoggedIn && !currentLoggedInUserDetails.LoginExpired { // if you are logged in but not expired shouldOverride, err := shouldOverrideLoginPrompt(currentLoggedInUserDetails.UserCredentials.Email) if err != nil { util.HandleError(err) diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go index 6c21dd787..95b6ca228 100644 --- a/cli/packages/util/constants.go +++ b/cli/packages/util/constants.go @@ -11,5 +11,8 @@ const ( KEYRING_SERVICE_NAME = "infisical" PERSONAL_SECRET_TYPE_NAME = "personal" SHARED_SECRET_TYPE_NAME = "shared" - CLI_VERSION = "v0.2.9" // +) + +var ( + CLI_VERSION = "v0.2.9" ) diff --git a/cli/packages/util/credentials.go b/cli/packages/util/credentials.go index 6410002c0..1766f04c7 100644 --- a/cli/packages/util/credentials.go +++ b/cli/packages/util/credentials.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/99designs/keyring" - "github.com/Infisical/infisical-merge/packages/config" + "github.com/Infisical/infisical-merge/packages/api" "github.com/Infisical/infisical-merge/packages/models" "github.com/go-resty/resty/v2" ) @@ -87,17 +87,10 @@ func GetCurrentLoggedInUserDetails() (LoggedInUserDetails, error) { SetAuthToken(userCreds.JTWToken). SetHeader("Accept", "application/json") - response, err := httpClient. - R(). - Post(fmt.Sprintf("%v/v1/auth/checkAuth", config.INFISICAL_URL)) - - if err != nil { - return LoggedInUserDetails{}, err - } - - if response.StatusCode() > 299 { + isAuthenticated := api.CallIsAuthenticated(httpClient) + if !isAuthenticated { return LoggedInUserDetails{ - IsUserLoggedIn: true, + IsUserLoggedIn: true, // was logged in LoginExpired: true, UserCredentials: userCreds, }, nil From a6d4431940b292977a7b66a48c5a8d9178538a01 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Tue, 31 Jan 2023 17:02:18 -0800 Subject: [PATCH 11/32] Auto add cli version from tag --- .github/workflows/release_build.yml | 2 ++ .goreleaser.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index df00c5c92..326854fa2 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -19,6 +19,7 @@ jobs: with: fetch-depth: 0 - run: git fetch --force --tags + - run: echo "Ref name ${{github.ref_name}}" - uses: actions/setup-go@v3 with: go-version: '>=1.19.3' @@ -42,6 +43,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }} FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }} AUR_KEY: ${{ secrets.AUR_KEY }} + CLI_VERSION: ${{github.ref_name}} - uses: actions/setup-python@v4 - run: pip install --upgrade cloudsmith-cli - name: Publish to CloudSmith diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 51154a4f3..7251a2b9a 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -14,6 +14,7 @@ before: builds: - id: darwin-build binary: infisical + ldflags: -X github.com/Infisical/infisical-merge/packages/util/util.CLI_VERSION={{ .Env.CLI_VERSION }} env: - CGO_ENABLED=1 - CC=/home/runner/work/osxcross/target/bin/o64-clang From b371dad50632be893f0de8dde41440bd66f92947 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Tue, 31 Jan 2023 17:22:44 -0800 Subject: [PATCH 12/32] Increase cli version --- .goreleaser.yaml | 2 +- cli/packages/util/constants.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 7251a2b9a..0bad2208a 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -14,7 +14,7 @@ before: builds: - id: darwin-build binary: infisical - ldflags: -X github.com/Infisical/infisical-merge/packages/util/util.CLI_VERSION={{ .Env.CLI_VERSION }} + # ldflags: -X github.com/Infisical/infisical-merge/packages/util/util.CLI_VERSION={{ .Env.CLI_VERSION }} env: - CGO_ENABLED=1 - CC=/home/runner/work/osxcross/target/bin/o64-clang diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go index 95b6ca228..aaff2cb5b 100644 --- a/cli/packages/util/constants.go +++ b/cli/packages/util/constants.go @@ -14,5 +14,5 @@ const ( ) var ( - CLI_VERSION = "v0.2.9" + CLI_VERSION = "v0.2.11" ) From 2c4e066f6421c461e28129fedc14fb6fb6b2b1b9 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Tue, 31 Jan 2023 17:34:50 -0800 Subject: [PATCH 13/32] bring back auto cli version in CI --- .goreleaser.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 0bad2208a..b2d9f310f 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -14,7 +14,7 @@ before: builds: - id: darwin-build binary: infisical - # ldflags: -X github.com/Infisical/infisical-merge/packages/util/util.CLI_VERSION={{ .Env.CLI_VERSION }} + ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Env.CLI_VERSION }} env: - CGO_ENABLED=1 - CC=/home/runner/work/osxcross/target/bin/o64-clang From 1871d1a8426143daa022b84568282d026f3b24bf Mon Sep 17 00:00:00 2001 From: jon4hz Date: Wed, 1 Feb 2023 03:35:54 +0100 Subject: [PATCH 14/32] fix: improve goreleaser --- .goreleaser.yaml | 14 +++++++++++++- cli/packages/util/constants.go | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index b2d9f310f..03ffd3e16 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -14,7 +14,9 @@ before: builds: - id: darwin-build binary: infisical - ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Env.CLI_VERSION }} + ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }} + flags: + - -trimpath env: - CGO_ENABLED=1 - CC=/home/runner/work/osxcross/target/bin/o64-clang @@ -25,10 +27,14 @@ builds: - goos: darwin goarch: "386" dir: ./cli + - id: all-other-builds env: - CGO_ENABLED=0 binary: infisical + ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }} + flags: + - -trimpath goos: - freebsd - linux @@ -66,8 +72,10 @@ release: checksum: name_template: 'checksums.txt' + snapshot: name_template: "{{ incpatch .Version }}" + changelog: sort: asc filters: @@ -81,6 +89,7 @@ changelog: # - infisical # dir: "{{ dir .ArtifactPath }}" # cmd: curl -F package=@{{ .ArtifactName }} https://{{ .Env.FURY_TOKEN }}@push.fury.io/infisical/ + brews: - name: infisical tap: @@ -92,6 +101,7 @@ brews: folder: Formula homepage: "https://infisical.com" description: "The official Infisical CLI" + nfpms: - id: infisical package_name: infisical @@ -117,6 +127,7 @@ nfpms: dst: /usr/share/zsh/site-functions/_infisical - src: ./manpages/infisical.1.gz dst: /usr/share/man/man1/infisical.1.gz + scoop: bucket: owner: Infisical @@ -127,6 +138,7 @@ scoop: homepage: "https://infisical.com" description: "The official Infisical CLI" license: MIT + aurs: - name: infisical-bin diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go index aaff2cb5b..5c169f6d5 100644 --- a/cli/packages/util/constants.go +++ b/cli/packages/util/constants.go @@ -14,5 +14,5 @@ const ( ) var ( - CLI_VERSION = "v0.2.11" + CLI_VERSION = "devel" ) From 723fa153bebbc5241abdad17953c627a822862ef Mon Sep 17 00:00:00 2001 From: jon4hz Date: Wed, 1 Feb 2023 03:36:26 +0100 Subject: [PATCH 15/32] ci: completion and manpages for homebrew --- .goreleaser.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 03ffd3e16..020c0418b 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -101,6 +101,12 @@ brews: folder: Formula homepage: "https://infisical.com" description: "The official Infisical CLI" + install: |- + bin.install infisical + bash_completion.install "completions/infisical.bash" => infisical + zsh_completion.install "completions/infisical.zsh" => "_infisical" + fish_completion.install "completions/infisical.fish" + man1.install "manpages/infisical.1.gz" nfpms: - id: infisical From f9ff99748b15f46f524c2ba5f26f04f2e841cb96 Mon Sep 17 00:00:00 2001 From: jon4hz Date: Wed, 1 Feb 2023 03:37:07 +0100 Subject: [PATCH 16/32] ci: remove obsolete var --- .github/workflows/release_build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 326854fa2..0a4d1106f 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -43,7 +43,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }} FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }} AUR_KEY: ${{ secrets.AUR_KEY }} - CLI_VERSION: ${{github.ref_name}} - uses: actions/setup-python@v4 - run: pip install --upgrade cloudsmith-cli - name: Publish to CloudSmith From 716795532eb5ce420e656eaedb54dc1f8d977382 Mon Sep 17 00:00:00 2001 From: jon4hz Date: Wed, 1 Feb 2023 03:38:18 +0100 Subject: [PATCH 17/32] ci: bump goreleaser action --- .github/workflows/release_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 0a4d1106f..3d11a1157 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -34,11 +34,11 @@ jobs: run: | mkdir ../../osxcross git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target - - uses: goreleaser/goreleaser-action@v2 + - uses: goreleaser/goreleaser-action@v4 with: distribution: goreleaser version: latest - args: release --rm-dist + args: release --clean env: GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }} FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }} From ffda30bd65c692cc113cc5f22d4c2f52f068b005 Mon Sep 17 00:00:00 2001 From: jon4hz Date: Wed, 1 Feb 2023 03:54:22 +0100 Subject: [PATCH 18/32] ci: mark goreleaser snapshots as such --- .goreleaser.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 020c0418b..74b69c1b9 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -74,7 +74,7 @@ checksum: name_template: 'checksums.txt' snapshot: - name_template: "{{ incpatch .Version }}" + name_template: "{{ incpatch .Version }}-devel" changelog: sort: asc From 1878bed10a1e06a8340d8b02385a8d0081394d61 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Tue, 31 Jan 2023 20:17:15 -0800 Subject: [PATCH 19/32] Revert "Merge pull request #279 from jon4hz/main" This reverts commit 87fd5e33f11a354a622990fb58d185d8094f29c6, reversing changes made to 2c4e066f6421c461e28129fedc14fb6fb6b2b1b9. --- .github/workflows/release_build.yml | 5 +++-- .goreleaser.yaml | 22 ++-------------------- cli/packages/util/constants.go | 2 +- 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 3d11a1157..326854fa2 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -34,15 +34,16 @@ jobs: run: | mkdir ../../osxcross git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target - - uses: goreleaser/goreleaser-action@v4 + - uses: goreleaser/goreleaser-action@v2 with: distribution: goreleaser version: latest - args: release --clean + args: release --rm-dist env: GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }} FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }} AUR_KEY: ${{ secrets.AUR_KEY }} + CLI_VERSION: ${{github.ref_name}} - uses: actions/setup-python@v4 - run: pip install --upgrade cloudsmith-cli - name: Publish to CloudSmith diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 74b69c1b9..b2d9f310f 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -14,9 +14,7 @@ before: builds: - id: darwin-build binary: infisical - ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }} - flags: - - -trimpath + ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Env.CLI_VERSION }} env: - CGO_ENABLED=1 - CC=/home/runner/work/osxcross/target/bin/o64-clang @@ -27,14 +25,10 @@ builds: - goos: darwin goarch: "386" dir: ./cli - - id: all-other-builds env: - CGO_ENABLED=0 binary: infisical - ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }} - flags: - - -trimpath goos: - freebsd - linux @@ -72,10 +66,8 @@ release: checksum: name_template: 'checksums.txt' - snapshot: - name_template: "{{ incpatch .Version }}-devel" - + name_template: "{{ incpatch .Version }}" changelog: sort: asc filters: @@ -89,7 +81,6 @@ changelog: # - infisical # dir: "{{ dir .ArtifactPath }}" # cmd: curl -F package=@{{ .ArtifactName }} https://{{ .Env.FURY_TOKEN }}@push.fury.io/infisical/ - brews: - name: infisical tap: @@ -101,13 +92,6 @@ brews: folder: Formula homepage: "https://infisical.com" description: "The official Infisical CLI" - install: |- - bin.install infisical - bash_completion.install "completions/infisical.bash" => infisical - zsh_completion.install "completions/infisical.zsh" => "_infisical" - fish_completion.install "completions/infisical.fish" - man1.install "manpages/infisical.1.gz" - nfpms: - id: infisical package_name: infisical @@ -133,7 +117,6 @@ nfpms: dst: /usr/share/zsh/site-functions/_infisical - src: ./manpages/infisical.1.gz dst: /usr/share/man/man1/infisical.1.gz - scoop: bucket: owner: Infisical @@ -144,7 +127,6 @@ scoop: homepage: "https://infisical.com" description: "The official Infisical CLI" license: MIT - aurs: - name: infisical-bin diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go index 5c169f6d5..aaff2cb5b 100644 --- a/cli/packages/util/constants.go +++ b/cli/packages/util/constants.go @@ -14,5 +14,5 @@ const ( ) var ( - CLI_VERSION = "devel" + CLI_VERSION = "v0.2.11" ) From 71cf54c28bb9d8059667b6601178b8d7891c21ce Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Tue, 31 Jan 2023 20:19:42 -0800 Subject: [PATCH 20/32] add auto cli version to all-other-builds --- .goreleaser.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index b2d9f310f..e7a294f6b 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -26,6 +26,7 @@ builds: goarch: "386" dir: ./cli - id: all-other-builds + ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Env.CLI_VERSION }} env: - CGO_ENABLED=0 binary: infisical From 4886537a5666e222e7ca3582d4480fab5059bf49 Mon Sep 17 00:00:00 2001 From: jon4hz Date: Wed, 1 Feb 2023 14:19:49 +0100 Subject: [PATCH 21/32] Revert "Revert "Merge pull request #279 from jon4hz/main"" This reverts commit 1878bed10a1e06a8340d8b02385a8d0081394d61. --- .github/workflows/release_build.yml | 5 ++--- .goreleaser.yaml | 22 ++++++++++++++++++++-- cli/packages/util/constants.go | 2 +- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 326854fa2..3d11a1157 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -34,16 +34,15 @@ jobs: run: | mkdir ../../osxcross git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target - - uses: goreleaser/goreleaser-action@v2 + - uses: goreleaser/goreleaser-action@v4 with: distribution: goreleaser version: latest - args: release --rm-dist + args: release --clean env: GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }} FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }} AUR_KEY: ${{ secrets.AUR_KEY }} - CLI_VERSION: ${{github.ref_name}} - uses: actions/setup-python@v4 - run: pip install --upgrade cloudsmith-cli - name: Publish to CloudSmith diff --git a/.goreleaser.yaml b/.goreleaser.yaml index e7a294f6b..76e93a737 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -14,7 +14,9 @@ before: builds: - id: darwin-build binary: infisical - ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Env.CLI_VERSION }} + ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }} + flags: + - -trimpath env: - CGO_ENABLED=1 - CC=/home/runner/work/osxcross/target/bin/o64-clang @@ -25,11 +27,15 @@ builds: - goos: darwin goarch: "386" dir: ./cli + - id: all-other-builds ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Env.CLI_VERSION }} env: - CGO_ENABLED=0 binary: infisical + ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }} + flags: + - -trimpath goos: - freebsd - linux @@ -67,8 +73,10 @@ release: checksum: name_template: 'checksums.txt' + snapshot: - name_template: "{{ incpatch .Version }}" + name_template: "{{ incpatch .Version }}-devel" + changelog: sort: asc filters: @@ -82,6 +90,7 @@ changelog: # - infisical # dir: "{{ dir .ArtifactPath }}" # cmd: curl -F package=@{{ .ArtifactName }} https://{{ .Env.FURY_TOKEN }}@push.fury.io/infisical/ + brews: - name: infisical tap: @@ -93,6 +102,13 @@ brews: folder: Formula homepage: "https://infisical.com" description: "The official Infisical CLI" + install: |- + bin.install infisical + bash_completion.install "completions/infisical.bash" => infisical + zsh_completion.install "completions/infisical.zsh" => "_infisical" + fish_completion.install "completions/infisical.fish" + man1.install "manpages/infisical.1.gz" + nfpms: - id: infisical package_name: infisical @@ -118,6 +134,7 @@ nfpms: dst: /usr/share/zsh/site-functions/_infisical - src: ./manpages/infisical.1.gz dst: /usr/share/man/man1/infisical.1.gz + scoop: bucket: owner: Infisical @@ -128,6 +145,7 @@ scoop: homepage: "https://infisical.com" description: "The official Infisical CLI" license: MIT + aurs: - name: infisical-bin diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go index aaff2cb5b..5c169f6d5 100644 --- a/cli/packages/util/constants.go +++ b/cli/packages/util/constants.go @@ -14,5 +14,5 @@ const ( ) var ( - CLI_VERSION = "v0.2.11" + CLI_VERSION = "devel" ) From c99b207e9ebb532fd0b2f6a99a00ce746ba6430b Mon Sep 17 00:00:00 2001 From: jon4hz Date: Wed, 1 Feb 2023 14:28:12 +0100 Subject: [PATCH 22/32] ci: maybe fix brew --- .goreleaser.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 76e93a737..fc39224aa 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -29,7 +29,6 @@ builds: dir: ./cli - id: all-other-builds - ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Env.CLI_VERSION }} env: - CGO_ENABLED=0 binary: infisical @@ -103,8 +102,8 @@ brews: homepage: "https://infisical.com" description: "The official Infisical CLI" install: |- - bin.install infisical - bash_completion.install "completions/infisical.bash" => infisical + bin.install "infisical" + bash_completion.install "completions/infisical.bash" => "infisical" zsh_completion.install "completions/infisical.zsh" => "_infisical" fish_completion.install "completions/infisical.fish" man1.install "manpages/infisical.1.gz" From 52697dea97261edd5c38b7685a583c2bae39413f Mon Sep 17 00:00:00 2001 From: Neeraj138 Date: Wed, 1 Feb 2023 18:42:03 +0530 Subject: [PATCH 23/32] login.tsx: Faster redirect from login to dashboard. --- frontend/src/pages/login.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frontend/src/pages/login.tsx b/frontend/src/pages/login.tsx index c32c4bd4f..213b5a263 100644 --- a/frontend/src/pages/login.tsx +++ b/frontend/src/pages/login.tsx @@ -22,6 +22,7 @@ export default function Login() { const [password, setPassword] = useState(''); const [errorLogin, setErrorLogin] = useState(false); const [isLoading, setIsLoading] = useState(false); + const [isAlreadyLoggedIn, setIsAlreadyLoggedIn] = useState(false); const router = useRouter(); const { t } = useTranslation(); const lang = router.locale ?? 'en'; @@ -44,6 +45,7 @@ export default function Login() { } }; if (isLoggedIn()) { + setIsAlreadyLoggedIn(true); redirectToDashboard(); } }, []); @@ -64,6 +66,10 @@ export default function Login() { }); }; + if (isAlreadyLoggedIn) { + return null + } + return (
From 54fa39f34770d9a53fb37e29246f5b43f2da12f7 Mon Sep 17 00:00:00 2001 From: Vladyslav Matsiiako Date: Wed, 1 Feb 2023 12:22:41 -0800 Subject: [PATCH 24/32] Fixed issues with breadcrumbs and redirects of forgot password --- frontend/src/components/navigation/NavHeader.tsx | 5 +++-- frontend/src/const.ts | 2 ++ frontend/src/pages/verify-email.tsx | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/navigation/NavHeader.tsx b/frontend/src/components/navigation/NavHeader.tsx index c550d46e9..247d4ac3d 100644 --- a/frontend/src/components/navigation/NavHeader.tsx +++ b/frontend/src/components/navigation/NavHeader.tsx @@ -25,6 +25,7 @@ export default function NavHeader({ const [orgName, setOrgName] = useState(''); const [workspaceName, setWorkspaceName] = useState(''); const router = useRouter(); + const projectId = String(router.query.id); useEffect(() => { (async () => { @@ -35,12 +36,12 @@ export default function NavHeader({ setOrgName(org.name); const workspace = await getProjectInfo({ - projectId: String(router.query.id) + projectId }); setWorkspaceName(workspace.name); })(); // eslint-disable-next-line react-hooks/exhaustive-deps - }, []); + }, [projectId]); return (
diff --git a/frontend/src/const.ts b/frontend/src/const.ts index 0e5ed9516..6ec3941a4 100644 --- a/frontend/src/const.ts +++ b/frontend/src/const.ts @@ -15,6 +15,8 @@ export const publicPaths = [ `/privacy`, `/terms`, `/subprocessors`, + `/verify-email`, + `/password-reset`, ]; export const languageMap = { diff --git a/frontend/src/pages/verify-email.tsx b/frontend/src/pages/verify-email.tsx index d134a07af..3b7e1c8d5 100644 --- a/frontend/src/pages/verify-email.tsx +++ b/frontend/src/pages/verify-email.tsx @@ -29,7 +29,7 @@ export default function VerifyEmail() { Login - + Date: Wed, 1 Feb 2023 23:15:39 +0200 Subject: [PATCH 25/32] chore: fix typo in quick start guide --- frontend/src/pages/home/[id].tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/home/[id].tsx b/frontend/src/pages/home/[id].tsx index 9ec119973..fef9397c4 100644 --- a/frontend/src/pages/home/[id].tsx +++ b/frontend/src/pages/home/[id].tsx @@ -167,7 +167,7 @@ export default function Home() { })} {learningItem({ text: 'Inject secrets locally', - subText: 'Replace .env files with a more secure an efficient alternative.', + subText: 'Replace .env files with a more secure and efficient alternative.', complete: false, icon: faNetworkWired, time: '8 min', From 3d14bc9a00c6476de8fc4d0c1daf672710decfc2 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Wed, 1 Feb 2023 20:31:05 -0800 Subject: [PATCH 26/32] remove env name check --- cli/packages/cmd/run.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/packages/cmd/run.go b/cli/packages/cmd/run.go index 4c7c9782f..c95a83bc4 100644 --- a/cli/packages/cmd/run.go +++ b/cli/packages/cmd/run.go @@ -58,9 +58,9 @@ var runCmd = &cobra.Command{ util.HandleError(err, "Unable to parse flag") } - if !util.IsSecretEnvironmentValid(envName) { - util.PrintMessageAndExit("Invalid environment name passed. Environment names can only be prod, dev, test or staging") - } + // if !util.IsSecretEnvironmentValid(envName) { + // util.PrintMessageAndExit("Invalid environment name passed. Environment names can only be prod, dev, test or staging") + // } secretOverriding, err := cmd.Flags().GetBool("secret-overriding") if err != nil { From 25bb966a32e124a0d90cab80803543aa07d444b3 Mon Sep 17 00:00:00 2001 From: Vladyslav Matsiiako Date: Wed, 1 Feb 2023 22:29:33 -0800 Subject: [PATCH 27/32] Added ability to change a role in an organization --- backend/src/routes/v2/organizations.ts | 2 +- .../src/components/basic/table/UserTable.tsx | 10 +++---- .../changeUserRoleInOrganization.ts | 27 +++++++++++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 frontend/src/pages/api/organization/changeUserRoleInOrganization.ts diff --git a/backend/src/routes/v2/organizations.ts b/backend/src/routes/v2/organizations.ts index 1362a7759..e1488e8a7 100644 --- a/backend/src/routes/v2/organizations.ts +++ b/backend/src/routes/v2/organizations.ts @@ -30,7 +30,7 @@ router.patch( '/:organizationId/memberships/:membershipId', param('organizationId').exists().trim(), param('membershipId').exists().trim(), - body('role').exists().isString().trim().isIn([ADMIN, MEMBER]), + body('role').exists().isString().trim().isIn([OWNER, ADMIN, MEMBER]), validateRequest, requireAuth({ acceptedAuthModes: ['jwt', 'apiKey'] diff --git a/frontend/src/components/basic/table/UserTable.tsx b/frontend/src/components/basic/table/UserTable.tsx index e82556b50..02e65c547 100644 --- a/frontend/src/components/basic/table/UserTable.tsx +++ b/frontend/src/components/basic/table/UserTable.tsx @@ -2,8 +2,8 @@ import { useEffect, useState } from 'react'; import { useRouter } from 'next/router'; import { faX } from '@fortawesome/free-solid-svg-icons'; +import changeUserRoleInOrganization from '@app/pages/api/organization/changeUserRoleInOrganization'; import deleteUserFromOrganization from '@app/pages/api/organization/deleteUserFromOrganization'; -import changeUserRoleInWorkspace from '@app/pages/api/workspace/changeUserRoleInWorkspace'; import deleteUserFromWorkspace from '@app/pages/api/workspace/deleteUserFromWorkspace'; import getLatestFileKey from '@app/pages/api/workspace/getLatestFileKey'; import uploadKeys from '@app/pages/api/workspace/uploadKeys'; @@ -55,9 +55,9 @@ const UserTable = ({ userData, changeData, myUser, filter, resendInvite, isOrg } ]); }; - // Update the rold of a certain user + // Update the role of a certain user const handleRoleUpdate = (index: number, e: string) => { - changeUserRoleInWorkspace(userData[index].membershipId, e); + changeUserRoleInOrganization(String(localStorage.getItem("orgData.id")), userData[index].membershipId, e); changeData([ ...userData.slice(0, index), ...[ @@ -145,9 +145,9 @@ const UserTable = ({ userData, changeData, myUser, filter, resendInvite, isOrg }
- {row.status === 'granted' && + {row.status === 'accepted' && ((myRole === 'admin' && row.role !== 'owner') || myRole === 'owner') && - myUser !== row.email ? ( + (myUser !== row.email) ? ( handleRoleUpdate(index, e)} diff --git a/frontend/src/pages/api/organization/changeUserRoleInOrganization.ts b/frontend/src/pages/api/organization/changeUserRoleInOrganization.ts new file mode 100644 index 000000000..6bbe966c4 --- /dev/null +++ b/frontend/src/pages/api/organization/changeUserRoleInOrganization.ts @@ -0,0 +1,27 @@ +import SecurityClient from '@app/components/utilities/SecurityClient'; + +/** + * This function change the access of a user in a certain organization + * @param {string} organizationId + * @param {string} membershipId + * @param {string} role + * @returns + */ +const changeUserRoleInOrganization = (organizationId: string, membershipId: string, role: string) => + SecurityClient.fetchCall(`/api/v2/organizations/${organizationId}/memberships/${membershipId}`, { + method: 'PATCH', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + role + }) + }).then(async (res) => { + if (res && res.status === 200) { + return res; + } + console.log('Failed to change the user role in an org'); + return undefined; + }); + +export default changeUserRoleInOrganization; From 7d181f334cd2499e66ef2b43b366cc6448fb2806 Mon Sep 17 00:00:00 2001 From: Kunal Singh Date: Thu, 2 Feb 2023 18:49:58 +0530 Subject: [PATCH 28/32] fix site url on pdf to be .env/SITE_URL --- frontend/src/components/utilities/config/index.ts | 5 +++-- frontend/src/components/utilities/generateBackupPDF.ts | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/utilities/config/index.ts b/frontend/src/components/utilities/config/index.ts index 7570785ba..7ecfb9d4d 100644 --- a/frontend/src/components/utilities/config/index.ts +++ b/frontend/src/components/utilities/config/index.ts @@ -4,11 +4,12 @@ const POSTHOG_HOST = process.env.NEXT_PUBLIC_POSTHOG_HOST! || "https://app.posthog.com"; const STRIPE_PRODUCT_PRO = process.env.NEXT_PUBLIC_STRIPE_PRODUCT_PRO!; const STRIPE_PRODUCT_STARTER = process.env.NEXT_PUBLIC_STRIPE_PRODUCT_STARTER!; +const {SITE_URL} = process.env export { ENV, POSTHOG_API_KEY, POSTHOG_HOST, + SITE_URL, STRIPE_PRODUCT_PRO, - STRIPE_PRODUCT_STARTER -}; \ No newline at end of file + STRIPE_PRODUCT_STARTER}; \ No newline at end of file diff --git a/frontend/src/components/utilities/generateBackupPDF.ts b/frontend/src/components/utilities/generateBackupPDF.ts index a4ee0035e..e51dfaa0a 100644 --- a/frontend/src/components/utilities/generateBackupPDF.ts +++ b/frontend/src/components/utilities/generateBackupPDF.ts @@ -1,5 +1,7 @@ import { jsPDF } from 'jspdf'; +import { SITE_URL } from './config'; + interface PDFProps { personalName: string; personalEmail: string; @@ -73,7 +75,7 @@ function generateBackupPDF({ personalName, personalEmail, generatedKey }: PDFPro doc.roundedRect(170, 488, 375, 35, 5, 5, 'F'); doc.setTextColor(23, 23, 23); doc.setFontSize(14); - doc.text('https://app.infisical.com/login', 180, 420); + doc.text(`${SITE_URL}/login`, 180, 420); doc.text(personalEmail, 180, 465); doc.text(generatedKey, 180, 510); doc.text('Need help? Contact us at support@infisical.com', 32, 575); From a660261678df4731357542ff5c9fad708dcf7430 Mon Sep 17 00:00:00 2001 From: Kunal Singh Date: Thu, 2 Feb 2023 19:25:36 +0530 Subject: [PATCH 29/32] fix type in Title -> --- frontend/public/locales/en/common.json | 8 ++++---- frontend/public/locales/fr/common.json | 8 ++++---- frontend/public/locales/ko/common.json | 4 ++-- frontend/public/locales/pt-BR/common.json | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/public/locales/en/common.json b/frontend/public/locales/en/common.json index 34cdcaea8..e02c4f474 100644 --- a/frontend/public/locales/en/common.json +++ b/frontend/public/locales/en/common.json @@ -1,5 +1,5 @@ { - "head-title": "{{title}} | Infiscal", + "head-title": "{{title}} | Infisical", "error_project-already-exists": "A project with this name already exists.", "no-mobile": " To use Infisical, please log in through a device with larger dimensions. ", "email": "Email", @@ -28,7 +28,7 @@ "select-event": "Select an event", "event": "Event", "user": "User", - "source": "Source", - "time": "Time", + "source": "Source", + "time": "Time", "timestamp": "Timestamp" -} +} \ No newline at end of file diff --git a/frontend/public/locales/fr/common.json b/frontend/public/locales/fr/common.json index 8552668aa..1f6a52447 100644 --- a/frontend/public/locales/fr/common.json +++ b/frontend/public/locales/fr/common.json @@ -1,5 +1,5 @@ { - "head-title": "{{title}} | Infiscal", + "head-title": "{{title}} | Infisical", "error_project-already-exists": "Un projet avec ce nom existe déjà.", "no-mobile": " Pour utiliser Infisical, veuillez vous connecter avec un appareil avec des dimensions plus grandes. ", "email": "Email", @@ -28,7 +28,7 @@ "select-event": "Sélectionnez un événement", "event": "Événement", "user": "Utilisateur", - "source": "Source", - "time": "Heure", + "source": "Source", + "time": "Heure", "timestamp": "Horodatage" -} +} \ No newline at end of file diff --git a/frontend/public/locales/ko/common.json b/frontend/public/locales/ko/common.json index 8274dd060..f0692ebf7 100644 --- a/frontend/public/locales/ko/common.json +++ b/frontend/public/locales/ko/common.json @@ -1,5 +1,5 @@ { - "head-title": "{{title}} | Infiscal", + "head-title": "{{title}} | Infisical", "error_project-already-exists": "동일한 이름을 가진 프로젝트가 이미 존재해요.", "no-mobile": " Infisical을 사용하려면, 큰 화면을 가진 디바이스로 로그인하여 주세요.", "email": "메일", @@ -23,4 +23,4 @@ "language": "언어", "search": "검색하기...", "note": "Note" -} +} \ No newline at end of file diff --git a/frontend/public/locales/pt-BR/common.json b/frontend/public/locales/pt-BR/common.json index 12e657d7c..207f0db29 100644 --- a/frontend/public/locales/pt-BR/common.json +++ b/frontend/public/locales/pt-BR/common.json @@ -1,5 +1,5 @@ { - "head-title": "{{title}} | Infiscal", + "head-title": "{{title}} | Infisical", "error_project-already-exists": "Já exite um projeto com este nome.", "no-mobile": "Para usar o Infisical, faça o login através de um dispositivo com dimensões maiores.", "email": "Email", From a013768313df844be3546108cfdae8c0e36d82b8 Mon Sep 17 00:00:00 2001 From: Kunal Singh Date: Thu, 2 Feb 2023 19:45:24 +0530 Subject: [PATCH 30/32] fix copyright label in go source --- cli/main.go | 2 +- cli/packages/cmd/export.go | 2 +- cli/packages/cmd/init.go | 2 +- cli/packages/cmd/login.go | 2 +- cli/packages/cmd/man.go | 2 +- cli/packages/cmd/root.go | 2 +- cli/packages/cmd/run.go | 2 +- cli/packages/cmd/secrets.go | 2 +- cli/packages/cmd/vault.go | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/main.go b/cli/main.go index 9b1e420fa..a51661ff6 100644 --- a/cli/main.go +++ b/cli/main.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package main diff --git a/cli/packages/cmd/export.go b/cli/packages/cmd/export.go index 2a6fa0dbd..41e170f70 100644 --- a/cli/packages/cmd/export.go +++ b/cli/packages/cmd/export.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/init.go b/cli/packages/cmd/init.go index a9a2d943d..413f61440 100644 --- a/cli/packages/cmd/init.go +++ b/cli/packages/cmd/init.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/login.go b/cli/packages/cmd/login.go index 74573c226..6a1dc2313 100644 --- a/cli/packages/cmd/login.go +++ b/cli/packages/cmd/login.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/man.go b/cli/packages/cmd/man.go index efe8686b3..86d68c8e7 100644 --- a/cli/packages/cmd/man.go +++ b/cli/packages/cmd/man.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/root.go b/cli/packages/cmd/root.go index 93a498860..ac827feb3 100644 --- a/cli/packages/cmd/root.go +++ b/cli/packages/cmd/root.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/run.go b/cli/packages/cmd/run.go index c95a83bc4..d31981b02 100644 --- a/cli/packages/cmd/run.go +++ b/cli/packages/cmd/run.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/secrets.go b/cli/packages/cmd/secrets.go index 912801f5d..060a69a45 100644 --- a/cli/packages/cmd/secrets.go +++ b/cli/packages/cmd/secrets.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/vault.go b/cli/packages/cmd/vault.go index a2b03dbec..d9e32769e 100644 --- a/cli/packages/cmd/vault.go +++ b/cli/packages/cmd/vault.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd From 216ace9f61718d651238b458811e11b31ad81298 Mon Sep 17 00:00:00 2001 From: Vladyslav Matsiiako Date: Thu, 2 Feb 2023 07:59:02 -0800 Subject: [PATCH 31/32] Updated readme and its translations; added contributors --- README.md | 33 ++++++++++------ i18n/README.en.md | 95 ++++++++++++++++++++++++++++++++--------------- i18n/README.es.md | 29 +++++++++++---- i18n/README.ko.md | 31 ++++++++++++---- i18n/README.tr.md | 47 +++++++++++++++++------ 5 files changed, 167 insertions(+), 68 deletions(-) diff --git a/README.md b/README.md index 8db0b919d..1ec8cff50 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ git commit activity - Cloudsmith downloads + Cloudsmith downloads Slack community channel @@ -55,11 +55,11 @@ - **[Secret Versioning](https://infisical.com/docs/getting-started/dashboard/versioning)** to view the change history for any secret - **[Activity Logs](https://infisical.com/docs/getting-started/dashboard/audit-logs)** to record every action taken in a project - **[Point-in-time Secrets Recovery](https://infisical.com/docs/getting-started/dashboard/pit-recovery)** for rolling back to any snapshot of your secrets +- **Role-based Access Controls** per environment +- 🔜 **2FA** (next week) - 🔜 **1-Click Deploy** to Digital Ocean and Heroku -- 🔜 **Authentication/Authorization** for projects (read/write controls soon) - 🔜 **Automatic Secret Rotation** -- 🔜 **2FA** -- 🔜 **Slack Integration & MS Teams** integrations +- 🔜 **Slack & MS Teams** integrations And more. @@ -99,15 +99,13 @@ Not sure where to get started? You can: - [GitHub Issues](https://github.com/Infisical/infisical-cli/issues) (For any bugs and errors you encounter using Infisical) - [Twitter](https://twitter.com/infisical) (Get news fast) -## 🐥 Status +## 🌄 Status -- [x] Public Alpha: Anyone can sign up over at [infisical.com](https://infisical.com) but go easy on us, there are kinks and we're just getting started. +- [x] Public Alpha: Anyone can sign up over at [infisical.com](https://infisical.com) but there are some minor kinks. - [ ] Public Beta: Stable enough for most non-enterprise use-cases. - [ ] Public: Production-ready. -We're currently in Public Alpha. - -## 🔌 Integrations +## �🔌 Integrations We're currently setting the foundation and building [integrations](https://infisical.com/docs/integrations/overview) so secrets can be synced everywhere. Any help is welcome! :) @@ -157,7 +155,7 @@ We're currently setting the foundation and building [integrations](https://infis - 🔜 AWS + 🔜 AWS PS (https://github.com/Infisical/infisical/issues/286) @@ -170,7 +168,7 @@ We're currently setting the foundation and building [integrations](https://infis - 🔜 GCP + 🔜 GCP SM (https://github.com/Infisical/infisical/issues/285) 🔜 GitLab CI/CD (https://github.com/Infisical/infisical/issues/134) @@ -216,6 +214,17 @@ We're currently setting the foundation and building [integrations](https://infis + + + 🔜 BuddyCI + + + 🔜 Serverless + + + 🔜 AWS Lambda + + @@ -347,7 +356,7 @@ Infisical officially launched as v.1.0 on November 21st, 2022. There are a lot o - + ## 🌎 Translations diff --git a/i18n/README.en.md b/i18n/README.en.md index fb907e302..1ec8cff50 100644 --- a/i18n/README.en.md +++ b/i18n/README.en.md @@ -3,7 +3,7 @@ infisical

-

Open-source, E2EE, simple tool to manage and sync environment variables across your team and infrastructure.

+

Open-source, E2EE, simple tool to manage secrets and configs across your team and infrastructure.

@@ -21,9 +21,12 @@ PRs welcome! - + git commit activity + + Cloudsmith downloads + Slack community channel @@ -34,20 +37,29 @@ Dashboard -**[Infisical](https://infisical.com)** is an open source, E2EE tool to help teams manage and sync environment variables across their development workflow and infrastructure. It's designed to be simple and take minutes to get going. -- **[User-Friendly Dashboard](https://infisical.com/docs/getting-started/dashboard/project)** to manage your team's environment variables within projects -- **[Language-Agnostic CLI](https://infisical.com/docs/cli/overview)** that pulls and injects environment variables into your local workflow +**Read this in other languages**: [English language](i18n/README.en.md) +[Spanish language](i18n/README.es.md) +[Korean language](i18n/README.ko.md) +[Turkish language](i18n/README.tr.md) + +**[Infisical](https://infisical.com)** is an open source, E2EE tool to help teams manage and sync secrets and configs across their development workflow and infrastructure. It's designed to be simple and take minutes to get going. + +- **[User-Friendly Dashboard](https://infisical.com/docs/getting-started/dashboard/project)** to manage your team's secrets and configs within projects +- **[Language-Agnostic CLI](https://infisical.com/docs/cli/overview)** that pulls and injects esecrets and configs into your local workflow - **[Complete control over your data](https://infisical.com/docs/self-hosting/overview)** - host it yourself on any infrastructure - **Navigate Multiple Environments** per project (e.g. development, staging, production, etc.) -- **Personal/Shared** scoping for environment variables +- **Personal overrides** for secrets and configs - **[Integrations](https://infisical.com/docs/integrations/overview)** with CI/CD and production infrastructure +- **[Infisical API](https://infisical.com/docs/api-reference/overview/introduction)** - manage secrets via HTTPS requests to the platform +- **[Secret Versioning](https://infisical.com/docs/getting-started/dashboard/versioning)** to view the change history for any secret +- **[Activity Logs](https://infisical.com/docs/getting-started/dashboard/audit-logs)** to record every action taken in a project +- **[Point-in-time Secrets Recovery](https://infisical.com/docs/getting-started/dashboard/pit-recovery)** for rolling back to any snapshot of your secrets +- **Role-based Access Controls** per environment +- 🔜 **2FA** (next week) - 🔜 **1-Click Deploy** to Digital Ocean and Heroku -- 🔜 **Authentication/Authorization** for projects (read/write controls soon) - 🔜 **Automatic Secret Rotation** -- 🔜 **2FA** -- 🔜 **Access Logs** -- 🔜 **Slack Integration & MS Teams** integrations +- 🔜 **Slack & MS Teams** integrations And more. @@ -65,7 +77,7 @@ To quickly get started, visit our [get started guide](https://infisical.com/docs Infisical makes secret management simple and end-to-end encrypted by default. We're on a mission to make it more accessible to all developers, not just security teams. -According to a [report](https://www.ekransystem.com/en/blog/secrets-management) in 2019, only 10% of organizations use secret management solutions despite all using digital secrets to some extent. +According to a [report](https://www.ekransystem.com/en/blog/secrets-management), only 10% of organizations use secret management solutions despite all using digital secrets to some extent. If you care about efficiency and security, then Infisical is right for you. @@ -87,15 +99,13 @@ Not sure where to get started? You can: - [GitHub Issues](https://github.com/Infisical/infisical-cli/issues) (For any bugs and errors you encounter using Infisical) - [Twitter](https://twitter.com/infisical) (Get news fast) -## 🐥 Status +## 🌄 Status -- [x] Public Alpha: Anyone can sign up over at [infisical.com](https://infisical.com) but go easy on us, there are kinks and we're just getting started. +- [x] Public Alpha: Anyone can sign up over at [infisical.com](https://infisical.com) but there are some minor kinks. - [ ] Public Beta: Stable enough for most non-enterprise use-cases. - [ ] Public: Production-ready. -We're currently in Public Alpha. - -## 🔌 Integrations +## �🔌 Integrations We're currently setting the foundation and building [integrations](https://infisical.com/docs/integrations/overview) so secrets can be synced everywhere. Any help is welcome! :) @@ -138,12 +148,14 @@ We're currently setting the foundation and building [integrations](https://infis - 🔜 Fly.io + + ✔️ Fly.io + - 🔜 AWS + 🔜 AWS PS (https://github.com/Infisical/infisical/issues/286) @@ -151,12 +163,12 @@ We're currently setting the foundation and building [integrations](https://infis - 🔜 Railway + 🔜 Railway (https://github.com/Infisical/infisical/issues/271) - 🔜 GCP + 🔜 GCP SM (https://github.com/Infisical/infisical/issues/285) 🔜 GitLab CI/CD (https://github.com/Infisical/infisical/issues/134) @@ -186,7 +198,7 @@ We're currently setting the foundation and building [integrations](https://infis - 🔜 Railway + 🔜 Forge @@ -197,7 +209,20 @@ We're currently setting the foundation and building [integrations](https://infis 🔜 Supabase - 🔜 Render (https://github.com/Infisical/infisical/issues/132) + + ✔️ Render + + + + + + 🔜 BuddyCI + + + 🔜 Serverless + + + 🔜 AWS Lambda @@ -270,13 +295,13 @@ We're currently setting the foundation and building [integrations](https://infis - - ✔️ Ruby on Rails + + ✔️ Vue - - ✔️ Vue + + ✔️ Ruby on Rails @@ -292,6 +317,16 @@ We're currently setting the foundation and building [integrations](https://infis + + + + ✔️ .NET + + + + And more... + + @@ -309,7 +344,7 @@ Looking to report a security vulnerability? Please don't post about it in GitHub ## 🚨 Stay Up-to-Date -Infisical officially launched as v.1.0 on November 21st, 2022. However, a lot of new features are coming very quickly. Watch **releases** of this repository to be notified about future updates: +Infisical officially launched as v.1.0 on November 21st, 2022. There are a lot of new features coming very frequently. Watch **releases** of this repository to be notified about future updates: ![infisical-star-github](https://github.com/Infisical/infisical/blob/main/.github/images/star-infisical.gif?raw=true) @@ -321,10 +356,10 @@ Infisical officially launched as v.1.0 on November 21st, 2022. However, a lot of - + ## 🌎 Translations -Infisical is currently available in English and Korean. Help us translate Infisical to your language! +Infisical is currently available in English, Korean, French, and Portuguese (Brazil). Help us translate Infisical to your language! -You can find all the info in [this issue](https://github.com/Infisical/infisical/issues/181). \ No newline at end of file +You can find all the info in [this issue](https://github.com/Infisical/infisical/issues/181). diff --git a/i18n/README.es.md b/i18n/README.es.md index 0139bdd65..d579bfa1c 100644 --- a/i18n/README.es.md +++ b/i18n/README.es.md @@ -144,12 +144,14 @@ Actualmente estamos sentando bases y construyendo [integraciones](https://infisi - 🔜 Fly.io + + ✔️ Fly.io + - 🔜 AWS + 🔜 AWS PS (https://github.com/Infisical/infisical/issues/286) @@ -157,12 +159,12 @@ Actualmente estamos sentando bases y construyendo [integraciones](https://infisi - 🔜 Railway + 🔜 Railway (https://github.com/Infisical/infisical/issues/271) - 🔜 GCP + 🔜 GCP SM (https://github.com/Infisical/infisical/issues/285) 🔜 GitLab CI/CD (https://github.com/Infisical/infisical/issues/134) @@ -192,7 +194,7 @@ Actualmente estamos sentando bases y construyendo [integraciones](https://infisi - 🔜 Railway + 🔜 Forge @@ -203,7 +205,20 @@ Actualmente estamos sentando bases y construyendo [integraciones](https://infisi 🔜 Supabase - 🔜 Render (https://github.com/Infisical/infisical/issues/132) + + ✔️ Render + + + + + + 🔜 BuddyCI + + + 🔜 Serverless + + + 🔜 AWS Lambda @@ -337,7 +352,7 @@ Infisical se lanzó oficialmente como v.1.0 el 21 de noviembre de 2022. Hay much - + ## 🌎 Traducciones diff --git a/i18n/README.ko.md b/i18n/README.ko.md index c56862b71..bab9e4d49 100644 --- a/i18n/README.ko.md +++ b/i18n/README.ko.md @@ -145,12 +145,14 @@ Infisical은 현재 공개 알파 상태에요. - 🔜 Fly.io + + ✔️ Fly.io + - 🔜 AWS + 🔜 AWS PS (https://github.com/Infisical/infisical/issues/286) @@ -158,12 +160,12 @@ Infisical은 현재 공개 알파 상태에요. - 🔜 Railway + 🔜 Railway (https://github.com/Infisical/infisical/issues/271) - 🔜 GCP + 🔜 GCP SM (https://github.com/Infisical/infisical/issues/285) 🔜 GitLab CI/CD (https://github.com/Infisical/infisical/issues/134) @@ -193,7 +195,7 @@ Infisical은 현재 공개 알파 상태에요. - 🔜 Railway + 🔜 Forge @@ -204,7 +206,20 @@ Infisical은 현재 공개 알파 상태에요. 🔜 Supabase - 🔜 Render (https://github.com/Infisical/infisical/issues/132) + + ✔️ Render + + + + + + 🔜 BuddyCI + + + 🔜 Serverless + + + 🔜 AWS Lambda @@ -306,7 +321,7 @@ Infisical은 현재 공개 알파 상태에요. - 더 찾아옵니다! + And more... @@ -338,7 +353,7 @@ Infisical은 2022년 11월 21일에 v1.0 버전을 출시했어요. 새로운 - + ## 🌎 번역 diff --git a/i18n/README.tr.md b/i18n/README.tr.md index 24daa8fc8..bef6aa6b8 100644 --- a/i18n/README.tr.md +++ b/i18n/README.tr.md @@ -143,12 +143,14 @@ Nereden başlayacağınızdan emin değil misiniz? O zaman; - 🔜 Fly.io + + ✔️ Fly.io + - 🔜 AWS + 🔜 AWS PS (https://github.com/Infisical/infisical/issues/286) @@ -156,12 +158,12 @@ Nereden başlayacağınızdan emin değil misiniz? O zaman; - 🔜 Railway + 🔜 Railway (https://github.com/Infisical/infisical/issues/271) - 🔜 GCP + 🔜 GCP SM (https://github.com/Infisical/infisical/issues/285) 🔜 GitLab CI/CD (https://github.com/Infisical/infisical/issues/134) @@ -191,7 +193,7 @@ Nereden başlayacağınızdan emin değil misiniz? O zaman; - 🔜 Railway + 🔜 Forge @@ -202,7 +204,20 @@ Nereden başlayacağınızdan emin değil misiniz? O zaman; 🔜 Supabase - 🔜 Render (https://github.com/Infisical/infisical/issues/132) + + ✔️ Render + + + + + + 🔜 BuddyCI + + + 🔜 Serverless + + + 🔜 AWS Lambda @@ -275,13 +290,13 @@ Nereden başlayacağınızdan emin değil misiniz? O zaman; - - ✔️ Ruby on Rails + + ✔️ Vue - - ✔️ Vue + + ✔️ Ruby on Rails @@ -297,6 +312,16 @@ Nereden başlayacağınızdan emin değil misiniz? O zaman; + + + + ✔️ .NET + + + + And more... + + @@ -326,7 +351,7 @@ Infisical 21 Kasım 2022 de v.1.0 resmi olarak olarak yayınlandı. Buna rağmen - + ## 🌎 Çeviriler From 44b2bc1795fb48f7084ab6a30a0b9aee35c3637c Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Thu, 2 Feb 2023 12:57:54 -0800 Subject: [PATCH 32/32] modify method to check for cli updates --- cli/packages/util/check-for-update.go | 4 ++-- cli/packages/util/vault.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cli/packages/util/check-for-update.go b/cli/packages/util/check-for-update.go index 5fbf39a1e..a23b90ad1 100644 --- a/cli/packages/util/check-for-update.go +++ b/cli/packages/util/check-for-update.go @@ -2,10 +2,10 @@ package util import ( "encoding/json" + "errors" "fmt" "io/ioutil" "net/http" - "errors" ) func CheckForUpdate() { @@ -42,5 +42,5 @@ func getLatestTag(repoOwner string, repoName string) (string, error) { json.Unmarshal(body, &tags) - return tags[0].Name, nil + return tags[0].Name[1:], nil } diff --git a/cli/packages/util/vault.go b/cli/packages/util/vault.go index 7e4ce1b31..0852e5f48 100644 --- a/cli/packages/util/vault.go +++ b/cli/packages/util/vault.go @@ -57,7 +57,7 @@ func fileKeyringPassphrasePrompt(prompt string) (string, error) { if password, ok := os.LookupEnv("INFISICAL_VAULT_FILE_PASSPHRASE"); ok { return password, nil } else { - fmt.Println("You may set the `INFISICAL_VAULT_FILE_PASSPHRASE` environment variable to avoid typing password") + fmt.Println("You may set the environment variable `INFISICAL_VAULT_FILE_PASSPHRASE` with your password to avoid typing it") } fmt.Fprintf(os.Stderr, "%s:", prompt) @@ -65,6 +65,7 @@ func fileKeyringPassphrasePrompt(prompt string) (string, error) { if err != nil { return "", err } + fmt.Println("") return string(b), nil }