Skip to content
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

BE: RBAC: Subject type/value is unintended to be optional #719

Merged
merged 3 commits into from
Jan 16, 2025
Merged

BE: RBAC: Subject type/value is unintended to be optional #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36b23cf
BE: RBAC: Subject type/value is unintended to be optional
wernerdv Jan 7, 2025
73acea6
Merge branch 'refs/heads/main' into issues/716
wernerdv Jan 13, 2025
c48ce7f
Merge branch 'main' into issues/716
Haarolean Jan 14, 2025
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
7 changes: 5 additions & 2 deletions api/src/main/java/io/kafbat/ui/model/rbac/Role.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.kafbat.ui.model.rbac;

import com.google.common.base.Preconditions;
import static com.google.common.base.Preconditions.checkArgument;

import java.util.List;
import lombok.Data;

Expand All @@ -13,9 +14,11 @@ public class Role {
List<Permission> permissions;

public void validate() {
Preconditions.checkArgument(!clusters.isEmpty(), "Role clusters cannot be empty");
checkArgument(!clusters.isEmpty(), "Role clusters cannot be empty");
checkArgument(!subjects.isEmpty(), "Role subjects cannot be empty");
permissions.forEach(Permission::transform);
permissions.forEach(Permission::validate);
subjects.forEach(Subject::validate);
}

}
11 changes: 11 additions & 0 deletions api/src/main/java/io/kafbat/ui/model/rbac/Subject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package io.kafbat.ui.model.rbac;

import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

import io.kafbat.ui.model.rbac.provider.Provider;
import lombok.Getter;

Expand All @@ -21,4 +24,12 @@ public void setType(String type) {
public void setValue(String value) {
this.value = value;
}

public void validate() {
checkNotNull(type, "Subject type cannot be null");
checkNotNull(value, "Subject value cannot be null");

checkArgument(!type.isEmpty(), "Subject type cannot be empty");
checkArgument(!value.isEmpty(), "Subject value cannot be empty");
}
}
Loading