You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2012/11/14 12:21:19 UTC
svn commit: r1409161 - in /qpid/trunk/qpid/cpp:
examples/messaging/client.cpp src/qpid/NullSaslServer.cpp
Author: gsim
Date: Wed Nov 14 11:21:18 2012
New Revision: 1409161
URL: http://svn.apache.org/viewvc?rev=1409161&view=rev
Log:
NO-JIRA: Fail on invalid PLAIN request
Modified:
qpid/trunk/qpid/cpp/examples/messaging/client.cpp
qpid/trunk/qpid/cpp/src/qpid/NullSaslServer.cpp
Modified: qpid/trunk/qpid/cpp/examples/messaging/client.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/client.cpp?rev=1409161&r1=1409160&r2=1409161&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/client.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/client.cpp Wed Nov 14 11:21:18 2012
@@ -48,8 +48,9 @@ int main(int argc, char** argv) {
Sender sender = session.createSender("service_queue");
//create temp queue & receiver...
- Address responseQueue("#response-queue; {create:always, delete:always}");
- Receiver receiver = session.createReceiver(responseQueue);
+ std::stringstream replies;
+ replies << "amq.direct/" << qpid::types::Uuid(true) << "; {node: {type:topic}}";
+ Receiver receiver = session.createReceiver(replies.str());
// Now send some messages ...
string s[] = {
@@ -60,7 +61,7 @@ int main(int argc, char** argv) {
};
Message request;
- request.setReplyTo(responseQueue);
+ request.setReplyTo(replies.str());
for (int i=0; i<4; i++) {
request.setContent(s[i]);
sender.send(request);
Modified: qpid/trunk/qpid/cpp/src/qpid/NullSaslServer.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/NullSaslServer.cpp?rev=1409161&r1=1409160&r2=1409161&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/NullSaslServer.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/NullSaslServer.cpp Wed Nov 14 11:21:18 2012
@@ -39,7 +39,10 @@ NullSaslServer::Status NullSaslServer::s
} else if (i != std::string::npos) {
//authorization id is first null delimited field
uid = response->substr(0, i);
- }//else not a valid SASL PLAIN response, throw error?
+ } else {
+ QPID_LOG(error, "Invalid PLAIN request, null delimiter not found in response data");
+ return FAIL;
+ }
if (!uid.empty()) {
//append realm if it has not already been added
i = uid.find(realm);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org