Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MaxKey单点登录官方(MaxKeyTop)
MaxKey
提交
e2e58ac7
MaxKey
项目概览
MaxKey单点登录官方(MaxKeyTop)
/
MaxKey
9 个月 前同步成功
通知
75
Star
3
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MaxKey
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
e2e58ac7
编写于
9月 01, 2020
作者:
MaxKey单点登录官方
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
v 2.2.0 RC2
上级
d80dfb7b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
24 addition
and
7 deletion
+24
-7
ReleaseNotes.txt
ReleaseNotes.txt
+3
-1
maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java
.../main/java/org/maxkey/domain/apps/AppsOAuth20Details.java
+2
-0
maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/ClientDetails.java
...org/maxkey/domain/apps/oauth2/provider/ClientDetails.java
+2
-0
maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/BaseClientDetails.java
...domain/apps/oauth2/provider/client/BaseClientDetails.java
+12
-1
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java
...uthz/oauth2/provider/client/JdbcClientDetailsService.java
+5
-5
未找到文件。
ReleaseNotes.txt
浏览文件 @
e2e58ac7
...
...
@@ -13,7 +13,9 @@
*(MAXKEY-200812) MGT管理密码修改增加自动密码生成
*(MAXKEY-200813) 优化TOKENBASED令牌内容的配置
*(MAXKEY-200814) 修复初始化密码和密码过期修改后错误问题
*(MAXKEY-200715) 依赖jar升级
*(MAXKEY-200815) 修复OAuth 2.0管理端的跳过确认提示不能修改
*(MAXKEY-200816) 应用管理修改时关闭修正
*(MAXKEY-200817) 依赖jar升级
passay 1.6.0
springBoot 2.3.3.RELEASE
springSecurity 5.3.4.RELEASE
...
...
maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java
浏览文件 @
e2e58ac7
...
...
@@ -106,6 +106,7 @@ public class AppsOAuth20Details extends Apps {
this
.
userInfoSigningAlgorithm
=
baseClientDetails
.
getUserInfoSigningAlgorithm
();
this
.
jwksUri
=
baseClientDetails
.
getJwksUri
();
this
.
approvalPrompt
=
baseClientDetails
.
getApprovalPrompt
();
}
...
...
@@ -322,6 +323,7 @@ public class AppsOAuth20Details extends Apps {
baseClientDetails
.
setUserInfoSigningAlgorithm
(
this
.
getUserInfoSigningAlgorithm
());
baseClientDetails
.
setJwksUri
(
this
.
getJwksUri
());
baseClientDetails
.
setApprovalPrompt
(
this
.
getApprovalPrompt
());
return
baseClientDetails
;
}
...
...
maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/ClientDetails.java
浏览文件 @
e2e58ac7
...
...
@@ -145,5 +145,7 @@ public interface ClientDetails extends Serializable {
public
String
getUserInfoEncryptionMethod
();
public
String
getJwksUri
();
public
String
getApprovalPrompt
();
}
maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/BaseClientDetails.java
浏览文件 @
e2e58ac7
...
...
@@ -92,6 +92,8 @@ public class BaseClientDetails implements ClientDetails {
private
String
jwksUri
;
private
String
approvalPrompt
;
public
BaseClientDetails
()
{
}
...
...
@@ -360,7 +362,16 @@ public class BaseClientDetails implements ClientDetails {
this
.
jwksUri
=
jwksUri
;
}
@Override
public
String
getApprovalPrompt
()
{
return
approvalPrompt
;
}
public
void
setApprovalPrompt
(
String
approvalPrompt
)
{
this
.
approvalPrompt
=
approvalPrompt
;
}
@Override
public
int
hashCode
()
{
final
int
prime
=
31
;
int
result
=
1
;
...
...
maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/client/JdbcClientDetailsService.java
浏览文件 @
e2e58ac7
...
...
@@ -47,8 +47,6 @@ import org.springframework.util.Assert;
import
org.springframework.util.ClassUtils
;
import
org.springframework.util.StringUtils
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
/**
* Basic, JDBC implementation of the client details service.
*/
...
...
@@ -60,7 +58,7 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg
private
static
final
String
CLIENT_FIELDS_FOR_UPDATE
=
"RESOURCE_IDS, SCOPE, "
+
"AUTHORIZED_GRANT_TYPES, WEB_SERVER_REDIRECT_URI, AUTHORITIES, ACCESS_TOKEN_VALIDITY, "
+
"REFRESH_TOKEN_VALIDITY, ADDITIONAL_INFORMATION, AUTOAPPROVE, "
+
"REFRESH_TOKEN_VALIDITY, ADDITIONAL_INFORMATION, AUTOAPPROVE,
APPROVALPROMPT ,
"
+
"IDTOKENSIGNINGALGORITHM, IDTOKENENCRYPTEDALGORITHM, IDTOKENENCRYPTIONMETHOD, "
+
"USERINFOSIGNINGALGORITHM, USERINFOCRYPTEDALGORITHM, USERINFOENCRYPTIONMETHOD, JWKSURI"
;
...
...
@@ -74,7 +72,7 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg
private
static
final
String
DEFAULT_SELECT_STATEMENT
=
BASE_FIND_STATEMENT
+
" where client_id = ?"
;
private
static
final
String
DEFAULT_INSERT_STATEMENT
=
"insert into mxk_apps_oauth_client_details ("
+
CLIENT_FIELDS
+
", client_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
;
+
", client_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?
,?
)"
;
private
static
final
String
DEFAULT_UPDATE_STATEMENT
=
"update mxk_apps_oauth_client_details "
+
"set "
+
CLIENT_FIELDS_FOR_UPDATE
.
replaceAll
(
", "
,
"=?, "
)
+
"=? where client_id = ?"
;
...
...
@@ -194,7 +192,8 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg
?
StringUtils
.
collectionToCommaDelimitedString
(
clientDetails
.
getAuthorities
())
:
null
,
clientDetails
.
getAccessTokenValiditySeconds
(),
clientDetails
.
getRefreshTokenValiditySeconds
(),
json
,
getAutoApproveScopes
(
clientDetails
),
clientDetails
.
getIdTokenSigningAlgorithm
(),
getAutoApproveScopes
(
clientDetails
),
clientDetails
.
getApprovalPrompt
(),
clientDetails
.
getIdTokenSigningAlgorithm
(),
clientDetails
.
getIdTokenEncryptedAlgorithm
(),
clientDetails
.
getIdTokenEncryptionMethod
(),
clientDetails
.
getUserInfoSigningAlgorithm
(),
clientDetails
.
getUserInfoEncryptedAlgorithm
(),
clientDetails
.
getUserInfoEncryptionMethod
(),
clientDetails
.
getJwksUri
(),
clientDetails
.
getClientId
()
};
...
...
@@ -279,6 +278,7 @@ public class JdbcClientDetailsService implements ClientDetailsService, ClientReg
details
.
setUserInfoEncryptionMethod
(
rs
.
getString
(
"USERINFOENCRYPTIONMETHOD"
));
details
.
setUserInfoSigningAlgorithm
(
rs
.
getString
(
"USERINFOSIGNINGALGORITHM"
));
details
.
setJwksUri
(
rs
.
getString
(
"JWKSURI"
));
details
.
setApprovalPrompt
(
rs
.
getString
(
"APPROVALPROMPT"
));
String
json
=
rs
.
getString
(
10
);
if
(
json
!=
null
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录