Skip to content

TEZ-4659: Refactoring minor issues in profile output servlet #439

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
ayushtkn merged 2 commits into from
Oct 31, 2025
+20 −1
Merged

TEZ-4659: Refactoring minor issues in profile output servlet #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb1bdee
Restrict some paths in ProfileOutputServlet
ayushtkn Oct 30, 2025
b6ca7a8
Add Response Code
ayushtkn Oct 31, 2025
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
12 changes: 11 additions & 1 deletion tez-common/src/main/java/org/apache/tez/common/web/ProfileOutputServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;

import javax.servlet.ServletException;
Expand All @@ -43,7 +44,16 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
writeMessage(response, "Run the profiler to be able to receive its output");
return;
}
File outputFile = new File(ProfileServlet.OUTPUT_DIR, queriedFile);
Path outputDir = Paths.get(ProfileServlet.OUTPUT_DIR).toAbsolutePath().normalize();
Path requestedPath = outputDir.resolve(queriedFile).normalize();

if (!requestedPath.startsWith(outputDir)) {
Copy link
Contributor

@abstractdog abstractdog Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about an additional status here:

    response.setStatus(HttpServletResponse.SC_FORBIDDEN);

response.setStatus(HttpServletResponse.SC_FORBIDDEN);
writeMessage(response, "Access denied: Invalid Path");
return;
}
File outputFile = requestedPath.toFile();

if (!outputFile.exists()) {
writeMessage(response, "Requested file does not exist: " + queriedFile);
return;
Expand Down
9 changes: 9 additions & 0 deletions tez-tests/src/test/java/org/apache/tez/test/TestAM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.apache.tez.test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

Expand All @@ -25,6 +26,8 @@
import java.net.HttpURLConnection;
import java.net.URL;

import javax.servlet.http.HttpServletResponse;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configuration.IntegerRanges;
import org.apache.hadoop.fs.FileSystem;
Expand Down Expand Up @@ -133,6 +136,12 @@ public void testAMWebUIService() throws TezException, IOException, InterruptedEx
checkAddress(webUIAddress + "/prof", 202);
checkAddress(webUIAddress + "/prof-output");

HttpURLConnection connection =
(HttpURLConnection) new URL(webUIAddress + "/prof-output?file=../etc/web").openConnection();
connection.connect();
assertEquals(HttpServletResponse.SC_FORBIDDEN, connection.getResponseCode());
assertTrue(new String(connection.getErrorStream().readAllBytes()).contains("Access denied: Invalid Path"));

URL url = new URL(webUIAddress);
IntegerRanges portRange = conf.getRange(TezConfiguration.TEZ_AM_WEBSERVICE_PORT_RANGE,
TezConfiguration.TEZ_AM_WEBSERVICE_PORT_RANGE_DEFAULT);
Expand Down