You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2011/02/11 05:14:59 UTC
svn commit: r1069673 - in /qpid/trunk/qpid/cpp/src/qmf: Agent.cpp
ConsoleSession.cpp ConsoleSessionImpl.h
Author: tross
Date: Fri Feb 11 04:14:59 2011
New Revision: 1069673
URL: http://svn.apache.org/viewvc?rev=1069673&view=rev
Log:
QPID-3046 - Refactored so that Connection::getAuthenticatedUsername is consulted each time
a sent message is annotated with the user-id.
Modified:
qpid/trunk/qpid/cpp/src/qmf/Agent.cpp
qpid/trunk/qpid/cpp/src/qmf/ConsoleSession.cpp
qpid/trunk/qpid/cpp/src/qmf/ConsoleSessionImpl.h
Modified: qpid/trunk/qpid/cpp/src/qmf/Agent.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/Agent.cpp?rev=1069673&r1=1069672&r2=1069673&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/Agent.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/Agent.cpp Fri Feb 11 04:14:59 2011
@@ -556,8 +556,9 @@ void AgentImpl::sendQuery(const Query& q
msg.setReplyTo(session.replyAddress);
msg.setCorrelationId(boost::lexical_cast<string>(correlator));
msg.setSubject(directSubject);
- if (!session.authUser.empty())
- msg.setUserId(session.authUser);
+ string userId(session.connection.getAuthenticatedUsername());
+ if (!userId.empty())
+ msg.setUserId(userId);
encode(QueryImplAccess::get(query).asMap(), msg);
if (sender.isValid()) {
sender.send(msg);
@@ -583,8 +584,9 @@ void AgentImpl::sendMethod(const string&
msg.setReplyTo(session.replyAddress);
msg.setCorrelationId(boost::lexical_cast<string>(correlator));
msg.setSubject(directSubject);
- if (!session.authUser.empty())
- msg.setUserId(session.authUser);
+ string userId(session.connection.getAuthenticatedUsername());
+ if (!userId.empty())
+ msg.setUserId(userId);
encode(map, msg);
if (sender.isValid()) {
sender.send(msg);
@@ -626,8 +628,9 @@ void AgentImpl::sendSchemaRequest(const
msg.setReplyTo(session.replyAddress);
msg.setContent(content);
msg.setSubject(directSubject);
- if (!session.authUser.empty())
- msg.setUserId(session.authUser);
+ string userId(session.connection.getAuthenticatedUsername());
+ if (!userId.empty())
+ msg.setUserId(userId);
if (sender.isValid()) {
sender.send(msg);
QPID_LOG(trace, "SENT V1SchemaRequest to=" << sender.getName() << "/" << directSubject);
Modified: qpid/trunk/qpid/cpp/src/qmf/ConsoleSession.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/ConsoleSession.cpp?rev=1069673&r1=1069672&r2=1069673&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ConsoleSession.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qmf/ConsoleSession.cpp Fri Feb 11 04:14:59 2011
@@ -65,7 +65,7 @@ Subscription ConsoleSession::subscribe(c
//========================================================================================
ConsoleSessionImpl::ConsoleSessionImpl(Connection& c, const string& options) :
- connection(c), domain("default"), authUser(c.getAuthenticatedUsername()), maxAgentAgeMinutes(5),
+ connection(c), domain("default"), maxAgentAgeMinutes(5),
opened(false), thread(0), threadCanceled(false), lastVisit(0), lastAgePass(0),
connectedBrokerInAgentList(false), schemaCache(new SchemaCache())
{
Modified: qpid/trunk/qpid/cpp/src/qmf/ConsoleSessionImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qmf/ConsoleSessionImpl.h?rev=1069673&r1=1069672&r2=1069673&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qmf/ConsoleSessionImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qmf/ConsoleSessionImpl.h Fri Feb 11 04:14:59 2011
@@ -72,7 +72,6 @@ namespace qmf {
qpid::messaging::Sender directSender;
qpid::messaging::Sender topicSender;
std::string domain;
- std::string authUser;
uint32_t maxAgentAgeMinutes;
bool listenOnDirect;
bool strictSecurity;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org