diff options
| author | Ted Ross <tross@apache.org> | 2011-02-11 04:14:59 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2011-02-11 04:14:59 +0000 |
| commit | ef8ed04b99e5712f183d83c6ab0b9b60a1657d87 (patch) | |
| tree | 8d443cda1ca0cf926785431e6108977149b1cf43 /qpid/cpp/src/qmf/Agent.cpp | |
| parent | d14a411199dd355c2d08a22abbdddfe656955cce (diff) | |
| download | qpid-python-ef8ed04b99e5712f183d83c6ab0b9b60a1657d87.tar.gz | |
QPID-3046 - Refactored so that Connection::getAuthenticatedUsername is consulted each time
a sent message is annotated with the user-id.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1069673 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qmf/Agent.cpp')
| -rw-r--r-- | qpid/cpp/src/qmf/Agent.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/qpid/cpp/src/qmf/Agent.cpp b/qpid/cpp/src/qmf/Agent.cpp index 3843053905..915f2a1c88 100644 --- a/qpid/cpp/src/qmf/Agent.cpp +++ b/qpid/cpp/src/qmf/Agent.cpp @@ -556,8 +556,9 @@ void AgentImpl::sendQuery(const Query& query, uint32_t correlator) 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& method, const Variant::Map& args, const 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 SchemaId& id) 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); |