You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/03/15 12:26:20 UTC
svn commit: r1787039 - in /qpid/java/branches/6.0.x: ./
broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Author: orudyy
Date: Wed Mar 15 12:26:19 2017
New Revision: 1787039
URL: http://svn.apache.org/viewvc?rev=1787039&view=rev
Log:
QPID-7696: [Java Broker] Do not require 'unbind' permission to delete queue or exchange
merged from 6.1.x branch using
svn merge -c 1786743 ^/qpid/java/branches/6.1.x
svn merge -c 1787035 ^/qpid/java/branches/6.1.x
merge conficts are resoved manually
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 15 12:26:19 2017
@@ -9,6 +9,6 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/branches/6.1.x:1767487,1770199,1774599,1785143,1785279,1785819,1786019,1786342,1786731,1786924,1786930,1786935,1786941
+/qpid/java/branches/6.1.x:1767487,1770199,1774599,1785143,1785279,1785819,1786019,1786342,1786731,1786743,1786924,1786930,1786935,1786941,1787035
/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1727954,1728089,1728167,1728302,1728497,1728501,1728524,1728639,1728651,1728772,1729215,1729297,1729347,1729356,1729406,1729408,1729412,1729515,1729638,1729656-1729
657,1729783,1729828,1729832,1729841,1729851,1729886,1729904,1729973,1730019,1730025,1730052,1730072,1730088,1730494,1730499,1730547,1730559,1730567,1730578,1730585,1730651,1730697,1730712-1730713,1730805,1731029,1731110,1731210,1731225,1731444,1731551,1731612,1732184,1732452,1732461,1732465,1732525,1732812,1733467,1734452,1736478,1736751,1736838,1737804,1737835,1737853,1737984,1737992,1738119,1738135,1738231,1738271,1738607,1738610,1738731,1738914,1741702,1742257,1742284,1742339,1742544,1742900,1742926,1743161,1743228,1743383,1743982,1744012-1744013,1744046,1744123,1744157,1744276,1744403,1745424,1745450,1746140,1746273,1747526,1748254,1748723,1748818,1749349,1749399,1749482,1749524,1750359-1750360,1750943,1751433,1754251,1754354,1754392,1754429,1754510,1754550,1755561,1755957,1758628,1758640,1758766,1758964,1758980,1759774,1759783,1760032,1760337,1760522,1760546,1762070,1763653,1763966,1763988,1765350,1765609,1765828,1766032,1766547,1766553,1766796,1769597,1772365,1774446,1785117,1
785158,1785311,1785854,1785936,1786188,1786342,1786690,1786723,1786914,1786923
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1787039&r1=1787038&r2=1787039&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Wed Mar 15 12:26:19 2017
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.exchange;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -36,6 +37,8 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import javax.security.auth.Subject;
+
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
@@ -66,6 +69,7 @@ import org.apache.qpid.server.model.Stat
import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.BaseQueue;
+import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.MessageEnqueueRecord;
import org.apache.qpid.server.store.StorableMessageMetaData;
import org.apache.qpid.server.txn.ServerTransaction;
@@ -185,13 +189,22 @@ public abstract class AbstractExchange<T
if(_closed.compareAndSet(false,true))
{
- List<ListenableFuture<Void>> removeBindingFutures = new ArrayList<>(_bindings.size());
+ final List<ListenableFuture<Void>> removeBindingFutures = new ArrayList<>(_bindings.size());
- List<BindingImpl> bindings = new ArrayList<>(_bindings);
- for(BindingImpl binding : bindings)
- {
- removeBindingFutures.add(binding.deleteAsync());
- }
+ final List<BindingImpl> bindings = new ArrayList<>(_bindings);
+ Subject.doAs(SecurityManager.getSubjectWithAddedSystemRights(),
+ new PrivilegedAction<Void>()
+ {
+ @Override
+ public Void run()
+ {
+ for (BindingImpl binding : bindings)
+ {
+ removeBindingFutures.add(binding.deleteAsync());
+ }
+ return null;
+ }
+ });
ListenableFuture<List<Void>> combinedFuture = Futures.allAsList(removeBindingFutures);
return doAfter(combinedFuture, new Runnable()
Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1787039&r1=1787038&r2=1787039&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java Wed Mar 15 12:26:19 2017
@@ -1969,12 +1969,19 @@ public abstract class AbstractQueue<X ex
final int queueDepthMessages = getQueueDepthMessages();
final List<ListenableFuture<Void>> removeBindingFutures = new ArrayList<>(_bindings.size());
final ArrayList<BindingImpl> bindingCopy = new ArrayList<>(_bindings);
-
- // TODO - RG - Need to sort out bindings!
- for (BindingImpl b : bindingCopy)
- {
- removeBindingFutures.add(b.deleteAsync());
- }
+ Subject.doAs(SecurityManager.getSubjectWithAddedSystemRights(),
+ new PrivilegedAction<Void>()
+ {
+ @Override
+ public Void run()
+ {
+ for (BindingImpl binding : bindingCopy)
+ {
+ removeBindingFutures.add(binding.deleteAsync());
+ }
+ return null;
+ }
+ });
ListenableFuture<List<Void>> combinedFuture = Futures.allAsList(removeBindingFutures);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org