Skip to content

Enforce user ownership on application list and datasource connections #1655

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
mkumatag merged 7 commits into from
Oct 28, 2026
Merged

Enforce user ownership on application list and datasource connections #1655

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
45cef1a
Enforce user ownership on application list and datasource connections
mkumatag Oct 27, 2026
cff2bb6
Refactor datasource handlers and update swagger docs
mkumatag Oct 27, 2026
117b18e
address review comment
mkumatag Oct 28, 2026
65e786b
address review comments - reuse the function
mkumatag Oct 28, 2026
81b45f7
fix fmt
mkumatag Oct 28, 2026
4cc86d8
Merge branch 'main' into fix-application-datasource-ownership
mkumatag Oct 28, 2026
fca0545
update the version
mkumatag Oct 28, 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 ai-services/docs/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,12 @@ const docTemplate = `{
"$ref": "#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse"
}
},
"403": {
"description": "User doesn't own this application",
"schema": {
"$ref": "#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse"
}
},
"404": {
"description": "Application or datasource not found",
"schema": {
Expand Down Expand Up @@ -633,6 +639,12 @@ const docTemplate = `{
"$ref": "#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse"
}
},
"403": {
"description": "User doesn't own this application",
"schema": {
"$ref": "#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse"
}
},
"404": {
"description": "Datasource not connected to this application",
"schema": {
Expand Down
12 changes: 12 additions & 0 deletions ai-services/docs/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,12 @@
"$ref": "#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse"
}
},
"403": {
"description": "User doesn't own this application",
"schema": {
"$ref": "#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse"
}
},
"404": {
"description": "Application or datasource not found",
"schema": {
Expand Down Expand Up @@ -627,6 +633,12 @@
"$ref": "#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse"
}
},
"403": {
"description": "User doesn't own this application",
"schema": {
"$ref": "#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse"
}
},
"404": {
"description": "Datasource not connected to this application",
"schema": {
Expand Down
8 changes: 8 additions & 0 deletions ai-services/docs/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,6 +1355,10 @@ paths:
description: Unauthorized
schema:
$ref: '#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse'
"403":
description: User doesn't own this application
schema:
$ref: '#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse'
"404":
description: Application or datasource not found
schema:
Expand Down Expand Up @@ -1400,6 +1404,10 @@ paths:
description: Unauthorized
schema:
$ref: '#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse'
"403":
description: User doesn't own this application
schema:
$ref: '#/definitions/internal_pkg_catalog_apiserver_handlers.ErrorResponse'
"404":
description: Datasource not connected to this application
schema:
Expand Down
11 changes: 11 additions & 0 deletions ai-services/internal/pkg/catalog/apiserver/handlers/application_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,24 @@ func (h *ApplicationHandler) ListApplications(c *gin.Context) {
return
}

// Extract user ID from auth context
userID := c.GetString(middleware.CtxUserIDKey)
if userID == "" {
c.JSON(http.StatusUnauthorized, ErrorResponse{
Error: "Unauthorized: user ID not found in context",
})

return
}
Comment thread
mkumatag marked this conversation as resolved.
Resolved

// Build request
req := repository.ListApplicationsRequest{
Page: page,
PageSize: pageSize,
DeploymentType: deploymentType,
CatalogID: catalogID,
Search: search,
CreatedBy: userID,
}

// Call service layer
Expand Down
Loading
Loading