Skip to content

Commit c64ccbf

Browse files
dzikowskidzikowski
committed
Revert "Use less strict permissions for channel genesis"
This reverts commit 31f3529.
1 parent 31f3529 commit c64ccbf

File tree

3 files changed

+13
-48
lines changed

3 files changed

+13
-48
lines changed

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3181,14 +3181,11 @@ createChannelAndJoin() {
31813181
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
31823182
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
31833183
3184-
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3185-
chmod -R a+rw "$DIR_NAME"
3184+
mkdir "$DIR_NAME" && cd "$DIR_NAME"
31863185
31873186
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb .
3188-
chmod a+rw "$CHANNEL_NAME".pb
31893187
31903188
osnadmin channel join --channelID "\${CHANNEL_NAME}" --config-block ./"$CHANNEL_NAME".pb -o "\${ORDERER_URL}"
3191-
cd ..
31923189
rm -rf "$DIR_NAME"
31933190
}
31943191
@@ -3210,10 +3207,8 @@ createChannelAndJoinTls() {
32103207
echo " TLS_CA_CERT_PATH: $TLS_CA_CERT_PATH"
32113208
32123209
if [ ! -d "$DIR_NAME" ]; then
3213-
mkdir -p "$DIR_NAME"
3214-
chmod -R a+rw "$DIR_NAME"
3210+
mkdir "$DIR_NAME"
32153211
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb "$DIR_NAME"
3216-
chmod a+rw "$DIR_NAME/$CHANNEL_NAME.pb"
32173212
fi
32183213
32193214
osnadmin channel join \\
@@ -3224,7 +3219,6 @@ createChannelAndJoinTls() {
32243219
--client-key "\${ADMIN_TLS_PRIVATE_KEY}" \\
32253220
--ca-file "\${TLS_CA_CERT_PATH}"
32263221
3227-
cd ..
32283222
rm -rf "$DIR_NAME"
32293223
}
32303224
@@ -3245,14 +3239,11 @@ fetchChannelAndJoin() {
32453239
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
32463240
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
32473241
3248-
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3249-
chmod -R a+rw "$DIR_NAME"
3242+
mkdir "$DIR_NAME" && cd "$DIR_NAME"
32503243
32513244
peer channel fetch newest -c "\${CHANNEL_NAME}" --orderer "\${ORDERER_URL}"
3252-
chmod a+rw "\${CHANNEL_NAME}"_newest.block
32533245
peer channel join -b "\${CHANNEL_NAME}"_newest.block
32543246
3255-
cd ..
32563247
rm -rf "$DIR_NAME"
32573248
}
32583249
@@ -3282,14 +3273,11 @@ fetchChannelAndJoinTls() {
32823273
echo " CORE_PEER_TLS_KEY_FILE: $CORE_PEER_TLS_KEY_FILE"
32833274
echo " CORE_PEER_TLS_ROOTCERT_FILE: $CORE_PEER_TLS_ROOTCERT_FILE"
32843275
3285-
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3286-
chmod -R a+rw "$DIR_NAME"
3276+
mkdir "$DIR_NAME" && cd "$DIR_NAME"
32873277
32883278
peer channel fetch newest -c "\${CHANNEL_NAME}" --orderer "\${ORDERER_URL}" --tls --cafile "$TLS_CA_CERT_PATH"
3289-
chmod a+rw "\${CHANNEL_NAME}"_newest.block
32903279
peer channel join -b "\${CHANNEL_NAME}"_newest.block --tls --cafile "$TLS_CA_CERT_PATH"
32913280
3292-
cd ..
32933281
rm -rf "$DIR_NAME"
32943282
}
32953283
"

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3206,14 +3206,11 @@ createChannelAndJoin() {
32063206
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
32073207
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
32083208
3209-
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3210-
chmod -R a+rw "$DIR_NAME"
3209+
mkdir "$DIR_NAME" && cd "$DIR_NAME"
32113210
32123211
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb .
3213-
chmod a+rw "$CHANNEL_NAME".pb
32143212
32153213
osnadmin channel join --channelID "\${CHANNEL_NAME}" --config-block ./"$CHANNEL_NAME".pb -o "\${ORDERER_URL}"
3216-
cd ..
32173214
rm -rf "$DIR_NAME"
32183215
}
32193216
@@ -3235,10 +3232,8 @@ createChannelAndJoinTls() {
32353232
echo " TLS_CA_CERT_PATH: $TLS_CA_CERT_PATH"
32363233
32373234
if [ ! -d "$DIR_NAME" ]; then
3238-
mkdir -p "$DIR_NAME"
3239-
chmod -R a+rw "$DIR_NAME"
3235+
mkdir "$DIR_NAME"
32403236
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb "$DIR_NAME"
3241-
chmod a+rw "$DIR_NAME/$CHANNEL_NAME.pb"
32423237
fi
32433238
32443239
osnadmin channel join \\
@@ -3249,7 +3244,6 @@ createChannelAndJoinTls() {
32493244
--client-key "\${ADMIN_TLS_PRIVATE_KEY}" \\
32503245
--ca-file "\${TLS_CA_CERT_PATH}"
32513246
3252-
cd ..
32533247
rm -rf "$DIR_NAME"
32543248
}
32553249
@@ -3270,14 +3264,11 @@ fetchChannelAndJoin() {
32703264
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
32713265
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
32723266
3273-
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3274-
chmod -R a+rw "$DIR_NAME"
3267+
mkdir "$DIR_NAME" && cd "$DIR_NAME"
32753268
32763269
peer channel fetch newest -c "\${CHANNEL_NAME}" --orderer "\${ORDERER_URL}"
3277-
chmod a+rw "\${CHANNEL_NAME}"_newest.block
32783270
peer channel join -b "\${CHANNEL_NAME}"_newest.block
32793271
3280-
cd ..
32813272
rm -rf "$DIR_NAME"
32823273
}
32833274
@@ -3307,14 +3298,11 @@ fetchChannelAndJoinTls() {
33073298
echo " CORE_PEER_TLS_KEY_FILE: $CORE_PEER_TLS_KEY_FILE"
33083299
echo " CORE_PEER_TLS_ROOTCERT_FILE: $CORE_PEER_TLS_ROOTCERT_FILE"
33093300
3310-
mkdir -p "$DIR_NAME" && cd "$DIR_NAME"
3311-
chmod -R a+rw "$DIR_NAME"
3301+
mkdir "$DIR_NAME" && cd "$DIR_NAME"
33123302
33133303
peer channel fetch newest -c "\${CHANNEL_NAME}" --orderer "\${ORDERER_URL}" --tls --cafile "$TLS_CA_CERT_PATH"
3314-
chmod a+rw "\${CHANNEL_NAME}"_newest.block
33153304
peer channel join -b "\${CHANNEL_NAME}"_newest.block --tls --cafile "$TLS_CA_CERT_PATH"
33163305
3317-
cd ..
33183306
rm -rf "$DIR_NAME"
33193307
}
33203308
"

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

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

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

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

2827
osnadmin channel join --channelID "${CHANNEL_NAME}" --config-block ./"$CHANNEL_NAME".pb -o "${ORDERER_URL}"
29-
cd ..
3028
rm -rf "$DIR_NAME"
3129
}
3230

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

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

5753
osnadmin channel join \
@@ -62,7 +58,6 @@ createChannelAndJoinTls() {
6258
--client-key "${ADMIN_TLS_PRIVATE_KEY}" \
6359
--ca-file "${TLS_CA_CERT_PATH}"
6460

65-
cd ..
6661
rm -rf "$DIR_NAME"
6762
}
6863

@@ -83,14 +78,11 @@ fetchChannelAndJoin() {
8378
echo " CORE_PEER_ADDRESS: $CORE_PEER_ADDRESS"
8479
echo " CORE_PEER_MSPCONFIGPATH: $CORE_PEER_MSPCONFIGPATH"
8580

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

8983
peer channel fetch newest -c "${CHANNEL_NAME}" --orderer "${ORDERER_URL}"
90-
chmod a+rw "${CHANNEL_NAME}"_newest.block
9184
peer channel join -b "${CHANNEL_NAME}"_newest.block
9285

93-
cd ..
9486
rm -rf "$DIR_NAME"
9587
}
9688

@@ -120,13 +112,10 @@ fetchChannelAndJoinTls() {
120112
echo " CORE_PEER_TLS_KEY_FILE: $CORE_PEER_TLS_KEY_FILE"
121113
echo " CORE_PEER_TLS_ROOTCERT_FILE: $CORE_PEER_TLS_ROOTCERT_FILE"
122114

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

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

130-
cd ..
131120
rm -rf "$DIR_NAME"
132121
}

0 commit comments

Comments
 (0)