You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by rg...@apache.org on 2022/07/31 00:09:14 UTC
[flume] 01/02: FLUME-3428 - Validate the parameter
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/flume.git
commit 7fe9af49c485756e1b618493a5bc00b70d7fbd2d
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sat Jul 30 01:16:17 2022 -0700
FLUME-3428 - Validate the parameter
---
.../org/apache/flume/source/jms/JMSMessageConsumer.java | 15 +++++++++++++++
.../flume/source/jms/JMSMessageConsumerTestBase.java | 8 +++++++-
.../apache/flume/source/jms/TestJMSMessageConsumer.java | 6 ++++++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSMessageConsumer.java b/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSMessageConsumer.java
index 645cbcce..5375bd03 100644
--- a/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSMessageConsumer.java
+++ b/flume-ng-sources/flume-jms-source/src/main/java/org/apache/flume/source/jms/JMSMessageConsumer.java
@@ -35,11 +35,14 @@ import javax.jms.Session;
import javax.jms.Topic;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
class JMSMessageConsumer {
private static final Logger logger = LoggerFactory.getLogger(JMSMessageConsumer.class);
+ private static final String JAVA_SCHEME = "java";
private final int batchSize;
private final long pollTimeout;
@@ -99,6 +102,14 @@ class JMSMessageConsumer {
throw new IllegalStateException(String.valueOf(destinationType));
}
} else {
+ try {
+ URI uri = new URI(destinationName);
+ String scheme = uri.getScheme();
+ assertTrue(scheme == null || scheme.equals(JAVA_SCHEME),
+ "Unsupported JNDI URI: " + destinationName);
+ } catch (URISyntaxException ex) {
+ logger.warn("Invalid JNDI URI - {}", destinationName);
+ }
destination = (Destination) initialContext.lookup(destinationName);
}
} catch (JMSException e) {
@@ -209,4 +220,8 @@ class JMSMessageConsumer {
logger.error("Could not destroy connection", e);
}
}
+
+ private void assertTrue(boolean arg, String msg) {
+ Preconditions.checkArgument(arg, msg);
+ }
}
diff --git a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/JMSMessageConsumerTestBase.java b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/JMSMessageConsumerTestBase.java
index b3bce784..aa964584 100644
--- a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/JMSMessageConsumerTestBase.java
+++ b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/JMSMessageConsumerTestBase.java
@@ -129,11 +129,17 @@ public abstract class JMSMessageConsumerTestBase {
}
}
- JMSMessageConsumer create() {
+ JMSMessageConsumer create(JMSDestinationType destinationType,
+ JMSDestinationLocator destinationLocator, String destinationName) {
return new JMSMessageConsumer(WONT_USE, connectionFactory, destinationName,
destinationLocator, destinationType, messageSelector, batchSize,
pollTimeout, converter, userName, password, Optional.<String>absent(), false, "");
}
+
+ JMSMessageConsumer create() {
+ return create(this.destinationType, this.destinationLocator, this.destinationName);
+ }
+
@After
public void tearDown() throws Exception {
beforeTearDown();
diff --git a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSMessageConsumer.java b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSMessageConsumer.java
index e7c5f290..636ffc32 100644
--- a/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSMessageConsumer.java
+++ b/flume-ng-sources/flume-jms-source/src/test/java/org/apache/flume/source/jms/TestJMSMessageConsumer.java
@@ -93,6 +93,12 @@ public class TestJMSMessageConsumer extends JMSMessageConsumerTestBase {
verify(connection).close();
}
}
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testInvalidDestination() throws Exception {
+ create(null, JMSDestinationLocator.JNDI, "ldap://localhost:389/test");
+ }
+
@Test(expected = IllegalArgumentException.class)
public void testInvalidBatchSizeZero() throws Exception {
batchSize = 0;