From c23e63893730aa56f288adc39214a511816768c9 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Mon, 16 Nov 2020 18:37:55 -0500
Subject: [PATCH] use safer mktemp

---
 bin/bubble_common                                             | 4 ++--
 .../packer/roles/bubble/files/bubble_restore_monitor.sh       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/bubble_common b/bin/bubble_common
index 3ce100b6..517e5de6 100755
--- a/bin/bubble_common
+++ b/bin/bubble_common
@@ -35,13 +35,13 @@ function handle_help_request () {
 function make_temp () {
   prefix="${1}"
   suffix="${2}"
-  echo "$(mktemp ${prefix}.XXXXXXXX${suffix})"
+  echo "$(mktemp ${prefix}.${suffix}.XXXXXXXX)"
 }
 
 function make_temp_dir () {
   prefix="${1}"
   suffix="${2}"
-  echo "$(mktemp -d ${prefix}.XXXXXXXX${suffix})"
+  echo "$(mktemp -d ${prefix}.${suffix}.XXXXXXXX)"
 }
 
 function quote_args () {
diff --git a/bubble-server/src/main/resources/packer/roles/bubble/files/bubble_restore_monitor.sh b/bubble-server/src/main/resources/packer/roles/bubble/files/bubble_restore_monitor.sh
index 57973b1d..ade26fd2 100755
--- a/bubble-server/src/main/resources/packer/roles/bubble/files/bubble_restore_monitor.sh
+++ b/bubble-server/src/main/resources/packer/roles/bubble/files/bubble_restore_monitor.sh
@@ -71,7 +71,7 @@ cp ${RESTORE_BASE}/bubble.jar ${BUBBLE_HOME}/api/bubble.jar
 
 # set wasRestored flag in self_node.json
 log "Adding wasRestored=true to ${SELF_NODE}"
-TEMP_SELF=$(mktemp /tmp/self_node.XXXXXXX.json)
+TEMP_SELF=$(mktemp /tmp/self_node.json.XXXXXXX)
 cat ${BUBBLE_SELF_NODE} | jq '.wasRestored = true' > ${TEMP_SELF} || die "Error adding 'wasRestored' flag to ${SELF_NODE}"
 cat ${TEMP_SELF} > ${BUBBLE_SELF_NODE} || die "Error rewriting ${SELF_NODE}"