Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a5f1e36
JPERF-729: Create a way to configure Jira admin user password during …
pczuj Jun 28, 2021
761f912
JPERF-729 Log dataset password update
mgrzaslewicz-atlassian Nov 16, 2021
e71d277
JPERF-729 Fix unit test
mgrzaslewicz-atlassian Nov 16, 2021
64b388b
JPERF-729 Handle both plain text and encrypted admin password dataset…
mgrzaslewicz-atlassian Nov 19, 2021
8e2bd06
JPERF-729 Add changelog entry, deprecate Database.setup(ssh) instead …
mgrzaslewicz-atlassian Nov 24, 2021
9e9fbc3
JPERF-729 Move changelog entry to unreleased, remove all API breaking…
mgrzaslewicz-atlassian Nov 24, 2021
341818c
JPERF-729 Apply suggestions from PR comments
mgrzaslewicz-atlassian Nov 24, 2021
9b8ae41
JPERF-729 Move username out of extension function to builder with def…
mgrzaslewicz-atlassian Nov 25, 2021
10f9d35
JPERF-729 Move username out of extension function to builder with def…
mgrzaslewicz-atlassian Nov 25, 2021
26aeb0e
JPERF-729 Make loggers non-static again to have the same approach eve…
mgrzaslewicz-atlassian Nov 25, 2021
881f9b2
JPERF-729 Add link to issue in changelog
mgrzaslewicz-atlassian Nov 25, 2021
fb2be73
JPERF-729 Unify logger creation
mgrzaslewicz-atlassian Nov 25, 2021
56ad890
JPERF-729 Change log level to debug for password update
mgrzaslewicz-atlassian Nov 25, 2021
0471a2a
JPERF-729 Extract password encryptor to follow single responsibility …
mgrzaslewicz-atlassian Nov 25, 2021
13bcd56
JPERF-729 Fix typo in test method name
mgrzaslewicz-atlassian Nov 25, 2021
4c49b61
JPERF-729 Refactor JiraUserPasswordOverridingDatabase
mgrzaslewicz-atlassian Nov 29, 2021
bfc5e2e
JPERF-729 Change withAdminPassword extension function return type to …
mgrzaslewicz-atlassian Dec 2, 2021
f5fb3b8
JPERF-729 Add .idea folder to gitignore
mgrzaslewicz-atlassian Jan 5, 2022
64c957f
JPERF-729 Use java.util.Function instead of kotlin interface - for ja…
mgrzaslewicz-atlassian Jan 11, 2022
614475f
JPERF-729 Simplify password encryptor API
mgrzaslewicz-atlassian Jan 11, 2022
6009d11
JPERF-729 Simplify password encryptor API even more
mgrzaslewicz-atlassian Jan 11, 2022
148c9ab
JPERF-729 Remove duplication in extension function creating builder
mgrzaslewicz-atlassian Jan 11, 2022
9be53d5
JPERF-729 Use shorter names in builder
mgrzaslewicz-atlassian Jan 11, 2022
16425ea
JPERF-729 Rename file containing JiraUserEncryptedPasswordProvider class
mgrzaslewicz-atlassian Jan 11, 2022
bab7c59
JPERF-729 Move CrowdEncryptedPasswordProvider to a separate file
mgrzaslewicz-atlassian Jan 12, 2022
9b2fbec
JPERF-729 Explicitly setup test context in JiraUserPasswordOverriding…
mgrzaslewicz-atlassian Jan 12, 2022
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.gradle
build
build
.idea
Comment thread
dagguh marked this conversation as resolved.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ Dropping a requirement of a major version of a dependency is a new contract.

## [Unreleased]
[Unreleased]: https://github.com/atlassian/infrastructure/compare/release-4.18.0...master
### Added
- `JiraUserPasswordOverridingDatabase` to support providing custom admin password during database setup [JPERF-729]

[JPERF-729]: https://ecosystem.atlassian.net/browse/JPERF-729

### Deprecated
- `Database.setup(ssh: SshConnection): String` in favor of `Database.performSetup(ssh: SshConnection): DatabaseSetup`

Comment thread
dagguh marked this conversation as resolved.
## [4.18.0] - 2021-04-14
[4.18.0]: https://github.com/atlassian/infrastructure/compare/release-4.17.5...release-4.18.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import org.apache.logging.log4j.Logger
import java.io.File
import java.net.URI
import java.nio.file.Files
import java.io.FileWriter
import java.io.BufferedWriter


