未验证 提交 ef652a43 编写于 作者: B Bolek Ziobrowski 提交者: GitHub

chore(core): auth framework refactoring (#3697)

上级 b957091a
...@@ -109,21 +109,25 @@ public interface SecurityContext { ...@@ -109,21 +109,25 @@ public interface SecurityContext {
void authorizeSelect(TableToken tableToken, @NotNull ObjList<CharSequence> columnNames); void authorizeSelect(TableToken tableToken, @NotNull ObjList<CharSequence> columnNames);
void authorizeShowUser(CharSequence userName); default void authorizeSelectOnAnyColumn(TableToken tableToken) {
//TODO: make non-default
void authorizeShowUsers(); }
void authorizeShowGroups(); void authorizeShowGroups();
void authorizeShowGroups(CharSequence userName); void authorizeShowGroups(CharSequence userName);
void authorizeShowPermissions(CharSequence entityName);
void authorizeShowServiceAccount(CharSequence serviceAccountName); void authorizeShowServiceAccount(CharSequence serviceAccountName);
void authorizeShowServiceAccounts(); void authorizeShowServiceAccounts();
void authorizeShowServiceAccounts(CharSequence userOrGroupName); void authorizeShowServiceAccounts(CharSequence userOrGroupName);
void authorizeShowPermissions(CharSequence entityName); void authorizeShowUser(CharSequence userName);
void authorizeShowUsers();
void authorizeTableBackup(ObjHashSet<TableToken> tableTokens); void authorizeTableBackup(ObjHashSet<TableToken> tableTokens);
......
...@@ -183,19 +183,19 @@ public class AllowAllSecurityContext implements SecurityContext { ...@@ -183,19 +183,19 @@ public class AllowAllSecurityContext implements SecurityContext {
} }
@Override @Override
public void authorizeShowUser(CharSequence userName) { public void authorizeSelectOnAnyColumn(TableToken tableToken) {
} }
@Override @Override
public void authorizeShowUsers() { public void authorizeShowGroups() {
} }
@Override @Override
public void authorizeShowGroups() { public void authorizeShowGroups(CharSequence userName) {
} }
@Override @Override
public void authorizeShowGroups(CharSequence userName) { public void authorizeShowPermissions(CharSequence entityName) {
} }
@Override @Override
...@@ -211,7 +211,11 @@ public class AllowAllSecurityContext implements SecurityContext { ...@@ -211,7 +211,11 @@ public class AllowAllSecurityContext implements SecurityContext {
} }
@Override @Override
public void authorizeShowPermissions(CharSequence entityName) { public void authorizeShowUser(CharSequence userName) {
}
@Override
public void authorizeShowUsers() {
} }
@Override @Override
......
...@@ -38,22 +38,22 @@ public class DenyAllSecurityContext extends ReadOnlySecurityContext { ...@@ -38,22 +38,22 @@ public class DenyAllSecurityContext extends ReadOnlySecurityContext {
} }
@Override @Override
public void authorizeShowUser(CharSequence userName) { public void authorizeSelectOnAnyColumn(TableToken tableToken) {
throw CairoException.nonCritical().put("permission denied"); throw CairoException.nonCritical().put("permission denied");
} }
@Override @Override
public void authorizeShowUsers() { public void authorizeShowGroups() {
throw CairoException.nonCritical().put("permission denied"); throw CairoException.nonCritical().put("permission denied");
} }
@Override @Override
public void authorizeShowGroups() { public void authorizeShowGroups(CharSequence userName) {
throw CairoException.nonCritical().put("permission denied"); throw CairoException.nonCritical().put("permission denied");
} }
@Override @Override
public void authorizeShowGroups(CharSequence userName) { public void authorizeShowPermissions(CharSequence entityName) {
throw CairoException.nonCritical().put("permission denied"); throw CairoException.nonCritical().put("permission denied");
} }
...@@ -73,7 +73,12 @@ public class DenyAllSecurityContext extends ReadOnlySecurityContext { ...@@ -73,7 +73,12 @@ public class DenyAllSecurityContext extends ReadOnlySecurityContext {
} }
@Override @Override
public void authorizeShowPermissions(CharSequence entityName) { public void authorizeShowUser(CharSequence userName) {
throw CairoException.nonCritical().put("permission denied");
}
@Override
public void authorizeShowUsers() {
throw CairoException.nonCritical().put("permission denied"); throw CairoException.nonCritical().put("permission denied");
} }
} }
...@@ -219,19 +219,19 @@ public class ReadOnlySecurityContext implements SecurityContext { ...@@ -219,19 +219,19 @@ public class ReadOnlySecurityContext implements SecurityContext {
} }
@Override @Override
public void authorizeShowUser(CharSequence userName) { public void authorizeSelectOnAnyColumn(TableToken tableToken) {
} }
@Override @Override
public void authorizeShowUsers() { public void authorizeShowGroups() {
} }
@Override @Override
public void authorizeShowGroups() { public void authorizeShowGroups(CharSequence userName) {
} }
@Override @Override
public void authorizeShowGroups(CharSequence userName) { public void authorizeShowPermissions(CharSequence entityName) {
} }
@Override @Override
...@@ -247,7 +247,11 @@ public class ReadOnlySecurityContext implements SecurityContext { ...@@ -247,7 +247,11 @@ public class ReadOnlySecurityContext implements SecurityContext {
} }
@Override @Override
public void authorizeShowPermissions(CharSequence entityName) { public void authorizeShowUser(CharSequence userName) {
}
@Override
public void authorizeShowUsers() {
} }
@Override @Override
......
...@@ -151,7 +151,8 @@ public class SecurityContextTest { ...@@ -151,7 +151,8 @@ public class SecurityContextTest {
} else { } else {
method.invoke(sc, ONE_PARAM_ARGS); method.invoke(sc, ONE_PARAM_ARGS);
} }
if (name.startsWith("authorizeShow")) { if (name.startsWith("authorizeShow")
|| name.startsWith("authorizeSelect")) {
continue; continue;
} }
Assert.fail(); Assert.fail();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册