Skip to content

Throw sercurity exceptions when permissions checks fail. Backport to 1.10 #1830

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
Manno15 merged 2 commits into from
Dec 9, 2020
Merged

Throw sercurity exceptions when permissions checks fail. Backport to 1.10 #1830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6fef7d
backport sercurity exceptions to 1.10
Manno15 Dec 8, 2020
67cb999
fix AuditMessageIT
Manno15 Dec 9, 2020
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
21 changes: 14 additions & 7 deletions server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ protected MasterClientServiceHandler(Master master) {
public long initiateFlush(TInfo tinfo, TCredentials c, String tableId)
throws ThriftSecurityException, ThriftTableOperationException {
String namespaceId = getNamespaceIdFromTableId(TableOperation.FLUSH, tableId);
master.security.canFlush(c, tableId, namespaceId);
if (!master.security.canFlush(c, tableId, namespaceId))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);

String zTablePath = Constants.ZROOT + "/" + master.getInstance().getInstanceID()
+ Constants.ZTABLES + "/" + tableId + Constants.ZTABLE_FLUSH_ID;
Expand Down Expand Up @@ -150,7 +151,8 @@ public void waitForFlush(TInfo tinfo, TCredentials c, String tableId, ByteBuffer
ByteBuffer endRow, long flushID, long maxLoops)
throws ThriftSecurityException, ThriftTableOperationException {
String namespaceId = getNamespaceIdFromTableId(TableOperation.FLUSH, tableId);
master.security.canFlush(c, tableId, namespaceId);
if (!master.security.canFlush(c, tableId, namespaceId))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);

if (endRow != null && startRow != null
&& ByteBufferUtil.toText(startRow).compareTo(ByteBufferUtil.toText(endRow)) >= 0)
Expand Down Expand Up @@ -305,7 +307,8 @@ public void setTableProperty(TInfo info, TCredentials credentials, String tableN
@Override
public void shutdown(TInfo info, TCredentials c, boolean stopTabletServers)
throws ThriftSecurityException {
master.security.canPerformSystemActions(c);
if (!master.security.canPerformSystemActions(c))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
if (stopTabletServers) {
master.setMasterGoalState(MasterGoalState.CLEAN_STOP);
EventCoordinator.Listener eventListener = master.nextEvent.getListener();
Expand All @@ -319,7 +322,8 @@ public void shutdown(TInfo info, TCredentials c, boolean stopTabletServers)
@Override
public void shutdownTabletServer(TInfo info, TCredentials c, String tabletServer, boolean force)
throws ThriftSecurityException {
master.security.canPerformSystemActions(c);
if (!master.security.canPerformSystemActions(c))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);

final TServerInstance doomed = master.tserverSet.find(tabletServer);
if (!force) {
Expand Down Expand Up @@ -391,15 +395,17 @@ public void reportTabletStatus(TInfo info, TCredentials credentials, String serv
@Override
public void setMasterGoalState(TInfo info, TCredentials c, MasterGoalState state)
throws ThriftSecurityException {
master.security.canPerformSystemActions(c);
if (!master.security.canPerformSystemActions(c))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);

master.setMasterGoalState(state);
}

@Override
public void removeSystemProperty(TInfo info, TCredentials c, String property)
throws ThriftSecurityException {
master.security.canPerformSystemActions(c);
if (!master.security.canPerformSystemActions(c))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);

try {
SystemPropUtil.removeSystemProperty(property);
Expand All @@ -413,7 +419,8 @@ public void removeSystemProperty(TInfo info, TCredentials c, String property)
@Override
public void setSystemProperty(TInfo info, TCredentials c, String property, String value)
throws ThriftSecurityException, TException {
master.security.canPerformSystemActions(c);
if (!master.security.canPerformSystemActions(c))
throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);

try {
SystemPropUtil.setSystemProperty(property, value);
Expand Down
2 changes: 1 addition & 1 deletion test/src/main/java/org/apache/accumulo/test/AuditMessageIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ public void testDeniedAudits() throws AccumuloSecurityException, AccumuloExcepti
auditConnector.tableOperations().rename(OLD_TEST_TABLE_NAME, NEW_TEST_TABLE_NAME);
} catch (AccumuloSecurityException ex) {}
try {
auditConnector.tableOperations().clone(OLD_TEST_TABLE_NAME, NEW_TEST_TABLE_NAME, true,
auditConnector.tableOperations().clone(OLD_TEST_TABLE_NAME, NEW_TEST_TABLE_NAME, false,
Collections.<String,String>emptyMap(), Collections.<String>emptySet());
} catch (AccumuloSecurityException ex) {}
try {
Expand Down