From 4932cafea3ae04b8ab2760c9c24343f68d616f3e Mon Sep 17 00:00:00 2001 From: Saqib Perwaiz Date: Tue, 3 Dec 2024 13:42:37 +0530 Subject: [PATCH 1/4] INFRA-4035 | Saqib | Changes to allow onCall DB DAG to run. --- .../navi/infra/portal/v2/jit/service/JitServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java b/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java index 3b7343f8..ee70dbd4 100644 --- a/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java +++ b/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java @@ -33,6 +33,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -496,7 +497,9 @@ class JitServiceImpl implements JitService { log.error("Invalid team : {} for jit request", jitRequestDto.getTeam()); throw new IllegalArgumentException("Invalid team"); } - if (jitRequestDto.getGrantWindow() > maxGrantWindow) { + if ( !jitRequestDto.getRequestedBy().equals(onCallApproverEmail) && + jitRequestDto.getGrantWindow() > maxGrantWindow + ) { log.error("Request forged. Invalid grant window by user: {}", jitRequestDto.getRequestedFor()); throw new IllegalArgumentException("Invalid grant window"); @@ -735,4 +738,4 @@ class JitServiceImpl implements JitService { ) throws IOException; } -} \ No newline at end of file +} From 969cb5591190d375e907d358784a369a8678dc74 Mon Sep 17 00:00:00 2001 From: Saqib Perwaiz Date: Tue, 3 Dec 2024 13:53:27 +0530 Subject: [PATCH 2/4] INFRA-4035 | Saqib | Fixes checkstyle --- .../com/navi/infra/portal/v2/jit/service/JitServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java b/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java index ee70dbd4..98176c98 100644 --- a/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java +++ b/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java @@ -497,8 +497,8 @@ class JitServiceImpl implements JitService { log.error("Invalid team : {} for jit request", jitRequestDto.getTeam()); throw new IllegalArgumentException("Invalid team"); } - if ( !jitRequestDto.getRequestedBy().equals(onCallApproverEmail) && - jitRequestDto.getGrantWindow() > maxGrantWindow + if (!jitRequestDto.getRequestedBy().equals(onCallApproverEmail) + && jitRequestDto.getGrantWindow() > maxGrantWindow ) { log.error("Request forged. Invalid grant window by user: {}", jitRequestDto.getRequestedFor()); From 0925c85961071cacc2e7ae732860c5517d2b40e7 Mon Sep 17 00:00:00 2001 From: Saqib Perwaiz Date: Tue, 3 Dec 2024 13:58:00 +0530 Subject: [PATCH 3/4] INFRA-4035 | Saqib | Removes unused imports --- kutegen | 2 +- .../com/navi/infra/portal/v2/jit/service/JitServiceImpl.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/kutegen b/kutegen index e2d0c8e2..48d4f5db 160000 --- a/kutegen +++ b/kutegen @@ -1 +1 @@ -Subproject commit e2d0c8e219b91d1b1df3276f999437776aba2ff4 +Subproject commit 48d4f5dbba0254561f22121b3113aa07bd36312d diff --git a/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java b/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java index 98176c98..f429467f 100644 --- a/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java +++ b/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java @@ -33,7 +33,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; From 80ee70b0c7b24132dd02257f93e78b4a30379a17 Mon Sep 17 00:00:00 2001 From: Saqib Perwaiz Date: Tue, 3 Dec 2024 14:08:27 +0530 Subject: [PATCH 4/4] INFRA-4035 | Saqib | Update kutegen --- kutegen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kutegen b/kutegen index 48d4f5db..e2d0c8e2 160000 --- a/kutegen +++ b/kutegen @@ -1 +1 @@ -Subproject commit 48d4f5dbba0254561f22121b3113aa07bd36312d +Subproject commit e2d0c8e219b91d1b1df3276f999437776aba2ff4