Skip to content
This repository was archived by the owner on Mar 31, 2023. It is now read-only.

[Deployment] Fix Rbac Config Load Error in K8s Deployment #367

Merged
xieus merged 1 commit into from
Aug 31, 2020
Merged

[Deployment] Fix Rbac Config Load Error in K8s Deployment #367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions lib/src/main/java/com/futurewei/alcor/common/rbac/StrictRbacManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Component;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
Expand All @@ -51,11 +53,14 @@ public StrictRbacManager() throws IOException {
}

private void initServiceRbacRules() throws IOException {
InputStream is = ClassLoader.getSystemResourceAsStream(SERVICE_RBAC_FILE_PATH);
if (is == null) {
is = ClassLoader.getSystemResourceAsStream(DEFAULT_RBAC_FILE_PATH);
ClassPathResource resource = new ClassPathResource(SERVICE_RBAC_FILE_PATH);
if (!resource.exists()) {
resource = new ClassPathResource(DEFAULT_RBAC_FILE_PATH);
if (!resource.exists()) {
throw new FileNotFoundException("rbac_policy.json cannot be opened because it does not exist");
}
}
serviceRbacRule = JsonUtil.readValue(is, ServiceRbacRule.class);
serviceRbacRule = JsonUtil.readValue(resource.getInputStream(), ServiceRbacRule.class);
}

@Override
Expand Down