/**
Expand All @@ -26,13 +24,12 @@ class LicenseOverridingMysql private constructor(
@Deprecated(message = "Use the Builder and pass licenses as Files to reduce accidental leakage of the license")
constructor(
database: Database,
licenses: List<String>) : this(database, LicenseCollection(licenses.map<String, File> {
licenses: List<String>
) : this(database, LicenseCollection(licenses.map<String, File> {
createTempLicenseFile(it)
}))

override fun setup(
ssh: SshConnection
): String = database.setup(ssh)
override fun setup(ssh: SshConnection): String = database.setup(ssh)

override fun start(
jira: URI,
Expand Down Expand Up @@ -89,4 +86,4 @@ internal fun createTempLicenseFile(license: String): File {
.use { it.write(license) }
return licenseFile

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class MySqlDatabase(
private val source: DatasetPackage,
private val maxConnections: Int
) : Database {

private val logger: Logger = LogManager.getLogger(this::class.java)

private val image: DockerImage = DockerImage(
Expand All @@ -36,13 +37,13 @@ class MySqlDatabase(
)

override fun setup(ssh: SshConnection): String {
val mysqlData = source.download(ssh)
val mysqlDataLocation = source.download(ssh)
image.run(
ssh = ssh,
parameters = "-p 3306:3306 -v `realpath $mysqlData`:/var/lib/mysql",
parameters = "-p 3306:3306 -v `realpath $mysqlDataLocation`:/var/lib/mysql",
arguments = "--skip-grant-tables --max_connections=$maxConnections"
)
return mysqlData
return mysqlDataLocation
}

override fun start(jira: URI, ssh: SshConnection) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.atlassian.performance.tools.infrastructure.api.database.passwordoverride

import com.atlassian.performance.tools.infrastructure.database.SshSqlClient
import com.atlassian.performance.tools.ssh.api.SshConnection

class CrowdEncryptedPasswordProvider(
private val jiraDatabaseSchemaName: String,
private val passwordPlainText: String,
private val passwordEncryptedWithAtlassianSecurityPasswordEncoder: String,
private val sqlClient: SshSqlClient
) : JiraUserEncryptedPasswordProvider {

override fun getEncryptedPassword(ssh: SshConnection): String {
val sqlResult =
sqlClient.runSql(ssh, "select attribute_value from ${jiraDatabaseSchemaName}.cwd_directory_attribute where attribute_name = 'user_encryption_method';").output
return when {
sqlResult.contains("plaintext") -> passwordPlainText
sqlResult.contains("atlassian-security") -> passwordEncryptedWithAtlassianSecurityPasswordEncoder
else -> throw RuntimeException("Unknown jira user password encryption type")
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.atlassian.performance.tools.infrastructure.api.database.passwordoverride

import com.atlassian.performance.tools.ssh.api.SshConnection

interface JiraUserEncryptedPasswordProvider {
fun getEncryptedPassword(ssh: SshConnection): String
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package com.atlassian.performance.tools.infrastructure.api.database.passwordoverride

import com.atlassian.performance.tools.infrastructure.api.database.Database
import com.atlassian.performance.tools.infrastructure.database.SshMysqlClient
import com.atlassian.performance.tools.infrastructure.database.SshSqlClient
import com.atlassian.performance.tools.ssh.api.SshConnection
import org.apache.logging.log4j.LogManager
import org.apache.logging.log4j.Logger
import java.net.URI

class JiraUserPasswordOverridingDatabase private constructor(
private val databaseDelegate: Database,
private val sqlClient: SshSqlClient,
private val username: String,
private val schema: String,
private val userPasswordPlainText: String,
private val jiraUserEncryptedPasswordProvider: JiraUserEncryptedPasswordProvider
) : Database {
private val logger: Logger = LogManager.getLogger(this::class.java)
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Logging responsibility could be split to a decorator on this class.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What would be the benefit?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are multiple benefits:

  • Decoupling logging from a class ensures that your code is observable
    • It's possible to create code that will replace logging with something easier to understand by machine, e.g. event system.
    • It's possible to write unit tests on the same signals as would trigger log lines seen by the user, i.e. you don't need to mock logger to use same signals.
  • You could easily remove the logger code from the execution path by removing the decorator from the initialisation. It could be done dynamically.
  • You could unit test the logger responsibility.
  • It spreads the foundation of the good practice of keeping things SRP.

Again I'm not insisting, especially with this one, because our practice was so far to not decouple logger from other business logic. Still I wanted to point it out to see your thoughts on it. I personally would prefer us to follow the decoupling practices, because I see how not following it damages the flexibility of our implementations. I don't believe in popular thinking that everything can be rewritten to match the new requirements - from my experience it never happens. However we can write code that is modular and later one be able to initialise it differently to achieve new requirements.

Copy link
Copy Markdown
Contributor

@mgrzaslewicz mgrzaslewicz Jan 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand all the benefits, but do we really need them?
Was there a single time in this library we had to test what's being logged or a need to make it configurable?
I don't feel adding functionality because it might be needed some day is a good thing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pczuj I think these are interesting dev experiments, they deserve to be explored. However, we shouldn't mix them inside a big and overdue feature PR.


override fun setup(ssh: SshConnection): String = databaseDelegate.setup(ssh)

override fun start(
jira: URI,
ssh: SshConnection
) {
databaseDelegate.start(jira, ssh)
val password = jiraUserEncryptedPasswordProvider.getEncryptedPassword(ssh)
sqlClient.runSql(ssh, "UPDATE ${schema}.cwd_user SET credential='$password' WHERE user_name='$username';")
logger.debug("Password for user '$username' updated to '${userPasswordPlainText}'")
}


class Builder(
private var databaseDelegate: Database,
private var plainTextPassword: String,
private var passwordEncrypted: String
) {
private var sqlClient: SshSqlClient = SshMysqlClient()
private var schema: String = "jiradb"
private var username: String = "admin"
private var jiraUserEncryptedPasswordProvider: JiraUserEncryptedPasswordProvider? = null

fun databaseDelegate(databaseDelegate: Database) = apply { this.databaseDelegate = databaseDelegate }
fun username(username: String) = apply { this.username = username }
fun plainTextPassword(userPasswordPlainText: String) = apply { this.plainTextPassword = userPasswordPlainText }
fun passwordEncrypted(userPasswordEncrypted: String) = apply { this.passwordEncrypted = userPasswordEncrypted }
fun sqlClient(sqlClient: SshSqlClient) = apply { this.sqlClient = sqlClient }
fun schema(jiraDatabaseSchemaName: String) = apply { this.schema = jiraDatabaseSchemaName }
fun jiraUserEncryptedPasswordProvider(jiraUserEncryptedPasswordProvider: JiraUserEncryptedPasswordProvider) =
apply { this.jiraUserEncryptedPasswordProvider = jiraUserEncryptedPasswordProvider }

fun build() = JiraUserPasswordOverridingDatabase(
databaseDelegate = databaseDelegate,
sqlClient = sqlClient,
username = username,
userPasswordPlainText = plainTextPassword,
schema = schema,
jiraUserEncryptedPasswordProvider = jiraUserEncryptedPasswordProvider ?: CrowdEncryptedPasswordProvider(
jiraDatabaseSchemaName = schema,
passwordPlainText = plainTextPassword,
passwordEncryptedWithAtlassianSecurityPasswordEncoder = passwordEncrypted,
sqlClient = sqlClient
)
)
}

}

/**
* @param adminPasswordEncrypted Based on [retrieving-the-jira-administrator](https://confluence.atlassian.com/jira/retrieving-the-jira-administrator-192836.html)
* to encode the password in Jira format use [com.atlassian.crowd.password.encoder.AtlassianSecurityPasswordEncoder](https://docs.atlassian.com/atlassian-crowd/4.2.2/com/atlassian/crowd/password/encoder/AtlassianSecurityPasswordEncoder.html)
* from the [com.atlassian.crowd.crowd-password-encoders](https://mvnrepository.com/artifact/com.atlassian.crowd/crowd-password-encoders/4.2.2).
*
*/
fun Database.overrideAdminPassword(adminPasswordPlainText: String, adminPasswordEncrypted: String): JiraUserPasswordOverridingDatabase.Builder {
Copy link
Copy Markdown
Contributor

@dagguh dagguh Jan 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Returning the builder opens up ways to override other params, thanks 👍

return JiraUserPasswordOverridingDatabase.Builder(
databaseDelegate = this,
plainTextPassword = adminPasswordPlainText,
passwordEncrypted = adminPasswordEncrypted
)
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.atlassian.performance.tools.infrastructure.api.database

import com.atlassian.performance.tools.infrastructure.mock.RememberingDatabase
import com.atlassian.performance.tools.infrastructure.mock.RememberingSshConnection
import com.atlassian.performance.tools.ssh.api.SshConnection
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
import java.io.File
Expand All @@ -11,14 +11,16 @@ class LicenseOverridingMysqlTest {

private val jira = URI("http://localhost/")

private fun Database.withLicenseString(licenses: List<String>) = LicenseOverridingMysql.Builder(this).licenseStrings(licenses).build()

@Test
fun shouldOverrideOneLicense() {
val licenseStrings = listOf("the only license")
val (testedDatabase, underlyingDatabase, ssh) = setUp(licenseStrings)

testedDatabase.start(jira, ssh)

assertThat(underlyingDatabase.started)
assertThat(underlyingDatabase.isStarted)
.`as`("underlying database started")
.isTrue()
assertSshCommands(ssh)
Expand Down Expand Up @@ -76,10 +78,7 @@ class LicenseOverridingMysqlTest {
val underlyingDatabase = RememberingDatabase()
@Suppress("DEPRECATION")
return DatabaseStartTest(
testedDatabase = LicenseOverridingMysql(
database = underlyingDatabase,
licenses = licenses
),
testedDatabase = underlyingDatabase.withLicenseString(licenses),
underlyingDatabase = underlyingDatabase,
ssh = RememberingSshConnection()
)
Expand All @@ -105,10 +104,7 @@ class LicenseOverridingMysqlTest {
val underlyingDatabase = RememberingDatabase()
@Suppress("DEPRECATION")
return DatabaseStartTest(
testedDatabase = LicenseOverridingMysql
.Builder(underlyingDatabase)
.licenseStrings(licenses)
.build(),
testedDatabase = underlyingDatabase.withLicenseString(licenses),
underlyingDatabase = underlyingDatabase,
ssh = RememberingSshConnection()
)
Expand Down Expand Up @@ -161,19 +157,4 @@ class LicenseOverridingMysqlTest {
val underlyingDatabase: RememberingDatabase,
val ssh: RememberingSshConnection
)

private class RememberingDatabase : Database {

var setup = false
var started = false

override fun setup(ssh: SshConnection): String {
setup = true
return "."
}

override fun start(jira: URI, ssh: SshConnection) {
started = true
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
package com.atlassian.performance.tools.infrastructure.api.database.passwordoverride

import com.atlassian.performance.tools.infrastructure.mock.MockSshSqlClient
import com.atlassian.performance.tools.infrastructure.mock.RememberingSshConnection
import com.atlassian.performance.tools.ssh.api.SshConnection
import org.assertj.core.api.Assertions.assertThat
import org.junit.Before
import org.junit.Test

class CrowdEncryptedPasswordProviderTest {
private lateinit var sqlClient: MockSshSqlClient
private lateinit var sshConnection: RememberingSshConnection
private lateinit var tested: JiraUserEncryptedPasswordProvider
private val passwordPlainText = "abcde"
private val passwordEncrypted = "*****"

@Before
fun setup() {
sqlClient = MockSshSqlClient()
sshConnection = RememberingSshConnection()
tested = CrowdEncryptedPasswordProvider(
jiraDatabaseSchemaName = "jiradb",
sqlClient = sqlClient,
passwordPlainText = passwordPlainText,
passwordEncryptedWithAtlassianSecurityPasswordEncoder = passwordEncrypted
)
}

@Test
fun shouldQueryEncryptionMethod() {
// given
sqlClient.queueReturnedSqlCommandResult(
SshConnection.SshResult(
exitStatus = 0,
output = """attribute_value
atlassian-security
""".trimMargin(),
errorOutput = ""
)
)
// when
tested.getEncryptedPassword(sshConnection)
// then
assertThat(sqlClient.getLog())
.`as`("sql queries executed")
.containsExactly(
"select attribute_value from jiradb.cwd_directory_attribute where attribute_name = 'user_encryption_method';"
)
}

@Test
fun shouldThrowExceptionWhenUnknownEncryption() {
// when
var exception: RuntimeException? = null
try {
tested.getEncryptedPassword(sshConnection)
} catch (e: RuntimeException) {
exception = e
}
// then
assertThat(exception).isNotNull()
assertThat(exception!!.message).isEqualTo("Unknown jira user password encryption type")
}

@Test
fun shouldReturnEncrypted() {
// given
sqlClient.queueReturnedSqlCommandResult(
SshConnection.SshResult(
exitStatus = 0,
output = """attribute_value
atlassian-security
""".trimMargin(),
errorOutput = ""
)
)
// when
val password = tested.getEncryptedPassword(sshConnection)
// then
assertThat(password).isEqualTo(passwordEncrypted)
}

@Test
fun shouldReturnPlainText() {
// given
sqlClient.queueReturnedSqlCommandResult(
SshConnection.SshResult(
exitStatus = 0,
output = """attribute_value
plaintext
""".trimMargin(),
errorOutput = ""
)
)
// when
val password = tested.getEncryptedPassword(sshConnection)
// then
assertThat(password).isEqualTo(passwordPlainText)
}

}
Loading