From c1e2191120026d7d50503528134c231838fb7f5c Mon Sep 17 00:00:00 2001 From: A Liu Ly Date: Mon, 5 Feb 2018 23:38:41 +0000 Subject: [PATCH 1/2] Assign dummy password to newly created users --- .../scala/gitbucket/core/service/AccountFederationService.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/service/AccountFederationService.scala b/src/main/scala/gitbucket/core/service/AccountFederationService.scala index 6ee84d224..8677af079 100644 --- a/src/main/scala/gitbucket/core/service/AccountFederationService.scala +++ b/src/main/scala/gitbucket/core/service/AccountFederationService.scala @@ -34,7 +34,7 @@ trait AccountFederationService { None case None => findAvailableUserName(preferredUserName, mailAddress) flatMap { userName => - createAccount(userName, "", fullName.getOrElse(userName), mailAddress, isAdmin = false, None, None) + createAccount(userName, "JUNKJUNK", fullName.getOrElse(userName), mailAddress, isAdmin = false, None, None) createAccountFederation(issuer, subject, userName) getAccountByUserName(userName) } From 283baaed57576649d4f66da15c964cb77a7c985c Mon Sep 17 00:00:00 2001 From: A Liu Ly Date: Wed, 7 Feb 2018 08:05:21 +0000 Subject: [PATCH 2/2] Fixed failing tests. --- .../scala/gitbucket/core/service/AccountFederationService.scala | 2 +- .../gitbucket/core/service/AccountFederationServiceSpec.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/service/AccountFederationService.scala b/src/main/scala/gitbucket/core/service/AccountFederationService.scala index 8677af079..bfb574c35 100644 --- a/src/main/scala/gitbucket/core/service/AccountFederationService.scala +++ b/src/main/scala/gitbucket/core/service/AccountFederationService.scala @@ -34,7 +34,7 @@ trait AccountFederationService { None case None => findAvailableUserName(preferredUserName, mailAddress) flatMap { userName => - createAccount(userName, "JUNKJUNK", fullName.getOrElse(userName), mailAddress, isAdmin = false, None, None) + createAccount(userName, "[DUMMY]", fullName.getOrElse(userName), mailAddress, isAdmin = false, None, None) createAccountFederation(issuer, subject, userName) getAccountByUserName(userName) } diff --git a/src/test/scala/gitbucket/core/service/AccountFederationServiceSpec.scala b/src/test/scala/gitbucket/core/service/AccountFederationServiceSpec.scala index fabc3dba4..4f0fe2d88 100644 --- a/src/test/scala/gitbucket/core/service/AccountFederationServiceSpec.scala +++ b/src/test/scala/gitbucket/core/service/AccountFederationServiceSpec.scala @@ -9,7 +9,7 @@ class AccountFederationServiceSpec extends FunSpec with ServiceSpecBase { withTestDB { implicit session => val actual = AccountFederationService.getOrCreateFederatedUser("someIssuer", "someSubject", "dummy@example.com", Some("foo"), Some("Foo")) assert(actual.get.userName == "foo") - assert(actual.get.password == "") + assert(actual.get.password == "[DUMMY]") assert(actual.get.fullName == "Foo") assert(actual.get.mailAddress == "dummy@example.com") assert(!actual.get.isAdmin)