Skip to content

Commit 31f3529

Browse files
dzikowskidzikowski
committed
Use less strict permissions for channel genesis
Signed-off-by: Jakub Dzikowski <jakub.t.dzikowski@gmail.com>
1 parent c430c74 commit 31f3529

File tree

3 files changed

+48
-13
lines changed

3 files changed

+48
-13
lines changed

‎e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3181,11 +3181,14 @@ createChannelAndJoin() {
31813181
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
31823182
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
31833183
3184-
mkdir "$DIR_NAME" && cd "$DIR_NAME"
3184+
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3185+
chmod -R a+rw "$DIR_NAME"
31853186
31863187
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb .
3188+
chmod a+rw "$CHANNEL_NAME".pb
31873189
31883190
osnadmin channel join --channelID "\${CHANNEL_NAME}" --config-block ./"$CHANNEL_NAME".pb -o "\${ORDERER_URL}"
3191+
cd ..
31893192
rm -rf "$DIR_NAME"
31903193
}
31913194
@@ -3207,8 +3210,10 @@ createChannelAndJoinTls() {
32073210
echo " TLS_CA_CERT_PATH: $TLS_CA_CERT_PATH"
32083211
32093212
if [ ! -d "$DIR_NAME" ]; then
3210-
mkdir "$DIR_NAME"
3213+
mkdir -p "$DIR_NAME"
3214+
chmod -R a+rw "$DIR_NAME"
32113215
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb "$DIR_NAME"
3216+
chmod a+rw "$DIR_NAME/$CHANNEL_NAME.pb"
32123217
fi
32133218
32143219
osnadmin channel join \\
@@ -3219,6 +3224,7 @@ createChannelAndJoinTls() {
32193224
--client-key "\${ADMIN_TLS_PRIVATE_KEY}" \\
32203225
--ca-file "\${TLS_CA_CERT_PATH}"
32213226
3227+
cd ..
32223228
rm -rf "$DIR_NAME"
32233229
}
32243230
@@ -3239,11 +3245,14 @@ fetchChannelAndJoin() {
32393245
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
32403246
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
32413247
3242-
mkdir "$DIR_NAME" && cd "$DIR_NAME"
3248+
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3249+
chmod -R a+rw "$DIR_NAME"
32433250
32443251
peer channel fetch newest -c "\${CHANNEL_NAME}" --orderer "\${ORDERER_URL}"
3252+
chmod a+rw "\${CHANNEL_NAME}"_newest.block
32453253
peer channel join -b "\${CHANNEL_NAME}"_newest.block
32463254
3255+
cd ..
32473256
rm -rf "$DIR_NAME"
32483257
}
32493258
@@ -3273,11 +3282,14 @@ fetchChannelAndJoinTls() {
32733282
echo " CORE_PEER_TLS_KEY_FILE: $CORE_PEER_TLS_KEY_FILE"
32743283
echo " CORE_PEER_TLS_ROOTCERT_FILE: $CORE_PEER_TLS_ROOTCERT_FILE"
32753284
3276-
mkdir "$DIR_NAME" && cd "$DIR_NAME"
3285+
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3286+
chmod -R a+rw "$DIR_NAME"
32773287
32783288
peer channel fetch newest -c "\${CHANNEL_NAME}" --orderer "\${ORDERER_URL}" --tls --cafile "$TLS_CA_CERT_PATH"
3289+
chmod a+rw "\${CHANNEL_NAME}"_newest.block
32793290
peer channel join -b "\${CHANNEL_NAME}"_newest.block --tls --cafile "$TLS_CA_CERT_PATH"
32803291
3292+
cd ..
32813293
rm -rf "$DIR_NAME"
32823294
}
32833295
"

‎e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3206,11 +3206,14 @@ createChannelAndJoin() {
32063206
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
32073207
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
32083208
3209-
mkdir "$DIR_NAME" && cd "$DIR_NAME"
3209+
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3210+
chmod -R a+rw "$DIR_NAME"
32103211
32113212
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb .
3213+
chmod a+rw "$CHANNEL_NAME".pb
32123214
32133215
osnadmin channel join --channelID "\${CHANNEL_NAME}" --config-block ./"$CHANNEL_NAME".pb -o "\${ORDERER_URL}"
3216+
cd ..
32143217
rm -rf "$DIR_NAME"
32153218
}
32163219
@@ -3232,8 +3235,10 @@ createChannelAndJoinTls() {
32323235
echo " TLS_CA_CERT_PATH: $TLS_CA_CERT_PATH"
32333236
32343237
if [ ! -d "$DIR_NAME" ]; then
3235-
mkdir "$DIR_NAME"
3238+
mkdir -p "$DIR_NAME"
3239+
chmod -R a+rw "$DIR_NAME"
32363240
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb "$DIR_NAME"
3241+
chmod a+rw "$DIR_NAME/$CHANNEL_NAME.pb"
32373242
fi
32383243
32393244
osnadmin channel join \\
@@ -3244,6 +3249,7 @@ createChannelAndJoinTls() {
32443249
--client-key "\${ADMIN_TLS_PRIVATE_KEY}" \\
32453250
--ca-file "\${TLS_CA_CERT_PATH}"
32463251
3252+
cd ..
32473253
rm -rf "$DIR_NAME"
32483254
}
32493255
@@ -3264,11 +3270,14 @@ fetchChannelAndJoin() {
32643270
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
32653271
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
32663272
3267-
mkdir "$DIR_NAME" && cd "$DIR_NAME"
3273+
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3274+
chmod -R a+rw "$DIR_NAME"
32683275
32693276
peer channel fetch newest -c "\${CHANNEL_NAME}" --orderer "\${ORDERER_URL}"
3277+
chmod a+rw "\${CHANNEL_NAME}"_newest.block
32703278
peer channel join -b "\${CHANNEL_NAME}"_newest.block
32713279
3280+
cd ..
32723281
rm -rf "$DIR_NAME"
32733282
}
32743283
@@ -3298,11 +3307,14 @@ fetchChannelAndJoinTls() {
32983307
echo " CORE_PEER_TLS_KEY_FILE: $CORE_PEER_TLS_KEY_FILE"
32993308
echo " CORE_PEER_TLS_ROOTCERT_FILE: $CORE_PEER_TLS_ROOTCERT_FILE"
33003309
3301-
mkdir "$DIR_NAME" && cd "$DIR_NAME"
3310+
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3311+
chmod -R a+rw "$DIR_NAME"
33023312
33033313
peer channel fetch newest -c "\${CHANNEL_NAME}" --orderer "\${ORDERER_URL}" --tls --cafile "$TLS_CA_CERT_PATH"
3314+
chmod a+rw "\${CHANNEL_NAME}"_newest.block
33043315
peer channel join -b "\${CHANNEL_NAME}"_newest.block --tls --cafile "$TLS_CA_CERT_PATH"
33053316
3317+
cd ..
33063318
rm -rf "$DIR_NAME"
33073319
}
33083320
"

‎src/setup-docker/templates/fabric-docker/scripts/cli/channel_fns-v3.sh‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ createChannelAndJoin() {
1919
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
2020
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
2121

22-
mkdir "$DIR_NAME" && cd "$DIR_NAME"
23-
22+
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
23+
chmod -R a+rw "$DIR_NAME"
2424

2525
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb .
26+
chmod a+rw "$CHANNEL_NAME".pb
2627

2728
osnadmin channel join --channelID "${CHANNEL_NAME}" --config-block ./"$CHANNEL_NAME".pb -o "${ORDERER_URL}"
29+
cd ..
2830
rm -rf "$DIR_NAME"
2931
}
3032

@@ -46,8 +48,10 @@ createChannelAndJoinTls() {
4648
echo " TLS_CA_CERT_PATH: $TLS_CA_CERT_PATH"
4749

4850
if [ ! -d "$DIR_NAME" ]; then
49-
mkdir "$DIR_NAME"
51+
mkdir -p "$DIR_NAME"
52+
chmod -R a+rw "$DIR_NAME"
5053
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb "$DIR_NAME"
54+
chmod a+rw "$DIR_NAME/$CHANNEL_NAME.pb"
5155
fi
5256

5357
osnadmin channel join \
@@ -58,6 +62,7 @@ createChannelAndJoinTls() {
5862
--client-key "${ADMIN_TLS_PRIVATE_KEY}" \
5963
--ca-file "${TLS_CA_CERT_PATH}"
6064

65+
cd ..
6166
rm -rf "$DIR_NAME"
6267
}
6368

@@ -78,11 +83,14 @@ fetchChannelAndJoin() {
7883
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
7984
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
8085

81-
mkdir "$DIR_NAME" && cd "$DIR_NAME"
86+
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
87+
chmod -R a+rw "$DIR_NAME"
8288

8389
peer channel fetch newest -c "${CHANNEL_NAME}" --orderer "${ORDERER_URL}"
90+
chmod a+rw "${CHANNEL_NAME}"_newest.block
8491
peer channel join -b "${CHANNEL_NAME}"_newest.block
8592

93+
cd ..
8694
rm -rf "$DIR_NAME"
8795
}
8896

@@ -112,10 +120,13 @@ fetchChannelAndJoinTls() {
112120
echo " CORE_PEER_TLS_KEY_FILE: $CORE_PEER_TLS_KEY_FILE"
113121
echo " CORE_PEER_TLS_ROOTCERT_FILE: $CORE_PEER_TLS_ROOTCERT_FILE"
114122

115-
mkdir "$DIR_NAME" && cd "$DIR_NAME"
123+
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
124+
chmod -R a+rw "$DIR_NAME"
116125

117126
peer channel fetch newest -c "${CHANNEL_NAME}" --orderer "${ORDERER_URL}" --tls --cafile "$TLS_CA_CERT_PATH"
127+
chmod a+rw "${CHANNEL_NAME}"_newest.block
118128
peer channel join -b "${CHANNEL_NAME}"_newest.block --tls --cafile "$TLS_CA_CERT_PATH"
119129

130+
cd ..
120131
rm -rf "$DIR_NAME"
121132
}

0 commit comments

Comments
 (0)