Skip to content

feat(amber): reject invalid dashboard resource type #8162

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

Closed
carloea2 wants to merge 1 commit into from
Closed

feat(amber): reject invalid dashboard resource type #8162

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
2 changes: 1 addition & 1 deletion amber/src/main/scala/org/apache/texera/web/resource/dashboard/DashboardResource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ object DashboardResource {
val q3 = ProjectSearchQueryBuilder.constructQuery(uid, params, includePublic)
val q4 = DatasetSearchQueryBuilder.constructQuery(uid, params, includePublic)
q1.unionAll(q3).unionAll(q4)
case _ => throw new IllegalArgumentException(s"Unknown resource type: ${params.resourceType}")
case _ => throw new BadRequestException(s"Unknown resource type: ${params.resourceType}")
}

val finalQuery =
Expand Down
5 changes: 3 additions & 2 deletions amber/src/test/scala/org/apache/texera/web/resource/dashboard/DashboardResourceSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import org.apache.texera.web.resource.dashboard.DashboardResource.SearchQueryPar
import org.jooq.impl.{DSL => JDSL}
import org.jooq.{OrderField, SQLDialect}

import javax.ws.rs.BadRequestException
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

Expand Down Expand Up @@ -128,7 +129,7 @@ class DashboardResourceSpec extends AnyFlatSpec with Matchers {
// constructQuery / SqlServer, so this is reachable with no database. The
// exception *type* is the real assertion: if the guard were moved below the
// query construction, this would surface as a SqlServer failure instead.
val thrown = the[IllegalArgumentException] thrownBy DashboardResource.searchAllResources(
val thrown = the[BadRequestException] thrownBy DashboardResource.searchAllResources(
new SessionUser(new User()), // uid stays null; unused on this path
SearchQueryParams(resourceType = "notAResourceType")
)
Expand All @@ -138,7 +139,7 @@ class DashboardResourceSpec extends AnyFlatSpec with Matchers {
it should "reject a resourceType that only differs from a valid one by case" in {
// Guards against someone relaxing the match to be case-insensitive on one
// side only: "Workflow" is not "workflow" today.
val thrown = the[IllegalArgumentException] thrownBy DashboardResource.searchAllResources(
val thrown = the[BadRequestException] thrownBy DashboardResource.searchAllResources(
new SessionUser(new User()),
SearchQueryParams(resourceType = "Workflow")
)
Expand Down
Loading