From ab5779622a07174d622af564100233065fec4e0a Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 21 Nov 2022 13:17:58 -0500 Subject: [PATCH 1/6] auto upload to docker hub action --- .github/workflows/docker-image.yml | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000000..643bfaefad --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,37 @@ +name: Push to Docker Hub + +on: + push: + branches: + - 'main' + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push backend + uses: docker/build-push-action@v3 + with: + push: true + context: ./backend + tags: infisical/backend:latest + - + name: Build and push frontend + uses: docker/build-push-action@v3 + with: + push: true + context: ./frontend + tags: infisical/frontend:latest From 1c8e95f7e4362695a6a5beaa529697a5bd1655cb Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 21 Nov 2022 13:21:02 -0500 Subject: [PATCH 2/6] Update docker-image.yml --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 643bfaefad..2446760506 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -26,12 +26,12 @@ jobs: uses: docker/build-push-action@v3 with: push: true - context: ./backend + context: backend tags: infisical/backend:latest - name: Build and push frontend uses: docker/build-push-action@v3 with: push: true - context: ./frontend + context: frontend tags: infisical/frontend:latest From 2439cbe09572b5a784554bbc0b7ea11ee77563a0 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 21 Nov 2022 13:31:40 -0500 Subject: [PATCH 3/6] update path to docker file for action --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 2446760506..44a56f9538 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -26,12 +26,12 @@ jobs: uses: docker/build-push-action@v3 with: push: true - context: backend + path: ./backend/Dockerfile tags: infisical/backend:latest - name: Build and push frontend uses: docker/build-push-action@v3 with: push: true - context: frontend + path: ./frontend/Dockerfile tags: infisical/frontend:latest From 9c9fcde8b16382f914640caa1c59f880251d7e4c Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 21 Nov 2022 13:33:56 -0500 Subject: [PATCH 4/6] Update docker-image.yml --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 44a56f9538..1e76bceafb 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -26,12 +26,12 @@ jobs: uses: docker/build-push-action@v3 with: push: true - path: ./backend/Dockerfile + context: /backend tags: infisical/backend:latest - name: Build and push frontend uses: docker/build-push-action@v3 with: push: true - path: ./frontend/Dockerfile + context: /frontend tags: infisical/frontend:latest From 5db5c6424a7903a119fb2a95aa26c265f3bc015e Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 21 Nov 2022 13:36:54 -0500 Subject: [PATCH 5/6] set docker build workflow manually --- .github/workflows/docker-image.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 1e76bceafb..1b80aa784a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,9 +1,6 @@ name: Push to Docker Hub -on: - push: - branches: - - 'main' +on: [workflow_dispatch] jobs: docker: From 518872da0da4b35db68138c8f4cfdb4f3d02f5f7 Mon Sep 17 00:00:00 2001 From: Tuan Dang Date: Mon, 21 Nov 2022 17:28:50 -0500 Subject: [PATCH 6/6] Bring back auth/signup-specific rate limiters --- backend/src/routes/auth.ts | 4 ++-- backend/src/routes/signup.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/routes/auth.ts b/backend/src/routes/auth.ts index 2ec18a3edb..43a57fe7e2 100644 --- a/backend/src/routes/auth.ts +++ b/backend/src/routes/auth.ts @@ -13,7 +13,7 @@ router.post( router.post( '/login1', - // loginLimiter, + loginLimiter, body('email').exists().trim().notEmpty(), body('clientPublicKey').exists().trim().notEmpty(), validateRequest, @@ -22,7 +22,7 @@ router.post( router.post( '/login2', - // loginLimiter, + loginLimiter, body('email').exists().trim().notEmpty(), body('clientProof').exists().trim().notEmpty(), validateRequest, diff --git a/backend/src/routes/signup.ts b/backend/src/routes/signup.ts index f24b14af9c..40b5929b04 100644 --- a/backend/src/routes/signup.ts +++ b/backend/src/routes/signup.ts @@ -7,7 +7,7 @@ import { signupLimiter } from '../helpers/rateLimiter'; router.post( '/email/signup', - // signupLimiter, + signupLimiter, body('email').exists().trim().notEmpty().isEmail(), validateRequest, signupController.beginEmailSignup @@ -15,7 +15,7 @@ router.post( router.post( '/email/verify', - // signupLimiter, + signupLimiter, body('email').exists().trim().notEmpty().isEmail(), body('code').exists().trim().notEmpty(), validateRequest, @@ -24,7 +24,7 @@ router.post( router.post( '/complete-account/signup', - // signupLimiter, + signupLimiter, requireSignupAuth, body('email').exists().trim().notEmpty().isEmail(), body('firstName').exists().trim().notEmpty(), @@ -42,7 +42,7 @@ router.post( router.post( '/complete-account/invite', - // signupLimiter, + signupLimiter, requireSignupAuth, body('email').exists().trim().notEmpty().isEmail(), body('firstName').exists().trim().notEmpty(),