crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Added /base64 variation of POST /arbitrary/* APIs

Browse Source 
This can be used to upload base64 encoded file data directly from the UI. Using base64 because base58 is unusably slow
This commit is contained in:
CalDescent 2021-11-21 19:12:01 +00:00
parent b4f3105035
commit c588786a06
1 changed files with 82 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.bouncycastle.util.encoders.Base64;
import org.qortal.api.*;
import org.qortal.api.model.ArbitraryResourceSummary;
import org.qortal.api.resource.TransactionsResource.ConfirmationStatus;
@ -348,7 +349,39 @@ public class ArbitraryResource {
String path) {
Security.checkApiCallAllowed(request);
return this.upload(Service.valueOf(serviceString), name, null, path, null);
return this.upload(Service.valueOf(serviceString), name, null, path, null, null);
}
@POST
@Path("/{service}/{name}/base64")
@Operation(
summary = "Build raw, unsigned, ARBITRARY transaction, based on user-supplied base64 encoded data",
requestBody = @RequestBody(
required = true,
content = @Content(
mediaType = MediaType.APPLICATION_OCTET_STREAM,
schema = @Schema(type = "string", format = "byte")
)
),
responses = {
@ApiResponse(
description = "raw, unsigned, ARBITRARY transaction encoded in Base58",
content = @Content(
mediaType = MediaType.TEXT_PLAIN,
schema = @Schema(
type = "string"
)
)
)
}
)
@SecurityRequirement(name = "apiKey")
public String postBase64EncodedData(@PathParam("service") String serviceString,
@PathParam("name") String name,
String base64) {
Security.checkApiCallAllowed(request);
return this.upload(Service.valueOf(serviceString), name, null, null, null, base64);
}
@POST
@ -382,7 +415,7 @@ public class ArbitraryResource {
String string) {
Security.checkApiCallAllowed(request);
return this.upload(Service.valueOf(serviceString), name, null, null, string);
return this.upload(Service.valueOf(serviceString), name, null, null, string, null);
}
@ -418,7 +451,7 @@ public class ArbitraryResource {
String path) {
Security.checkApiCallAllowed(request);
return this.upload(Service.valueOf(serviceString), name, identifier, path, null);
return this.upload(Service.valueOf(serviceString), name, identifier, path, null, null);
}
@POST
@ -453,10 +486,43 @@ public class ArbitraryResource {
String string) {
Security.checkApiCallAllowed(request);
return this.upload(Service.valueOf(serviceString), name, identifier, null, string);
return this.upload(Service.valueOf(serviceString), name, identifier, null, string, null);
}
private String upload(Service service, String name, String identifier, String path, String string) {
@POST
@Path("/{service}/{name}/{identifier}/base64")
@Operation(
summary = "Build raw, unsigned, ARBITRARY transaction, based on user supplied base64 encoded data",
requestBody = @RequestBody(
required = true,
content = @Content(
mediaType = MediaType.APPLICATION_OCTET_STREAM,
schema = @Schema(type = "string", format = "byte")
)
),
responses = {
@ApiResponse(
description = "raw, unsigned, ARBITRARY transaction encoded in Base58",
content = @Content(
mediaType = MediaType.TEXT_PLAIN,
schema = @Schema(
type = "string"
)
)
)
}
)
@SecurityRequirement(name = "apiKey")
public String postBase64EncodedData(@PathParam("service") String serviceString,
@PathParam("name") String name,
@PathParam("identifier") String identifier,
String base64) {
Security.checkApiCallAllowed(request);
return this.upload(Service.valueOf(serviceString), name, identifier, null, null, base64);
}
private String upload(Service service, String name, String identifier, String path, String string, String base64) {
// Fetch public key from registered name
try (final Repository repository = RepositoryManager.getRepository()) {
NameData nameData = repository.getNameRepository().fromName(name);
@ -483,6 +549,13 @@ public class ArbitraryResource {
writer.close();
path = tempFile.toPath().toString();
}
// ... or base64 encoded raw data
else if (base64 != null) {
File tempFile = File.createTempFile("qortal-", ".tmp");
tempFile.deleteOnExit();
Files.write(tempFile.toPath(), Base64.decode(base64));
path = tempFile.toPath().toString();
}
else {
throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.INVALID_CRITERIA, "Missing path or data string");
}
@ -498,6 +571,7 @@ public class ArbitraryResource {
return Base58.encode(ArbitraryTransactionTransformer.toBytes(transactionData));
} catch (DataException | TransformationException | IllegalStateException e) {
LOGGER.info("Unable to upload data: {}", e.getMessage());
throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.INVALID_DATA, e.getMessage());
}