-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Various tweaks, getting rid of AWS Secret Manager support, adding Lambda
Regarding AWS Secrets Manager, see it's secret-rotation lifecycle: https://docs.aws.amazon.com/secretsmanager/latest/userguide/rotating-secrets-lambda-function-overview.html The `createSecret`, `setSecret`, `testSecret`, `finishSecret` lifecycle that Secrets Manager uses to update a secret is an unhelpful complication for the use case of rotating the Play application secret, where there's no meaningful, useful & easy test for a secret. The Secrets Manager API also only exposes the `CreatedDate` of a secret, not when it was finalised, which doesn't marry well with `play-secret-rotation's need for a 'publication time' of a secret, from which a usage-delay will determine when that secret becomes active.
- Loading branch information
Showing
8 changed files
with
122 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// replace the conventional main artifact with an uber-jar | ||
addArtifact(artifact in (Compile, packageBin), assembly) |
57 changes: 57 additions & 0 deletions
57
...eterstore/lambda/src/main/scala/com/gu/play/secretrotation/aws/ParameterStoreLambda.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
package com.gu.play.secretrotation.aws | ||
|
||
import com.amazonaws.auth.profile.ProfileCredentialsProvider | ||
import com.amazonaws.auth.{AWSCredentialsProvider, InstanceProfileCredentialsProvider} | ||
import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagementClientBuilder | ||
import com.amazonaws.services.simplesystemsmanagement.model.{DescribeParametersRequest, ParameterStringFilter, PutParameterRequest} | ||
import com.gu.play.secretrotation.SecretGenerator.generateSecret | ||
|
||
object ParameterStoreLambda extends App { | ||
|
||
def lambdaHandler(): Unit = { | ||
new Updater( | ||
credentials = new InstanceProfileCredentialsProvider(false), | ||
parameterName = System.getenv("PARAMETER_NAME") | ||
).updateSecret() | ||
} | ||
|
||
/* | ||
This is only invoked (as a 'main' method) in development, *not* when running as an AWS Lambda. | ||
run com.gu.play.secretrotation.aws.ParameterStoreLambda | ||
*/ | ||
args.toList match { | ||
case profileName :: parameterName => | ||
val devUpdater = new Updater( | ||
credentials = new ProfileCredentialsProvider(profileName), | ||
parameterName = args(1) | ||
) | ||
devUpdater.updateSecret() | ||
case _ => | ||
Console.err.println("ERROR - expected exactly 2 arguments: yourProfile yourParameterName") | ||
System.exit(1) | ||
} | ||
|
||
class Updater(credentials: AWSCredentialsProvider, parameterName: String) { | ||
val ssmClient = | ||
AWSSimpleSystemsManagementClientBuilder.standard().withCredentials(credentials).build() | ||
|
||
def updateSecret() = { | ||
val describeSecretParameterRequest = new DescribeParametersRequest() | ||
.withParameterFilters(new ParameterStringFilter().withKey("Name").withValues(parameterName)) | ||
|
||
val metadata = ssmClient.describeParameters(describeSecretParameterRequest).getParameters.get(0) | ||
|
||
val kmsKeyId = metadata.getKeyId | ||
|
||
val putParameterResult = | ||
ssmClient.putParameter(new PutParameterRequest() | ||
.withName(parameterName) | ||
.withOverwrite(true) | ||
.withKeyId(kmsKeyId) | ||
.withValue(generateSecret) | ||
) | ||
println(s"Updated secret, put parameter version ${putParameterResult.getVersion}") | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 0 additions & 50 deletions
50
aws-secretsmanager/src/main/scala/com/gu/play/secretrotation/aws/AwsSecretsManager.scala
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
secret-generator/src/main/scala/com/gu/play/secretrotation/SecretGenerator.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package com.gu.play.secretrotation | ||
|
||
import java.security.SecureRandom | ||
|
||
object SecretGenerator { | ||
|
||
/** | ||
* Copied from play.sbt.ApplicationSecretGenerator#generateSecret ...we could | ||
* have just introduced that as a dependency, but might as well reduce the | ||
* size of the AWS Lambda jar... | ||
* @return 64-character play secret | ||
*/ | ||
def generateSecret = { | ||
val random = new SecureRandom() | ||
|
||
(1 to 64).map { _ => | ||
(random.nextInt(75) + 48).toChar | ||
}.mkString.replaceAll("\\\\+", "/") | ||
} | ||
} |