Allow Slack API endpoints (#1105)

opendatadiscovery · Nov 14, 2022 · 846c537 · 846c537
1 parent 5f00c0e
commit 846c537
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...form-api/src/main/java/org/opendatadiscovery/oddplatform/auth/util/SecurityConstants.java b/...form-api/src/main/java/org/opendatadiscovery/oddplatform/auth/util/SecurityConstants.java
@@ -71,8 +71,8 @@
 
 @UtilityClass
 public final class SecurityConstants {
-
-    public static final String[] WHITELIST_PATHS = {"/actuator/**", "/favicon.ico", "/ingestion/**", "/img/**"};
+    public static final String[] WHITELIST_PATHS =
+        {"/actuator/**", "/favicon.ico", "/ingestion/**", "/img/**", "/api/slack/events"};
 
     public static final List<SecurityRule> SECURITY_RULES = List.of(
         new SecurityRule(NO_CONTEXT,

diff --git a/...rc/main/java/org/opendatadiscovery/oddplatform/config/LoginFormSecurityConfiguration.java b/...rc/main/java/org/opendatadiscovery/oddplatform/config/LoginFormSecurityConfiguration.java
@@ -45,7 +45,7 @@ public SecurityWebFilterChain securityWebFilterChainLoginForm(
         return http
             .csrf().disable()
             .authorizeExchange()
-            .pathMatchers("/actuator/health", "/favicon.ico", "/ingestion/entities").permitAll()
+            .pathMatchers("/actuator/health", "/favicon.ico", "/ingestion/entities", "/api/slack/events").permitAll()
             .pathMatchers("/**").authenticated()
             .and().formLogin().authenticationSuccessHandler(authHandler)
             .and().logout()

diff --git a/...pi/src/main/java/org/opendatadiscovery/oddplatform/controller/AlertManagerController.java b/...pi/src/main/java/org/opendatadiscovery/oddplatform/controller/AlertManagerController.java
@@ -7,8 +7,8 @@
 import org.opendatadiscovery.oddplatform.dto.alert.ExternalAlert;
 import org.opendatadiscovery.oddplatform.service.AlertService;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Mono;
 
@@ -18,7 +18,7 @@ public class AlertManagerController {
     private final AlertService alertService;
 
     // TODO: define OpenAPI spec based on alert provider contract
-    @RequestMapping("ingestion/alert/alertmanager")
+    @PostMapping(path = "ingestion/alert/alertmanager")
     public Mono<ResponseEntity<Void>> alertManagerWebhook(@RequestBody final Mono<AlertManagerRequest> request) {
         return request
             .flatMap(req -> alertService.handleExternalAlerts(req.getAlerts()))

diff --git a/...va/org/opendatadiscovery/oddplatform/datacollaboration/controller/EventApiController.java b/...va/org/opendatadiscovery/oddplatform/datacollaboration/controller/EventApiController.java
@@ -6,8 +6,8 @@
 import org.opendatadiscovery.oddplatform.datacollaboration.controller.parser.SlackEventParser;
 import org.opendatadiscovery.oddplatform.datacollaboration.service.DataCollaborationService;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Mono;
 
@@ -19,7 +19,7 @@ public class EventApiController {
     private final DataCollaborationService dataCollaborationService;
     private final SlackEventParser slackEventParser;
 
-    @RequestMapping("/api/slack/events")
+    @PostMapping(path = "/api/slack/events")
     public Mono<ResponseEntity<SlackEventResponse>> handleSlackEvent(
         @RequestBody final Mono<String> rawRequestBody
     ) {