Skip to content

HDDS-13168. Fix error response format in CheckUploadContentTypeFilter #8614

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
adoroszlai merged 3 commits into from
Jun 13, 2025
Merged

HDDS-13168. Fix error response format in CheckUploadContentTypeFilter #8614

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74cea9f
HDDS-13168. Fix content type error response format in CheckUploadCont…
unknowntpo Jun 12, 2025
df9f36b
refactor: do not change the unnecessary code
unknowntpo Jun 13, 2025
5fdd64b
refactor: use JSONUtil to craft JSON response
unknowntpo Jun 13, 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
17 changes: 14 additions & 3 deletions ...fsgateway/src/main/java/org/apache/ozone/fs/http/server/CheckUploadContentTypeFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.ozone.fs.http.server;

import java.io.IOException;
import java.io.PrintWriter;
import java.util.HashSet;
import java.util.Set;
import javax.servlet.Filter;
Expand Down Expand Up @@ -93,10 +94,20 @@ public void doFilter(ServletRequest request, ServletResponse response,
if (contentTypeOK) {
chain.doFilter(httpReq, httpRes);
} else {
httpRes.sendError(HttpServletResponse.SC_BAD_REQUEST,
"Data upload requests must have content-type set to '" +
HttpFSConstants.UPLOAD_CONTENT_TYPE + "'");
httpRes.setStatus(HttpServletResponse.SC_BAD_REQUEST);
httpRes.setContentType("application/json");
httpRes.setCharacterEncoding("UTF-8");

String errorMessage = "Data upload requests must have content-type set to '" +
HttpFSConstants.UPLOAD_CONTENT_TYPE + "'";

// Create JSON response
String jsonResponse = "{\"error\":\"" + errorMessage + "\"}";

PrintWriter writer = httpRes.getWriter();
writer.write(jsonResponse);
writer.flush();
writer.close();

@jojochuang jojochuang Jun 13, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please consider using a utility library to craft JSON output, for example, Jackson:

import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.HashMap;
import java.util.Map;

Map<String, String> errorMap = new HashMap<>();
errorMap.put("error", errorMessage);

ObjectMapper mapper = new ObjectMapper();
String jsonResponse = mapper.writeValueAsString(errorMap);

PrintWriter writer = httpRes.getWriter();
writer.write(jsonResponse);

@unknowntpo unknowntpo Jun 13, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I use JsonUtil to do this, which use Jackson under the hood.

}
}

Expand Down