From 761414f73bc737b7804143d6a454ae8abd3c8389 Mon Sep 17 00:00:00 2001
From: Alok Joshi <AJoshi19@slb.com>
Date: Thu, 16 Feb 2023 09:11:31 -0600
Subject: [PATCH] bypass info and swagger apis in collaboration filter
---
.../osdu/storage/util/CollaborationFilter.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/storage-core/src/main/java/org/opengroup/osdu/storage/util/CollaborationFilter.java b/storage-core/src/main/java/org/opengroup/osdu/storage/util/CollaborationFilter.java
index bee6cbd2a..3beaa8b68 100644
--- a/storage-core/src/main/java/org/opengroup/osdu/storage/util/CollaborationFilter.java
+++ b/storage-core/src/main/java/org/opengroup/osdu/storage/util/CollaborationFilter.java
@@ -22,8 +22,6 @@ import static org.opengroup.osdu.storage.util.StringConstants.COLLABORATIONS_FEA
@Component
public class CollaborationFilter implements Filter {
public static final String X_COLLABORATION_HEADER_NAME = "x-collaboration";
- private static final String DATA_PARTITION_ID = "data-partition-id";
-
@Autowired
public IFeatureFlag collaborationFeatureFlag;
@@ -31,10 +29,18 @@ public class CollaborationFilter implements Filter {
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
+
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ if(httpRequest.getRequestURI().contains("info") ||
+ httpRequest.getRequestURI().contains("swagger") ||
+ httpRequest.getRequestURI().contains("health") ||
+ httpRequest.getRequestURI().contains("api-docs"))
+ return;
+
HttpServletResponse httpResponse = (HttpServletResponse) response;
if (!collaborationFeatureFlag.isFeatureEnabled(COLLABORATIONS_FEATURE_NAME)) {
- String collaborationHeader = ((HttpServletRequest) request).getHeader(X_COLLABORATION_HEADER_NAME);
+ String collaborationHeader = httpRequest.getHeader(X_COLLABORATION_HEADER_NAME);
if (!Strings.isNullOrEmpty(collaborationHeader)) {
httpResponse.setContentType(MediaType.APPLICATION_JSON_VALUE);
httpResponse.setStatus(HttpStatus.SC_LOCKED);
--
GitLab