From 9295ab4f88098b4b7e705eb94b37c3181e2aee08 Mon Sep 17 00:00:00 2001 From: harsha Date: Thu, 7 Oct 2021 12:04:20 +0530 Subject: [PATCH 1/2] OP-7668 : Added mapping URLs --- .../gate/controllers/OpsmxAutopilotController.groovy | 11 ++++++----- .../services/internal/OpsmxAutopilotService.groovy | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxAutopilotController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxAutopilotController.groovy index 5d695f929b..0d34d2c3ba 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxAutopilotController.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/OpsmxAutopilotController.groovy @@ -272,12 +272,13 @@ class OpsmxAutopilotController { @ApiOperation(value = "Endpoint for autopilot rest services") @RequestMapping(value = "/{type}/{source}/{source1}/{source2}/{source3}", method = RequestMethod.GET) Object getAutoResponse6(@PathVariable("type") String type, - @PathVariable("source") String source, - @PathVariable("source1") String source1, - @PathVariable("source2") String source2, - @PathVariable("source3") String source3) { + @PathVariable("source") String source, + @PathVariable("source1") String source1, + @PathVariable("source2") String source2, + @PathVariable("source3") String source3, + @RequestParam(value = "verificationType", required = false) String verificationType) { - return opsmxAutopilotService.getAutoResponse6(type, source, source1, source2, source3) + return opsmxAutopilotService.getAutoResponse6(type, source, source1, source2, source3, verificationType) } @ApiOperation(value = "Endpoint for autopilot rest services") diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxAutopilotService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxAutopilotService.groovy index 4899b952ab..5147e9e6f8 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxAutopilotService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/OpsmxAutopilotService.groovy @@ -126,10 +126,11 @@ interface OpsmxAutopilotService { @GET("/autopilot/{type}/{source}/{source1}/{source2}/{source3}") Object getAutoResponse6(@Path('type') String type, - @Path('source') String source, - @Path('source1') String source1, - @Path('source2') String source2, - @Path('source3') String source3) + @Path('source') String source, + @Path('source1') String source1, + @Path('source2') String source2, + @Path('source3') String source3, + @Query("verificationType") String verificationType) @GET("/autopilot/{type}/{source}/{source1}/{source2}/{source3}/{source4}") Object getAutoResponse7(@Path('type') String type, From 81ddb69a538af6b3ff673adfc3427ed10ce43d25 Mon Sep 17 00:00:00 2001 From: Pranav-b-7 Date: Thu, 7 Oct 2021 19:25:56 +0530 Subject: [PATCH 2/2] Auth turned off for /oes/echo/ and /auditservice/v1/echo/events/data/ --- .../com/netflix/spinnaker/gate/config/AuthConfig.groovy | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gate-core/src/main/groovy/com/netflix/spinnaker/gate/config/AuthConfig.groovy b/gate-core/src/main/groovy/com/netflix/spinnaker/gate/config/AuthConfig.groovy index f2f53cf204..198a079d48 100644 --- a/gate-core/src/main/groovy/com/netflix/spinnaker/gate/config/AuthConfig.groovy +++ b/gate-core/src/main/groovy/com/netflix/spinnaker/gate/config/AuthConfig.groovy @@ -116,7 +116,9 @@ class AuthConfig { .antMatchers(HttpMethod.GET,'/visibilityservice/v2/approvalGateInstances/{id}/status').permitAll() .antMatchers(HttpMethod.GET,'/visibilityservice/v1/approvalGateInstances/{id}/status').permitAll() .antMatchers(HttpMethod.POST,'/oes/echo').permitAll() + .antMatchers(HttpMethod.POST,'/oes/echo/').permitAll() .antMatchers(HttpMethod.POST,'/auditservice/v1/echo/events/data').permitAll() + .antMatchers(HttpMethod.POST,'/auditservice/v1/echo/events/data/').permitAll() .antMatchers(HttpMethod.GET,'/autopilot/mgmt/**').permitAll() .antMatchers('/plugins/deck/**').permitAll() .antMatchers(HttpMethod.POST, '/webhooks/**').permitAll() @@ -181,7 +183,9 @@ class AuthConfig { .antMatchers(HttpMethod.GET,'/visibilityservice/v2/approvalGateInstances/{id}/status').permitAll() .antMatchers(HttpMethod.GET,'/visibilityservice/v1/approvalGateInstances/{id}/status').permitAll() .antMatchers(HttpMethod.POST,'/oes/echo').permitAll() + .antMatchers(HttpMethod.POST,'/oes/echo/').permitAll() .antMatchers(HttpMethod.POST,'/auditservice/v1/echo/events/data').permitAll() + .antMatchers(HttpMethod.POST,'/auditservice/v1/echo/events/data/').permitAll() .antMatchers(HttpMethod.GET,'/autopilot/mgmt/**').permitAll() .antMatchers('/**/favicon.ico').permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()