Skip to content

fix: add authorization checks to Studio OAuth service endpoints #16127

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

Open
adilburaksen wants to merge 3 commits into
base: develop
Choose a base branch
from
+18 −0
Open

fix: add authorization checks to Studio OAuth service endpoints #16127

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04dfb64
fix: add authorization checks to Studio OAuth service endpoints
adilburaksen May 16, 2026
e250ec9
fix: address review feedback on OAuth authorization checks
adilburaksen May 16, 2026
e7d5e51
fix: correct deleteOAuthProvider permission from CREATE to DELETE
adilburaksen May 16, 2026
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
12 changes: 12 additions & 0 deletions ...cdap-data-pipeline-base/src/main/java/io/cdap/cdap/datapipeline/service/OAuthHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
import io.cdap.cdap.datapipeline.oauth.PutOAuthCredentialRequest;
import io.cdap.cdap.datapipeline.oauth.PutOAuthProviderRequest;
import io.cdap.cdap.datapipeline.oauth.RefreshTokenResponse;
import io.cdap.cdap.proto.element.EntityType;
Comment thread
adilburaksen marked this conversation as resolved.
import io.cdap.cdap.proto.id.NamespaceId;
import io.cdap.cdap.proto.security.StandardPermission;
import io.cdap.cdap.security.spi.authorization.ContextAccessEnforcer;
import io.cdap.common.http.HttpRequest;
import io.cdap.common.http.HttpRequests;
import io.cdap.common.http.HttpResponse;
Expand Down Expand Up @@ -71,11 +75,13 @@ public class OAuthHandler extends AbstractSystemHttpServiceHandler {
.create();

private OAuthStore oauthStore;
private ContextAccessEnforcer contextAccessEnforcer;

@Override
public void initialize(SystemHttpServiceContext context) throws Exception {
super.initialize(context);
this.oauthStore = new OAuthStore(context, context, context.getAdmin());
this.contextAccessEnforcer = context.getContextAccessEnforcer();
Comment thread
adilburaksen marked this conversation as resolved.
}

@GET
Expand Down Expand Up @@ -116,6 +122,8 @@ public void putOAuthProvider(HttpServiceRequest request, HttpServiceResponder re
@QueryParam("reuse_client_credentials") @DefaultValue("false")
Boolean reuseClientCredentials) {
try {
contextAccessEnforcer.enforceOnParent(EntityType.SYSTEM_APP_ENTITY, NamespaceId.SYSTEM,
StandardPermission.CREATE);
Comment thread
adilburaksen marked this conversation as resolved.
try {
PutOAuthProviderRequest putOAuthProviderRequest = GSON.fromJson(
StandardCharsets.UTF_8.decode(request.getContent()).toString(),
Expand Down Expand Up @@ -182,6 +190,8 @@ public void putOAuthCredential(HttpServiceRequest request, HttpServiceResponder
@PathParam("provider") String provider,
@PathParam("credential") String credentialId) {
try {
contextAccessEnforcer.enforceOnParent(EntityType.SYSTEM_APP_ENTITY, NamespaceId.SYSTEM,
StandardPermission.CREATE);
Comment thread
adilburaksen marked this conversation as resolved.
PutOAuthCredentialRequest putOAuthCredentialRequest;
try {
putOAuthCredentialRequest = GSON.fromJson(StandardCharsets.UTF_8.decode(request.getContent()).toString(),
Expand Down Expand Up @@ -291,6 +301,8 @@ public void getOAuthCredential(HttpServiceRequest request, HttpServiceResponder
@PathParam("provider") String provider,
@PathParam("credential") String credentialId) {
try {
contextAccessEnforcer.enforceOnParent(EntityType.SYSTEM_APP_ENTITY, NamespaceId.SYSTEM,
StandardPermission.GET);
Comment thread
adilburaksen marked this conversation as resolved.
Outdated
OAuthProvider oauthProvider = getProvider(provider);
Optional<OAuthAccessToken> oAuthAccessToken = getAccessToken(provider, credentialId);

Expand Down