summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/cluster/FailoverExchange.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2011-12-06 15:56:40 +0000
committerAlan Conway <aconway@apache.org>2011-12-06 15:56:40 +0000
commitef1fbc16c604f22307251ed1c2ccfa8debad1762 (patch)
treeb6b0c097cd643e51b7c1615e6b2f8c2aca850efa /cpp/src/qpid/cluster/FailoverExchange.cpp
parenta2ec0c96a9783538756f80ed19ab1af589a39dff (diff)
downloadqpid-python-ef1fbc16c604f22307251ed1c2ccfa8debad1762.tar.gz
QPID-3652: Fix cluster authentication.
Only allow brokers that authenticate as the cluster-username to join a cluster. New broker first connects to a cluster broker authenticates as the cluster-username and sends its CPG member ID to the qpid.cluster-credentials exchange. The cluster broker that subsequently acts as updater verifies that the credentials are valid before connecting to give the update. NOTE 1: If you are using an ACL, the cluster-username must be allowed to publish to the qpid.cluster-credentials exchange. E.g. in your ACL file: acl allow foo@QPID publish exchange name=qpid.cluster-credentials NOTE 2: This changes the cluster initialization protocol, you will need to restart the cluster with all new version brokers. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1210989 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/FailoverExchange.cpp')
-rw-r--r--cpp/src/qpid/cluster/FailoverExchange.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/qpid/cluster/FailoverExchange.cpp b/cpp/src/qpid/cluster/FailoverExchange.cpp
index cfbe34a460..43ec27cf2c 100644
--- a/cpp/src/qpid/cluster/FailoverExchange.cpp
+++ b/cpp/src/qpid/cluster/FailoverExchange.cpp
@@ -28,6 +28,7 @@
#include "qpid/framing/MessageTransferBody.h"
#include "qpid/log/Statement.h"
#include "qpid/framing/Array.h"
+#include "qpid/UrlArray.h"
#include <boost/bind.hpp>
#include <algorithm>
@@ -86,9 +87,7 @@ void FailoverExchange::route(Deliverable&, const string& , const framing::FieldT
void FailoverExchange::sendUpdate(const Queue::shared_ptr& queue) {
// Called with lock held.
if (urls.empty()) return;
- framing::Array array(0x95);
- for (Urls::const_iterator i = urls.begin(); i != urls.end(); ++i)
- array.add(boost::shared_ptr<Str16Value>(new Str16Value(i->str())));
+ framing::Array array = vectorToUrlArray(urls);
const ProtocolVersion v;
boost::intrusive_ptr<Message> msg(new Message);
AMQFrame command(MessageTransferBody(v, typeName, 1, 0));