forked from pinterest/druid
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pull upstream to upgrade log4j to 2.15.0 to address security vulnerab…
…ilities Summary: Druid is running with JVM 1.8.0_232 but log4j 2.5 so it's P1 rather than p0. Pull upstream to upgrade log4j to 2.15.0 to address security vulnerabilities Changes are from the following upstream PRs: # Upgrade log4j from 2.8.2 to 2.15.0 apache#12051 apache#12056 # Upgrade log4j from 2.5 to 2.8.2 apache#8878 Reviewers: O1139 Druid, jgu, itallam Reviewed By: O1139 Druid, jgu, itallam Subscribers: jenkins, shawncao, #realtime-analytics Differential Revision: https://phabricator.pinadmin.com/D823708
- Loading branch information
Jian Wang
committed
Dec 13, 2021
1 parent
6d2ef8e
commit 5bea06b
Showing
4 changed files
with
64 additions
and
2 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
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
43 changes: 43 additions & 0 deletions
43
services/src/test/java/org/apache/druid/cli/Log4JShutdownPropertyCheckerTest.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,43 @@ | ||
/* | ||
* 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.druid.cli; | ||
|
||
import org.junit.Assert; | ||
import org.junit.Test; | ||
|
||
import java.util.Properties; | ||
|
||
public class Log4JShutdownPropertyCheckerTest | ||
{ | ||
@Test | ||
public void test_sets_the_stuff() | ||
{ | ||
Log4JShutdownPropertyChecker checker = new Log4JShutdownPropertyChecker(); | ||
Properties properties = new Properties(); | ||
checker.checkProperties(properties); | ||
|
||
Assert.assertEquals( | ||
"org.apache.druid.common.config.Log4jShutdown", | ||
properties.get("log4j.shutdownCallbackRegistry") | ||
); | ||
Assert.assertEquals("true", properties.get("log4j.shutdownHookEnabled")); | ||
Assert.assertEquals("false", properties.get("log4j2.is.webapp")); | ||
} | ||
} |