From 35d1053dc063f2efbd7e204e15b1027a268ea89d Mon Sep 17 00:00:00 2001 From: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:42:37 +0530 Subject: [PATCH] Add Cache-Control and Pragma Header (#18406) * Add Cache Control and Pragma to Asset Servlet * Add on null Or Empty --- .../service/exception/OMErrorPageHandler.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/exception/OMErrorPageHandler.java b/openmetadata-service/src/main/java/org/openmetadata/service/exception/OMErrorPageHandler.java index 65cf21c4c2e..d629efc6618 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/exception/OMErrorPageHandler.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/exception/OMErrorPageHandler.java @@ -1,5 +1,7 @@ package org.openmetadata.service.exception; +import static org.openmetadata.common.utils.CommonUtil.nullOrEmpty; + import java.io.IOException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -13,6 +15,8 @@ import org.openmetadata.service.config.OMWebConfiguration; @Slf4j public class OMErrorPageHandler extends ErrorPageErrorHandler { + private static final String CACHE_CONTROL_HEADER = "Cache-Control"; + private static final String PRAGMA_HEADER = "Pragma"; private final OMWebConfiguration webConfiguration; public OMErrorPageHandler(OMWebConfiguration webConfiguration) { @@ -88,6 +92,16 @@ public class OMErrorPageHandler extends ErrorPageErrorHandler { // Policy Permission webConfiguration.getPermissionPolicyHeaderFactory().build().forEach(response::setHeader); + // Cache-Control + if (!nullOrEmpty(webConfiguration.getCacheControl())) { + response.setHeader(CACHE_CONTROL_HEADER, webConfiguration.getCacheControl()); + } + + // Pragma + if (!nullOrEmpty(webConfiguration.getPragma())) { + response.setHeader(PRAGMA_HEADER, webConfiguration.getPragma()); + } + // Additional Headers webConfiguration.getHeaders().forEach(response::setHeader); }