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

Jump to bottom

security: bad horizontal access control #292

Merged
merged 1 commit into from
Sep 10, 2023
Merged

security: bad horizontal access control #292

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion server/odc-service/src/main/java/com/oceanbase/odc/service/connection/ConnectionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,13 +577,16 @@ public ConnectionConfig getForConnectionSkipPermissionCheck(@NotNull Long id) {
@Transactional(rollbackFor = Exception.class)
@PreAuthenticate(actions = "update", resourceType = "ODC_CONNECTION", indexOfIdParam = 0)
public ConnectionConfig getForConnect(@NotNull Long id) {
return getForConnectionSkipPermissionCheck(id);
ConnectionConfig connection = getForConnectionSkipPermissionCheck(id);
permissionValidator.checkCurrentOrganization(connection);
return connection;
}

@SkipAuthorize("check permission inside")
public boolean checkPermission(@NotNull Long connectionId, @NotEmpty List<String> actions) {
try {
ConnectionConfig connection = internalGetSkipUserCheck(connectionId, false);
permissionValidator.checkCurrentOrganization(connection);
securityManager.checkPermission(
securityManager.getPermissionByActions(connection, actions));
} catch (Exception ex) {
Expand Down
13 changes: 11 additions & 2 deletions ...-service/src/main/java/com/oceanbase/odc/service/connection/database/DatabaseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import com.oceanbase.odc.core.authority.util.SkipAuthorize;
import com.oceanbase.odc.core.session.ConnectionSession;
import com.oceanbase.odc.core.session.ConnectionSessionConstants;
import com.oceanbase.odc.core.shared.constant.ConnectionVisibleScope;
import com.oceanbase.odc.core.shared.constant.ErrorCodes;
import com.oceanbase.odc.core.shared.constant.OrganizationType;
import com.oceanbase.odc.core.shared.constant.ResourceRoleName;
Expand All @@ -77,6 +78,7 @@
import com.oceanbase.odc.service.connection.model.ConnectionConfig;
import com.oceanbase.odc.service.db.DBIdentitiesService;
import com.oceanbase.odc.service.db.DBSchemaService;
import com.oceanbase.odc.service.iam.HorizontalDataPermissionValidator;
import com.oceanbase.odc.service.iam.auth.AuthenticationFacade;
import com.oceanbase.odc.service.iam.auth.AuthorizationFacade;
import com.oceanbase.odc.service.session.factory.DefaultConnectSessionFactory;
Expand Down Expand Up @@ -128,6 +130,9 @@ public class DatabaseService {
@Autowired
private JdbcLockRegistry jdbcLockRegistry;

@Autowired
private HorizontalDataPermissionValidator horizontalDataPermissionValidator;

@Transactional(rollbackFor = Exception.class)
@SkipAuthorize("internal authenticated")
public Database detail(@NonNull Long id) {
Expand All @@ -154,7 +159,9 @@ public Page<Database> listDatabasesByDataSource(@NonNull Long id, String name, @
.connectionIdEquals(id)
.and(DatabaseSpecs.nameLike(name));
Page<DatabaseEntity> entities = databaseRepository.findAll(specs, pageable);
return entitiesToModels(entities);
Page<Database> databases = entitiesToModels(entities);
horizontalDataPermissionValidator.checkCurrentOrganization(databases.getContent());
return databases;
}

@Transactional(rollbackFor = Exception.class)
Expand Down Expand Up @@ -364,9 +371,11 @@ public Boolean internalSyncDataSourceSchemas(@NonNull Long dataSourceId) throws
return false;
}
ConnectionConfig connection = connectionService.getForConnectionSkipPermissionCheck(dataSourceId);
if (connection.getEnvironmentId().longValue() == -1L) {
if (connection.getEnvironmentId().longValue() == -1L
|| connection.getVisibleScope() == ConnectionVisibleScope.PRIVATE) {
return false;
}
horizontalDataPermissionValidator.checkCurrentOrganization(connection);
DefaultConnectSessionFactory factory = new DefaultConnectSessionFactory(connection);
connectionSession = factory.generateSession();
List<DatabaseEntity> latestDatabases =
Expand Down
4 changes: 4 additions & 0 deletions ...er/odc-service/src/main/java/com/oceanbase/odc/service/session/ConnectSessionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
import com.oceanbase.odc.service.db.DBCharsetService;
import com.oceanbase.odc.service.db.session.DBSessionService;
import com.oceanbase.odc.service.feature.VersionDiffConfigService;
import com.oceanbase.odc.service.iam.HorizontalDataPermissionValidator;
import com.oceanbase.odc.service.iam.auth.AuthenticationFacade;
import com.oceanbase.odc.service.iam.auth.AuthorizationFacade;
import com.oceanbase.odc.service.lab.model.LabProperties;
Expand Down Expand Up @@ -131,6 +132,8 @@ public class ConnectSessionService {
private DBSessionService dbSessionService;
@Autowired
private EnvironmentRepository environmentRepository;
@Autowired
private HorizontalDataPermissionValidator horizontalDataPermissionValidator;

@PostConstruct
public void init() {
Expand Down Expand Up @@ -212,6 +215,7 @@ private ConnectionSession create(@NotNull Long dataSourceId, String schemaName)
preCheckSessionLimit();

ConnectionConfig connection = connectionService.getForConnectionSkipPermissionCheck(dataSourceId);
horizontalDataPermissionValidator.checkCurrentOrganization(connection);
log.info("Begin to create session, connection id={}, name={}", connection.id(), connection.getName());
Set<String> actions = authorizationFacade.getAllPermittedActions(authenticationFacade.currentUser(),
ResourceType.ODC_CONNECTION, "" + dataSourceId);
Expand Down