refactor: 백엔드 리펙토링 진행 중
This commit is contained in:
-41
@@ -1,41 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.identity;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
/** Opaque direct-transfer workflow identity for single-part or multipart sessions. */
|
||||
public final class DirectTransferSessionId {
|
||||
|
||||
private final String canonicalText;
|
||||
|
||||
private DirectTransferSessionId(String canonicalText) {
|
||||
this.canonicalText = ObjectIdentitySupport.requireRouted(canonicalText, "osu1", "osm1");
|
||||
}
|
||||
|
||||
public static DirectTransferSessionId parse(String canonicalText) {
|
||||
return new DirectTransferSessionId(canonicalText);
|
||||
}
|
||||
|
||||
public String canonicalText() {
|
||||
return canonicalText;
|
||||
}
|
||||
|
||||
public String redactedLogToken() {
|
||||
return ObjectIdentitySupport.redactedLogToken(canonicalText);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return redactedLogToken();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
return other instanceof DirectTransferSessionId that
|
||||
&& canonicalText.equals(that.canonicalText);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(canonicalText);
|
||||
}
|
||||
}
|
||||
-15
@@ -1,15 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.identity;
|
||||
|
||||
/** One-based multipart part number, bounded by the S3-compatible maximum. */
|
||||
public record MultipartPartNumber(int value) {
|
||||
|
||||
public MultipartPartNumber {
|
||||
if (value < 1 || value > 10_000) {
|
||||
throw new IllegalArgumentException("multipart part number must be between 1 and 10000");
|
||||
}
|
||||
}
|
||||
|
||||
public static MultipartPartNumber of(int value) {
|
||||
return new MultipartPartNumber(value);
|
||||
}
|
||||
}
|
||||
-16
@@ -48,22 +48,6 @@ final class ObjectIdentitySupport {
|
||||
return value;
|
||||
}
|
||||
|
||||
static String requirePartReceipt(String value) {
|
||||
if (value == null || value.length() > 48) {
|
||||
throw invalid("part receipt token");
|
||||
}
|
||||
String[] parts = value.split("\\.", -1);
|
||||
if (parts.length != 3
|
||||
|| !"osp1".equals(parts[0])
|
||||
|| parts[1].length() != 26
|
||||
|| !parts[1].matches(CROCKFORD)
|
||||
|| !parts[2].matches("[0-9a-f]{10}")) {
|
||||
throw invalid("part receipt token");
|
||||
}
|
||||
requireCheck(parts[0] + "." + parts[1], parts[2]);
|
||||
return value;
|
||||
}
|
||||
|
||||
static String redactedLogToken(String canonicalText) {
|
||||
int separator = canonicalText.indexOf('.');
|
||||
String family = separator < 0 ? "object-id" : canonicalText.substring(0, separator);
|
||||
|
||||
-40
@@ -1,40 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.identity;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
/** Server-issued opaque acknowledgement of a verified multipart part. */
|
||||
public final class PartReceiptToken {
|
||||
|
||||
private final String canonicalText;
|
||||
|
||||
private PartReceiptToken(String canonicalText) {
|
||||
this.canonicalText = ObjectIdentitySupport.requirePartReceipt(canonicalText);
|
||||
}
|
||||
|
||||
public static PartReceiptToken parse(String canonicalText) {
|
||||
return new PartReceiptToken(canonicalText);
|
||||
}
|
||||
|
||||
public String canonicalText() {
|
||||
return canonicalText;
|
||||
}
|
||||
|
||||
public String redactedLogToken() {
|
||||
return ObjectIdentitySupport.redactedLogToken(canonicalText);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return redactedLogToken();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
return other instanceof PartReceiptToken that && canonicalText.equals(that.canonicalText);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(canonicalText);
|
||||
}
|
||||
}
|
||||
-61
@@ -1,61 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.model;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import java.net.URI;
|
||||
import java.time.Instant;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/** Transient download bearer grant; persistence and string rendering must omit its secret URI. */
|
||||
public final class DirectDownloadGrant {
|
||||
|
||||
private final DirectTransferSessionId sessionId;
|
||||
private final URI requestUri;
|
||||
private final Map<String, String> signedHeaders;
|
||||
private final Instant expiresAt;
|
||||
|
||||
public DirectDownloadGrant(
|
||||
DirectTransferSessionId sessionId,
|
||||
URI requestUri,
|
||||
Map<String, String> signedHeaders,
|
||||
Instant expiresAt) {
|
||||
this.sessionId = Objects.requireNonNull(sessionId, "sessionId must be non-null");
|
||||
this.requestUri = requireGrantUri(requestUri);
|
||||
this.signedHeaders = ObjectModelSupport.immutableHeaders(signedHeaders);
|
||||
this.expiresAt = ObjectModelSupport.requireExpiry(expiresAt);
|
||||
}
|
||||
|
||||
public DirectTransferSessionId sessionId() {
|
||||
return sessionId;
|
||||
}
|
||||
|
||||
public URI requestUri() {
|
||||
return requestUri;
|
||||
}
|
||||
|
||||
public Map<String, String> signedHeaders() {
|
||||
return signedHeaders;
|
||||
}
|
||||
|
||||
public Instant expiresAt() {
|
||||
return expiresAt;
|
||||
}
|
||||
|
||||
private static URI requireGrantUri(URI uri) {
|
||||
if (uri == null
|
||||
|| uri.toASCIIString().length() > 4096
|
||||
|| uri.getHost() == null
|
||||
|| uri.getUserInfo() != null
|
||||
|| uri.getFragment() != null
|
||||
|| !("https".equalsIgnoreCase(uri.getScheme())
|
||||
|| "http".equalsIgnoreCase(uri.getScheme()))) {
|
||||
throw new IllegalArgumentException("grant URI is invalid");
|
||||
}
|
||||
return uri;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "DirectDownloadGrant[session=" + sessionId.redactedLogToken() + ", redacted]";
|
||||
}
|
||||
}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.model;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectStageHandle;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectVersionToken;
|
||||
import java.util.Objects;
|
||||
|
||||
/** Server-verified completion; a client success claim alone never creates this receipt. */
|
||||
public record DirectUploadCompletionReceipt(
|
||||
ObjectOperationKey operationKey,
|
||||
DirectTransferSessionId sessionId,
|
||||
ObjectStageHandle stageHandle,
|
||||
ObjectVersionToken exactVersion,
|
||||
ObjectContentIdentity verifiedContent,
|
||||
ObjectMutationOutcome outcome) {
|
||||
|
||||
public DirectUploadCompletionReceipt {
|
||||
Objects.requireNonNull(operationKey, "operationKey must be non-null");
|
||||
Objects.requireNonNull(sessionId, "sessionId must be non-null");
|
||||
Objects.requireNonNull(stageHandle, "stageHandle must be non-null");
|
||||
Objects.requireNonNull(exactVersion, "exactVersion must be non-null");
|
||||
Objects.requireNonNull(verifiedContent, "verifiedContent must be non-null");
|
||||
Objects.requireNonNull(outcome, "outcome must be non-null");
|
||||
}
|
||||
}
|
||||
-61
@@ -1,61 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.model;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import java.net.URI;
|
||||
import java.time.Instant;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/** Transient bearer grant; string rendering never includes its URI or signed header values. */
|
||||
public final class DirectUploadGrant {
|
||||
|
||||
private final DirectTransferSessionId sessionId;
|
||||
private final URI requestUri;
|
||||
private final Map<String, String> signedHeaders;
|
||||
private final Instant expiresAt;
|
||||
|
||||
public DirectUploadGrant(
|
||||
DirectTransferSessionId sessionId,
|
||||
URI requestUri,
|
||||
Map<String, String> signedHeaders,
|
||||
Instant expiresAt) {
|
||||
this.sessionId = Objects.requireNonNull(sessionId, "sessionId must be non-null");
|
||||
this.requestUri = requireGrantUri(requestUri);
|
||||
this.signedHeaders = ObjectModelSupport.immutableHeaders(signedHeaders);
|
||||
this.expiresAt = ObjectModelSupport.requireExpiry(expiresAt);
|
||||
}
|
||||
|
||||
public DirectTransferSessionId sessionId() {
|
||||
return sessionId;
|
||||
}
|
||||
|
||||
public URI requestUri() {
|
||||
return requestUri;
|
||||
}
|
||||
|
||||
public Map<String, String> signedHeaders() {
|
||||
return signedHeaders;
|
||||
}
|
||||
|
||||
public Instant expiresAt() {
|
||||
return expiresAt;
|
||||
}
|
||||
|
||||
private static URI requireGrantUri(URI uri) {
|
||||
if (uri == null
|
||||
|| uri.toASCIIString().length() > 4096
|
||||
|| uri.getHost() == null
|
||||
|| uri.getUserInfo() != null
|
||||
|| uri.getFragment() != null
|
||||
|| !("https".equalsIgnoreCase(uri.getScheme())
|
||||
|| "http".equalsIgnoreCase(uri.getScheme()))) {
|
||||
throw new IllegalArgumentException("grant URI is invalid");
|
||||
}
|
||||
return uri;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "DirectUploadGrant[session=" + sessionId.redactedLogToken() + ", redacted]";
|
||||
}
|
||||
}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.model;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectStageHandle;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectVersionToken;
|
||||
import java.util.Objects;
|
||||
|
||||
/** Verified multipart completion receipt that still represents an unpublished stage. */
|
||||
public record MultipartReceipt(
|
||||
ObjectOperationKey operationKey,
|
||||
DirectTransferSessionId sessionId,
|
||||
ObjectStageHandle stageHandle,
|
||||
ObjectVersionToken exactVersion,
|
||||
ObjectContentIdentity verifiedContent,
|
||||
ObjectMutationOutcome outcome) {
|
||||
|
||||
public MultipartReceipt {
|
||||
Objects.requireNonNull(operationKey, "operationKey must be non-null");
|
||||
Objects.requireNonNull(sessionId, "sessionId must be non-null");
|
||||
Objects.requireNonNull(stageHandle, "stageHandle must be non-null");
|
||||
Objects.requireNonNull(exactVersion, "exactVersion must be non-null");
|
||||
Objects.requireNonNull(verifiedContent, "verifiedContent must be non-null");
|
||||
Objects.requireNonNull(outcome, "outcome must be non-null");
|
||||
}
|
||||
}
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.model;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import java.time.Instant;
|
||||
import java.util.Objects;
|
||||
|
||||
/** Opaque multipart session with a bounded part budget and expiry. */
|
||||
public record MultipartSession(
|
||||
ObjectOperationKey operationKey,
|
||||
DirectTransferSessionId sessionId,
|
||||
Instant expiresAt,
|
||||
int maximumParts,
|
||||
ObjectMutationOutcome outcome) {
|
||||
|
||||
public MultipartSession {
|
||||
Objects.requireNonNull(operationKey, "operationKey must be non-null");
|
||||
Objects.requireNonNull(sessionId, "sessionId must be non-null");
|
||||
Objects.requireNonNull(expiresAt, "expiresAt must be non-null");
|
||||
Objects.requireNonNull(outcome, "outcome must be non-null");
|
||||
if (maximumParts < 1 || maximumParts > 10_000) {
|
||||
throw new IllegalArgumentException("maximumParts is outside the supported range");
|
||||
}
|
||||
}
|
||||
}
|
||||
-2
@@ -7,8 +7,6 @@ public enum ObjectCapabilityRequirement {
|
||||
CONDITIONAL_RETIREMENT,
|
||||
SHA_256_VERIFICATION,
|
||||
SCAN_GATED_PUBLICATION,
|
||||
DIRECT_UPLOAD,
|
||||
DIRECT_MULTIPART,
|
||||
RETENTION_HOLD,
|
||||
SERVER_SIDE_ENCRYPTION,
|
||||
RESPONSE_LOSS_RECONCILIATION
|
||||
|
||||
-28
@@ -1,9 +1,5 @@
|
||||
package dev.caskeleton.application.objectstorage.model;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
final class ObjectModelSupport {
|
||||
|
||||
private ObjectModelSupport() {}
|
||||
@@ -17,28 +13,4 @@ final class ObjectModelSupport {
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
static Map<String, String> immutableHeaders(Map<String, String> headers) {
|
||||
if (headers == null || headers.size() > 32) {
|
||||
throw new IllegalArgumentException("signed headers are invalid");
|
||||
}
|
||||
Map<String, String> copy = new LinkedHashMap<>();
|
||||
headers.forEach(
|
||||
(name, value) -> {
|
||||
String checkedName = requireBoundedToken("signed header name", name, 128);
|
||||
String checkedValue = requireBoundedToken("signed header value", value, 1024);
|
||||
if (!checkedName.equals(checkedName.toLowerCase(java.util.Locale.ROOT))) {
|
||||
throw new IllegalArgumentException("signed header name is invalid");
|
||||
}
|
||||
copy.put(checkedName, checkedValue);
|
||||
});
|
||||
return Map.copyOf(copy);
|
||||
}
|
||||
|
||||
static Instant requireExpiry(Instant expiresAt) {
|
||||
if (expiresAt == null) {
|
||||
throw new IllegalArgumentException("grant expiry is invalid");
|
||||
}
|
||||
return expiresAt;
|
||||
}
|
||||
}
|
||||
|
||||
-73
@@ -1,73 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.model;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.MultipartPartNumber;
|
||||
import java.net.URI;
|
||||
import java.time.Instant;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/** Transient multipart-part bearer grant with redacted rendering. */
|
||||
public final class PartUploadGrant {
|
||||
|
||||
private final DirectTransferSessionId sessionId;
|
||||
private final MultipartPartNumber partNumber;
|
||||
private final URI requestUri;
|
||||
private final Map<String, String> signedHeaders;
|
||||
private final Instant expiresAt;
|
||||
|
||||
public PartUploadGrant(
|
||||
DirectTransferSessionId sessionId,
|
||||
MultipartPartNumber partNumber,
|
||||
URI requestUri,
|
||||
Map<String, String> signedHeaders,
|
||||
Instant expiresAt) {
|
||||
this.sessionId = Objects.requireNonNull(sessionId, "sessionId must be non-null");
|
||||
this.partNumber = Objects.requireNonNull(partNumber, "partNumber must be non-null");
|
||||
this.requestUri = requireGrantUri(requestUri);
|
||||
this.signedHeaders = ObjectModelSupport.immutableHeaders(signedHeaders);
|
||||
this.expiresAt = ObjectModelSupport.requireExpiry(expiresAt);
|
||||
}
|
||||
|
||||
public DirectTransferSessionId sessionId() {
|
||||
return sessionId;
|
||||
}
|
||||
|
||||
public MultipartPartNumber partNumber() {
|
||||
return partNumber;
|
||||
}
|
||||
|
||||
public URI requestUri() {
|
||||
return requestUri;
|
||||
}
|
||||
|
||||
public Map<String, String> signedHeaders() {
|
||||
return signedHeaders;
|
||||
}
|
||||
|
||||
public Instant expiresAt() {
|
||||
return expiresAt;
|
||||
}
|
||||
|
||||
private static URI requireGrantUri(URI uri) {
|
||||
if (uri == null
|
||||
|| uri.toASCIIString().length() > 4096
|
||||
|| uri.getHost() == null
|
||||
|| uri.getUserInfo() != null
|
||||
|| uri.getFragment() != null
|
||||
|| !("https".equalsIgnoreCase(uri.getScheme())
|
||||
|| "http".equalsIgnoreCase(uri.getScheme()))) {
|
||||
throw new IllegalArgumentException("grant URI is invalid");
|
||||
}
|
||||
return uri;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "PartUploadGrant[session="
|
||||
+ sessionId.redactedLogToken()
|
||||
+ ", part="
|
||||
+ partNumber.value()
|
||||
+ ", redacted]";
|
||||
}
|
||||
}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.port;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.PartReceiptToken;
|
||||
import dev.caskeleton.application.objectstorage.model.MultipartReceipt;
|
||||
import dev.caskeleton.application.objectstorage.model.MultipartSession;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectMutationReceipt;
|
||||
import dev.caskeleton.application.objectstorage.model.PartUploadGrant;
|
||||
import dev.caskeleton.application.objectstorage.request.MultipartAbortRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.MultipartCompleteRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.MultipartPartAcknowledgement;
|
||||
import dev.caskeleton.application.objectstorage.request.MultipartStartRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.PartUploadGrantRequest;
|
||||
|
||||
/** Adapter-owned multipart session, part-ledger, completion, and abort boundary. */
|
||||
public interface DirectMultipartUploadPort {
|
||||
|
||||
MultipartSession startMultipart(MultipartStartRequest request);
|
||||
|
||||
PartUploadGrant createPartGrant(PartUploadGrantRequest request);
|
||||
|
||||
PartReceiptToken acknowledgePart(MultipartPartAcknowledgement request);
|
||||
|
||||
MultipartReceipt completeMultipart(MultipartCompleteRequest request);
|
||||
|
||||
ObjectMutationReceipt abortMultipart(MultipartAbortRequest request);
|
||||
}
|
||||
-10
@@ -1,10 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.port;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.model.DirectDownloadGrant;
|
||||
import dev.caskeleton.application.objectstorage.request.DirectDownloadGrantRequest;
|
||||
|
||||
/** Issues a bounded exact-version download grant after application authorization. */
|
||||
public interface DirectObjectDownloadGrantPort {
|
||||
|
||||
DirectDownloadGrant createDownloadGrant(DirectDownloadGrantRequest request);
|
||||
}
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.port;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.model.DirectUploadCompletionReceipt;
|
||||
import dev.caskeleton.application.objectstorage.model.DirectUploadGrant;
|
||||
import dev.caskeleton.application.objectstorage.request.DirectUploadCompletionRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.DirectUploadGrantRequest;
|
||||
|
||||
/** Direct single-object grant issuance and server-side completion verification. */
|
||||
public interface DirectObjectUploadPort {
|
||||
|
||||
DirectUploadGrant createUploadGrant(DirectUploadGrantRequest request);
|
||||
|
||||
DirectUploadCompletionReceipt completeUpload(DirectUploadCompletionRequest request);
|
||||
}
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.port;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectMutationReceipt;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectPurgeRequest;
|
||||
|
||||
/**
|
||||
* Privileged exact-version physical purge boundary. It must be assembled only in a separate
|
||||
* maintenance composition with stronger credentials and must never be injected into normal business
|
||||
* use cases.
|
||||
*/
|
||||
public interface ObjectPurgeMaintenancePort {
|
||||
|
||||
ObjectMutationReceipt purge(ObjectPurgeRequest request);
|
||||
}
|
||||
-29
@@ -1,29 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.request;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.content.CancellationView;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectReference;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectVersionToken;
|
||||
import dev.caskeleton.application.outbound.CallBudget;
|
||||
import java.time.Duration;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
|
||||
/** Request for a short-lived exact-version download grant after application authorization. */
|
||||
public record DirectDownloadGrantRequest(
|
||||
ObjectOperationKey operationKey,
|
||||
ObjectReference reference,
|
||||
Optional<ObjectVersionToken> expectedVersion,
|
||||
Duration requestedTtl,
|
||||
CallBudget budget,
|
||||
CancellationView cancellation) {
|
||||
|
||||
public DirectDownloadGrantRequest {
|
||||
ObjectRequestSupport.required(operationKey, "operationKey");
|
||||
ObjectRequestSupport.required(reference, "reference");
|
||||
Objects.requireNonNull(expectedVersion, "expectedVersion must be non-null");
|
||||
requestedTtl = ObjectRequestSupport.grantTtl(requestedTtl);
|
||||
ObjectRequestSupport.required(budget, "budget");
|
||||
ObjectRequestSupport.required(cancellation, "cancellation");
|
||||
}
|
||||
}
|
||||
-24
@@ -1,24 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.request;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.content.CancellationView;
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectContentIdentity;
|
||||
import dev.caskeleton.application.outbound.CallBudget;
|
||||
|
||||
/** Server verification request for a direct upload; it contains no trusted client-success flag. */
|
||||
public record DirectUploadCompletionRequest(
|
||||
ObjectOperationKey operationKey,
|
||||
DirectTransferSessionId sessionId,
|
||||
ObjectContentIdentity expectedContent,
|
||||
CallBudget budget,
|
||||
CancellationView cancellation) {
|
||||
|
||||
public DirectUploadCompletionRequest {
|
||||
ObjectRequestSupport.required(operationKey, "operationKey");
|
||||
ObjectRequestSupport.required(sessionId, "sessionId");
|
||||
ObjectRequestSupport.required(expectedContent, "expectedContent");
|
||||
ObjectRequestSupport.required(budget, "budget");
|
||||
ObjectRequestSupport.required(cancellation, "cancellation");
|
||||
}
|
||||
}
|
||||
-30
@@ -1,30 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.request;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.content.CancellationView;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectContentIdentity;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectMediaType;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectPublicationRequirement;
|
||||
import dev.caskeleton.application.outbound.CallBudget;
|
||||
import java.time.Duration;
|
||||
|
||||
/** Request for a bounded direct-upload bearer grant. */
|
||||
public record DirectUploadGrantRequest(
|
||||
ObjectOperationKey operationKey,
|
||||
ObjectMediaType declaredMediaType,
|
||||
ObjectContentIdentity contentIdentity,
|
||||
ObjectPublicationRequirement publicationRequirement,
|
||||
Duration requestedTtl,
|
||||
CallBudget budget,
|
||||
CancellationView cancellation) {
|
||||
|
||||
public DirectUploadGrantRequest {
|
||||
ObjectRequestSupport.required(operationKey, "operationKey");
|
||||
ObjectRequestSupport.required(declaredMediaType, "declaredMediaType");
|
||||
ObjectRequestSupport.required(contentIdentity, "contentIdentity");
|
||||
ObjectRequestSupport.required(publicationRequirement, "publicationRequirement");
|
||||
requestedTtl = ObjectRequestSupport.grantTtl(requestedTtl);
|
||||
ObjectRequestSupport.required(budget, "budget");
|
||||
ObjectRequestSupport.required(cancellation, "cancellation");
|
||||
}
|
||||
}
|
||||
-21
@@ -1,21 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.request;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.content.CancellationView;
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.outbound.CallBudget;
|
||||
|
||||
/** Conditional abort of one exact multipart session. */
|
||||
public record MultipartAbortRequest(
|
||||
ObjectOperationKey operationKey,
|
||||
DirectTransferSessionId sessionId,
|
||||
CallBudget budget,
|
||||
CancellationView cancellation) {
|
||||
|
||||
public MultipartAbortRequest {
|
||||
ObjectRequestSupport.required(operationKey, "operationKey");
|
||||
ObjectRequestSupport.required(sessionId, "sessionId");
|
||||
ObjectRequestSupport.required(budget, "budget");
|
||||
ObjectRequestSupport.required(cancellation, "cancellation");
|
||||
}
|
||||
}
|
||||
-35
@@ -1,35 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.request;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.content.CancellationView;
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.identity.PartReceiptToken;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectContentIdentity;
|
||||
import dev.caskeleton.application.outbound.CallBudget;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/** Completes multipart using only server-issued part tokens and an exact full-content identity. */
|
||||
public record MultipartCompleteRequest(
|
||||
ObjectOperationKey operationKey,
|
||||
DirectTransferSessionId sessionId,
|
||||
List<PartReceiptToken> partTokens,
|
||||
ObjectContentIdentity expectedContent,
|
||||
CallBudget budget,
|
||||
CancellationView cancellation) {
|
||||
|
||||
public MultipartCompleteRequest {
|
||||
ObjectRequestSupport.required(operationKey, "operationKey");
|
||||
ObjectRequestSupport.required(sessionId, "sessionId");
|
||||
ObjectRequestSupport.required(partTokens, "partTokens");
|
||||
if (partTokens.isEmpty()
|
||||
|| partTokens.size() > 10_000
|
||||
|| partTokens.stream().anyMatch(Objects::isNull)) {
|
||||
throw new IllegalArgumentException("partTokens are outside the supported range");
|
||||
}
|
||||
partTokens = List.copyOf(partTokens);
|
||||
ObjectRequestSupport.required(expectedContent, "expectedContent");
|
||||
ObjectRequestSupport.required(budget, "budget");
|
||||
ObjectRequestSupport.required(cancellation, "cancellation");
|
||||
}
|
||||
}
|
||||
-37
@@ -1,37 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.request;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.MultipartPartNumber;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectDigest;
|
||||
|
||||
/** Bounded client completion claim that the server verifies before issuing an opaque part token. */
|
||||
public record MultipartPartAcknowledgement(
|
||||
ObjectOperationKey operationKey,
|
||||
DirectTransferSessionId sessionId,
|
||||
MultipartPartNumber partNumber,
|
||||
long observedLength,
|
||||
ObjectDigest observedDigest,
|
||||
String clientCompletionClaim) {
|
||||
|
||||
public MultipartPartAcknowledgement {
|
||||
ObjectRequestSupport.required(operationKey, "operationKey");
|
||||
ObjectRequestSupport.required(sessionId, "sessionId");
|
||||
ObjectRequestSupport.required(partNumber, "partNumber");
|
||||
ObjectRequestSupport.positive(observedLength, "observedLength");
|
||||
ObjectRequestSupport.required(observedDigest, "observedDigest");
|
||||
clientCompletionClaim =
|
||||
ObjectRequestSupport.boundedToken(clientCompletionClaim, "clientCompletionClaim", 1024);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "MultipartPartAcknowledgement[operation="
|
||||
+ operationKey.operationId().value()
|
||||
+ ", session="
|
||||
+ sessionId.redactedLogToken()
|
||||
+ ", part="
|
||||
+ partNumber.value()
|
||||
+ ", completionClaim=redacted]";
|
||||
}
|
||||
}
|
||||
-34
@@ -1,34 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.request;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.content.CancellationView;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectContentIdentity;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectMediaType;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectPublicationRequirement;
|
||||
import dev.caskeleton.application.outbound.CallBudget;
|
||||
import java.time.Duration;
|
||||
|
||||
/** Starts one adapter-owned multipart session for an exact content identity. */
|
||||
public record MultipartStartRequest(
|
||||
ObjectOperationKey operationKey,
|
||||
ObjectMediaType declaredMediaType,
|
||||
ObjectContentIdentity contentIdentity,
|
||||
ObjectPublicationRequirement publicationRequirement,
|
||||
int maximumParts,
|
||||
Duration sessionTtl,
|
||||
CallBudget budget,
|
||||
CancellationView cancellation) {
|
||||
|
||||
public MultipartStartRequest {
|
||||
ObjectRequestSupport.required(operationKey, "operationKey");
|
||||
ObjectRequestSupport.required(declaredMediaType, "declaredMediaType");
|
||||
ObjectRequestSupport.required(contentIdentity, "contentIdentity");
|
||||
ObjectRequestSupport.required(publicationRequirement, "publicationRequirement");
|
||||
if (maximumParts < 1 || maximumParts > 10_000) {
|
||||
throw new IllegalArgumentException("maximumParts is outside the supported range");
|
||||
}
|
||||
sessionTtl = ObjectRequestSupport.grantTtl(sessionTtl);
|
||||
ObjectRequestSupport.required(budget, "budget");
|
||||
ObjectRequestSupport.required(cancellation, "cancellation");
|
||||
}
|
||||
}
|
||||
+9
-1
@@ -7,12 +7,18 @@ import dev.caskeleton.application.objectstorage.identity.ObjectVersionToken;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectPublicationRequirement;
|
||||
import dev.caskeleton.application.outbound.CallBudget;
|
||||
|
||||
/** Finalize is the sole staged operation allowed to mint a published reference. */
|
||||
/**
|
||||
* Finalize is the sole staged operation allowed to mint a published reference. It carries the
|
||||
* publication claim (fence and claimant) it runs under, so a finalize whose lease expired or was
|
||||
* taken over cannot race an abort.
|
||||
*/
|
||||
public record ObjectFinalizeRequest(
|
||||
ObjectOperationKey operationKey,
|
||||
ObjectStageHandle stageHandle,
|
||||
ObjectVersionToken exactVersion,
|
||||
ObjectPublicationRequirement publicationRequirement,
|
||||
long handoffFence,
|
||||
String claimant,
|
||||
CallBudget budget,
|
||||
CancellationView cancellation) {
|
||||
|
||||
@@ -21,6 +27,8 @@ public record ObjectFinalizeRequest(
|
||||
ObjectRequestSupport.required(stageHandle, "stageHandle");
|
||||
ObjectRequestSupport.required(exactVersion, "exactVersion");
|
||||
ObjectRequestSupport.required(publicationRequirement, "publicationRequirement");
|
||||
ObjectRequestSupport.positive(handoffFence, "handoffFence");
|
||||
claimant = ObjectRequestSupport.boundedToken(claimant, "claimant", 128);
|
||||
ObjectRequestSupport.required(budget, "budget");
|
||||
ObjectRequestSupport.required(cancellation, "cancellation");
|
||||
}
|
||||
|
||||
-24
@@ -1,24 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.request;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.content.CancellationView;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectReference;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectVersionToken;
|
||||
import dev.caskeleton.application.outbound.CallBudget;
|
||||
|
||||
/** Privileged physical purge request with an exact immutable version precondition. */
|
||||
public record ObjectPurgeRequest(
|
||||
ObjectOperationKey operationKey,
|
||||
ObjectReference reference,
|
||||
ObjectVersionToken exactVersion,
|
||||
CallBudget budget,
|
||||
CancellationView cancellation) {
|
||||
|
||||
public ObjectPurgeRequest {
|
||||
ObjectRequestSupport.required(operationKey, "operationKey");
|
||||
ObjectRequestSupport.required(reference, "reference");
|
||||
ObjectRequestSupport.required(exactVersion, "exactVersion");
|
||||
ObjectRequestSupport.required(budget, "budget");
|
||||
ObjectRequestSupport.required(cancellation, "cancellation");
|
||||
}
|
||||
}
|
||||
-32
@@ -1,32 +0,0 @@
|
||||
package dev.caskeleton.application.objectstorage.request;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.content.CancellationView;
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.MultipartPartNumber;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectDigest;
|
||||
import dev.caskeleton.application.outbound.CallBudget;
|
||||
import java.time.Duration;
|
||||
|
||||
/** Creates one bounded part grant tied to exact expected length and digest. */
|
||||
public record PartUploadGrantRequest(
|
||||
ObjectOperationKey operationKey,
|
||||
DirectTransferSessionId sessionId,
|
||||
MultipartPartNumber partNumber,
|
||||
long exactPartLength,
|
||||
ObjectDigest expectedPartDigest,
|
||||
Duration requestedTtl,
|
||||
CallBudget budget,
|
||||
CancellationView cancellation) {
|
||||
|
||||
public PartUploadGrantRequest {
|
||||
ObjectRequestSupport.required(operationKey, "operationKey");
|
||||
ObjectRequestSupport.required(sessionId, "sessionId");
|
||||
ObjectRequestSupport.required(partNumber, "partNumber");
|
||||
ObjectRequestSupport.positive(exactPartLength, "exactPartLength");
|
||||
ObjectRequestSupport.required(expectedPartDigest, "expectedPartDigest");
|
||||
requestedTtl = ObjectRequestSupport.grantTtl(requestedTtl);
|
||||
ObjectRequestSupport.required(budget, "budget");
|
||||
ObjectRequestSupport.required(cancellation, "cancellation");
|
||||
}
|
||||
}
|
||||
+3
-49
@@ -3,9 +3,6 @@ package dev.caskeleton.application.objectstorage;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectDestinationId;
|
||||
import dev.caskeleton.application.objectstorage.model.DirectDownloadGrant;
|
||||
import dev.caskeleton.application.objectstorage.model.DirectUploadGrant;
|
||||
import dev.caskeleton.application.objectstorage.model.PartUploadGrant;
|
||||
import dev.caskeleton.application.storage.ObjectStoragePort;
|
||||
import dev.caskeleton.application.storage.StoredObject;
|
||||
import dev.caskeleton.application.testsupport.CompiledPackageScanner;
|
||||
@@ -16,17 +13,13 @@ import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.reflect.RecordComponent;
|
||||
import java.lang.reflect.Type;
|
||||
import java.net.URI;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
class ObjectStorageArchitectureContractTest {
|
||||
|
||||
private static final String CONTRACT_PACKAGE = "dev.caskeleton.application.objectstorage";
|
||||
private static final Set<Class<?>> URI_GRANTS =
|
||||
Set.of(DirectUploadGrant.class, DirectDownloadGrant.class, PartUploadGrant.class);
|
||||
private static final List<String> FORBIDDEN_TYPE_NAMES =
|
||||
List.of(
|
||||
"org.springframework.",
|
||||
@@ -39,7 +32,8 @@ class ObjectStorageArchitectureContractTest {
|
||||
"dev.caskeleton.adapter.",
|
||||
"dev.caskeleton.bootstrap.",
|
||||
"java.nio.file.Path",
|
||||
"java.io.File");
|
||||
"java.io.File",
|
||||
"java.net.URI");
|
||||
|
||||
@Test
|
||||
void semanticContractIsFrameworkProviderTransportAndPersistentLocatorFree() throws Exception {
|
||||
@@ -72,19 +66,6 @@ class ObjectStorageArchitectureContractTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void uriAppearsOnlyOnExplicitTransientGrantValues() throws Exception {
|
||||
for (Class<?> contract : topLevelClassesUnder(CONTRACT_PACKAGE)) {
|
||||
boolean exposesUri =
|
||||
ArraysSupport.allTypes(contract).stream()
|
||||
.map(Type::getTypeName)
|
||||
.anyMatch(name -> name.equals(URI.class.getName()));
|
||||
if (exposesUri) {
|
||||
assertThat(URI_GRANTS).as(contract.getName()).contains(contract);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
// Reflection characterizes the still-active removal seam until data/API migration completes.
|
||||
@SuppressWarnings("removal")
|
||||
@@ -105,11 +86,7 @@ class ObjectStorageArchitectureContractTest {
|
||||
}
|
||||
|
||||
private static void assertTypeIsPure(Class<?> owner, Type type) {
|
||||
String typeName = type.getTypeName();
|
||||
assertTypeNameIsPure(owner, typeName);
|
||||
if (typeName.contains(URI.class.getName())) {
|
||||
assertThat(URI_GRANTS).as(owner.getName()).contains(owner);
|
||||
}
|
||||
assertTypeNameIsPure(owner, type.getTypeName());
|
||||
}
|
||||
|
||||
private static void assertTypeNameIsPure(Class<?> owner, String typeName) {
|
||||
@@ -135,27 +112,4 @@ class ObjectStorageArchitectureContractTest {
|
||||
assertThat(classes).isNotEmpty();
|
||||
return classes;
|
||||
}
|
||||
|
||||
private static final class ArraysSupport {
|
||||
|
||||
private ArraysSupport() {}
|
||||
|
||||
static List<Type> allTypes(Class<?> type) {
|
||||
List<Type> types = new ArrayList<>();
|
||||
for (Field field : type.getDeclaredFields()) {
|
||||
types.add(field.getGenericType());
|
||||
}
|
||||
for (Constructor<?> constructor : type.getDeclaredConstructors()) {
|
||||
types.addAll(List.of(constructor.getGenericParameterTypes()));
|
||||
}
|
||||
for (Method method : type.getDeclaredMethods()) {
|
||||
types.add(method.getGenericReturnType());
|
||||
types.addAll(List.of(method.getGenericParameterTypes()));
|
||||
}
|
||||
for (RecordComponent component : recordComponents(type)) {
|
||||
types.add(component.getGenericType());
|
||||
}
|
||||
return types;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-23
@@ -3,8 +3,6 @@ package dev.caskeleton.application.objectstorage;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.MultipartPartNumber;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectDestinationId;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectId;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationEpoch;
|
||||
@@ -13,7 +11,6 @@ import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectReference;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectStageHandle;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectVersionToken;
|
||||
import dev.caskeleton.application.objectstorage.identity.PartReceiptToken;
|
||||
import net.jqwik.api.ForAll;
|
||||
import net.jqwik.api.Property;
|
||||
import net.jqwik.api.constraints.CharRange;
|
||||
@@ -44,26 +41,18 @@ class ObjectStorageIdentityContractTest {
|
||||
ObjectReference.parse("osr1." + ROUTE + "." + OBJECT + ".d53d9429ac");
|
||||
ObjectStageHandle stage =
|
||||
ObjectStageHandle.parse("osh1." + ROUTE + "." + OBJECT + ".f3226a9833");
|
||||
DirectTransferSessionId upload =
|
||||
DirectTransferSessionId.parse("osu1." + ROUTE + "." + OBJECT + ".55459818cc");
|
||||
DirectTransferSessionId multipart =
|
||||
DirectTransferSessionId.parse("osm1." + ROUTE + "." + OBJECT + ".13a5a3b163");
|
||||
ObjectVersionToken version =
|
||||
ObjectVersionToken.parse("osv1." + ROUTE + "." + OBJECT + ".6678c6821f");
|
||||
PartReceiptToken part = PartReceiptToken.parse("osp1." + OBJECT + ".8f6f53696e");
|
||||
|
||||
assertThat(reference.canonicalText()).startsWith("osr1.");
|
||||
assertThat(stage.canonicalText()).startsWith("osh1.");
|
||||
assertThat(upload.canonicalText()).startsWith("osu1.");
|
||||
assertThat(multipart.canonicalText()).startsWith("osm1.");
|
||||
assertThat(version.canonicalText()).startsWith("osv1.");
|
||||
assertThat(part.canonicalText()).startsWith("osp1.");
|
||||
assertThat(reference.redactedLogToken()).doesNotContain(ROUTE).doesNotContain(OBJECT);
|
||||
assertThat(reference.toString()).isEqualTo(reference.redactedLogToken());
|
||||
}
|
||||
|
||||
@Test
|
||||
void prefixesCannotBeSubstitutedAcrossPublishedStageAndSessionTypes() {
|
||||
void prefixesCannotBeSubstitutedAcrossPublishedStageAndVersionTypes() {
|
||||
String reference = "osr1." + ROUTE + "." + OBJECT + ".d53d9429ac";
|
||||
String stage = "osh1." + ROUTE + "." + OBJECT + ".f3226a9833";
|
||||
|
||||
@@ -71,7 +60,7 @@ class ObjectStorageIdentityContractTest {
|
||||
.isInstanceOf(IllegalArgumentException.class);
|
||||
assertThatThrownBy(() -> ObjectReference.parse(stage))
|
||||
.isInstanceOf(IllegalArgumentException.class);
|
||||
assertThatThrownBy(() -> DirectTransferSessionId.parse(reference))
|
||||
assertThatThrownBy(() -> ObjectVersionToken.parse(reference))
|
||||
.isInstanceOf(IllegalArgumentException.class);
|
||||
}
|
||||
|
||||
@@ -90,16 +79,6 @@ class ObjectStorageIdentityContractTest {
|
||||
.hasMessageNotContaining("filesystem");
|
||||
}
|
||||
|
||||
@Test
|
||||
void multipartPartNumberIsOneBasedAndBounded() {
|
||||
assertThat(MultipartPartNumber.of(1).value()).isEqualTo(1);
|
||||
assertThat(MultipartPartNumber.of(10_000).value()).isEqualTo(10_000);
|
||||
assertThatThrownBy(() -> MultipartPartNumber.of(0))
|
||||
.isInstanceOf(IllegalArgumentException.class);
|
||||
assertThatThrownBy(() -> MultipartPartNumber.of(10_001))
|
||||
.isInstanceOf(IllegalArgumentException.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
void nullBlankAndOversizeValuesAreRejected() {
|
||||
assertThatThrownBy(() -> ObjectDestinationId.of(null))
|
||||
|
||||
+2
-83
@@ -2,12 +2,9 @@ package dev.caskeleton.application.objectstorage;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
import dev.caskeleton.application.objectstorage.identity.DirectTransferSessionId;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectReference;
|
||||
import dev.caskeleton.application.objectstorage.identity.ObjectStageHandle;
|
||||
import dev.caskeleton.application.objectstorage.model.DirectDownloadGrant;
|
||||
import dev.caskeleton.application.objectstorage.model.DirectUploadGrant;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectCapabilityRequirement;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectEncryptionRequirement;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectHandoffReceipt;
|
||||
@@ -16,21 +13,10 @@ import dev.caskeleton.application.objectstorage.model.ObjectPublicationRequireme
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectPublishReceipt;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectRetentionRequirement;
|
||||
import dev.caskeleton.application.objectstorage.model.ObjectStageReceipt;
|
||||
import dev.caskeleton.application.objectstorage.model.PartUploadGrant;
|
||||
import dev.caskeleton.application.objectstorage.port.DirectObjectUploadPort;
|
||||
import dev.caskeleton.application.objectstorage.port.ObjectInspectionPort;
|
||||
import dev.caskeleton.application.objectstorage.port.ObjectPurgeMaintenancePort;
|
||||
import dev.caskeleton.application.objectstorage.port.ObjectRetirementPort;
|
||||
import dev.caskeleton.application.objectstorage.port.ObjectScanMaintenancePort;
|
||||
import dev.caskeleton.application.objectstorage.port.ObjectTransferPort;
|
||||
import dev.caskeleton.application.objectstorage.port.StagedObjectPublicationPort;
|
||||
import dev.caskeleton.application.objectstorage.request.DirectDownloadGrantRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.DirectUploadCompletionRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.DirectUploadGrantRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.MultipartAbortRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.MultipartCompleteRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.MultipartPartAcknowledgement;
|
||||
import dev.caskeleton.application.objectstorage.request.MultipartStartRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectAbortAuthorization;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectAbortRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectFinalizeRequest;
|
||||
@@ -38,20 +24,16 @@ import dev.caskeleton.application.objectstorage.request.ObjectHandoffClaimReques
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectHandoffReleaseRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectHandoffRenewRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectPublishRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectPurgeRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectRetireRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectScanVerdictRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectStageRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.ObjectVerifyRequest;
|
||||
import dev.caskeleton.application.objectstorage.request.PartUploadGrantRequest;
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.reflect.RecordComponent;
|
||||
import java.net.URI;
|
||||
import java.time.Instant;
|
||||
import java.util.Arrays;
|
||||
import java.util.EnumSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
class ObjectStoragePortContractTest {
|
||||
@@ -60,7 +42,6 @@ class ObjectStoragePortContractTest {
|
||||
List.of(
|
||||
ObjectPublishRequest.class,
|
||||
ObjectRetireRequest.class,
|
||||
ObjectPurgeRequest.class,
|
||||
ObjectStageRequest.class,
|
||||
ObjectVerifyRequest.class,
|
||||
ObjectScanVerdictRequest.class,
|
||||
@@ -69,15 +50,7 @@ class ObjectStoragePortContractTest {
|
||||
ObjectHandoffClaimRequest.class,
|
||||
ObjectHandoffRenewRequest.class,
|
||||
ObjectHandoffReleaseRequest.class,
|
||||
ObjectAbortAuthorization.class,
|
||||
DirectDownloadGrantRequest.class,
|
||||
DirectUploadGrantRequest.class,
|
||||
DirectUploadCompletionRequest.class,
|
||||
MultipartStartRequest.class,
|
||||
PartUploadGrantRequest.class,
|
||||
MultipartPartAcknowledgement.class,
|
||||
MultipartCompleteRequest.class,
|
||||
MultipartAbortRequest.class);
|
||||
ObjectAbortAuthorization.class);
|
||||
|
||||
private static final List<Class<?>> PUBLIC_RECEIPTS =
|
||||
List.of(
|
||||
@@ -109,9 +82,7 @@ class ObjectStoragePortContractTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void purgeScannerAndBusinessRetirementAreSeparatePrivilegeSurfaces() {
|
||||
assertThat(ObjectPurgeMaintenancePort.class.isAssignableFrom(ObjectRetirementPort.class))
|
||||
.isFalse();
|
||||
void scannerAndStagedPublicationAreSeparatePrivilegeSurfaces() {
|
||||
assertThat(ObjectScanMaintenancePort.class.isAssignableFrom(StagedObjectPublicationPort.class))
|
||||
.isFalse();
|
||||
assertThat(
|
||||
@@ -126,29 +97,6 @@ class ObjectStoragePortContractTest {
|
||||
.containsExactlyInAnyOrder("transferForScan", "recordScanVerdict");
|
||||
}
|
||||
|
||||
@Test
|
||||
void directCompletionVerifiesExpectedContentAndNeverAcceptsAClientSuccessFlag() {
|
||||
assertThat(componentTypes(DirectUploadCompletionRequest.class))
|
||||
.contains(dev.caskeleton.application.objectstorage.model.ObjectContentIdentity.class)
|
||||
.doesNotContain(boolean.class, Boolean.class);
|
||||
assertThat(
|
||||
Arrays.stream(DirectObjectUploadPort.class.getMethods()).map(Method::getName).toList())
|
||||
.containsExactlyInAnyOrder("createUploadGrant", "completeUpload");
|
||||
}
|
||||
|
||||
@Test
|
||||
void multipartCompletionAcceptsOnlyServerIssuedPartTokens() {
|
||||
RecordComponent tokens =
|
||||
Arrays.stream(MultipartCompleteRequest.class.getRecordComponents())
|
||||
.filter(component -> component.getName().equals("partTokens"))
|
||||
.findFirst()
|
||||
.orElseThrow();
|
||||
|
||||
assertThat(tokens.getGenericType().getTypeName())
|
||||
.isEqualTo(
|
||||
"java.util.List<dev.caskeleton.application.objectstorage.identity.PartReceiptToken>");
|
||||
}
|
||||
|
||||
@Test
|
||||
void onlyFinalizationProducesAPublishedReferenceInTheStagedFamily() {
|
||||
assertThat(componentTypes(ObjectStageReceipt.class)).doesNotContain(ObjectReference.class);
|
||||
@@ -199,35 +147,6 @@ class ObjectStoragePortContractTest {
|
||||
assertThat(EnumSet.allOf(ObjectCapabilityRequirement.class)).isNotEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
void transientGrantToStringRedactsUriAndSignedHeaders() {
|
||||
DirectTransferSessionId session =
|
||||
DirectTransferSessionId.parse("osu1.0123456789ab.0123456789abcdefghjkmnpqrs.55459818cc");
|
||||
DirectUploadGrant upload =
|
||||
new DirectUploadGrant(
|
||||
session,
|
||||
URI.create("https://storage.example/private?X-Amz-Signature=secret"),
|
||||
Map.of("x-amz-checksum-sha256", "secret-checksum"),
|
||||
Instant.parse("2026-07-28T12:00:00Z"));
|
||||
DirectDownloadGrant download =
|
||||
new DirectDownloadGrant(
|
||||
session,
|
||||
URI.create("https://storage.example/private?X-Amz-Signature=secret"),
|
||||
Map.of("response-content-disposition", "private-name"),
|
||||
Instant.parse("2026-07-28T12:00:00Z"));
|
||||
PartUploadGrant part =
|
||||
new PartUploadGrant(
|
||||
session,
|
||||
dev.caskeleton.application.objectstorage.identity.MultipartPartNumber.of(1),
|
||||
URI.create("https://storage.example/private?X-Amz-Signature=secret"),
|
||||
Map.of("x-amz-checksum-sha256", "secret-checksum"),
|
||||
Instant.parse("2026-07-28T12:00:00Z"));
|
||||
|
||||
assertThat(upload.toString()).doesNotContain("storage.example", "secret");
|
||||
assertThat(download.toString()).doesNotContain("storage.example", "private-name");
|
||||
assertThat(part.toString()).doesNotContain("storage.example", "secret-checksum");
|
||||
}
|
||||
|
||||
/**
|
||||
* Component types of a record, as wildcards rather than captures.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user