From 1b59f3f78562b09d33ee07c9dea19e5dcf700c83 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 29 Nov 2024 15:21:58 +0800 Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20CAS=E6=96=B9=E5=BC=8F=E7=99=BB?= =?UTF-8?q?=E5=BD=95api=E9=89=B4=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- .../src/main/java/io/dataease/constant/AuthConstant.java | 2 ++ .../src/main/java/io/dataease/utils/WhitelistUtils.java | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/de-xpack b/de-xpack index 13ecdfab14..30f243bb49 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 13ecdfab148086cf6e66fed2bcb41d88fdd5efab +Subproject commit 30f243bb49f9bafb9e987d0ff9d2533ce3fb5810 diff --git a/sdk/common/src/main/java/io/dataease/constant/AuthConstant.java b/sdk/common/src/main/java/io/dataease/constant/AuthConstant.java index 730f1133f0..60c94fa93f 100644 --- a/sdk/common/src/main/java/io/dataease/constant/AuthConstant.java +++ b/sdk/common/src/main/java/io/dataease/constant/AuthConstant.java @@ -12,6 +12,8 @@ public class AuthConstant { public final static String CAS_X_USER = "X-CAS-USER"; public final static String DE_API_PREFIX = "/de2api"; + public final static String DE_CASAPI_PREFIX = "/casbi/de2api"; + public final static String DE_OIDCAPI_PREFIX = "/oidcbi/de2api"; // public final static String REFRESH_TOKEN_KEY = "X-DE-REFRESH-TOKEN"; diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java index 7473f88ff8..2dd9125645 100644 --- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java @@ -58,6 +58,12 @@ public class WhitelistUtils { if (StringUtils.startsWith(requestURI, AuthConstant.DE_API_PREFIX)) { requestURI = requestURI.replaceFirst(AuthConstant.DE_API_PREFIX, ""); } + if (StringUtils.startsWith(requestURI, AuthConstant.DE_CASAPI_PREFIX)) { + requestURI = requestURI.replaceFirst(AuthConstant.DE_CASAPI_PREFIX, ""); + } + if (StringUtils.startsWith(requestURI, AuthConstant.DE_OIDCAPI_PREFIX)) { + requestURI = requestURI.replaceFirst(AuthConstant.DE_OIDCAPI_PREFIX, ""); + } return WHITE_PATH.contains(requestURI) || StringUtils.endsWithAny(requestURI, ".ico", "js", ".css", "svg", "png", "jpg", "js.map", ".otf", ".ttf", ".woff2") || StringUtils.startsWithAny(requestURI, "data:image")