Neilk1021 commented on code in PR #7055:
URL: https://github.com/apache/texera/pull/7055#discussion_r3707084365
##########
amber/src/main/scala/org/apache/texera/web/resource/auth/AuthResource.scala:
##########
@@ -35,53 +36,103 @@ import javax.ws.rs._
import javax.ws.rs.core.MediaType
object AuthResource {
+ private val logger: Logger = Logger(classOf[AuthResource])
- private def userDao =
- new UserDao(
- SqlServer
- .getInstance()
- .createDSLContext()
- .configuration
+ private def context = SqlServer.getInstance().context
+ private def userDao = new UserDao(context.configuration)
+
+ private val passwordEncryptor = new StrongPasswordEncryptor
+
+ private def localHandleExists(handle: String): Boolean = {
+ context.fetchExists(
+ context
+ .selectFrom(AUTH_PROVIDER)
+ .where(AUTH_PROVIDER.PROVIDER_TYPE.eq(ProviderTypeEnum.LOCAL))
+ .and(AUTH_PROVIDER.PROVIDER_ID.eq(handle))
)
+ }
+
+ //TODO ASSERT THAT ALL USERS WERE MIGRATED CORRECTLY AND CHECK
/**
* Retrieve exactly one User from databases with the given username and
password.
* The password is used to validate against the hashed password stored in
the db.
*
- * @param name String
+ * @param username String
* @param password String, plain text password
* @return
*/
- def retrieveUserByUsernameAndPassword(name: String, password: String):
Option[User] = {
- if (password == null) return None
- if (name == null) return None
- Option(
- SqlServer
- .getInstance()
- .createDSLContext()
- .select()
- .from(USER)
- .where(USER.NAME.eq(name))
- .fetchOneInto(classOf[User])
- ).filter(user => new StrongPasswordEncryptor().checkPassword(password,
user.getPassword))
- }
+ def retrieveUserByUsernameAndPassword(username: String, password: String):
Option[User] = {
+ if (password == null || username == null) return None
- def createAdminUser(): Unit = {
- val adminUsername = UserSystemConfig.adminUsername
- val adminPassword = UserSystemConfig.adminPassword
+ val record = context
+ .select()
+ .from(AUTH_PROVIDER)
+ .join(USER)
+ .on(USER.UID.eq(AUTH_PROVIDER.UID))
+ .where(AUTH_PROVIDER.PROVIDER_TYPE.eq(ProviderTypeEnum.LOCAL))
+ .and(AUTH_PROVIDER.PROVIDER_ID.eq(username))
+ .fetchOne()
- if (adminUsername.trim.nonEmpty && adminPassword.trim.nonEmpty) {
- val existingUser = userDao.fetchByName(adminUsername)
- if (existingUser.isEmpty) {
- val user = new User
- user.setName(adminUsername)
- user.setEmail(adminUsername)
- user.setRole(UserRoleEnum.ADMIN)
- user.setPassword(new
StrongPasswordEncryptor().encryptPassword(adminPassword))
- userDao.insert(user)
+ Option(record).flatMap(r => {
+ val encryptedPassword = r.get(AUTH_PROVIDER.PASSWORD)
+ if (passwordEncryptor.checkPassword(password, encryptedPassword)) {
+ Some(r.into(USER).into(classOf[User]))
+ } else {
+ None
}
+ })
+ }
+
+ /**
+ * Create a user together with the LOCAL credential it logs in with. The
handle is passed
+ * explicitly rather than read off `user.getName`, so that identity is
never re-derived
+ * from the mutable display name.
+ */
+ private def insertLocalUser(user: User, handle: String, hashedPassword:
String): Unit = {
Review Comment:
Added
--
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]
