Password in quotes and explicit hash type

dfpc-coe · Oct 23, 2024 · 02d141a · 02d141a
1 parent 69f2bdd
commit 02d141a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/cloudformation/lib/api.js b/cloudformation/lib/api.js
@@ -230,15 +230,15 @@ export default {
                         ContainerPort: 389
                     }],
                     Environment: [
-                        { Name: 'StackName', Value: cf.stackName },
-                        { Name: 'AWS_DEFAULT_REGION', Value: cf.region },
-                        { Name: 'LDAP_ORGANISATION', Value: cf.ref('LDAPOrganisation') },
-                        { Name: 'LDAP_DOMAIN', Value: cf.ref('LDAPDomain') },
-                        { Name: 'LDAP_ADMIN_USERNAME', Value: cf.sub('{{resolve:secretsmanager:${AWS::StackName}/admin:SecretString:username:AWSCURRENT}}') },
-                        { Name: 'LDAP_ADMIN_PASSWORD', Value: cf.sub('{{resolve:secretsmanager:${AWS::StackName}/admin:SecretString:password:AWSCURRENT}}') },
-                        { Name: 'LDAP_SVC_USERNAME', Value: cf.sub('{{resolve:secretsmanager:${AWS::StackName}/svc:SecretString:password:AWSCURRENT}}') },
-                        { Name: 'LDAP_SVC_PASSWORD', Value: cf.sub('{{resolve:secretsmanager:${AWS::StackName}/svc:SecretString:password:AWSCURRENT}}') },
+                        { Name: 'StackName',            Value: cf.stackName },
+                        { Name: 'AWS_DEFAULT_REGION',   Value: cf.region },
+                        { Name: 'LDAP_ORGANISATION',    Value: cf.ref('LDAPOrganisation') },
+                        { Name: 'LDAP_DOMAIN',          Value: cf.ref('LDAPDomain') },
+                        { Name: 'LDAP_ADMIN_USERNAME',  Value: cf.sub('{{resolve:secretsmanager:${AWS::StackName}/admin:SecretString:username:AWSCURRENT}}') },
+                        { Name: 'LDAP_ADMIN_PASSWORD',  Value: cf.sub('{{resolve:secretsmanager:${AWS::StackName}/admin:SecretString:password:AWSCURRENT}}') },
                         { Name: 'LDAP_CONFIG_PASSWORD', Value: cf.sub('{{resolve:secretsmanager:${AWS::StackName}/admin:SecretString:password:AWSCURRENT}}') }
+                        { Name: 'LDAP_SVC_USERNAME',    Value: cf.sub('{{resolve:secretsmanager:${AWS::StackName}/svc:SecretString:username:AWSCURRENT}}') },
+                        { Name: 'LDAP_SVC_PASSWORD',    Value: cf.sub('{{resolve:secretsmanager:${AWS::StackName}/svc:SecretString:password:AWSCURRENT}}') },
                     ],
                     LogConfiguration: {
                         LogDriver: 'awslogs',

diff --git a/start b/start
@@ -11,7 +11,7 @@ TLD="$(echo "${LDAP_DOMAIN}" | sed 's/^.*\.//')"
 echo "ORG: ${ORG}"
 echo "TLD: ${TLD}"
 
-SERVICE_PASSWORD="$(slappasswd -s ${LDAP_SVC_PASSWORD})"
+SERVICE_PASSWORD="$(slappasswd -h "{SSHA}" -s "${LDAP_SVC_PASSWORD}")"
 
 for filename in /container/templates/*.ldif; do
     echo "Building ${filename}"