You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2011/10/13 23:08:41 UTC
svn commit: r1183101 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/web/JsonUtil.java
src/hdfs/org/apache/hadoop/hdfs/web/resources/ExceptionHandler.java
Author: szetszwo
Date: Thu Oct 13 21:08:40 2011
New Revision: 1183101
URL: http://svn.apache.org/viewvc?rev=1183101&view=rev
Log:
HDFS-2428. Convert com.sun.jersey.api.ParamException$QueryParamException to IllegalArgumentException and response it as http BAD_REQUEST in webhdfs.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/JsonUtil.java
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/resources/ExceptionHandler.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1183101&r1=1183100&r2=1183101&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Thu Oct 13 21:08:40 2011
@@ -38,6 +38,17 @@ Release 0.20.206.0 - unreleased
HADOOP-7509. Improve exception message thrown when Authentication is
required. (Ravi Prakash via suresh)
+Release 0.20.205.1 - unreleased
+
+ BUG FIXES
+
+ HDFS-2441. Remove the Content-Type set by HttpServer.QuotingInputFilter in
+ webhdfs responses. (szetszwo)
+
+ HDFS-2428. Convert com.sun.jersey.api.ParamException$QueryParamException
+ to IllegalArgumentException and response it as http BAD_REQUEST in webhdfs.
+ (szetszwo)
+
Release 0.20.205.0 - unreleased
NEW FEATURES
@@ -319,9 +330,6 @@ Release 0.20.205.0 - unreleased
HDFS-2411. With webhdfs enabled in secure mode the auth to local mappings
are not being respected. (jitendra)
- HDFS-2441. Remove the Content-Type set by HttpServer.QuotingInputFilter in
- webhdfs responses. (szetszwo)
-
IMPROVEMENTS
MAPREDUCE-2928. MR-2413 improvements (Eli Collins via mattf)
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/JsonUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/JsonUtil.java?rev=1183101&r1=1183100&r2=1183101&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/JsonUtil.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/JsonUtil.java Thu Oct 13 21:08:40 2011
@@ -98,17 +98,18 @@ public class JsonUtil {
/** Convert an exception object to a Json string. */
public static String toJsonString(final Exception e) {
final Map<String, Object> m = new TreeMap<String, Object>();
- m.put("className", e.getClass().getName());
+ m.put("exception", e.getClass().getSimpleName());
m.put("message", e.getMessage());
+ m.put("javaClassName", e.getClass().getName());
return toJsonString(RemoteException.class, m);
}
/** Convert a Json map to a RemoteException. */
public static RemoteException toRemoteException(final Map<?, ?> json) {
final Map<?, ?> m = (Map<?, ?>)json.get(RemoteException.class.getSimpleName());
- final String className = (String)m.get("className");
final String message = (String)m.get("message");
- return new RemoteException(className, message);
+ final String javaClassName = (String)m.get("javaClassName");
+ return new RemoteException(javaClassName, message);
}
private static String toJsonString(final Class<?> clazz, final Object value) {
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/resources/ExceptionHandler.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/resources/ExceptionHandler.java?rev=1183101&r1=1183100&r2=1183101&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/resources/ExceptionHandler.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/resources/ExceptionHandler.java Thu Oct 13 21:08:40 2011
@@ -29,17 +29,28 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hdfs.web.JsonUtil;
+import com.sun.jersey.api.ParamException;
+
/** Handle exceptions. */
@Provider
public class ExceptionHandler implements ExceptionMapper<Exception> {
public static final Log LOG = LogFactory.getLog(ExceptionHandler.class);
@Override
- public Response toResponse(final Exception e) {
+ public Response toResponse(Exception e) {
if (LOG.isTraceEnabled()) {
LOG.trace("GOT EXCEPITION", e);
}
+ //Convert exception
+ if (e instanceof ParamException) {
+ final ParamException paramexception = (ParamException)e;
+ e = new IllegalArgumentException("Invalid value for webhdfs parameter \""
+ + paramexception.getParameterName() + "\": "
+ + e.getCause().getMessage(), e);
+ }
+
+ //Map response status
final Response.Status s;
if (e instanceof SecurityException) {
s = Response.Status.UNAUTHORIZED;
@@ -49,7 +60,10 @@ public class ExceptionHandler implements
s = Response.Status.FORBIDDEN;
} else if (e instanceof UnsupportedOperationException) {
s = Response.Status.BAD_REQUEST;
+ } else if (e instanceof IllegalArgumentException) {
+ s = Response.Status.BAD_REQUEST;
} else {
+ LOG.warn("INTERNAL_SERVER_ERROR", e);
s = Response.Status.INTERNAL_SERVER_ERROR;
}