Skip to content

Commit 99c2298

Browse files
author
Chris Wilson
committed
Fixing log4j issue CVE-2021-44228 
1 parent 79ce591 commit 99c2298

File tree

80 files changed

+791
-375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+791
-375
lines changed

‎apps/sparkpost-documentor-app/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
77
org.eclipse.jdt.core.compiler.debug.localVariable=generate
88
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
99
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
10+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1011
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1112
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
13+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
14+
org.eclipse.jdt.core.compiler.processAnnotations=enabled
15+
org.eclipse.jdt.core.compiler.release=disabled
1216
org.eclipse.jdt.core.compiler.source=1.7
1317
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
1418
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=48

‎apps/sparkpost-documentor-app/log4j2.properties‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
status = error
2+
name = PropertiesConfig
3+
4+
filters = threshold
5+
6+
filter.threshold.type = ThresholdFilter
7+
filter.threshold.level = debug
8+
9+
appenders = console
10+
11+
appender.console.type = Console
12+
appender.console.name = STDOUT
13+
appender.console.layout.type = PatternLayout
14+
appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
15+
16+
rootLogger.level = debug
17+
rootLogger.appenderRefs = stdout
18+
rootLogger.appenderRef.stdout.ref = STDOUT
19+

‎apps/sparkpost-documentor-app/pom.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</dependency>
1818

1919
<dependency>
20-
<groupId>log4j</groupId>
21-
<artifactId>log4j</artifactId>
20+
<groupId>org.apache.logging.log4j</groupId>
21+
<artifactId>log4j-core</artifactId>
2222
</dependency>
2323
<dependency>
2424
<groupId>com.google.code.gson</groupId>
@@ -28,25 +28,21 @@
2828
<dependency>
2929
<groupId>org.apache.httpcomponents</groupId>
3030
<artifactId>httpclient</artifactId>
31-
<version>4.5</version>
31+
<version>4.5.13</version>
3232
</dependency>
3333
<!-- the following two dependencies are required for correct jmockit operation
3434
under maven see http://code.google.com/p/jmockit/issues/detail?id=128 comment
3535
#8 -->
3636
<dependency>
37-
<groupId>com.googlecode.jmockit</groupId>
38-
<artifactId>jmockit</artifactId>
37+
<groupId>org.jmock</groupId>
38+
<artifactId>jmock-junit4</artifactId>
3939
<scope>test</scope>
4040
</dependency>
4141
<dependency>
4242
<groupId>junit</groupId>
4343
<artifactId>junit</artifactId>
4444
<scope>test</scope>
4545
</dependency>
46-
<dependency>
47-
<groupId>com.google.code.findbugs</groupId>
48-
<artifactId>annotations</artifactId>
49-
</dependency>
5046
<dependency>
5147
<groupId>org.projectlombok</groupId>
5248
<artifactId>lombok</artifactId>

‎apps/sparkpost-javamail-app/log4j2.properties‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
status = error
2+
name = PropertiesConfig
3+
4+
filters = threshold
5+
6+
filter.threshold.type = ThresholdFilter
7+
filter.threshold.level = debug
8+
9+
appenders = console
10+
11+
appender.console.type = Console
12+
appender.console.name = STDOUT
13+
appender.console.layout.type = PatternLayout
14+
appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
15+
16+
rootLogger.level = debug
17+
rootLogger.appenderRefs = stdout
18+
rootLogger.appenderRef.stdout.ref = STDOUT
19+

‎apps/sparkpost-javamail-app/src/main/java/com/sparkpost/sample/App.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import javax.mail.internet.MimeMessage;
2121
import javax.mail.internet.MimeMultipart;
2222

23-
import org.apache.log4j.Level;
24-
import org.apache.log4j.Logger;
23+
import org.apache.logging.log4j.Level;
24+
import org.apache.logging.log4j.core.config.Configurator;
2525

