bobbai00 commented on code in PR #3767: URL: https://github.com/apache/texera/pull/3767#discussion_r2379608577
########## core/auth/src/main/scala/edu/uci/ics/texera/auth/util/ComputingUnitAccess.scala: ########## @@ -0,0 +1,56 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package edu.uci.ics.texera.auth.util + +import edu.uci.ics.texera.dao.SqlServer +import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum +import edu.uci.ics.texera.dao.jooq.generated.tables.daos.{ComputingUnitUserAccessDao, WorkflowComputingUnitDao} +import ComputingUnitAccess._ +import org.jooq.DSLContext + +import scala.jdk.CollectionConverters._ + + +object ComputingUnitAccess { + private lazy val context: DSLContext = SqlServer + .getInstance() + .createDSLContext() +} + +class ComputingUnitAccess { Review Comment: move these methods to the object `ComputingUnitAccess` above to make them static. You can mimic object `DatasetAccessResource` ########## core/access-control-service/src/main/scala/edu/uci/ics/texera/service/resource/AccessControlResource.scala: ########## @@ -0,0 +1,55 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package edu.uci.ics.texera.service.resource + +import com.typesafe.scalalogging.LazyLogging +import edu.uci.ics.texera.auth.JwtParser.parseToken +import edu.uci.ics.texera.auth.SessionUser +import edu.uci.ics.texera.auth.util.{ComputingUnitAccess, HeaderField} +import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum +import edu.uci.ics.texera.service.access.AccessChecker +import jakarta.ws.rs.{GET, POST, Path, Produces} +import jakarta.ws.rs.core.{Context, HttpHeaders, MediaType, Response, UriInfo} + +import java.util.Optional +import scala.jdk.CollectionConverters.{CollectionHasAsScala, MapHasAsScala} + +@Produces(Array(MediaType.APPLICATION_JSON)) +@Path("/auth") +class AccessControlResource extends LazyLogging { Review Comment: Please move the definitions in `AccessChecker.scala`, including constants and functions to here, as `object AccessControlResource`. So that those methods become static. Currently I saw you wrap the `AccessChecker` as a class, but such class carries no internal state, so it is better to simplify it as sets of static functions. Also it makes code easier to read after merging two files into one. ########## core/access-control-service/src/main/scala/edu/uci/ics/texera/service/access/AccessChecker.scala: ########## @@ -0,0 +1,104 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package edu.uci.ics.texera.service.access + +import com.typesafe.scalalogging.LazyLogging +import edu.uci.ics.texera.auth.JwtParser.parseToken +import edu.uci.ics.texera.auth.SessionUser +import edu.uci.ics.texera.auth.util.{ComputingUnitAccess, HeaderField} +import edu.uci.ics.texera.dao.jooq.generated.enums.PrivilegeEnum +import jakarta.ws.rs.core.{HttpHeaders, Response, UriInfo} + +import java.util.Optional +import scala.jdk.CollectionConverters.{CollectionHasAsScala, MapHasAsScala} +import scala.util.matching.Regex + +class AccessChecker extends LazyLogging { + + private val computingUnitAccess: ComputingUnitAccess = new ComputingUnitAccess() Review Comment: Please change `computingUnitAccess`'s methods into static methods, so that you don't need to create a dummy instance for it -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
