Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
z_stack
Activiti
提交
851d55be
A
Activiti
项目概览
z_stack
/
Activiti
12 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
Activiti
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
851d55be
编写于
6月 22, 2022
作者:
G
Giovanni Fertuso
提交者:
GitHub
6月 22, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[AAE-9212] Allow APPLICATION_MANAGER access Processes and tasks admin services (#3974)
上级
bdbbd3b8
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
29 addition
and
2 deletion
+29
-2
activiti-core/activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/activiti/runtime/api/impl/ProcessAdminRuntimeImpl.java
...rg/activiti/runtime/api/impl/ProcessAdminRuntimeImpl.java
+1
-1
activiti-core/activiti-api-impl/activiti-api-task-runtime-impl/src/main/java/org/activiti/runtime/api/impl/TaskAdminRuntimeImpl.java
...a/org/activiti/runtime/api/impl/TaskAdminRuntimeImpl.java
+1
-1
activiti-core/activiti-spring-boot-starter/src/test/java/org/activiti/spring/boot/RuntimeTestConfiguration.java
...va/org/activiti/spring/boot/RuntimeTestConfiguration.java
+7
-0
activiti-core/activiti-spring-boot-starter/src/test/java/org/activiti/spring/boot/process/ProcessRuntimeIT.java
...va/org/activiti/spring/boot/process/ProcessRuntimeIT.java
+10
-0
activiti-core/activiti-spring-boot-starter/src/test/java/org/activiti/spring/boot/tasks/TaskRuntimeUnAuthorizedTest.java
...tiviti/spring/boot/tasks/TaskRuntimeUnAuthorizedTest.java
+10
-0
未找到文件。
activiti-core/activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/activiti/runtime/api/impl/ProcessAdminRuntimeImpl.java
浏览文件 @
851d55be
...
@@ -53,7 +53,7 @@ import org.springframework.context.ApplicationEventPublisher;
...
@@ -53,7 +53,7 @@ import org.springframework.context.ApplicationEventPublisher;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
@PreAuthorize
(
"has
Role('ACTIVITI_ADMIN
')"
)
@PreAuthorize
(
"has
AnyRole('ACTIVITI_ADMIN','APPLICATION_MANAGER
')"
)
public
class
ProcessAdminRuntimeImpl
implements
ProcessAdminRuntime
{
public
class
ProcessAdminRuntimeImpl
implements
ProcessAdminRuntime
{
private
final
RepositoryService
repositoryService
;
private
final
RepositoryService
repositoryService
;
...
...
activiti-core/activiti-api-impl/activiti-api-task-runtime-impl/src/main/java/org/activiti/runtime/api/impl/TaskAdminRuntimeImpl.java
浏览文件 @
851d55be
...
@@ -47,7 +47,7 @@ import org.activiti.runtime.api.model.impl.APIVariableInstanceConverter;
...
@@ -47,7 +47,7 @@ import org.activiti.runtime.api.model.impl.APIVariableInstanceConverter;
import
org.activiti.runtime.api.query.impl.PageImpl
;
import
org.activiti.runtime.api.query.impl.PageImpl
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PreAuthorize
;
@PreAuthorize
(
"has
Role('ACTIVITI_ADMIN
')"
)
@PreAuthorize
(
"has
AnyRole('ACTIVITI_ADMIN','APPLICATION_MANAGER
')"
)
public
class
TaskAdminRuntimeImpl
implements
TaskAdminRuntime
{
public
class
TaskAdminRuntimeImpl
implements
TaskAdminRuntime
{
private
final
TaskService
taskService
;
private
final
TaskService
taskService
;
...
...
activiti-core/activiti-spring-boot-starter/src/test/java/org/activiti/spring/boot/RuntimeTestConfiguration.java
浏览文件 @
851d55be
...
@@ -120,6 +120,13 @@ public class RuntimeTestConfiguration {
...
@@ -120,6 +120,13 @@ public class RuntimeTestConfiguration {
"password"
,
"password"
,
deanAuthorities
));
deanAuthorities
));
List
<
GrantedAuthority
>
managerAuthorities
=
new
ArrayList
<>();
managerAuthorities
.
add
(
new
SimpleGrantedAuthority
(
"ROLE_APPLICATION_MANAGER"
));
extendedInMemoryUserDetailsManager
.
createUser
(
new
User
(
"manager"
,
"password"
,
managerAuthorities
));
return
extendedInMemoryUserDetailsManager
;
return
extendedInMemoryUserDetailsManager
;
}
}
...
...
activiti-core/activiti-spring-boot-starter/src/test/java/org/activiti/spring/boot/process/ProcessRuntimeIT.java
浏览文件 @
851d55be
...
@@ -994,4 +994,14 @@ public class ProcessRuntimeIT {
...
@@ -994,4 +994,14 @@ public class ProcessRuntimeIT {
assertThat
(
processInstancePage
.
getContent
()).
hasSize
(
1
);
assertThat
(
processInstancePage
.
getContent
()).
hasSize
(
1
);
assertThat
(
processInstancePage
.
getContent
().
get
(
0
).
getId
()).
isEqualTo
(
processInstance
.
getId
());
assertThat
(
processInstancePage
.
getContent
().
get
(
0
).
getId
()).
isEqualTo
(
processInstance
.
getId
());
}
}
@Test
public
void
should_returnProcessesWhenUserIsApplicationManager
()
{
securityUtil
.
logInAs
(
"manager"
);
Page
<
ProcessInstance
>
processInstancePage
=
processAdminRuntime
.
processInstances
(
Pageable
.
of
(
0
,
50
));
assertThat
(
processInstancePage
).
isNotNull
();
}
}
}
activiti-core/activiti-spring-boot-starter/src/test/java/org/activiti/spring/boot/tasks/TaskRuntimeUnAuthorizedTest.java
浏览文件 @
851d55be
...
@@ -86,4 +86,14 @@ public class TaskRuntimeUnAuthorizedTest {
...
@@ -86,4 +86,14 @@ public class TaskRuntimeUnAuthorizedTest {
.
isInstanceOf
(
NotFoundException
.
class
);
.
isInstanceOf
(
NotFoundException
.
class
);
}
}
@Test
public
void
shouldGetTasksAsApplicationManager
()
{
securityUtil
.
logInAs
(
"manager"
);
Page
<
Task
>
tasks
=
taskAdminRuntime
.
tasks
(
Pageable
.
of
(
0
,
50
));
assertThat
(
tasks
.
getContent
()).
hasSize
(
0
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录