Skip to content
Snippets Groups Projects
Commit 5282e867 authored by Yurii Ruban [EPAM / GCP]'s avatar Yurii Ruban [EPAM / GCP]
Browse files

Excluded push API point

parent ead4aba0
No related branches found
No related tags found
1 merge request!561GC\CI - Disable PubSub push endpoint.
Pipeline #314280 failed
......@@ -30,8 +30,6 @@ import org.opengroup.osdu.notification.provider.interfaces.IServiceAccountValida
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.context.annotation.RequestScope;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Arrays;
......@@ -53,7 +51,6 @@ public class AuthorizationFilter {
private ICache<String, Groups> cache;
public boolean hasAnyPermission(String... requiredRoles) {
requestInfoExt.checkHeaders(getRequest());
DpsHeaders dpsHeaders = requestInfoExt.getHeaders();
if (StringUtils.isBlank(dpsHeaders.getAuthorization()))
throw new AppException(302, "Redirect", "No credentials sent on request.");
......@@ -62,9 +59,8 @@ public class AuthorizationFilter {
requestInfoExt.assignPartitionIdIfNotInHeader();
}
HttpServletRequest request = getRequest();
String path = request != null ? request.getServletPath() : "";
if (request != null && "GET".equals(request.getMethod()) &&
String path = request.getServletPath();
if ("GET".equals(request.getMethod()) &&
(path.equals("/swagger-ui.html") || path.equals("/info"))) {
return true;
}
......@@ -116,9 +112,4 @@ public class AuthorizationFilter {
requestInfoExt.setHeaders(dpsHeaders);
return authorizationResponse;
}
private HttpServletRequest getRequest() {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
return attributes != null ? attributes.getRequest() : null;
}
}
......@@ -68,14 +68,4 @@ public class RequestInfoExt extends RequestInfo {
headers.put(DpsHeaders.DATA_PARTITION_ID, tenant);
}
}
public void checkHeaders(HttpServletRequest request) {
if (request != null) {
Map<String, String> headersFromRequest = Collections
.list(request.getHeaderNames())
.stream()
.collect(Collectors.toMap(h -> h, request::getHeader));
this.setHeaders(DpsHeaders.createFromMap(headersFromRequest));
}
}
}
......@@ -16,6 +16,7 @@
package org.opengroup.osdu.notification.provider.gcp;
import org.opengroup.osdu.notification.api.PubsubEndpoint;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
......@@ -26,6 +27,11 @@ import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication
@ComponentScan(value = {"org.opengroup.osdu"}, excludeFilters = {
@Filter(
type = FilterType.ASSIGNABLE_TYPE,
value = {
PubsubEndpoint.class
}),
@Filter(
type = FilterType.REGEX,
pattern = {"org.opengroup.osdu.core.gcp.multitenancy.StorageFactory"}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment