dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12050 from dataease/pr@dev@fix_cas_report_task

Browse Source 
fix(X-Pack): CAS登录用户使用定时报告无效
This commit is contained in:
fit2cloud-chenyw 2024-09-05 15:50:12 +08:00 committed by GitHub
commit df3e6b1174
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 71 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/backend/src/main/java/io/dataease/auth/config/cas/CasStrategy.java
View File

@ -1,9 +1,14 @@
package io.dataease.auth.config.cas;
import com.auth0.jwt.JWT;
import com.auth0.jwt.interfaces.Claim;
import com.auth0.jwt.interfaces.DecodedJWT;
import io.dataease.auth.service.impl.ShiroServiceImpl;
import io.dataease.commons.utils.CommonBeanFactory;
import io.dataease.commons.utils.LogUtil;
import io.dataease.commons.utils.ServletUtils;
import io.dataease.service.system.SystemParameterService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.util.AntPathMatcher;
import org.jasig.cas.client.authentication.UrlPatternMatcherStrategy;
@ -38,9 +43,9 @@ public class CasStrategy implements UrlPatternMatcherStrategy {
s = s.substring(beginIndex + serverName.length());
}
if (StringUtils.equals("/", s)) {
if (fromLink(serverName)) return true;
return false;
return fromLink(serverName);
}
if (fromShot()) return true;
if (StringUtils.equals("/login", s)) return false;
if (StringUtils.startsWith(s, "/cas/callBack")) return false;
if (StringUtils.equals("/api/auth/deLogout", s)) return true;
@ -74,4 +79,17 @@ public class CasStrategy implements UrlPatternMatcherStrategy {
}
return false;
}
private Boolean fromShot() {
String token = ServletUtils.getToken();
if (StringUtils.isBlank(token)) return false;
try {
DecodedJWT jwt = JWT.decode(token);
Claim forShot = jwt.getClaim("forShot");
return ObjectUtils.isNotEmpty(forShot) && forShot.asBoolean();
} catch (Exception e) {
LogUtil.error(e.getMessage());
return false;
}
}
}

12
core/backend/src/main/java/io/dataease/auth/util/JWTUtils.java
View File

@ -125,6 +125,18 @@ public class JWTUtils {
return IPUtils.get();
}
public static String signShotToken(TokenInfo tokenInfo, String secret) {
Long userId = tokenInfo.getUserId();
long expireTimeMillis = getExpireTime();
Date date = new Date(System.currentTimeMillis() + expireTimeMillis);
Algorithm algorithm = Algorithm.HMAC256(secret);
Builder builder = JWT.create()
.withClaim("username", tokenInfo.getUsername())
.withClaim("forShot", true)
.withClaim("userId", userId);
return builder.withExpiresAt(date).sign(algorithm);
}
public static String sign(TokenInfo tokenInfo, String secret, boolean writeOnline) {
Long userId = tokenInfo.getUserId();

10
core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java
View File

@ -435,9 +435,7 @@ public class EmailTaskHandler extends TaskHandler implements Job {
private String tokenByUser(SysUserEntity user) {
TokenInfo tokenInfo = TokenInfo.builder().userId(user.getUserId()).username(user.getUsername()).build();
String token = JWTUtils.sign(tokenInfo, user.getPassword(), false);
return token;
return JWTUtils.signShotToken(tokenInfo, user.getPassword());
}
private String panelUrl(String panelId) {
@ -445,4 +443,10 @@ public class EmailTaskHandler extends TaskHandler implements Job {
return domain + "/#/previewScreenShot/" + panelId + "/true";
}
public static void main(String[] args) {
TokenInfo tokenInfo = TokenInfo.builder().userId(1L).username("admin").build();
String contextPath = JWTUtils.signShotToken(tokenInfo, "ae8000252199d4f2aa00e3b99e6f9934");
System.out.println(contextPath);
}
}

55
core/frontend/public/link.html
View File

@ -29,30 +29,39 @@
}
return (false)
}
const link = getQueryVariable('link')
const user = getQueryVariable('user')
const terminal = getQueryVariable('terminal')
const attachParams = getQueryVariable('attachParams')
const fromLink = getQueryVariable('fromLink')
const ticket = getQueryVariable('ticket')
const baseUrl = window.location.pathname.replace('link.html', '')
let url = baseUrl + "#/delink?link=" + encodeURIComponent(link)
if (terminal) {
url += '&terminal=' + terminal
const shot = getQueryVariable('shot')
if (shot) {
const panelId = getQueryVariable('panelId')
const baseUrl = window.location.pathname.replace('link.html', '')
const shoturl = baseUrl + "#/previewScreenShot/" + panelId + "/true"
window.location.href = shoturl
} else {
const link = getQueryVariable('link')
const user = getQueryVariable('user')
const terminal = getQueryVariable('terminal')
const attachParams = getQueryVariable('attachParams')
const fromLink = getQueryVariable('fromLink')
const ticket = getQueryVariable('ticket')
const baseUrl = window.location.pathname.replace('link.html', '')
let url = baseUrl + "#/delink?link=" + encodeURIComponent(link)
if (terminal) {
url += '&terminal=' + terminal
}
if (user) {
url += '&user=' + encodeURIComponent(user)
}
if (attachParams) {
url += '&attachParams=' + encodeURIComponent(attachParams)
}
if (fromLink) {
url += '&fromLink=' + fromLink
}
if (ticket) {
url += '&ticket=' + ticket
}
window.location.href = url
}
if (user) {
url += '&user=' + encodeURIComponent(user)
}
if (attachParams) {
url += '&attachParams=' + encodeURIComponent(attachParams)
}
if (fromLink) {
url += '&fromLink=' + fromLink
}
if (ticket) {
url += '&ticket=' + ticket
}
window.location.href = url
</script>
</html>