-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Fix reloading of the configuration from HTTP(S)"
This reverts commit be24f92.
- Loading branch information
Showing
23 changed files
with
810 additions
and
916 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
202 changes: 202 additions & 0 deletions
202
...st/src/test/java/org/apache/logging/log4j/core/filter/HttpThreadContextMapFilterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| /* | ||
| * 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.logging.log4j.core.filter; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertNotEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| import static org.junit.jupiter.api.Assertions.fail; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.StandardCopyOption; | ||
| import java.util.Base64; | ||
| import java.util.Enumeration; | ||
| import java.util.concurrent.CountDownLatch; | ||
| import java.util.concurrent.TimeUnit; | ||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.apache.logging.log4j.ThreadContext; | ||
| import org.apache.logging.log4j.core.Appender; | ||
| import org.apache.logging.log4j.core.LoggerContext; | ||
| import org.apache.logging.log4j.core.config.Configurator; | ||
| import org.apache.logging.log4j.core.test.appender.ListAppender; | ||
| import org.eclipse.jetty.http.HttpHeader; | ||
| import org.eclipse.jetty.server.Server; | ||
| import org.eclipse.jetty.server.ServerConnector; | ||
| import org.eclipse.jetty.servlet.DefaultServlet; | ||
| import org.eclipse.jetty.servlet.ServletContextHandler; | ||
| import org.eclipse.jetty.servlet.ServletHolder; | ||
| import org.junit.Assert; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junitpioneer.jupiter.RetryingTest; | ||
|
|
||
| /** | ||
| * Unit test for simple App. | ||
| */ | ||
| public class HttpThreadContextMapFilterTest implements MutableThreadContextMapFilter.FilterConfigUpdateListener { | ||
|
|
||
| private static final String BASIC = "Basic "; | ||
| private static final String expectedCreds = "log4j:log4j"; | ||
| private static Server server; | ||
| private static final Base64.Decoder decoder = Base64.getDecoder(); | ||
| private static int port; | ||
| static final String CONFIG = "log4j2-mutableFilter.xml"; | ||
| static LoggerContext loggerContext = null; | ||
| static final File targetFile = new File("target/test-classes/testConfig.json"); | ||
| static final Path target = targetFile.toPath(); | ||
| CountDownLatch updated = new CountDownLatch(1); | ||
|
|
||
| @BeforeAll | ||
| public static void startServer() throws Exception { | ||
| try { | ||
| server = new Server(0); | ||
| final ServletContextHandler context = new ServletContextHandler(); | ||
| final ServletHolder defaultServ = new ServletHolder("default", TestServlet.class); | ||
| defaultServ.setInitParameter("resourceBase", System.getProperty("user.dir")); | ||
| defaultServ.setInitParameter("dirAllowed", "true"); | ||
| context.addServlet(defaultServ, "/"); | ||
| server.setHandler(context); | ||
|
|
||
| // Start Server | ||
| server.start(); | ||
| port = ((ServerConnector) server.getConnectors()[0]).getLocalPort(); | ||
| try { | ||
| Files.deleteIfExists(target); | ||
| } catch (IOException ioe) { | ||
| // Ignore this. | ||
| } | ||
| } catch (Throwable ex) { | ||
| ex.printStackTrace(); | ||
| throw ex; | ||
| } | ||
| } | ||
|
|
||
| @AfterAll | ||
| public static void stopServer() throws Exception { | ||
| if (server != null) { | ||
| server.stop(); | ||
| } | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void after() { | ||
| try { | ||
| Files.deleteIfExists(target); | ||
| } catch (IOException ioe) { | ||
| // Ignore this. | ||
| } | ||
| if (loggerContext != null) { | ||
| loggerContext.stop(); | ||
| loggerContext = null; | ||
| } | ||
| } | ||
|
|
||
| @RetryingTest(maxAttempts = 5, suspendForMs = 10) | ||
| public void filterTest() throws Exception { | ||
| System.setProperty("log4j2.Configuration.allowedProtocols", "http"); | ||
| System.setProperty("logging.auth.username", "log4j"); | ||
| System.setProperty("logging.auth.password", "log4j"); | ||
| System.setProperty("configLocation", "http://localhost:" + port + "/testConfig.json"); | ||
| ThreadContext.put("loginId", "rgoers"); | ||
| Path source = new File("target/test-classes/emptyConfig.json").toPath(); | ||
| Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING); | ||
| final long fileTime = targetFile.lastModified() - 2000; | ||
| assertTrue(targetFile.setLastModified(fileTime)); | ||
| loggerContext = Configurator.initialize(null, CONFIG); | ||
| assertNotNull(loggerContext); | ||
| final Appender app = loggerContext.getConfiguration().getAppender("List"); | ||
| assertNotNull(app); | ||
| assertTrue(app instanceof ListAppender); | ||
| final MutableThreadContextMapFilter filter = | ||
| (MutableThreadContextMapFilter) loggerContext.getConfiguration().getFilter(); | ||
| assertNotNull(filter); | ||
| filter.registerListener(this); | ||
| final Logger logger = loggerContext.getLogger("Test"); | ||
| logger.debug("This is a test"); | ||
| Assertions.assertEquals(0, ((ListAppender) app).getEvents().size()); | ||
| source = new File("target/test-classes/filterConfig.json").toPath(); | ||
| Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING); | ||
| assertNotEquals(fileTime, targetFile.lastModified()); | ||
| if (!updated.await(5, TimeUnit.SECONDS)) { | ||
| fail("File update was not detected"); | ||
| } | ||
| updated = new CountDownLatch(1); | ||
| logger.debug("This is a test"); | ||
| Assertions.assertEquals(1, ((ListAppender) app).getEvents().size()); | ||
| Assertions.assertTrue(Files.deleteIfExists(target)); | ||
| if (!updated.await(5, TimeUnit.SECONDS)) { | ||
| fail("File update for delete was not detected"); | ||
| } | ||
| } | ||
|
|
||
| public static class TestServlet extends DefaultServlet { | ||
|
|
||
| private static final long serialVersionUID = -2885158530511450659L; | ||
|
|
||
| @Override | ||
| protected void doGet(final HttpServletRequest request, final HttpServletResponse response) | ||
| throws ServletException, IOException { | ||
| final Enumeration<String> headers = request.getHeaders(HttpHeader.AUTHORIZATION.toString()); | ||
| if (headers == null) { | ||
| response.sendError(401, "No Auth header"); | ||
| return; | ||
| } | ||
| while (headers.hasMoreElements()) { | ||
| final String authData = headers.nextElement(); | ||
| Assert.assertTrue("Not a Basic auth header", authData.startsWith(BASIC)); | ||
| final String credentials = new String(decoder.decode(authData.substring(BASIC.length()))); | ||
| if (!expectedCreds.equals(credentials)) { | ||
| response.sendError(401, "Invalid credentials"); | ||
| return; | ||
| } | ||
| } | ||
| if (request.getServletPath().equals("/testConfig.json")) { | ||
| final File file = new File("target/test-classes/testConfig.json"); | ||
| if (!file.exists()) { | ||
| response.sendError(404, "File not found"); | ||
| return; | ||
| } | ||
| final long modifiedSince = request.getDateHeader(HttpHeader.IF_MODIFIED_SINCE.toString()); | ||
| final long lastModified = (file.lastModified() / 1000) * 1000; | ||
| if (modifiedSince > 0 && lastModified <= modifiedSince) { | ||
| response.setStatus(304); | ||
| return; | ||
| } | ||
| response.setDateHeader(HttpHeader.LAST_MODIFIED.toString(), lastModified); | ||
| response.setContentLengthLong(file.length()); | ||
| Files.copy(file.toPath(), response.getOutputStream()); | ||
| response.getOutputStream().flush(); | ||
| response.setStatus(200); | ||
| } else { | ||
| response.sendError(400, "Unsupported request"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void onEvent() { | ||
| updated.countDown(); | ||
| } | ||
| } |
Oops, something went wrong.