Skip to content

Commit 86dc389

Browse files
author
irinaschubert
authored
fix: Deprecation warnings for SCryptPasswordEncoder (#2308)
1 parent ca3a8d0 commit 86dc389

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎dsp-shared/src/main/scala/dsp/valueobjects/User.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ object User {
177177
// check which type of hash we have
178178
if (self.value.startsWith("$e0801$")) {
179179
// SCrypt
180-
val encoder = new SCryptPasswordEncoder()
180+
val encoder = new SCryptPasswordEncoder(16384, 8, 1, 32, 64)
181181
encoder.matches(passwordString, self.value)
182182
} else if (self.value.startsWith("$2a$")) {
183183
// BCrypt

‎webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ final case class UserADM(
482482
if (hashedPassword.startsWith("$e0801$")) {
483483
// SCrypt
484484
import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder
485-
val encoder = new SCryptPasswordEncoder()
485+
val encoder = new SCryptPasswordEncoder(16384, 8, 1, 32, 64)
486486
encoder.matches(password, hashedPassword)
487487
} else if (hashedPassword.startsWith("$2a$")) {
488488
// BCrypt

‎webapi/src/main/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ case class UserProfileV1(
214214
if (hashedPassword.startsWith("$e0801$")) {
215215
// SCrypt
216216
import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder
217-
val encoder = new SCryptPasswordEncoder()
217+
val encoder = new SCryptPasswordEncoder(16384, 8, 1, 32, 64)
218218
encoder.matches(password, hashedPassword.toString)
219219
} else if (hashedPassword.startsWith("$2a$")) {
220220
// BCrypt

‎webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class UsersMessagesADMSpec extends CoreSpec {
8787
}
8888

8989
"allow checking the SCrypt passwords" in {
90-
val encoder = new SCryptPasswordEncoder()
90+
val encoder = new SCryptPasswordEncoder(16384, 8, 1, 32, 64)
9191
val hp = encoder.encode("123456")
9292
val up = UserADM(
9393
id = "something",

‎webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1Spec.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class UserMessagesV1Spec extends AnyWordSpecLike with Matchers {
6969

7070
"allow checking SCrypt passwords" in {
7171
// hashedPassword = encoder.encode(createRequest.password);
72-
val encoder = new SCryptPasswordEncoder
72+
val encoder = new SCryptPasswordEncoder(16384, 8, 1, 32, 64)
7373
val hp = encoder.encode("123456")
7474
val up = UserProfileV1(
7575
userData = UserDataV1(

0 commit comments

Comments
 (0)