Qortal/qortal
Qortal/qortal
3
0
Fork 3
mirror of https://github.com/Qortal/qortal.git synced 2025-02-12 02:05:50 +00:00
Code Issues Projects Releases Wiki Activity

Return the data directly in GET /arbitrary/{service}/{name}, instead of a path to the data

Browse Source
This commit is contained in:
CalDescent 2021-10-29 18:52:05 +01:00
parent 24ca126f5a
commit 3934120541
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/org/qortal/api/resource/ArbitraryResource.java
View File

@ -11,11 +11,14 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
@ -59,8 +62,9 @@ public class ArbitraryResource {
private static final Logger LOGGER = LogManager.getLogger(ArbitraryResource.class); private static final Logger LOGGER = LogManager.getLogger(ArbitraryResource.class);
@Context @Context HttpServletRequest request;
HttpServletRequest request; @Context HttpServletResponse response;
@Context ServletContext context;
@GET @GET
@Path("/search") @Path("/search")
@ -226,7 +230,7 @@ public class ArbitraryResource {
@GET @GET
@Path("/{service}/{name}") @Path("/{service}/{name}")
@Operation( @Operation(
summary = "Fetch local file path for data with supplied service and name", summary = "Fetch raw data from file with supplied service, name, and relative path",
description = "An optional rebuild boolean can be supplied. If true, any existing cached data will be invalidated.", description = "An optional rebuild boolean can be supplied. If true, any existing cached data will be invalidated.",
responses = { responses = {
@ApiResponse( @ApiResponse(
@ -240,17 +244,32 @@ public class ArbitraryResource {
) )
} }
) )
public String get(@PathParam("service") String serviceString, public HttpServletResponse get(@PathParam("service") String serviceString,
@PathParam("name") String name, @PathParam("name") String name,
@QueryParam("rebuild") boolean rebuild) { @QueryParam("filepath") String filepath,
@QueryParam("rebuild") boolean rebuild) {
Security.checkApiCallAllowed(request); Security.checkApiCallAllowed(request);
if (filepath == null) {
throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.INVALID_CRITERIA, "Missing filepath");
}
Service service = Service.valueOf(serviceString); Service service = Service.valueOf(serviceString);
ArbitraryDataReader arbitraryDataReader = new ArbitraryDataReader(name, ArbitraryDataFile.ResourceIdType.NAME, service); ArbitraryDataReader arbitraryDataReader = new ArbitraryDataReader(name, ArbitraryDataFile.ResourceIdType.NAME, service);
try { try {
arbitraryDataReader.loadSynchronously(rebuild); arbitraryDataReader.loadSynchronously(rebuild);
return arbitraryDataReader.getFilePath().toAbsolutePath().toString();
// TODO: limit file size that can be read into memory
java.nio.file.Path path = Paths.get(arbitraryDataReader.getFilePath().toString(), filepath);
if (!Files.exists(path)) {
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.INVALID_CRITERIA);
}
byte[] data = Files.readAllBytes(path);
response.setContentType(context.getMimeType(path.toString()));
response.setContentLength(data.length);
response.getOutputStream().write(data);
return response;
} catch (Exception e) { } catch (Exception e) {
LOGGER.info(String.format("Unable to load %s %s: %s", service, name, e.getMessage())); LOGGER.info(String.format("Unable to load %s %s: %s", service, name, e.getMessage()));
throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e); throw ApiExceptionFactory.INSTANCE.createException(request, ApiError.REPOSITORY_ISSUE, e);

12
tools/qdata
View File

@ -74,19 +74,11 @@ elif [[ "${method}" == "GET" ]]; then
rebuild="false" rebuild="false"
fi fi
response=$(curl --silent --insecure -X GET "http://${host}:${port}/arbitrary/${service}/${name}?rebuild=${rebuild}" -H "Content-Type: application/json" -d "{\"privateKey\":\"${private_key}\",\"transactionBytes\":\"${tx_data}\"}") response=$(curl --silent --insecure -X GET "http://${host}:${port}/arbitrary/${service}/${name}?rebuild=${rebuild}&filepath=${filepath}")
if [[ "${response}" == *"error"* || "${response}" == *"ERROR"* ]]; then if [[ "${response}" == *"error"* || "${response}" == *"ERROR"* ]]; then
echo "${response}"; exit echo "${response}"; exit
fi fi
# Parse the successful response echo "${response}"
output_path="${response}/${filepath}"
if [ ! -f "${output_path}" ] && [ ! -d "${output_path}" ]; then
echo "Error: file not found at path: ${output_path}"
echo "Please ensure you have supplied a valid filepath."
exit
fi
cat "${output_path}"
fi fi