Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
21939ae1
提交
21939ae1
authored
9月 26, 2021
作者:
fit2cloud-chenyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 修复oidc缺失信息报错方式
上级
ddd21356
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
54 行增加
和
33 行删除
+54
-33
SSOServer.java
...d/src/main/java/io/dataease/plugins/server/SSOServer.java
+52
-32
index.vue
frontend/src/views/login/index.vue
+2
-1
没有找到文件。
backend/src/main/java/io/dataease/plugins/server/SSOServer.java
浏览文件 @
21939ae1
package
io
.
dataease
.
plugins
.
server
;
package
io
.
dataease
.
plugins
.
server
;
import
java.io.UnsupportedEncodingException
;
import
java.net.URLEncoder
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -39,39 +41,57 @@ public class SSOServer {
...
@@ -39,39 +41,57 @@ public class SSOServer {
@GetMapping
(
"/callBack"
)
@GetMapping
(
"/callBack"
)
public
ModelAndView
callBack
(
@RequestParam
(
"code"
)
String
code
,
@RequestParam
(
"state"
)
String
state
)
{
public
ModelAndView
callBack
(
@RequestParam
(
"code"
)
String
code
,
@RequestParam
(
"state"
)
String
state
)
{
Map
<
String
,
OidcXpackService
>
beansOfType
=
SpringContextUtil
.
getApplicationContext
().
getBeansOfType
((
OidcXpackService
.
class
));
ModelAndView
modelAndView
=
new
ModelAndView
(
"redirect:/"
);
if
(
beansOfType
.
keySet
().
size
()
==
0
)
{
HttpServletResponse
response
=
ServletUtils
.
response
();
DEException
.
throwException
(
"缺少oidc插件"
);
}
OidcXpackService
oidcXpackService
=
SpringContextUtil
.
getBean
(
OidcXpackService
.
class
);
Boolean
suuportOIDC
=
oidcXpackService
.
isSuuportOIDC
();
if
(!
suuportOIDC
)
{
DEException
.
throwException
(
"未开启oidc"
);
}
Map
<
String
,
String
>
config
=
config
(
oidcXpackService
);
SSOToken
ssoToken
=
oidcXpackService
.
requestSsoToken
(
config
,
code
,
state
);
SSOUserInfo
ssoUserInfo
=
oidcXpackService
.
requestUserInfo
(
config
,
ssoToken
.
getAccessToken
());
SysUserEntity
sysUserEntity
=
authUserService
.
getUserBySub
(
ssoUserInfo
.
getSub
());
if
(
null
==
sysUserEntity
){
sysUserService
.
validateExistUser
(
ssoUserInfo
.
getUsername
(),
ssoUserInfo
.
getEmail
());
sysUserService
.
saveOIDCUser
(
ssoUserInfo
);
sysUserEntity
=
authUserService
.
getUserBySub
(
ssoUserInfo
.
getSub
());
}
TokenInfo
tokenInfo
=
TokenInfo
.
builder
().
userId
(
sysUserEntity
.
getUserId
()).
username
(
sysUserEntity
.
getUsername
()).
build
();
String
realPwd
=
CodingUtil
.
md5
(
sysUserService
.
defaultPWD
());
String
token
=
JWTUtils
.
sign
(
tokenInfo
,
realPwd
);
ServletUtils
.
setToken
(
token
);
HttpServletResponse
response
=
ServletUtils
.
response
();
Cookie
cookie_token
=
new
Cookie
(
"Authorization"
,
token
);
cookie_token
.
setPath
(
"/"
);
Cookie
cookie_id_token
=
new
Cookie
(
"IdToken"
,
ssoToken
.
getIdToken
());
cookie_id_token
.
setPath
(
"/"
);
Cookie
cookie_ac_token
=
new
Cookie
(
"AccessToken"
,
ssoToken
.
getAccessToken
());
cookie_ac_token
.
setPath
(
"/"
);
response
.
addCookie
(
cookie_token
);
try
{
response
.
addCookie
(
cookie_id_token
);
Map
<
String
,
OidcXpackService
>
beansOfType
=
SpringContextUtil
.
getApplicationContext
().
getBeansOfType
((
OidcXpackService
.
class
));
response
.
addCookie
(
cookie_ac_token
);
if
(
beansOfType
.
keySet
().
size
()
==
0
)
{
ModelAndView
modelAndView
=
new
ModelAndView
(
"redirect:/"
);
DEException
.
throwException
(
"缺少oidc插件"
);
}
OidcXpackService
oidcXpackService
=
SpringContextUtil
.
getBean
(
OidcXpackService
.
class
);
Boolean
suuportOIDC
=
oidcXpackService
.
isSuuportOIDC
();
if
(!
suuportOIDC
)
{
DEException
.
throwException
(
"未开启oidc"
);
}
Map
<
String
,
String
>
config
=
config
(
oidcXpackService
);
SSOToken
ssoToken
=
oidcXpackService
.
requestSsoToken
(
config
,
code
,
state
);
SSOUserInfo
ssoUserInfo
=
oidcXpackService
.
requestUserInfo
(
config
,
ssoToken
.
getAccessToken
());
SysUserEntity
sysUserEntity
=
authUserService
.
getUserBySub
(
ssoUserInfo
.
getSub
());
if
(
null
==
sysUserEntity
){
sysUserService
.
validateExistUser
(
ssoUserInfo
.
getUsername
(),
ssoUserInfo
.
getEmail
());
sysUserService
.
saveOIDCUser
(
ssoUserInfo
);
sysUserEntity
=
authUserService
.
getUserBySub
(
ssoUserInfo
.
getSub
());
}
TokenInfo
tokenInfo
=
TokenInfo
.
builder
().
userId
(
sysUserEntity
.
getUserId
()).
username
(
sysUserEntity
.
getUsername
()).
build
();
String
realPwd
=
CodingUtil
.
md5
(
sysUserService
.
defaultPWD
());
String
token
=
JWTUtils
.
sign
(
tokenInfo
,
realPwd
);
ServletUtils
.
setToken
(
token
);
Cookie
cookie_token
=
new
Cookie
(
"Authorization"
,
token
);
cookie_token
.
setPath
(
"/"
);
Cookie
cookie_id_token
=
new
Cookie
(
"IdToken"
,
ssoToken
.
getIdToken
());
cookie_id_token
.
setPath
(
"/"
);
Cookie
cookie_ac_token
=
new
Cookie
(
"AccessToken"
,
ssoToken
.
getAccessToken
());
cookie_ac_token
.
setPath
(
"/"
);
response
.
addCookie
(
cookie_token
);
response
.
addCookie
(
cookie_id_token
);
response
.
addCookie
(
cookie_ac_token
);
}
catch
(
Exception
e
)
{
String
msg
;
try
{
msg
=
URLEncoder
.
encode
(
e
.
getMessage
(),
"UTF-8"
);
Cookie
cookie_error
=
new
Cookie
(
"OidcError"
,
msg
);
cookie_error
.
setPath
(
"/"
);
response
.
addCookie
(
cookie_error
);
return
modelAndView
;
}
catch
(
UnsupportedEncodingException
e1
)
{
// TODO Auto-generated catch block
e
.
printStackTrace
();
}
}
return
modelAndView
;
return
modelAndView
;
}
}
private
Map
<
String
,
String
>
config
(
OidcXpackService
oidcXpackService
)
{
private
Map
<
String
,
String
>
config
(
OidcXpackService
oidcXpackService
)
{
...
...
frontend/src/views/login/index.vue
浏览文件 @
21939ae1
...
@@ -66,6 +66,7 @@ import { encrypt } from '@/utils/rsaEncrypt'
...
@@ -66,6 +66,7 @@ import { encrypt } from '@/utils/rsaEncrypt'
import
{
ldapStatus
,
oidcStatus
}
from
'@/api/user'
import
{
ldapStatus
,
oidcStatus
}
from
'@/api/user'
import
{
getSysUI
}
from
'@/utils/auth'
import
{
getSysUI
}
from
'@/utils/auth'
import
PluginCom
from
'@/views/system/plugin/PluginCom'
import
PluginCom
from
'@/views/system/plugin/PluginCom'
import
Cookies
from
'js-cookie'
export
default
{
export
default
{
name
:
'Login'
,
name
:
'Login'
,
components
:
{
PluginCom
},
components
:
{
PluginCom
},
...
@@ -92,7 +93,7 @@ export default {
...
@@ -92,7 +93,7 @@ export default {
},
},
computed
:
{
computed
:
{
msg
()
{
msg
()
{
return
this
.
$store
.
state
.
user
.
loginMsg
return
this
.
$store
.
state
.
user
.
loginMsg
||
Cookies
.
get
(
'OidcError'
)
}
}
},
},
watch
:
{
watch
:
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论