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/16 05:13:52 UTC
svn commit: r1071138 - /qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
Author: tross
Date: Wed Feb 16 04:13:51 2011
New Revision: 1071138
URL: http://svn.apache.org/viewvc?rev=1071138&view=rev
Log:
QPID-3060
Modified:
qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
Modified: qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py?rev=1071138&r1=1071137&r2=1071138&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py (original)
+++ qpid/trunk/qpid/extras/qmf/src/py/qmf/console.py Wed Feb 16 04:13:51 2011
@@ -380,7 +380,8 @@ class Object(object):
dp.routing_key = self.getV2RoutingKey()
mp = self._broker.amqpSession.message_properties()
mp.content_type = "amqp/map"
- mp.user_id = self._broker.authUser
+ if self._broker.saslUser:
+ mp.user_id = self._broker.saslUser
mp.correlation_id = str(seq)
mp.app_id = "qmf2"
mp.reply_to = self._broker.amqpSession.reply_to("qmf.default.direct", self._broker.v2_direct_queue)
@@ -1492,7 +1493,8 @@ class Session:
dp.routing_key = objectId.getV2RoutingKey()
mp = broker.amqpSession.message_properties()
mp.content_type = "amqp/map"
- mp.user_id = broker.authUser
+ if broker.saslUser:
+ mp.user_id = broker.saslUser
mp.correlation_id = str(seq)
mp.app_id = "qmf2"
mp.reply_to = broker.amqpSession.reply_to("qmf.default.direct", broker.v2_direct_queue)
@@ -2236,6 +2238,7 @@ class Broker(Thread):
self.connTimeout = connTimeout
self.authUser = authUser
self.authPass = authPass
+ self.saslUser = None
self.cv = Condition()
self.seqToAgentMap = {}
self.error = None
@@ -2409,6 +2412,11 @@ class Broker(Thread):
self.conn.start()
sock.settimeout(oldTimeout)
self.conn.aborted = oldAborted
+ uid = self.conn.user_id
+ if uid.__class__ == tuple and len(uid) == 2:
+ self.saslUser = uid[1]
+ else:
+ self.saslUser = None
# prevent topic queues from filling up (and causing the agents to
# disconnect) by discarding the oldest queued messages when full.
@@ -2588,7 +2596,8 @@ class Broker(Thread):
dp.routing_key = "console.request.agent_locate"
mp = self.amqpSession.message_properties()
mp.content_type = "amqp/list"
- mp.user_id = self.authUser
+ if self.saslUser:
+ mp.user_id = self.saslUser
mp.app_id = "qmf2"
mp.reply_to = self.amqpSession.reply_to("qmf.default.direct", self.v2_direct_queue)
mp.application_headers = {'qmf.opcode':'_agent_locate_request'}
@@ -2630,7 +2639,8 @@ class Broker(Thread):
dp.ttl = ttl
mp = self.amqpSession.message_properties()
mp.content_type = "x-application/qmf"
- mp.user_id = self.authUser
+ if self.saslUser:
+ mp.user_id = self.saslUser
mp.reply_to = self.amqpSession.reply_to("amq.direct", self.replyName)
return Message(dp, mp, body)
@@ -3543,7 +3553,8 @@ class Agent:
dp.routing_key = self.getV2RoutingKey()
mp = self.broker.amqpSession.message_properties()
mp.content_type = "amqp/map"
- mp.user_id = self.broker.authUser
+ if self.broker.saslUser:
+ mp.user_id = self.broker.saslUser
mp.correlation_id = str(sequence)
mp.app_id = "qmf2"
mp.reply_to = self.broker.amqpSession.reply_to("qmf.default.direct", self.broker.v2_direct_queue)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org