You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by xi...@apache.org on 2022/12/13 10:08:44 UTC
[pulsar] branch branch-2.10 updated: [fix][broker] Extract additional servlets to the default directory by… (#17477)
This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new ffe0a22de4d [fix][broker] Extract additional servlets to the default directory by… (#17477)
ffe0a22de4d is described below
commit ffe0a22de4daa4ad1c575f2edb98bb1021a45cce
Author: Andras Beni <an...@streamnative.io>
AuthorDate: Thu Sep 22 13:27:09 2022 +0200
[fix][broker] Extract additional servlets to the default directory by… (#17477)
(cherry picked from commit 3d47ee8ab6a2d39017413b21160a21067cf7439b)
---
.../web/plugin/servlet/AdditionalServlets.java | 3 +-
.../web/plugin/servlet/AdditionalServletsTest.java | 82 ++++++++++++++++++++++
2 files changed, 84 insertions(+), 1 deletion(-)
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlets.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlets.java
index 8a7bce8e332..4feef4c7a6f 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlets.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServlets.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.Map;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pulsar.common.configuration.PulsarConfiguration;
import org.apache.pulsar.common.nar.NarClassLoader;
@@ -70,7 +71,7 @@ public class AdditionalServlets implements AutoCloseable {
}
String narExtractionDirectory = conf.getProperties().getProperty(NAR_EXTRACTION_DIRECTORY);
- if (narExtractionDirectory == null) {
+ if (StringUtils.isBlank(narExtractionDirectory)) {
narExtractionDirectory = NarClassLoader.DEFAULT_NAR_EXTRACTION_DIR;
}
diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java
new file mode 100644
index 00000000000..0d5e6f5262b
--- /dev/null
+++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/web/plugin/servlet/AdditionalServletsTest.java
@@ -0,0 +1,82 @@
+/**
+ * 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.pulsar.broker.web.plugin.servlet;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import org.apache.pulsar.common.configuration.PulsarConfiguration;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Properties;
+
+public class AdditionalServletsTest {
+
+
+ @Test
+ public void testEmptyStringAsExtractionDirectory() throws IOException {
+ Properties p = new Properties();
+ p.put("narExtractionDirectory", "");
+ p.put("additionalServlets", "AS1,AS2");
+ p.put("additionalServletDirectory", "/additionalServletDirectory");
+
+ PulsarConfiguration config = mock(PulsarConfiguration.class);
+ Mockito.when(config.getProperties()).thenReturn(p);
+
+ AdditionalServletMetadata asm1 = additionalServletMetadata(1);
+ AdditionalServletMetadata asm2 = additionalServletMetadata(2);
+
+ AdditionalServletDefinitions definitions = new AdditionalServletDefinitions();
+ definitions.servlets().put("AS1", asm1);
+ definitions.servlets().put("AS2", asm2);
+
+ AdditionalServletWithClassLoader as1 = mock(AdditionalServletWithClassLoader.class);
+ AdditionalServletWithClassLoader as2 = mock(AdditionalServletWithClassLoader.class);
+
+ String originalTmpDirectory = System.getProperty("java.io.tmpdir");
+ try (MockedStatic<AdditionalServletUtils> utils = mockStatic(AdditionalServletUtils.class)) {
+ String tmpDirectory = "/my/tmp/directory";
+ System.setProperty("java.io.tmpdir", tmpDirectory);
+ utils.when(() -> AdditionalServletUtils.searchForServlets(
+ "/additionalServletDirectory", tmpDirectory)).thenReturn(definitions);
+ utils.when(() -> AdditionalServletUtils.load(asm1, tmpDirectory)).thenReturn(as1);
+ utils.when(() -> AdditionalServletUtils.load(asm2, tmpDirectory)).thenReturn(as2);
+
+ AdditionalServlets servlets = AdditionalServlets.load(config);
+
+ Assert.assertEquals(servlets.getServlets().get("AS1"), as1);
+ Assert.assertEquals(servlets.getServlets().get("AS2"), as2);
+ } finally {
+ System.setProperty("java.io.tmpdir", originalTmpDirectory);
+ }
+ }
+
+ private AdditionalServletMetadata additionalServletMetadata(int index) {
+ AdditionalServletMetadata as = new AdditionalServletMetadata();
+ as.setArchivePath(Paths.get("/additionalServletDirectory/" + index));
+ as.setDefinition(new AdditionalServletDefinition());
+ as.getDefinition().setName("as" + index);
+ as.getDefinition().setAdditionalServletClass("com.example.AS" + index);
+ as.getDefinition().setDescription("Additional Servlet " +index);
+ return as;
+ }
+}