Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Pig
提交
e39355c3
P
Pig
项目概览
int
/
Pig
上一次同步 大约 1 年
通知
8
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Pig
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e39355c3
编写于
6月 17, 2021
作者:
L
lbw
浏览文件
操作
浏览文件
下载
差异文件
🐛
fix #I3VH9H PigUserDetailsServiceImpl.loadUserByUsername中无法使用WebUtils.getClientId
上级
52c91058
a50a32bc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
4 deletion
+18
-4
pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/WebUtils.java
...ain/java/com/pig4cloud/pig/common/core/util/WebUtils.java
+16
-2
pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java
...g4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java
+1
-1
pom.xml
pom.xml
+1
-1
未找到文件。
pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/WebUtils.java
浏览文件 @
e39355c3
...
@@ -34,8 +34,10 @@ import org.springframework.web.method.HandlerMethod;
...
@@ -34,8 +34,10 @@ import org.springframework.web.method.HandlerMethod;
import
javax.servlet.http.Cookie
;
import
javax.servlet.http.Cookie
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.validation.constraints.NotNull
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
java.io.PrintWriter
;
import
java.io.UnsupportedEncodingException
;
import
java.nio.charset.StandardCharsets
;
import
java.nio.charset.StandardCharsets
;
/**
/**
...
@@ -154,13 +156,25 @@ public class WebUtils extends org.springframework.web.util.WebUtils {
...
@@ -154,13 +156,25 @@ public class WebUtils extends org.springframework.web.util.WebUtils {
* @return
* @return
*/
*/
@SneakyThrows
@SneakyThrows
public
String
[]
getClientId
(
ServerHttpRequest
request
)
{
public
String
getClientId
(
ServerHttpRequest
request
)
{
String
header
=
request
.
getHeaders
().
getFirst
(
HttpHeaders
.
AUTHORIZATION
);
String
header
=
request
.
getHeaders
().
getFirst
(
HttpHeaders
.
AUTHORIZATION
);
return
splitClient
(
header
)[
0
];
}
@SneakyThrows
public
String
getClientId
(
HttpServletRequest
request
)
{
String
header
=
WebUtils
.
getRequest
().
getHeader
(
"Authorization"
);
return
splitClient
(
header
)[
0
];
}
@NotNull
private
static
String
[]
splitClient
(
String
header
)
throws
UnsupportedEncodingException
{
if
(
header
==
null
||
!
header
.
startsWith
(
BASIC_
))
{
if
(
header
==
null
||
!
header
.
startsWith
(
BASIC_
))
{
throw
new
CheckedException
(
"请求头中client信息为空"
);
throw
new
CheckedException
(
"请求头中client信息为空"
);
}
}
byte
[]
base64Token
=
header
.
substring
(
6
).
getBytes
(
"UTF-8"
);
byte
[]
base64Token
=
header
.
substring
(
6
).
getBytes
(
StandardCharsets
.
UTF_8
);
byte
[]
decoded
;
byte
[]
decoded
;
try
{
try
{
decoded
=
Base64
.
decode
(
base64Token
);
decoded
=
Base64
.
decode
(
base64Token
);
...
...
pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java
浏览文件 @
e39355c3
...
@@ -60,7 +60,7 @@ public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory<Obje
...
@@ -60,7 +60,7 @@ public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory<Obje
ServerHttpRequest
request
=
exchange
.
getRequest
();
ServerHttpRequest
request
=
exchange
.
getRequest
();
boolean
isAuthToken
=
CharSequenceUtil
.
containsAnyIgnoreCase
(
request
.
getURI
().
getPath
(),
boolean
isAuthToken
=
CharSequenceUtil
.
containsAnyIgnoreCase
(
request
.
getURI
().
getPath
(),
SecurityConstants
.
OAUTH_TOKEN_URL
);
SecurityConstants
.
OAUTH_TOKEN_URL
);
boolean
isIgnoreClient
=
configProperties
.
getIgnoreClients
().
contains
(
WebUtils
.
getClientId
(
request
)
[
0
]
);
boolean
isIgnoreClient
=
configProperties
.
getIgnoreClients
().
contains
(
WebUtils
.
getClientId
(
request
));
try
{
try
{
// only oauth and the request not in ignore clients need check code.
// only oauth and the request not in ignore clients need check code.
if
(
isAuthToken
&&
!
isIgnoreClient
)
{
if
(
isAuthToken
&&
!
isIgnoreClient
)
{
...
...
pom.xml
浏览文件 @
e39355c3
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
<maven.compiler.target>
1.8
</maven.compiler.target>
<maven.compiler.target>
1.8
</maven.compiler.target>
<spring-boot-admin.version>
2.4.1
</spring-boot-admin.version>
<spring-boot-admin.version>
2.4.1
</spring-boot-admin.version>
<hutool.version>
5.6.7
</hutool.version>
<hutool.version>
5.6.7
</hutool.version>
<mybatis-plus.version>
3.
3.4.1
</mybatis-plus.version>
<mybatis-plus.version>
3.
4.3
</mybatis-plus.version>
<dynamic-ds.version>
3.4.0
</dynamic-ds.version>
<dynamic-ds.version>
3.4.0
</dynamic-ds.version>
<captcha.version>
2.2.0
</captcha.version>
<captcha.version>
2.2.0
</captcha.version>
<velocity.version>
1.7
</velocity.version>
<velocity.version>
1.7
</velocity.version>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录