Skip to content

alarms: use HardenedLoggingEventInputStream to address possible RCE when #8083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chubnastia merged 1 commit into from
Apr 29, 2026
+7 −6
Merged

alarms: use HardenedLoggingEventInputStream to address possible RCE when #8083

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions modules/dcache/src/main/java/org/dcache/alarms/logback/LogEntryServerSocketNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
*/
package org.dcache.alarms.logback;

import ch.qos.logback.classic.net.server.HardenedLoggingEventInputStream;
import ch.qos.logback.classic.spi.ILoggingEvent;
import dmg.cells.nucleus.CDC;
import java.io.BufferedInputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.net.Socket;
import java.net.SocketException;
import java.util.HashMap;
Expand All @@ -109,7 +109,7 @@ final class LogEntryServerSocketNode implements Runnable {
private static final Logger LOGGER
= LoggerFactory.getLogger(LogEntryServerSocketNode.class);

private final ObjectInputStream ois;
private final HardenedLoggingEventInputStream inputStream;
private final Socket socket;
private final LogEntryServer server;
private final String hostName;
Expand All @@ -121,15 +121,16 @@ final class LogEntryServerSocketNode implements Runnable {
this.server = socketServer;
this.socket = socket;
hostName = socket.getInetAddress().getCanonicalHostName();
ois = new ObjectInputStream(new BufferedInputStream(socket.getInputStream()));
inputStream =
new HardenedLoggingEventInputStream(new BufferedInputStream(socket.getInputStream()));
}

public void run() {
LogEntryHandler handler = server.getHandler();
running = true;
try {
while (running) {
ILoggingEvent event = (ILoggingEvent) ois.readObject();
ILoggingEvent event = (ILoggingEvent) inputStream.readObject();
Map<String, String> properties = new HashMap<>();
Map<String, String> mdc = event.getMDCPropertyMap();
properties.put(Alarm.HOST_TAG, hostName);
Expand Down Expand Up @@ -164,11 +165,11 @@ void close() {
if (running) {
running = false;
try {
ois.close();
inputStream.close();
} catch (IOException e) {
LOGGER.debug("Could not close connection: {}, cause: {}.",
e.getMessage(), e.getCause());
}
}
}
}
}
Loading