From de64d833ef557b01a78c8f77e77ec3045e52bc1a Mon Sep 17 00:00:00 2001 From: Arjan H Date: Wed, 11 May 2022 18:10:18 +0200 Subject: [PATCH] Fix rate-limit-policies.yml generation with multiple domains (#45) --- gui/apply-boulder | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gui/apply-boulder b/gui/apply-boulder index f414bb9..bc41b49 100755 --- a/gui/apply-boulder +++ b/gui/apply-boulder @@ -32,7 +32,7 @@ if [ "$PKI_DOMAIN_MODE" == "lockdown" ] && [ "$PKI_LOCKDOWN_DOMAINS" != "" ]; th echo >> hostname-policy.yaml echo "# Lockdown are the domains that this LabCA instance can issue certificates for" >> hostname-policy.yaml echo "Lockdown:" >> hostname-policy.yaml - for d in $(echo $PKI_LOCKDOWN_DOMAINS | sed -e "s/\\\r\\\n/ /g" | tr '\r' ' '); do + for d in $(echo $PKI_LOCKDOWN_DOMAINS | sed -e "s/\\\r/ /g" | sed -e "s/\\\n/ /g"); do echo " - \"$d\"" >> hostname-policy.yaml done fi @@ -41,7 +41,7 @@ if [ "$PKI_DOMAIN_MODE" == "whitelist" ] && [ "$PKI_WHITELIST_DOMAINS" != "" ]; echo "# Whitelist are the domains that this LabCA instance can issue certificates for" >> hostname-policy.yaml echo "# in *addition* to all normal public domains" >> hostname-policy.yaml echo "Whitelist:" >> hostname-policy.yaml - for d in $(echo $PKI_WHITELIST_DOMAINS | sed -e "s/\\\r\\\n/ /g" | tr '\r' ' '); do + for d in $(echo $PKI_WHITELIST_DOMAINS | sed -e "s/\\\r/ /g" | sed -e "s/\\\n/ /g"); do echo " - \"$d\"" >> hostname-policy.yaml done fi @@ -51,13 +51,13 @@ if [ "$PKI_DOMAIN_MODE" == "lockdown" ] || [ "$PKI_DOMAIN_MODE" == "whitelist" ] REPLACEMENT="" if [ "$PKI_DOMAIN_MODE" == "lockdown" ] && [ "$PKI_LOCKDOWN_DOMAINS" != "" ]; then - for d in $(echo $PKI_LOCKDOWN_DOMAINS | sed -e "s/\\\r\\\n/ /g" | tr '\r' ' '); do - REPLACEMENT+=" $d: 10000\n" + for d in $(echo $PKI_LOCKDOWN_DOMAINS | sed -e "s/\\\r/ /g" | sed -e "s/\\\n/ /g"); do + REPLACEMENT+=" $d: 10000\r" done fi if [ "$PKI_DOMAIN_MODE" == "whitelist" ] && [ "$PKI_WHITELIST_DOMAINS" != "" ]; then - for d in $(echo $PKI_WHITELIST_DOMAINS | sed -e "s/\\\r\\\n/ /g" | tr '\r' ' '); do - REPLACEMENT=" $d: 10000\n" + for d in $(echo $PKI_WHITELIST_DOMAINS | sed -e "s/\\\r/ /g" | sed -e "s/\\\n/ /g"); do + REPLACEMENT+=" $d: 10000\r" done fi cat rate-limit-policies.yml | tr '\n' '\r' | sed -e "s/\(must-staple.le.wtf: 10000\).*\( registrationOverrides:\)/\1\n$REPLACEMENT\2/" | tr '\r' '\n' > rate-limit-policies.yml.bak && mv rate-limit-policies.yml.bak rate-limit-policies.yml