Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Do not expand dollar signs in AWS Marketplace passwords (#1977)

Ekhorn3f112ffb797a
diff --git a/.ci_cd/aws/cloudformation-aws-marketplace.yml b/.ci_cd/aws/cloudformation-aws-marketplace.yml
index f0dcc414f..c0b7eb7c0 100644
--- a/.ci_cd/aws/cloudformation-aws-marketplace.yml
+++ b/.ci_cd/aws/cloudformation-aws-marketplace.yml
@@ -324,12 +324,22 @@ Resources:
# If hostname is not provided, use the IPv4 address of the EC2 instance, otherwise use the hostname.
[ -z "${Host}" ] && HOST=$(curl v4.ident.me 2>/dev/null) || HOST="${Host}"
+ # Avoid parameter expansion if the password contains `$`
+ PASSWORD=$(cat << 'EOF'
+ ${Password}
+ EOF
+ )
+ SMTP_PASSWORD=$(cat << 'EOF'
+ ${SMTPPassword}
+ EOF
+ )
+
# Set environment variables and start OpenRemote with the Docker Compose file.
OR_HOSTNAME="$HOST" \
- OR_ADMIN_PASSWORD="${Password}" \
+ OR_ADMIN_PASSWORD="$PASSWORD" \
OR_EMAIL_HOST="${SMTPHost}" \
OR_EMAIL_USER="${SMTPUser}" \
- OR_EMAIL_PASSWORD="${SMTPPassword}" \
+ OR_EMAIL_PASSWORD="$SMTP_PASSWORD" \
OR_EMAIL_FROM="${SMTPFrom}" \
docker-compose -f /openremote/docker-compose.yml -p openremote up -d