Skip to content

BE: RBAC: Impl separate permissions for topic analysis #513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 10, 2024
Merged

BE: RBAC: Impl separate permissions for topic analysis #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e93d981
restrict access to the topic analysis feature
bachmanity1 Jul 30, 2024
2531db5
update topic conotroller
bachmanity1 Jul 31, 2024
6574115
fix frontend
bachmanity1 Jul 31, 2024
dfa585a
disbale statistics tab unless ANALYSIS_VIEW action is allowed
bachmanity1 Aug 2, 2024
e75f16b
remove MESSAGES_READ from ANALYSIS dependant actions
bachmanity1 Aug 2, 2024
ec578bc
Merge branch 'main' into feature/512
Haarolean Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions api/src/main/java/io/kafbat/ui/controller/TopicsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package io.kafbat.ui.controller;

import static io.kafbat.ui.model.rbac.permission.TopicAction.ANALYSIS_RUN;
import static io.kafbat.ui.model.rbac.permission.TopicAction.ANALYSIS_VIEW;
import static io.kafbat.ui.model.rbac.permission.TopicAction.CREATE;
import static io.kafbat.ui.model.rbac.permission.TopicAction.DELETE;
import static io.kafbat.ui.model.rbac.permission.TopicAction.EDIT;
import static io.kafbat.ui.model.rbac.permission.TopicAction.MESSAGES_READ;
import static io.kafbat.ui.model.rbac.permission.TopicAction.VIEW;
import static java.util.stream.Collectors.toList;

Expand Down Expand Up @@ -272,7 +273,7 @@ public Mono<ResponseEntity<Void>> analyzeTopic(String clusterName, String topicN

var context = AccessContext.builder()
.cluster(clusterName)
.topicActions(topicName, MESSAGES_READ)
.topicActions(topicName, ANALYSIS_RUN)
.operationName("analyzeTopic")
.build();

Expand All @@ -288,7 +289,7 @@ public Mono<ResponseEntity<Void>> cancelTopicAnalysis(String clusterName, String
ServerWebExchange exchange) {
var context = AccessContext.builder()
.cluster(clusterName)
.topicActions(topicName, MESSAGES_READ)
.topicActions(topicName, ANALYSIS_RUN)
.operationName("cancelTopicAnalysis")
.build();

Expand All @@ -306,7 +307,7 @@ public Mono<ResponseEntity<TopicAnalysisDTO>> getTopicAnalysis(String clusterNam

var context = AccessContext.builder()
.cluster(clusterName)
.topicActions(topicName, MESSAGES_READ)
.topicActions(topicName, ANALYSIS_VIEW)
.operationName("getTopicAnalysis")
.build();

Expand Down
2 changes: 2 additions & 0 deletions api/src/main/java/io/kafbat/ui/model/rbac/permission/TopicAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public enum TopicAction implements PermissibleAction {
MESSAGES_READ(VIEW),
MESSAGES_PRODUCE(VIEW),
MESSAGES_DELETE(VIEW, EDIT),
ANALYSIS_VIEW(VIEW),
ANALYSIS_RUN(VIEW, ANALYSIS_VIEW),

;

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Topics/Topic/Statistics/Metrics.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const Metrics: React.FC = () => {
buttonSize="M"
permission={{
resource: ResourceType.TOPIC,
action: Action.MESSAGES_READ,
action: Action.ANALYSIS_RUN,
value: params.topicName,
}}
>
Expand Down Expand Up @@ -110,7 +110,7 @@ const Metrics: React.FC = () => {
buttonSize="S"
permission={{
resource: ResourceType.TOPIC,
action: Action.MESSAGES_READ,
action: Action.ANALYSIS_RUN,
value: params.topicName,
}}
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Topics/Topic/Statistics/Statistics.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const Statistics: React.FC = () => {
buttonSize="M"
permission={{
resource: ResourceType.TOPIC,
action: Action.MESSAGES_READ,
action: Action.ANALYSIS_RUN,
value: params.topicName,
}}
>
Expand Down
9 changes: 7 additions & 2 deletions frontend/src/components/Topics/Topic/Topic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,17 @@ const Topic: React.FC = () => {
>
Settings
</NavLink>
<NavLink
<ActionNavLink
to={clusterTopicStatisticsRelativePath}
className={({ isActive }) => (isActive ? 'is-active' : '')}
permission={{
resource: ResourceType.TOPIC,
action: Action.ANALYSIS_VIEW,
value: topicName,
}}
>
Statistics
</NavLink>
</ActionNavLink>
</Navbar>
<Suspense fallback={<PageLoader />}>
<Routes>
Expand Down
Loading