2626
import com.sparkpost.Client;
2727
import com.sparkpost.exception.SparkPostException;
@@ -41,7 +41,7 @@
4141
public class App extends SparkPostBaseApp {
4242

4343
public static void main(String[] args) throws Exception {
44-
Logger.getRootLogger().setLevel(Level.DEBUG);
44+
Configurator.setRootLevel(Level.DEBUG);
4545

4646
App app = new App();
4747
app.runApp();

‎apps/sparkpost-samples-app/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
77
org.eclipse.jdt.core.compiler.debug.localVariable=generate
88
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
99
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
10+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1011
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1112
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
13+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
14+
org.eclipse.jdt.core.compiler.processAnnotations=enabled
15+
org.eclipse.jdt.core.compiler.release=disabled
1216
org.eclipse.jdt.core.compiler.source=1.7
1317
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
1418
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=48

‎apps/sparkpost-samples-app/log4j2.properties‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
status = error
2+
name = PropertiesConfig
3+
4+
filters = threshold
5+
6+
filter.threshold.type = ThresholdFilter
7+
filter.threshold.level = debug
8+
9+
appenders = console
10+
11+
appender.console.type = Console
12+
appender.console.name = STDOUT
13+
appender.console.layout.type = PatternLayout
14+
appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
15+
16+
rootLogger.level = debug
17+
rootLogger.appenderRefs = stdout
18+
rootLogger.appenderRef.stdout.ref = STDOUT
19+

‎apps/sparkpost-samples-app/pom.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</dependency>
1919

2020
<dependency>
21-
<groupId>log4j</groupId>
22-
<artifactId>log4j</artifactId>
21+
<groupId>org.apache.logging.log4j</groupId>
22+
<artifactId>log4j-core</artifactId>
2323
</dependency>
2424
<dependency>
2525
<groupId>com.google.code.gson</groupId>
@@ -29,25 +29,21 @@
2929
<dependency>
3030
<groupId>org.apache.httpcomponents</groupId>
3131
<artifactId>httpclient</artifactId>
32-
<version>4.5</version>
32+
<version>4.5.13</version>
3333
</dependency>
3434
<!-- the following two dependencies are required for correct jmockit operation
3535
under maven see http://code.google.com/p/jmockit/issues/detail?id=128 comment
3636
#8 -->
3737
<dependency>
38-
<groupId>com.googlecode.jmockit</groupId>
39-
<artifactId>jmockit</artifactId>
38+
<groupId>org.jmock</groupId>
39+
<artifactId>jmock-junit4</artifactId>
4040
<scope>test</scope>
4141
</dependency>
4242
<dependency>
4343
<groupId>junit</groupId>
4444
<artifactId>junit</artifactId>
4545
<scope>test</scope>
4646
</dependency>
47-
<dependency>
48-
<groupId>com.google.code.findbugs</groupId>
49-
<artifactId>annotations</artifactId>
50-
</dependency>
5147
<dependency>
5248
<groupId>org.projectlombok</groupId>
5349
<artifactId>lombok</artifactId>

‎apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/BadApiKeyErrorSample.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
import java.io.IOException;
55

6-
import org.apache.log4j.Level;
7-
import org.apache.log4j.Logger;
6+
import org.apache.logging.log4j.Level;
7+
import org.apache.logging.log4j.LogManager;
8+
import org.apache.logging.log4j.Logger;
9+
import org.apache.logging.log4j.core.config.Configurator;
810

911
import com.sparkpost.Client;
1012
import com.sparkpost.exception.SparkPostAccessForbiddenException;
@@ -19,12 +21,12 @@
1921
*/
2022
public class BadApiKeyErrorSample extends SparkPostBaseApp {
2123

22-
static final Logger logger = Logger.getLogger(BadApiKeyErrorSample.class);
24+
static final Logger logger = LogManager.getLogger(BadApiKeyErrorSample.class);
2325

2426
private Client client;
2527

2628
public static void main(String[] args) throws SparkPostException, IOException {
27-
Logger.getRootLogger().setLevel(Level.DEBUG);
29+
Configurator.setRootLevel(Level.DEBUG);
2830

2931
BadApiKeyErrorSample sample = new BadApiKeyErrorSample();
3032
sample.runApp();

‎apps/sparkpost-samples-app/src/main/java/com/sparkpost/error/samples/ForceTransportError.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
import java.io.IOException;
55

6-
import org.apache.log4j.Level;
7-
import org.apache.log4j.Logger;
6+
import org.apache.logging.log4j.Level;
7+
import org.apache.logging.log4j.LogManager;
8+
import org.apache.logging.log4j.Logger;
9+
import org.apache.logging.log4j.core.config.Configurator;
810

911
import com.sparkpost.Client;
1012
import com.sparkpost.exception.SparkPostErrorServerResponseException;
@@ -17,12 +19,12 @@
1719

1820
public class ForceTransportError extends SparkPostBaseApp {
1921

20-
static final Logger logger = Logger.getLogger(ForceTransportError.class);
22+
static final Logger logger = LogManager.getLogger(ForceTransportError.class);
2123

2224
private Client client;
2325

2426
public static void main(String[] args) throws SparkPostException, IOException {
25-
Logger.getRootLogger().setLevel(Level.DEBUG);
27+
Configurator.setRootLevel(Level.DEBUG);
2628

2729
ForceTransportError app = new ForceTransportError();
2830
app.runApp();

0 commit comments

Comments
 (0)