openstack/oslo.messaging
Code Issues Proposed changes

Merge "Disable ACL if authentication cannot be performed."

Browse Source
This commit is contained in:
Jenkins 2015-09-17 02:45:44 +00:00 committed by Gerrit Code Review
commit 9afb9a30e8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup-test-env-qpid.sh
View File

@ -44,7 +44,6 @@ fi
cat > ${DATADIR}/qpidd.conf <<EOF cat > ${DATADIR}/qpidd.conf <<EOF
port=65123 port=65123
acl-file=${DATADIR}/qpidd.acl
sasl-config=${DATADIR}/sasl2 sasl-config=${DATADIR}/sasl2
${LIBACL} ${LIBACL}
mgmt-enable=yes mgmt-enable=yes
@ -63,6 +62,7 @@ EOF
else else
cat >> ${DATADIR}/qpidd.conf <<EOF cat >> ${DATADIR}/qpidd.conf <<EOF
auth=yes auth=yes
acl-file=${DATADIR}/qpidd.acl
EOF EOF
fi fi
@ -92,8 +92,19 @@ cat > ${DATADIR}/sasl2/qpidd.conf <<EOF
pwcheck_method: auxprop pwcheck_method: auxprop
auxprop_plugin: sasldb auxprop_plugin: sasldb
sasldb_path: ${DATADIR}/qpidd.sasldb sasldb_path: ${DATADIR}/qpidd.sasldb
EOF
# TODO(kgiusti): we can remove "ANONYMOUS" once proton 0.10.1+ is released:
# https://issues.apache.org/jira/browse/PROTON-974
if [ $PROTOCOL == "1" ]; then
cat >> ${DATADIR}/sasl2/qpidd.conf <<EOF
mech_list: PLAIN ANONYMOUS
EOF
else
cat >> ${DATADIR}/sasl2/qpidd.conf <<EOF
mech_list: PLAIN mech_list: PLAIN
EOF EOF
fi
echo secretqpid | saslpasswd2 -c -p -f ${DATADIR}/qpidd.sasldb -u QPID stackqpid echo secretqpid | saslpasswd2 -c -p -f ${DATADIR}/qpidd.sasldb -u QPID stackqpid