-
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.
[LOG4J2-1863] Add class filtering to AbstractSocketServer
This allows a whitelist of class names to be specified to configure which classes are allowed to be deserialized in both TcpSocketServer and UdpSocketServer.
- Loading branch information
Showing
5 changed files
with
140 additions
and
6 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
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
67 changes: 67 additions & 0 deletions
67
log4j-core/src/main/java/org/apache/logging/log4j/core/util/FilteredObjectInputStream.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,67 @@ | ||
/* | ||
* 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.util; | ||
|
||
import java.io.IOException; | ||
import java.io.InputStream; | ||
import java.io.InvalidObjectException; | ||
import java.io.ObjectInputStream; | ||
import java.io.ObjectStreamClass; | ||
import java.util.Arrays; | ||
import java.util.Collection; | ||
import java.util.List; | ||
|
||
/** | ||
* Extended ObjectInputStream that only allows certain classes to be deserialized. | ||
* | ||
* @since 2.8.2 | ||
*/ | ||
public class FilteredObjectInputStream extends ObjectInputStream { | ||
|
||
private static final List<String> REQUIRED_JAVA_CLASSES = Arrays.asList( | ||
// for StandardLevel | ||
"java.lang.Enum", | ||
// for location information | ||
"java.lang.StackTraceElement", | ||
// for Message delegate | ||
"java.rmi.MarshalledObject", | ||
"[B" | ||
); | ||
|
||
private final Collection<String> allowedClasses; | ||
|
||
public FilteredObjectInputStream(final InputStream in, final Collection<String> allowedClasses) throws IOException { | ||
super(in); | ||
this.allowedClasses = allowedClasses; | ||
} | ||
|
||
@Override | ||
protected Class<?> resolveClass(final ObjectStreamClass desc) throws IOException, ClassNotFoundException { | ||
String name = desc.getName(); | ||
if (!(isAllowedByDefault(name) || allowedClasses.contains(name))) { | ||
throw new InvalidObjectException("Class is not allowed for deserialization: " + name); | ||
} | ||
return super.resolveClass(desc); | ||
} | ||
|
||
private static boolean isAllowedByDefault(final String name) { | ||
return name.startsWith("org.apache.logging.log4j.") || | ||
name.startsWith("[Lorg.apache.logging.log4j.") || | ||
REQUIRED_JAVA_CLASSES.contains(name); | ||
} | ||
|
||
} |