mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

better error message

Browse Source
This commit is contained in:
Greg DiCristofaro 2023-08-25 07:56:29 -04:00
parent cfb619aaad
commit 227d32d1c0
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Core/src/com/basistech/df/cybertriage/autopsy/ctapi/CTCloudHttpClient.java
View File

@ -158,16 +158,23 @@ class CTCloudHttpClient {
// Parse Response // Parse Response
if (classType != null) { if (classType != null) {
HttpEntity entity = response.getEntity(); HttpEntity entity = response.getEntity();
String entityStr = EntityUtils.toString(entity); if (entity != null) {
O respObj = mapper.readValue(entityStr, classType); String entityStr = EntityUtils.toString(entity);
return respObj; if (StringUtils.isNotBlank(entityStr)) {
} else { O respObj = mapper.readValue(entityStr, classType);
return null; return respObj;
}
}
} }
return null;
} else { } else {
LOGGER.log(Level.WARNING, "Response Received. - Status Error {}", response.getStatusLine()); LOGGER.log(Level.WARNING, "Response Received. - Status Error {}", response.getStatusLine());
handleNonOKResponse(response, ""); handleNonOKResponse(response, "");
} }
// transform all non-CTCloudException's into a CTCloudException
} catch (CTCloudException ex) {
throw ex;
} catch (Exception ex) { } catch (Exception ex) {
LOGGER.log(Level.WARNING, "Error when parsing response from CyberTriage Cloud", ex); LOGGER.log(Level.WARNING, "Error when parsing response from CyberTriage Cloud", ex);
throw new CTCloudException(CTCloudException.parseUnknownException(ex), ex); throw new CTCloudException(CTCloudException.parseUnknownException(ex), ex);
@ -191,7 +198,7 @@ class CTCloudHttpClient {
if (fileUploadRequest == null) { if (fileUploadRequest == null) {
throw new CTCloudException(ErrorCode.BAD_REQUEST, new IllegalArgumentException("fileUploadRequest cannot be null")); throw new CTCloudException(ErrorCode.BAD_REQUEST, new IllegalArgumentException("fileUploadRequest cannot be null"));
} }
String fullUrlPath = fileUploadRequest.getFullUrlPath(); String fullUrlPath = fileUploadRequest.getFullUrlPath();
String fileName = fileUploadRequest.getFileName(); String fileName = fileUploadRequest.getFileName();
InputStream fileInputStream = fileUploadRequest.getFileInputStream(); InputStream fileInputStream = fileUploadRequest.getFileInputStream();
@ -200,7 +207,7 @@ class CTCloudHttpClient {
if (StringUtils.isBlank(fullUrlPath) || fileInputStream == null || contentLength == null || contentLength <= 0) { if (StringUtils.isBlank(fullUrlPath) || fileInputStream == null || contentLength == null || contentLength <= 0) {
throw new CTCloudException(ErrorCode.BAD_REQUEST, new IllegalArgumentException("fullUrlPath, fileInputStream, contentLength must not be empty, null or less than 0")); throw new CTCloudException(ErrorCode.BAD_REQUEST, new IllegalArgumentException("fullUrlPath, fileInputStream, contentLength must not be empty, null or less than 0"));
} }
URI putUri; URI putUri;
try { try {
putUri = new URI(fullUrlPath); putUri = new URI(fullUrlPath);