From 9f7a5e8d990d09d94e2287263f98fb1e3bd9fd6b Mon Sep 17 00:00:00 2001 From: Kurt Seifried Date: Thu, 25 Mar 2021 21:46:32 -0600 Subject: [PATCH] Fixed information leak Signed-off-by: Kurt Seifried Signed-off-by: Ry Jones --- commercial-paper/organization/digibank/digibank.sh | 7 ++++--- commercial-paper/organization/magnetocorp/magnetocorp.sh | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/commercial-paper/organization/digibank/digibank.sh b/commercial-paper/organization/digibank/digibank.sh index 31df1e79..1b977b12 100755 --- a/commercial-paper/organization/digibank/digibank.sh +++ b/commercial-paper/organization/digibank/digibank.sh @@ -2,6 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 # +TMPFILE=`mktemp` shopt -s extglob function _exit(){ @@ -19,7 +20,7 @@ DIR=${PWD} # Locate the test network cd "${DIR}/../../../test-network" -env | sort > /tmp/env.orig +env | sort > $TMPFILE OVERRIDE_ORG="1" . ./scripts/envVar.sh @@ -30,8 +31,8 @@ parsePeerConnectionParameters 1 2 export FABRIC_CFG_PATH="${DIR}/../../../config" export PATH="${DIR}/../../../bin:${PWD}:$PATH" -env | sort | comm -1 -3 /tmp/env.orig - | sed -E 's/(.*)=(.*)/export \1="\2"/' +env | sort | comm -1 -3 $TMPFILE - | sed -E 's/(.*)=(.*)/export \1="\2"/' -rm /tmp/env.orig +rm $TMPFILE cd "${DIR}" diff --git a/commercial-paper/organization/magnetocorp/magnetocorp.sh b/commercial-paper/organization/magnetocorp/magnetocorp.sh index 6469ee74..c061d275 100755 --- a/commercial-paper/organization/magnetocorp/magnetocorp.sh +++ b/commercial-paper/organization/magnetocorp/magnetocorp.sh @@ -1,6 +1,7 @@ #!/bin/bash # # SPDX-License-Identifier: Apache-2.0 +TMPFILE=`mktemp` shopt -s extglob function _exit(){ @@ -17,9 +18,9 @@ function _exit(){ # Where am I? DIR=${PWD} -# Locate the test-network +# Locate the test-network cd "${DIR}/../../../test-network" -env | sort > /tmp/env.orig +env | sort > $TMPFILE OVERRIDE_ORG="2" . ./scripts/envVar.sh @@ -31,7 +32,7 @@ parsePeerConnectionParameters 1 2 export FABRIC_CFG_PATH="${DIR}/../../../config" export PATH="${DIR}/../../../bin:${PWD}:$PATH" -env | sort | comm -1 -3 /tmp/env.orig - | sed -E 's/(.*)=(.*)/export \1="\2"/' -rm /tmp/env.orig +env | sort | comm -1 -3 $TMPFILE - | sed -E 's/(.*)=(.*)/export \1="\2"/' +rm $TMPFILE cd "${DIR}"