qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r1060110 - in /qpid/trunk/qpid/cpp/src/qpid/broker: Link.cpp Link.h
Date Mon, 17 Jan 2011 22:11:36 GMT
Author: gsim
Date: Mon Jan 17 22:11:35 2011
New Revision: 1060110

URL: http://svn.apache.org/viewvc?rev=1060110&view=rev
Log:
QPID-3006: remove incorrect and unnecessary authorisation check

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp
    qpid/trunk/qpid/cpp/src/qpid/broker/Link.h

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp?rev=1060110&r1=1060109&r2=1060110&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp Mon Jan 17 22:11:35 2011
@@ -174,18 +174,6 @@ void Link::closed (int, std::string text
         destroy();
 }
 
-void Link::checkClosePermission()
-{
-    Mutex::ScopedLock mutex(lock);
-    
-    AclModule* acl = getBroker()->getAcl();
-    std::string userID = getUsername() + "@" + getBroker()->getOptions().realm;
-    if (acl && !acl->authorise(userID,acl::ACT_DELETE,acl::OBJ_LINK,"")){
-        throw UnauthorizedAccessException("ACL denied delete link request");
-    }
-}
-
-
 void Link::destroy ()
 {
     Bridges toDelete;
@@ -415,7 +403,6 @@ Manageable::status_t Link::ManagementMet
     switch (op)
     {
     case _qmf::Link::METHOD_CLOSE :
-        checkClosePermission();
         if (!closing) {
 	    closing = true;
 	    if (state != STATE_CONNECTING && connection) {

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Link.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Link.h?rev=1060110&r1=1060109&r2=1060110&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Link.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Link.h Mon Jan 17 22:11:35 2011
@@ -85,7 +85,6 @@ namespace qpid {
             void destroy();                  // Called when mgmt deletes this link
             void ioThreadProcessing();       // Called on connection's IO thread by request
             bool tryFailover();              // Called during maintenance visit
-            void checkClosePermission();     // ACL check for explict mgmt call to close
this link
 
         public:
             typedef boost::shared_ptr<Link> shared_ptr;



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message