You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/02/27 03:25:38 UTC
[1/2] activemq-artemis git commit: This closes #1051
Repository: activemq-artemis
Updated Branches:
refs/heads/master c71063d2a -> 3d503ac8d
This closes #1051
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/3d503ac8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3d503ac8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3d503ac8
Branch: refs/heads/master
Commit: 3d503ac8d16713f071ab2863ea3b072486f1cd96
Parents: c71063d 216f317
Author: Clebert Suconic <cl...@apache.org>
Authored: Sun Feb 26 22:25:10 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Sun Feb 26 22:25:10 2017 -0500
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 8 +-
.../openwire/SecurityOpenWireTest.java | 83 ++++++++++++++++++++
2 files changed, 90 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1000 Openwire exception
response no correlation-id
Posted by cl...@apache.org.
ARTEMIS-1000 Openwire exception response no correlation-id
When openwire sends back an exception response, it doesn't set
the correct correlation id. This causes the client to miss the
response and the exception won't get caught.
To fix it we need to add the correlation id before sending.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/216f3176
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/216f3176
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/216f3176
Branch: refs/heads/master
Commit: 216f31765f91b281e41c83dd8bf09bf81db0f155
Parents: c71063d
Author: Howard Gao <ho...@gmail.com>
Authored: Mon Feb 27 09:30:22 2017 +0800
Committer: Clebert Suconic <cl...@apache.org>
Committed: Sun Feb 26 22:25:10 2017 -0500
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 8 +-
.../openwire/SecurityOpenWireTest.java | 83 ++++++++++++++++++++
2 files changed, 90 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/216f3176/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index 08a71da..5f408a6 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -289,7 +289,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
if (responseRequired) {
if (response == null) {
response = new Response();
- response.setCorrelationId(command.getCommandId());
+ response.setCorrelationId(commandId);
}
}
@@ -339,6 +339,12 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
public void sendException(Exception e) {
Response resp = convertException(e);
+ if (context != null) {
+ Command command = context.getLastCommand();
+ if (command != null) {
+ resp.setCorrelationId(command.getCommandId());
+ }
+ }
try {
dispatch(resp);
} catch (IOException e2) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/216f3176/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SecurityOpenWireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SecurityOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SecurityOpenWireTest.java
new file mode 100644
index 0000000..3c7e50f
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SecurityOpenWireTest.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.integration.openwire;
+
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.security.Role;
+import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.JMSException;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import java.util.HashSet;
+import java.util.Set;
+
+public class SecurityOpenWireTest extends BasicOpenWireTest {
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ //this system property is used to construct the executor in
+ //org.apache.activemq.transport.AbstractInactivityMonitor.createExecutor()
+ //and affects the pool's shutdown time. (default is 30 sec)
+ //set it to 2 to make tests shutdown quicker.
+ System.setProperty("org.apache.activemq.transport.AbstractInactivityMonitor.keepAliveTime", "2");
+ this.realStore = true;
+ enableSecurity = true;
+ super.setUp();
+ }
+
+ @Override
+ protected void extraServerConfig(Configuration serverConfig) {
+
+ super.extraServerConfig(serverConfig);
+ ActiveMQJAASSecurityManager securityManager = (ActiveMQJAASSecurityManager) server.getSecurityManager();
+ securityManager.getConfiguration().addUser("denyQ", "denyQ");
+ securityManager.getConfiguration().addRole("denyQ", "denyQ");
+ }
+
+ @Test
+ public void testSendNoAuth() throws Exception {
+ Set<Role> roles = new HashSet<>();
+ roles.add(new Role("programmers", false, false, false, false, false, false, false, false, false, false));
+
+ server.getSecurityRepository().addMatch("denyQ", roles);
+ SimpleString denyQ = new SimpleString("denyQ");
+ server.createQueue(denyQ, RoutingType.ANYCAST, denyQ, null, true, false);
+ try (Connection connection = factory.createConnection("denyQ", "denyQ")) {
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = session.createQueue("denyQ");
+ System.out.println("Queue:" + queue);
+ MessageProducer producer = session.createProducer(queue);
+ producer.setDeliveryMode(DeliveryMode.PERSISTENT);
+ try {
+ producer.send(session.createTextMessage());
+ fail();
+ } catch (JMSException e) {
+ //pass
+ }
+ }
+ }
+
+}