mirror of
https://github.com/oven-sh/bun
synced 2026-02-02 15:08:46 +00:00
feat(s3Client): add support for ListObjectsV2 action (#16948)
This commit is contained in:
Inqnuam
114
packages/bun-types/s3.d.ts
vendored
114
packages/bun-types/s3.d.ts
vendored
@@ -617,6 +617,106 @@ declare module "bun" {
|
||||
stat(): Promise<S3Stats>;
|
||||
}
|
||||
|
||||
interface S3ListObjectsOptions {
|
||||
/** Limits the response to keys that begin with the specified prefix. */
|
||||
prefix?: string;
|
||||
/** ContinuationToken indicates to S3 that the list is being continued on this bucket with a token. ContinuationToken is obfuscated and is not a real key. You can use this ContinuationToken for pagination of the list results. */
|
||||
continuationToken?: string;
|
||||
/** A delimiter is a character that you use to group keys. */
|
||||
delimiter?: string;
|
||||
/** Sets the maximum number of keys returned in the response. By default, the action returns up to 1,000 key names. The response might contain fewer keys but will never contain more. */
|
||||
maxKeys?: number;
|
||||
/** StartAfter is where you want S3 to start listing from. S3 starts listing after this specified key. StartAfter can be any key in the bucket. */
|
||||
startAfter?: string;
|
||||
/** Encoding type used by S3 to encode the object keys in the response. Responses are encoded only in UTF-8. An object key can contain any Unicode character. However, the XML 1.0 parser can't parse certain characters, such as characters with an ASCII value from 0 to 10. For characters that aren't supported in XML 1.0, you can add this parameter to request that S3 encode the keys in the response. */
|
||||
encodingType?: "url";
|
||||
/** If you want to return the owner field with each key in the result, then set the FetchOwner field to true. */
|
||||
fetchOwner?: boolean;
|
||||
}
|
||||
|
||||
interface S3ListObjectsResponse {
|
||||
/** All of the keys (up to 1,000) that share the same prefix are grouped together. When counting the total numbers of returns by this API operation, this group of keys is considered as one item.
|
||||
*
|
||||
* A response can contain CommonPrefixes only if you specify a delimiter.
|
||||
*
|
||||
* CommonPrefixes contains all (if there are any) keys between Prefix and the next occurrence of the string specified by a delimiter.
|
||||
*
|
||||
* CommonPrefixes lists keys that act like subdirectories in the directory specified by Prefix.
|
||||
*
|
||||
* For example, if the prefix is notes/ and the delimiter is a slash (/) as in notes/summer/july, the common prefix is notes/summer/. All of the keys that roll up into a common prefix count as a single return when calculating the number of returns. */
|
||||
commonPrefixes?: { prefix: string }[];
|
||||
/** Metadata about each object returned. */
|
||||
contents?: {
|
||||
/** The algorithm that was used to create a checksum of the object. */
|
||||
checksumAlgorithm?: "CRC32" | "CRC32C" | "SHA1" | "SHA256" | "CRC64NVME";
|
||||
/** The checksum type that is used to calculate the object’s checksum value. */
|
||||
checksumType?: "COMPOSITE" | "FULL_OBJECT";
|
||||
/**
|
||||
* The entity tag is a hash of the object. The ETag reflects changes only to the contents of an object, not its metadata. The ETag may or may not be an MD5 digest of the object data. Whether or not it is depends on how the object was created and how it is encrypted as described below:
|
||||
*
|
||||
* - Objects created by the PUT Object, POST Object, or Copy operation, or through the AWS Management Console, and are encrypted by SSE-S3 or plaintext, have ETags that are an MD5 digest of their object data.
|
||||
* - Objects created by the PUT Object, POST Object, or Copy operation, or through the AWS Management Console, and are encrypted by SSE-C or SSE-KMS, have ETags that are not an MD5 digest of their object data.
|
||||
* - If an object is created by either the Multipart Upload or Part Copy operation, the ETag is not an MD5 digest, regardless of the method of encryption. If an object is larger than 16 MB, the AWS Management Console will upload or copy that object as a Multipart Upload, and therefore the ETag will not be an MD5 digest.
|
||||
*
|
||||
* MD5 is not supported by directory buckets.
|
||||
*/
|
||||
eTag?: string;
|
||||
/** The name that you assign to an object. You use the object key to retrieve the object. */
|
||||
key: string;
|
||||
/** Creation date of the object. */
|
||||
lastModified?: string;
|
||||
/** The owner of the object */
|
||||
owner?: {
|
||||
/** The ID of the owner. */
|
||||
id?: string;
|
||||
/** The display name of the owner. */
|
||||
displayName?: string;
|
||||
};
|
||||
/** Specifies the restoration status of an object. Objects in certain storage classes must be restored before they can be retrieved. */
|
||||
restoreStatus?: {
|
||||
/** Specifies whether the object is currently being restored. */
|
||||
isRestoreInProgress?: boolean;
|
||||
/** Indicates when the restored copy will expire. This value is populated only if the object has already been restored. */
|
||||
restoreExpiryDate?: string;
|
||||
};
|
||||
/** Size in bytes of the object */
|
||||
size?: number;
|
||||
/** The class of storage used to store the object. */
|
||||
storageClass?:
|
||||
| "STANDARD"
|
||||
| "REDUCED_REDUNDANCY"
|
||||
| "GLACIER"
|
||||
| "STANDARD_IA"
|
||||
| "ONEZONE_IA"
|
||||
| "INTELLIGENT_TIERING"
|
||||
| "DEEP_ARCHIVE"
|
||||
| "OUTPOSTS"
|
||||
| "GLACIER_IR"
|
||||
| "SNOW"
|
||||
| "EXPRESS_ONEZONE";
|
||||
}[];
|
||||
/** If ContinuationToken was sent with the request, it is included in the response. You can use the returned ContinuationToken for pagination of the list response. */
|
||||
continuationToken?: string;
|
||||
/** Causes keys that contain the same string between the prefix and the first occurrence of the delimiter to be rolled up into a single result element in the CommonPrefixes collection. These rolled-up keys are not returned elsewhere in the response. Each rolled-up result counts as only one return against the MaxKeys value. */
|
||||
delimiter?: string;
|
||||
/** Encoding type used by S3 to encode object key names in the XML response. */
|
||||
encodingType?: "url";
|
||||
/** Set to false if all of the results were returned. Set to true if more keys are available to return. If the number of results exceeds that specified by MaxKeys, all of the results might not be returned. */
|
||||
isTruncated?: boolean;
|
||||
/** KeyCount is the number of keys returned with this request. KeyCount will always be less than or equal to the MaxKeys field. For example, if you ask for 50 keys, your result will include 50 keys or fewer. */
|
||||
keyCount?: number;
|
||||
/** Sets the maximum number of keys returned in the response. By default, the action returns up to 1,000 key names. The response might contain fewer keys but will never contain more. */
|
||||
maxKeys?: number;
|
||||
/** The bucket name. */
|
||||
name?: string;
|
||||
/** NextContinuationToken is sent when isTruncated is true, which means there are more keys in the bucket that can be listed. The next list requests to S3 can be continued with this NextContinuationToken. NextContinuationToken is obfuscated and is not a real key. */
|
||||
nextContinuationToken?: string;
|
||||
/** Keys that begin with the indicated prefix. */
|
||||
prefix?: string;
|
||||
/** If StartAfter was sent with the request, it is included in the response. */
|
||||
startAfter?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* A configured S3 bucket instance for managing files.
|
||||
* The instance is callable to create S3File instances and provides methods
|
||||
@@ -818,6 +918,20 @@ declare module "bun" {
|
||||
* @param options The options to use for the S3 client.
|
||||
*/
|
||||
stat(path: string, options?: S3Options): Promise<S3Stats>;
|
||||
|
||||
/** Returns some or all (up to 1,000) of the objects in a bucket with each request.
|
||||
*
|
||||
* You can use the request parameters as selection criteria to return a subset of the objects in a bucket.
|
||||
*/
|
||||
list(
|
||||
input?: S3ListObjectsOptions | null,
|
||||
options?: Pick<S3Options, "accessKeyId" | "secretAccessKey" | "sessionToken" | "region" | "bucket" | "endpoint">,
|
||||
): Promise<S3ListObjectsResponse>;
|
||||
|
||||
static list(
|
||||
input?: S3ListObjectsOptions | null,
|
||||
options?: Pick<S3Options, "accessKeyId" | "secretAccessKey" | "sessionToken" | "region" | "bucket" | "endpoint">,
|
||||
): Promise<S3ListObjectsResponse>;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -20,6 +20,10 @@ export default [
|
||||
fn: "staticUnlink",
|
||||
length: 2,
|
||||
},
|
||||
list: {
|
||||
fn: "staticListObjects",
|
||||
length: 2,
|
||||
},
|
||||
presign: {
|
||||
fn: "staticPresign",
|
||||
length: 2,
|
||||
@@ -56,6 +60,10 @@ export default [
|
||||
fn: "unlink",
|
||||
length: 2,
|
||||
},
|
||||
list: {
|
||||
fn: "listObjects",
|
||||
length: 2,
|
||||
},
|
||||
presign: {
|
||||
fn: "presign",
|
||||
length: 2,
|
||||
|
||||
@@ -238,6 +238,18 @@ pub const S3Client = struct {
|
||||
});
|
||||
}
|
||||
|
||||
pub fn listObjects(ptr: *@This(), globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSValue {
|
||||
const args = callframe.argumentsAsArray(2);
|
||||
|
||||
const object_keys = args[0];
|
||||
const options = args[1];
|
||||
|
||||
var blob = try S3File.constructS3FileWithS3CredentialsAndOptions(globalThis, .{ .string = bun.PathString.empty }, options, ptr.credentials, ptr.options, null, null);
|
||||
|
||||
defer blob.detach();
|
||||
return blob.store.?.data.s3.listObjects(blob.store.?, globalThis, object_keys, options);
|
||||
}
|
||||
|
||||
pub fn unlink(ptr: *@This(), globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSValue {
|
||||
const arguments = callframe.arguments_old(2).slice();
|
||||
var args = JSC.Node.ArgumentsSlice.init(globalThis.bunVM(), arguments);
|
||||
@@ -299,4 +311,18 @@ pub const S3Client = struct {
|
||||
pub fn staticStat(globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSValue {
|
||||
return S3File.stat(globalThis, callframe);
|
||||
}
|
||||
|
||||
pub fn staticListObjects(globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSValue {
|
||||
const args = callframe.argumentsAsArray(2);
|
||||
const object_keys = args[0];
|
||||
const options = args[1];
|
||||
|
||||
// get credentials from env
|
||||
const existing_credentials = globalThis.bunVM().transpiler.env.getS3Credentials();
|
||||
|
||||
var blob = try S3File.constructS3FileWithS3Credentials(globalThis, .{ .string = bun.PathString.empty }, options, existing_credentials);
|
||||
|
||||
defer blob.detach();
|
||||
return blob.store.?.data.s3.listObjects(blob.store.?, globalThis, object_keys, options);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -510,7 +510,7 @@ pub fn getPresignUrlFrom(this: *Blob, globalThis: *JSC.JSGlobalObject, extra_opt
|
||||
.method = method,
|
||||
.acl = credentialsWithOptions.acl,
|
||||
.storage_class = credentialsWithOptions.storage_class,
|
||||
}, .{ .expires = expires }) catch |sign_err| {
|
||||
}, false, .{ .expires = expires }) catch |sign_err| {
|
||||
return S3.throwSignError(sign_err, globalThis);
|
||||
};
|
||||
defer result.deinit();
|
||||
|
||||
@@ -3710,6 +3710,67 @@ pub const Blob = struct {
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
pub fn listObjects(this: *@This(), store: *Store, globalThis: *JSC.JSGlobalObject, listOptions: JSValue, extra_options: ?JSValue) bun.JSError!JSValue {
|
||||
if (!listOptions.isEmptyOrUndefinedOrNull() and !listOptions.isObject()) {
|
||||
return globalThis.throwInvalidArguments("S3Client.listObjects() needs a S3ListObjectsOption as it's first argument", .{});
|
||||
}
|
||||
|
||||
const Wrapper = struct {
|
||||
promise: JSC.JSPromise.Strong,
|
||||
store: *Store,
|
||||
resolvedlistOptions: S3.S3ListObjectsOptions,
|
||||
global: *JSC.JSGlobalObject,
|
||||
|
||||
pub fn resolve(result: S3.S3ListObjectsResult, opaque_self: *anyopaque) void {
|
||||
const self: *@This() = @ptrCast(@alignCast(opaque_self));
|
||||
defer self.deinit();
|
||||
const globalObject = self.global;
|
||||
|
||||
switch (result) {
|
||||
.success => |list_result| {
|
||||
defer list_result.deinit();
|
||||
self.promise.resolve(globalObject, list_result.toJS(globalObject));
|
||||
},
|
||||
|
||||
inline .not_found, .failure => |err| {
|
||||
self.promise.reject(globalObject, err.toJS(globalObject, self.store.getPath()));
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn deinit(self: *@This()) void {
|
||||
self.store.deref();
|
||||
self.promise.deinit();
|
||||
self.resolvedlistOptions.deinit();
|
||||
self.destroy();
|
||||
}
|
||||
|
||||
pub inline fn destroy(self: *@This()) void {
|
||||
bun.destroy(self);
|
||||
}
|
||||
};
|
||||
|
||||
const promise = JSC.JSPromise.Strong.init(globalThis);
|
||||
const value = promise.value();
|
||||
const proxy_url = globalThis.bunVM().transpiler.env.getHttpProxy(true, null);
|
||||
const proxy = if (proxy_url) |url| url.href else null;
|
||||
var aws_options = try this.getCredentialsWithOptions(extra_options, globalThis);
|
||||
defer aws_options.deinit();
|
||||
|
||||
const options = S3.getListObjectsOptionsFromJS(globalThis, listOptions) catch bun.outOfMemory();
|
||||
store.ref();
|
||||
|
||||
S3.listObjects(&aws_options.credentials, options, @ptrCast(&Wrapper.resolve), bun.new(Wrapper, .{
|
||||
.promise = promise,
|
||||
.store = store, // store is needed in case of not found error
|
||||
.resolvedlistOptions = options,
|
||||
.global = globalThis,
|
||||
}), proxy);
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
pub fn initWithReferencedCredentials(pathlike: JSC.Node.PathLike, mime_type: ?http.MimeType, credentials: *S3Credentials) S3Store {
|
||||
credentials.ref();
|
||||
return .{
|
||||
|
||||
@@ -2606,7 +2606,7 @@ pub fn Bun__fetch_(
|
||||
var result = credentialsWithOptions.credentials.signRequest(.{
|
||||
.path = url.s3Path(),
|
||||
.method = method,
|
||||
}, null) catch |sign_err| {
|
||||
}, false, null) catch |sign_err| {
|
||||
is_error = true;
|
||||
return JSPromise.rejectedPromiseValue(globalThis, s3.getJSSignError(sign_err, globalThis));
|
||||
};
|
||||
|
||||
@@ -586,7 +586,7 @@ pub const Response = struct {
|
||||
const result = credentials.signRequest(.{
|
||||
.path = blob.store.?.data.s3.path(),
|
||||
.method = .GET,
|
||||
}, .{ .expires = 15 * 60 }) catch |sign_err| {
|
||||
}, false, .{ .expires = 15 * 60 }) catch |sign_err| {
|
||||
return s3.throwSignError(sign_err, globalThis);
|
||||
};
|
||||
defer result.deinit();
|
||||
|
||||
@@ -23,6 +23,10 @@ pub const S3UploadResult = S3SimpleRequest.S3UploadResult;
|
||||
pub const S3StatResult = S3SimpleRequest.S3StatResult;
|
||||
pub const S3DownloadResult = S3SimpleRequest.S3DownloadResult;
|
||||
pub const S3DeleteResult = S3SimpleRequest.S3DeleteResult;
|
||||
const S3ListObjects = @import("./list_objects.zig");
|
||||
pub const S3ListObjectsResult = S3SimpleRequest.S3ListObjectsResult;
|
||||
pub const S3ListObjectsOptions = @import("./list_objects.zig").S3ListObjectsOptions;
|
||||
pub const getListObjectsOptionsFromJS = S3ListObjects.getListObjectsOptionsFromJS;
|
||||
|
||||
pub fn stat(
|
||||
this: *S3Credentials,
|
||||
@@ -99,6 +103,131 @@ pub fn delete(
|
||||
}, .{ .delete = callback }, callback_context);
|
||||
}
|
||||
|
||||
pub fn listObjects(
|
||||
this: *S3Credentials,
|
||||
listOptions: S3ListObjectsOptions,
|
||||
callback: *const fn (S3ListObjectsResult, *anyopaque) void,
|
||||
callback_context: *anyopaque,
|
||||
proxy_url: ?[]const u8,
|
||||
) void {
|
||||
var search_params: bun.ByteList = .{};
|
||||
|
||||
search_params.append(bun.default_allocator, "?") catch bun.outOfMemory();
|
||||
|
||||
if (listOptions.continuation_token) |continuation_token| {
|
||||
var buff: [1024]u8 = undefined;
|
||||
const encoded = S3Credentials.encodeURIComponent(continuation_token, &buff, true) catch bun.outOfMemory();
|
||||
search_params.appendFmt(bun.default_allocator, "continuation-token={s}", .{encoded}) catch bun.outOfMemory();
|
||||
}
|
||||
|
||||
if (listOptions.delimiter) |delimiter| {
|
||||
var buff: [1024]u8 = undefined;
|
||||
const encoded = S3Credentials.encodeURIComponent(delimiter, &buff, true) catch bun.outOfMemory();
|
||||
|
||||
if (listOptions.continuation_token != null) {
|
||||
search_params.appendFmt(bun.default_allocator, "&delimiter={s}", .{encoded}) catch bun.outOfMemory();
|
||||
} else {
|
||||
search_params.appendFmt(bun.default_allocator, "delimiter={s}", .{encoded}) catch bun.outOfMemory();
|
||||
}
|
||||
}
|
||||
|
||||
if (listOptions.encoding_type != null) {
|
||||
if (listOptions.continuation_token != null or listOptions.delimiter != null) {
|
||||
search_params.append(bun.default_allocator, "&encoding-type=url") catch bun.outOfMemory();
|
||||
} else {
|
||||
search_params.append(bun.default_allocator, "encoding-type=url") catch bun.outOfMemory();
|
||||
}
|
||||
}
|
||||
|
||||
if (listOptions.fetch_owner) |fetch_owner| {
|
||||
if (listOptions.continuation_token != null or listOptions.delimiter != null or listOptions.encoding_type != null) {
|
||||
search_params.appendFmt(bun.default_allocator, "&fetch-owner={}", .{fetch_owner}) catch bun.outOfMemory();
|
||||
} else {
|
||||
search_params.appendFmt(bun.default_allocator, "fetch-owner={}", .{fetch_owner}) catch bun.outOfMemory();
|
||||
}
|
||||
}
|
||||
|
||||
if (listOptions.continuation_token != null or listOptions.delimiter != null or listOptions.encoding_type != null or listOptions.fetch_owner != null) {
|
||||
search_params.append(bun.default_allocator, "&list-type=2") catch bun.outOfMemory();
|
||||
} else {
|
||||
search_params.append(bun.default_allocator, "list-type=2") catch bun.outOfMemory();
|
||||
}
|
||||
|
||||
if (listOptions.max_keys) |max_keys| {
|
||||
search_params.appendFmt(bun.default_allocator, "&max-keys={}", .{max_keys}) catch bun.outOfMemory();
|
||||
}
|
||||
|
||||
if (listOptions.prefix) |prefix| {
|
||||
var buff: [1024]u8 = undefined;
|
||||
const encoded = S3Credentials.encodeURIComponent(prefix, &buff, true) catch bun.outOfMemory();
|
||||
search_params.appendFmt(bun.default_allocator, "&prefix={s}", .{encoded}) catch bun.outOfMemory();
|
||||
}
|
||||
|
||||
if (listOptions.start_after) |start_after| {
|
||||
var buff: [1024]u8 = undefined;
|
||||
const encoded = S3Credentials.encodeURIComponent(start_after, &buff, true) catch bun.outOfMemory();
|
||||
search_params.appendFmt(bun.default_allocator, "&start-after={s}", .{encoded}) catch bun.outOfMemory();
|
||||
}
|
||||
|
||||
const result = this.signRequest(.{
|
||||
.path = "",
|
||||
.method = .GET,
|
||||
.search_params = search_params.slice(),
|
||||
}, true, null) catch |sign_err| {
|
||||
search_params.deinitWithAllocator(bun.default_allocator);
|
||||
|
||||
const error_code_and_message = Error.getSignErrorCodeAndMessage(sign_err);
|
||||
callback(.{ .failure = .{ .code = error_code_and_message.code, .message = error_code_and_message.message } }, callback_context);
|
||||
|
||||
return;
|
||||
};
|
||||
|
||||
search_params.deinitWithAllocator(bun.default_allocator);
|
||||
|
||||
const headers = JSC.WebCore.Headers.fromPicoHttpHeaders(result.headers(), bun.default_allocator) catch bun.outOfMemory();
|
||||
|
||||
const task = bun.new(S3HttpSimpleTask, .{
|
||||
.http = undefined,
|
||||
.range = null,
|
||||
.sign_result = result,
|
||||
.callback_context = callback_context,
|
||||
.callback = .{ .listObjects = callback },
|
||||
.headers = headers,
|
||||
.vm = JSC.VirtualMachine.get(),
|
||||
});
|
||||
|
||||
task.poll_ref.ref(task.vm);
|
||||
|
||||
const url = bun.URL.parse(result.url);
|
||||
const proxy = proxy_url orelse "";
|
||||
|
||||
task.http = bun.http.AsyncHTTP.init(
|
||||
bun.default_allocator,
|
||||
.GET,
|
||||
url,
|
||||
task.headers.entries,
|
||||
task.headers.buf.items,
|
||||
&task.response_buffer,
|
||||
"",
|
||||
bun.http.HTTPClientResult.Callback.New(
|
||||
*S3HttpSimpleTask,
|
||||
S3HttpSimpleTask.httpCallback,
|
||||
).init(task),
|
||||
.follow,
|
||||
.{
|
||||
.http_proxy = if (proxy.len > 0) bun.URL.parse(proxy) else null,
|
||||
.verbose = task.vm.getVerboseFetch(),
|
||||
.reject_unauthorized = task.vm.getTLSRejectUnauthorized(),
|
||||
},
|
||||
);
|
||||
|
||||
// queue http request
|
||||
bun.http.HTTPThread.init(&.{});
|
||||
var batch = bun.ThreadPool.Batch{};
|
||||
task.http.schedule(bun.default_allocator, &batch);
|
||||
bun.http.http_thread.schedule(batch);
|
||||
}
|
||||
|
||||
pub fn upload(
|
||||
this: *S3Credentials,
|
||||
path: []const u8,
|
||||
@@ -484,7 +613,7 @@ pub fn downloadStream(
|
||||
var result = this.signRequest(.{
|
||||
.path = path,
|
||||
.method = .GET,
|
||||
}, null) catch |sign_err| {
|
||||
}, false, null) catch |sign_err| {
|
||||
if (range) |range_| bun.default_allocator.free(range_);
|
||||
const error_code_and_message = Error.getSignErrorCodeAndMessage(sign_err);
|
||||
callback(.{ .allocator = bun.default_allocator, .list = .{} }, false, .{
|
||||
|
||||
@@ -326,6 +326,7 @@ pub const S3Credentials = struct {
|
||||
url: []const u8,
|
||||
|
||||
content_disposition: []const u8 = "",
|
||||
content_md5: []const u8 = "",
|
||||
session_token: []const u8 = "",
|
||||
acl: ?ACL = null,
|
||||
storage_class: ?StorageClass = null,
|
||||
@@ -379,6 +380,10 @@ pub const S3Credentials = struct {
|
||||
if (this.url.len > 0) {
|
||||
bun.freeSensitive(bun.default_allocator, this.url);
|
||||
}
|
||||
|
||||
if (this.content_md5.len > 0) {
|
||||
bun.default_allocator.free(this.content_md5);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -389,6 +394,7 @@ pub const S3Credentials = struct {
|
||||
path: []const u8,
|
||||
method: bun.http.Method,
|
||||
content_hash: ?[]const u8 = null,
|
||||
content_md5: ?[]const u8 = null,
|
||||
search_params: ?[]const u8 = null,
|
||||
content_disposition: ?[]const u8 = null,
|
||||
acl: ?ACL = null,
|
||||
@@ -443,7 +449,7 @@ pub const S3Credentials = struct {
|
||||
else => error.InvalidHexChar,
|
||||
};
|
||||
}
|
||||
fn encodeURIComponent(input: []const u8, buffer: []u8, comptime encode_slash: bool) ![]const u8 {
|
||||
pub fn encodeURIComponent(input: []const u8, buffer: []u8, comptime encode_slash: bool) ![]const u8 {
|
||||
var written: usize = 0;
|
||||
|
||||
for (input) |c| {
|
||||
@@ -477,10 +483,17 @@ pub const S3Credentials = struct {
|
||||
return buffer[0..written];
|
||||
}
|
||||
|
||||
pub fn signRequest(this: *const @This(), signOptions: SignOptions, signQueryOption: ?SignQueryOptions) !SignResult {
|
||||
pub fn signRequest(this: *const @This(), signOptions: SignOptions, comptime allow_empty_path: bool, signQueryOption: ?SignQueryOptions) !SignResult {
|
||||
const method = signOptions.method;
|
||||
const request_path = signOptions.path;
|
||||
const content_hash = signOptions.content_hash;
|
||||
var content_md5 = signOptions.content_md5;
|
||||
|
||||
if (content_md5) |content_md5_val| {
|
||||
const len = bun.base64.encodeLen(content_md5_val);
|
||||
const content_md5_as_base64 = bun.default_allocator.alloc(u8, len) catch bun.outOfMemory();
|
||||
content_md5 = content_md5_as_base64[0..bun.base64.encode(content_md5_as_base64, content_md5_val)];
|
||||
}
|
||||
|
||||
const search_params = signOptions.search_params;
|
||||
|
||||
@@ -538,6 +551,7 @@ pub const S3Credentials = struct {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (strings.endsWith(path, "/")) {
|
||||
path = path[0 .. path.len - 1];
|
||||
} else if (strings.endsWith(path, "\\")) {
|
||||
@@ -550,7 +564,7 @@ pub const S3Credentials = struct {
|
||||
}
|
||||
|
||||
// if we allow path.len == 0 it will list the bucket for now we disallow
|
||||
if (path.len == 0) return error.InvalidPath;
|
||||
if (!allow_empty_path and path.len == 0) return error.InvalidPath;
|
||||
|
||||
var normalized_path_buffer: [1024 + 63 + 2]u8 = undefined; // 1024 max key size and 63 max bucket name
|
||||
var path_buffer: [1024]u8 = undefined;
|
||||
@@ -602,63 +616,127 @@ pub const S3Credentials = struct {
|
||||
|
||||
const amz_day = amz_date[0..8];
|
||||
const signed_headers = if (signQuery) "host" else brk: {
|
||||
if (storage_class != null) {
|
||||
if (acl != null) {
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-storage-class;x-amz-security-token";
|
||||
if (content_md5 != null) {
|
||||
if (storage_class != null) {
|
||||
if (acl != null) {
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;content-md5;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-storage-class";
|
||||
} else {
|
||||
break :brk "content-disposition;content-md5;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
}
|
||||
} else {
|
||||
break :brk "content-disposition;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
if (session_token != null) {
|
||||
break :brk "content-md5;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-storage-class";
|
||||
} else {
|
||||
break :brk "content-md5;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (session_token != null) {
|
||||
break :brk "host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-storage-class;x-amz-security-token";
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;content-md5;host;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-storage-class";
|
||||
} else {
|
||||
break :brk "content-disposition;content-md5;host;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
}
|
||||
} else {
|
||||
break :brk "host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
if (session_token != null) {
|
||||
break :brk "content-md5;host;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-storage-class";
|
||||
} else {
|
||||
break :brk "content-md5;host;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;host;x-amz-content-sha256;x-amz-date;x-amz-storage-class;x-amz-security-token";
|
||||
if (acl != null) {
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;content-md5;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
} else {
|
||||
break :brk "content-disposition;content-md5;host;x-amz-acl;x-amz-content-sha256;x-amz-date";
|
||||
}
|
||||
} else {
|
||||
break :brk "content-disposition;host;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
if (session_token != null) {
|
||||
break :brk "content-md5;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
} else {
|
||||
break :brk "content-md5;host;x-amz-acl;x-amz-content-sha256;x-amz-date";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (session_token != null) {
|
||||
break :brk "host;x-amz-content-sha256;x-amz-date;x-amz-storage-class;x-amz-security-token";
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;content-md5;host;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
} else {
|
||||
break :brk "content-disposition;content-md5;host;x-amz-content-sha256;x-amz-date";
|
||||
}
|
||||
} else {
|
||||
break :brk "host;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
if (session_token != null) {
|
||||
break :brk "content-md5;host;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
} else {
|
||||
break :brk "content-md5;host;x-amz-content-sha256;x-amz-date";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (acl != null) {
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
if (storage_class != null) {
|
||||
if (acl != null) {
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-storage-class";
|
||||
} else {
|
||||
break :brk "content-disposition;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
}
|
||||
} else {
|
||||
break :brk "content-disposition;host;x-amz-acl;x-amz-content-sha256;x-amz-date";
|
||||
if (session_token != null) {
|
||||
break :brk "host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-storage-class";
|
||||
} else {
|
||||
break :brk "host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (session_token != null) {
|
||||
break :brk "host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;host;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-storage-class";
|
||||
} else {
|
||||
break :brk "content-disposition;host;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
}
|
||||
} else {
|
||||
break :brk "host;x-amz-acl;x-amz-content-sha256;x-amz-date";
|
||||
if (session_token != null) {
|
||||
break :brk "host;x-amz-content-sha256;x-amz-date;x-amz-security-token;x-amz-storage-class";
|
||||
} else {
|
||||
break :brk "host;x-amz-content-sha256;x-amz-date;x-amz-storage-class";
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;host;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
if (acl != null) {
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
} else {
|
||||
break :brk "content-disposition;host;x-amz-acl;x-amz-content-sha256;x-amz-date";
|
||||
}
|
||||
} else {
|
||||
break :brk "content-disposition;host;x-amz-content-sha256;x-amz-date";
|
||||
if (session_token != null) {
|
||||
break :brk "host;x-amz-acl;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
} else {
|
||||
break :brk "host;x-amz-acl;x-amz-content-sha256;x-amz-date";
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (session_token != null) {
|
||||
break :brk "host;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
if (content_disposition != null) {
|
||||
if (session_token != null) {
|
||||
break :brk "content-disposition;host;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
} else {
|
||||
break :brk "content-disposition;host;x-amz-content-sha256;x-amz-date";
|
||||
}
|
||||
} else {
|
||||
break :brk "host;x-amz-content-sha256;x-amz-date";
|
||||
if (session_token != null) {
|
||||
break :brk "host;x-amz-content-sha256;x-amz-date;x-amz-security-token";
|
||||
} else {
|
||||
break :brk "host;x-amz-content-sha256;x-amz-date";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -696,33 +774,73 @@ pub const S3Credentials = struct {
|
||||
if (session_token) |token| {
|
||||
encoded_session_token = encodeURIComponent(token, &token_encoded_buffer, true) catch return error.InvalidSessionToken;
|
||||
}
|
||||
|
||||
var content_md5_encoded_buffer: [128]u8 = undefined; // MD5 as base64 (which is required for AWS SigV4) is always 44, when encoded its always 46 (44 + ==)
|
||||
var encoded_content_md5: ?[]const u8 = null;
|
||||
|
||||
if (content_md5) |content_md5_value| {
|
||||
encoded_content_md5 = encodeURIComponent(content_md5_value, &content_md5_encoded_buffer, true) catch return error.FailedToGenerateSignature;
|
||||
}
|
||||
|
||||
const canonical = brk_canonical: {
|
||||
if (storage_class) |storage_class_value| {
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Acl={s}&x-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, acl_value, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, host, signed_headers, aws_content_hash });
|
||||
if (encoded_content_md5) |encoded_content_md5_value| {
|
||||
if (storage_class) |storage_class_value| {
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nContent-MD5={s}&X-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&x-amz-storage-class={s}\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, encoded_content_md5_value, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, storage_class_value, host, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nContent-MD5={s}&X-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&x-amz-storage-class={s}\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, encoded_content_md5_value, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, storage_class_value, host, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Acl={s}&x-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, acl_value, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, host, signed_headers, aws_content_hash });
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nContent-MD5={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&x-amz-storage-class={s}\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, storage_class_value, host, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nContent-MD5={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&x-amz-storage-class={s}\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, storage_class_value, host, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nx-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, host, signed_headers, aws_content_hash });
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nContent-MD5={s}&X-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, encoded_content_md5_value, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, host, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nContent-MD5={s}&X-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, encoded_content_md5_value, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, host, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nx-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, host, signed_headers, aws_content_hash });
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nContent-MD5={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, host, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nContent-MD5={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, host, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, host, signed_headers, aws_content_hash });
|
||||
if (storage_class) |storage_class_value| {
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&x-amz-storage-class={s}\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, storage_class_value, host, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&x-amz-storage-class={s}\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, storage_class_value, host, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, host, signed_headers, aws_content_hash });
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&x-amz-storage-class={s}\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, storage_class_value, host, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&x-amz-storage-class={s}\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, this.accessKeyId, amz_day, region, service_name, amz_date, expires, storage_class_value, host, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, host, signed_headers, aws_content_hash });
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, host, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, host, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, this.accessKeyId, amz_day, region, service_name, amz_date, expires, host, signed_headers, aws_content_hash });
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, host, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\nX-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host\nhost:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, this.accessKeyId, amz_day, region, service_name, amz_date, expires, host, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -734,64 +852,128 @@ pub const S3Credentials = struct {
|
||||
|
||||
const signature = bun.hmac.generate(sigDateRegionServiceReq, signValue, .sha256, &hmac_sig_service) orelse return error.FailedToGenerateSignature;
|
||||
|
||||
if (storage_class) |storage_class_value| {
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&x-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
if (encoded_content_md5) |encoded_content_md5_value| {
|
||||
if (storage_class) |storage_class_value| {
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&x-amz-storage-class={s}&Content-MD5={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, storage_class_value, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&x-amz-storage-class={s}&Content-MD5={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, storage_class_value, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
}
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&x-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?x-amz-storage-class={s}&Content-MD5={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, storage_class_value, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?x-amz-storage-class={s}&Content-MD5={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, storage_class_value, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?x-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&Content-MD5={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&Content-MD5={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
}
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?x-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Algorithm=AWS4-HMAC-SHA256&Content-MD5={s}&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Algorithm=AWS4-HMAC-SHA256&Content-MD5={s}&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, encoded_content_md5_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
if (storage_class) |storage_class_value| {
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&x-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&x-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
}
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?x-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?x-amz-storage-class={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, storage_class_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
if (acl) |acl_value| {
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Acl={s}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, acl_value, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
}
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
if (encoded_session_token) |token| {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-Security-Token={s}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, this.accessKeyId, amz_day, region, service_name, amz_date, expires, token, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
} else {
|
||||
break :brk try std.fmt.allocPrint(
|
||||
bun.default_allocator,
|
||||
"{s}://{s}{s}?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential={s}%2F{s}%2F{s}%2F{s}%2Faws4_request&X-Amz-Date={s}&X-Amz-Expires={}&X-Amz-SignedHeaders=host&X-Amz-Signature={s}",
|
||||
.{ protocol, host, normalizedPath, this.accessKeyId, amz_day, region, service_name, amz_date, expires, std.fmt.bytesToHex(signature[0..DIGESTED_HMAC_256_LEN], .lower) },
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -799,63 +981,137 @@ pub const S3Credentials = struct {
|
||||
var encoded_content_disposition_buffer: [255]u8 = undefined;
|
||||
const encoded_content_disposition: []const u8 = if (content_disposition) |cd| encodeURIComponent(cd, &encoded_content_disposition_buffer, true) catch return error.ContentTypeIsTooLong else "";
|
||||
const canonical = brk_canonical: {
|
||||
if (storage_class) |storage_class_value| {
|
||||
if (acl) |acl_value| {
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, acl_value, aws_content_hash, amz_date, storage_class_value, token, signed_headers, aws_content_hash });
|
||||
if (content_md5) |content_md5_value| {
|
||||
if (storage_class) |storage_class_value| {
|
||||
if (acl) |acl_value| {
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, content_md5_value, host, acl_value, aws_content_hash, amz_date, token, storage_class_value, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, content_md5_value, host, acl_value, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, acl_value, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", content_md5_value, host, acl_value, aws_content_hash, amz_date, token, storage_class_value, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", content_md5_value, host, acl_value, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, acl_value, aws_content_hash, amz_date, storage_class_value, token, signed_headers, aws_content_hash });
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, content_md5_value, host, aws_content_hash, amz_date, token, storage_class_value, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, content_md5_value, host, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, acl_value, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", content_md5_value, host, aws_content_hash, amz_date, token, storage_class_value, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", content_md5_value, host, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, aws_content_hash, amz_date, storage_class_value, token, signed_headers, aws_content_hash });
|
||||
if (acl) |acl_value| {
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, content_md5_value, host, acl_value, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, content_md5_value, host, acl_value, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", content_md5_value, host, acl_value, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", content_md5_value, host, acl_value, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, aws_content_hash, amz_date, storage_class_value, token, signed_headers, aws_content_hash });
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, content_md5_value, host, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, content_md5_value, host, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", content_md5_value, host, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-md5:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{
|
||||
method_name,
|
||||
normalizedPath,
|
||||
if (search_params) |p| p[1..] else "",
|
||||
content_md5_value,
|
||||
host,
|
||||
aws_content_hash,
|
||||
amz_date,
|
||||
signed_headers,
|
||||
aws_content_hash,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (acl) |acl_value| {
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, acl_value, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
if (storage_class) |storage_class_value| {
|
||||
if (acl) |acl_value| {
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, acl_value, aws_content_hash, amz_date, token, storage_class_value, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, acl_value, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, acl_value, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, acl_value, aws_content_hash, amz_date, token, storage_class_value, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, acl_value, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, acl_value, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, aws_content_hash, amz_date, token, storage_class_value, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, acl_value, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, aws_content_hash, amz_date, token, storage_class_value, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-storage-class:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, aws_content_hash, amz_date, storage_class_value, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
if (acl) |acl_value| {
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, acl_value, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, acl_value, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, acl_value, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-acl:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, acl_value, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
if (content_disposition != null) {
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\ncontent-disposition:{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", encoded_content_disposition, host, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
}
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
if (session_token) |token| {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\nx-amz-security-token:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, aws_content_hash, amz_date, token, signed_headers, aws_content_hash });
|
||||
} else {
|
||||
break :brk_canonical try std.fmt.bufPrint(&tmp_buffer, "{s}\n{s}\n{s}\nhost:{s}\nx-amz-content-sha256:{s}\nx-amz-date:{s}\n\n{s}\n{s}", .{ method_name, normalizedPath, if (search_params) |p| p[1..] else "", host, aws_content_hash, amz_date, signed_headers, aws_content_hash });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -935,6 +1191,13 @@ pub const S3Credentials = struct {
|
||||
result._headers_len += 1;
|
||||
}
|
||||
|
||||
if (content_md5) |c_md5| {
|
||||
const content_md5_value = bun.default_allocator.dupe(u8, c_md5) catch bun.outOfMemory();
|
||||
result.content_md5 = content_md5_value;
|
||||
result._headers[result._headers_len] = .{ .name = "content-md5", .value = content_md5_value };
|
||||
result._headers_len += 1;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
};
|
||||
|
||||
587
src/s3/list_objects.zig
Normal file
587
src/s3/list_objects.zig
Normal file
@@ -0,0 +1,587 @@
|
||||
const std = @import("std");
|
||||
const bun = @import("root").bun;
|
||||
const JSC = bun.JSC;
|
||||
const JSValue = JSC.JSValue;
|
||||
const JSGlobalObject = JSC.JSGlobalObject;
|
||||
const strings = bun.strings;
|
||||
|
||||
pub const S3ListObjectsOptions = struct {
|
||||
continuation_token: ?[]const u8,
|
||||
delimiter: ?[]const u8,
|
||||
encoding_type: ?[]const u8,
|
||||
fetch_owner: ?bool,
|
||||
max_keys: ?i64,
|
||||
prefix: ?[]const u8,
|
||||
start_after: ?[]const u8,
|
||||
|
||||
_continuation_token: ?JSC.ZigString.Slice,
|
||||
_delimiter: ?JSC.ZigString.Slice,
|
||||
_encoding_type: ?JSC.ZigString.Slice,
|
||||
_prefix: ?JSC.ZigString.Slice,
|
||||
_start_after: ?JSC.ZigString.Slice,
|
||||
|
||||
pub fn deinit(this: *@This()) void {
|
||||
if (this._continuation_token) |slice| slice.deinit();
|
||||
if (this._delimiter) |slice| slice.deinit();
|
||||
if (this._encoding_type) |slice| slice.deinit();
|
||||
if (this._prefix) |slice| slice.deinit();
|
||||
if (this._start_after) |slice| slice.deinit();
|
||||
}
|
||||
};
|
||||
|
||||
const ObjectOwner = struct {
|
||||
id: ?[]const u8,
|
||||
display_name: ?[]const u8,
|
||||
};
|
||||
|
||||
const ObjectRestoreStatus = struct {
|
||||
is_restore_in_progress: ?bool,
|
||||
restore_expiry_date: ?[]const u8,
|
||||
};
|
||||
|
||||
const S3ListObjectsContents = struct {
|
||||
key: []const u8,
|
||||
etag: ?[]const u8,
|
||||
checksum_type: ?[]const u8,
|
||||
checksum_algorithme: ?[]const u8,
|
||||
last_modified: ?[]const u8,
|
||||
object_size: ?i64,
|
||||
storage_class: ?[]const u8,
|
||||
owner: ?ObjectOwner,
|
||||
restore_status: ?ObjectRestoreStatus,
|
||||
};
|
||||
|
||||
pub const S3ListObjectsV2Result = struct {
|
||||
name: ?[]const u8,
|
||||
prefix: ?[]const u8,
|
||||
key_count: ?i64,
|
||||
max_keys: ?i64,
|
||||
delimiter: ?[]const u8,
|
||||
encoding_type: ?[]const u8,
|
||||
is_truncated: ?bool,
|
||||
continuation_token: ?[]const u8,
|
||||
next_continuation_token: ?[]const u8,
|
||||
start_after: ?[]const u8,
|
||||
common_prefixes: ?std.ArrayList([]const u8),
|
||||
contents: ?std.ArrayList(S3ListObjectsContents),
|
||||
|
||||
pub fn deinit(this: @This()) void {
|
||||
if (this.contents) |contents| {
|
||||
contents.deinit();
|
||||
}
|
||||
if (this.common_prefixes) |common_prefixes| {
|
||||
common_prefixes.deinit();
|
||||
}
|
||||
}
|
||||
|
||||
pub fn toJS(this: @This(), globalObject: *JSGlobalObject) JSValue {
|
||||
const jsResult = JSValue.createEmptyObject(globalObject, 12);
|
||||
|
||||
if (this.name) |name| {
|
||||
jsResult.put(globalObject, JSC.ZigString.static("name"), bun.String.createUTF8ForJS(globalObject, name));
|
||||
}
|
||||
|
||||
if (this.prefix) |prefix| {
|
||||
jsResult.put(globalObject, JSC.ZigString.static("prefix"), bun.String.createUTF8ForJS(globalObject, prefix));
|
||||
}
|
||||
|
||||
if (this.delimiter) |delimiter| {
|
||||
jsResult.put(globalObject, JSC.ZigString.static("delimiter"), bun.String.createUTF8ForJS(globalObject, delimiter));
|
||||
}
|
||||
|
||||
if (this.start_after) |start_after| {
|
||||
jsResult.put(globalObject, JSC.ZigString.static("startAfter"), bun.String.createUTF8ForJS(globalObject, start_after));
|
||||
}
|
||||
if (this.encoding_type) |encoding_type| {
|
||||
jsResult.put(globalObject, JSC.ZigString.static("encodingType"), bun.String.createUTF8ForJS(globalObject, encoding_type));
|
||||
}
|
||||
|
||||
if (this.continuation_token) |continuation_token| {
|
||||
jsResult.put(globalObject, JSC.ZigString.static("continuationToken"), bun.String.createUTF8ForJS(globalObject, continuation_token));
|
||||
}
|
||||
|
||||
if (this.next_continuation_token) |next_continuation_token| {
|
||||
jsResult.put(globalObject, JSC.ZigString.static("nextContinuationToken"), bun.String.createUTF8ForJS(globalObject, next_continuation_token));
|
||||
}
|
||||
|
||||
if (this.is_truncated) |is_truncated| {
|
||||
jsResult.put(globalObject, JSC.ZigString.static("isTruncated"), JSValue.jsBoolean(is_truncated));
|
||||
}
|
||||
|
||||
if (this.key_count) |key_count| {
|
||||
jsResult.put(globalObject, JSC.ZigString.static("keyCount"), JSValue.jsNumber(key_count));
|
||||
}
|
||||
|
||||
if (this.max_keys) |max_keys| {
|
||||
jsResult.put(globalObject, JSC.ZigString.static("maxKeys"), JSValue.jsNumber(max_keys));
|
||||
}
|
||||
|
||||
if (this.contents) |contents| {
|
||||
const jsContents = JSValue.createEmptyArray(globalObject, contents.items.len);
|
||||
|
||||
for (contents.items, 0..) |item, i| {
|
||||
const objectInfo = JSValue.createEmptyObject(globalObject, 1);
|
||||
objectInfo.put(globalObject, JSC.ZigString.static("key"), bun.String.createUTF8ForJS(globalObject, item.key));
|
||||
|
||||
if (item.etag) |etag| {
|
||||
objectInfo.put(globalObject, JSC.ZigString.static("eTag"), bun.String.createUTF8ForJS(globalObject, etag));
|
||||
}
|
||||
|
||||
if (item.checksum_algorithme) |checksum_algorithme| {
|
||||
objectInfo.put(globalObject, JSC.ZigString.static("checksumAlgorithme"), bun.String.createUTF8ForJS(globalObject, checksum_algorithme));
|
||||
}
|
||||
|
||||
if (item.checksum_type) |checksum_type| {
|
||||
objectInfo.put(globalObject, JSC.ZigString.static("checksumType"), bun.String.createUTF8ForJS(globalObject, checksum_type));
|
||||
}
|
||||
|
||||
if (item.last_modified) |last_modified| {
|
||||
objectInfo.put(globalObject, JSC.ZigString.static("lastModified"), bun.String.createUTF8ForJS(globalObject, last_modified));
|
||||
}
|
||||
|
||||
if (item.object_size) |object_size| {
|
||||
objectInfo.put(globalObject, JSC.ZigString.static("size"), JSValue.jsNumber(object_size));
|
||||
}
|
||||
|
||||
if (item.storage_class) |storage_class| {
|
||||
objectInfo.put(globalObject, JSC.ZigString.static("storageClass"), bun.String.createUTF8ForJS(globalObject, storage_class));
|
||||
}
|
||||
|
||||
if (item.owner) |owner| {
|
||||
const jsOwner = JSValue.createEmptyObject(globalObject, 2);
|
||||
if (owner.id) |id| {
|
||||
jsOwner.put(globalObject, JSC.ZigString.static("id"), bun.String.createUTF8ForJS(globalObject, id));
|
||||
}
|
||||
|
||||
if (owner.display_name) |display_name| {
|
||||
jsOwner.put(globalObject, JSC.ZigString.static("displayName"), bun.String.createUTF8ForJS(globalObject, display_name));
|
||||
}
|
||||
|
||||
objectInfo.put(globalObject, JSC.ZigString.static("owner"), jsOwner);
|
||||
}
|
||||
|
||||
jsContents.putIndex(globalObject, @intCast(i), objectInfo);
|
||||
}
|
||||
|
||||
jsResult.put(globalObject, JSC.ZigString.static("contents"), jsContents);
|
||||
}
|
||||
|
||||
if (this.common_prefixes) |common_prefixes| {
|
||||
const jsCommonPrefixes = JSValue.createEmptyArray(globalObject, common_prefixes.items.len);
|
||||
|
||||
for (common_prefixes.items, 0..) |prefix, i| {
|
||||
const jsPrefix = JSValue.createEmptyObject(globalObject, 1);
|
||||
jsPrefix.put(globalObject, JSC.ZigString.static("prefix"), bun.String.createUTF8ForJS(globalObject, prefix));
|
||||
jsCommonPrefixes.putIndex(globalObject, @intCast(i), jsPrefix);
|
||||
}
|
||||
|
||||
jsResult.put(globalObject, JSC.ZigString.static("commonPrefixes"), jsCommonPrefixes);
|
||||
}
|
||||
|
||||
return jsResult;
|
||||
}
|
||||
};
|
||||
|
||||
pub fn parseS3ListObjectsResult(xml: []const u8) !S3ListObjectsV2Result {
|
||||
var result: S3ListObjectsV2Result = .{
|
||||
.contents = null,
|
||||
.common_prefixes = null,
|
||||
.continuation_token = null,
|
||||
.delimiter = null,
|
||||
.encoding_type = null,
|
||||
.is_truncated = null,
|
||||
.key_count = null,
|
||||
.max_keys = null,
|
||||
.name = null,
|
||||
.next_continuation_token = null,
|
||||
.prefix = null,
|
||||
.start_after = null,
|
||||
};
|
||||
|
||||
var contents = std.ArrayList(S3ListObjectsContents).init(bun.default_allocator);
|
||||
var common_prefixes = std.ArrayList([]const u8).init(bun.default_allocator);
|
||||
|
||||
// we dont use trailing ">" as it may finish with xmlns=...
|
||||
if (strings.indexOf(xml, "<ListBucketResult")) |delete_result_pos| {
|
||||
var i: usize = 0;
|
||||
while (i < xml[delete_result_pos..].len) {
|
||||
if (xml[i] != '<') {
|
||||
i += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (strings.indexOf(xml[i + 1 ..], ">")) |end| {
|
||||
i = i + 1;
|
||||
const tag_name_end_pos = i + end; // +1 for <
|
||||
|
||||
const tagName = xml[i..tag_name_end_pos];
|
||||
i = tag_name_end_pos + 1; // +1 for >
|
||||
|
||||
if (strings.eql(tagName, "Contents")) {
|
||||
var looking_for_end_tag = true;
|
||||
|
||||
var object_key: ?[]const u8 = null;
|
||||
var last_modified: ?[]const u8 = null;
|
||||
var object_size: ?i64 = null;
|
||||
var storage_class: ?[]const u8 = null;
|
||||
var etag: ?[]const u8 = null;
|
||||
var checksum_type: ?[]const u8 = null;
|
||||
var checksum_algorithme: ?[]const u8 = null;
|
||||
var owner_id: ?[]const u8 = null;
|
||||
var owner_display_name: ?[]const u8 = null;
|
||||
var is_restore_in_progress: ?bool = null;
|
||||
var restore_expiry_date: ?[]const u8 = null;
|
||||
|
||||
while (looking_for_end_tag) {
|
||||
if (i >= xml.len) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (xml[i] == '<') {
|
||||
if (strings.indexOf(xml[i + 1 ..], ">")) |__end| {
|
||||
const inner_tag_name_or_tag_end = xml[i + 1 .. i + 1 + __end];
|
||||
|
||||
i = i + 2 + __end;
|
||||
|
||||
if (strings.eql(inner_tag_name_or_tag_end, "/Contents")) {
|
||||
looking_for_end_tag = false;
|
||||
} else if (strings.eql(inner_tag_name_or_tag_end, "Key")) {
|
||||
if (strings.indexOf(xml[i..], "</Key>")) |__tag_end| {
|
||||
object_key = xml[i .. i + __tag_end];
|
||||
i = i + __tag_end + 6;
|
||||
}
|
||||
} else if (strings.eql(inner_tag_name_or_tag_end, "LastModified")) {
|
||||
if (strings.indexOf(xml[i..], "</LastModified>")) |__tag_end| {
|
||||
last_modified = xml[i .. i + __tag_end];
|
||||
i = i + __tag_end + 15;
|
||||
}
|
||||
} else if (strings.eql(inner_tag_name_or_tag_end, "Size")) {
|
||||
if (strings.indexOf(xml[i..], "</Size>")) |__tag_end| {
|
||||
const size = xml[i .. i + __tag_end];
|
||||
|
||||
object_size = std.fmt.parseInt(i64, size, 10) catch null;
|
||||
i = i + __tag_end + 7;
|
||||
}
|
||||
} else if (strings.eql(inner_tag_name_or_tag_end, "StorageClass")) {
|
||||
if (strings.indexOf(xml[i..], "</StorageClass>")) |__tag_end| {
|
||||
storage_class = xml[i .. i + __tag_end];
|
||||
i = i + __tag_end + 15;
|
||||
}
|
||||
} else if (strings.eql(inner_tag_name_or_tag_end, "ChecksumType")) {
|
||||
if (strings.indexOf(xml[i..], "</ChecksumType>")) |__tag_end| {
|
||||
checksum_type = xml[i .. i + __tag_end];
|
||||
i = i + __tag_end + 15;
|
||||
}
|
||||
} else if (strings.eql(inner_tag_name_or_tag_end, "ChecksumAlgorithm")) {
|
||||
if (strings.indexOf(xml[i..], "</ChecksumAlgorithm>")) |__tag_end| {
|
||||
checksum_algorithme = xml[i .. i + __tag_end];
|
||||
i = i + __tag_end + 20;
|
||||
}
|
||||
} else if (strings.eql(inner_tag_name_or_tag_end, "ETag")) {
|
||||
if (strings.indexOf(xml[i..], "</ETag>")) |__tag_end| {
|
||||
const input = xml[i .. i + __tag_end];
|
||||
|
||||
const size = std.mem.replacementSize(u8, input, """, "\"");
|
||||
var output = try bun.default_allocator.alloc(u8, size);
|
||||
|
||||
const len = std.mem.replace(u8, input, """, "\"", output);
|
||||
|
||||
if (len != 0) {
|
||||
etag = output[0 .. input.len - len * 5]; // 5 = """.len - 1 for replacement "
|
||||
} else {
|
||||
etag = input;
|
||||
}
|
||||
|
||||
i = i + __tag_end + 7;
|
||||
}
|
||||
} else if (strings.eql(inner_tag_name_or_tag_end, "Owner")) {
|
||||
if (strings.indexOf(xml[i..], "</Owner>")) |__tag_end| {
|
||||
const owner = xml[i .. i + __tag_end];
|
||||
i = i + __tag_end + 8;
|
||||
|
||||
if (strings.indexOf(owner, "<ID>")) |id_start| {
|
||||
const id_start_pos = id_start + 4;
|
||||
if (strings.indexOf(owner, "</ID>")) |id_end| {
|
||||
const isNotEmpty = id_start_pos < id_end;
|
||||
if (isNotEmpty) {
|
||||
owner_id = owner[id_start_pos..id_end];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (strings.indexOf(owner, "<DisplayName>")) |id_start| {
|
||||
const id_start_pos = id_start + 13;
|
||||
if (strings.indexOf(owner, "</DisplayName>")) |id_end| {
|
||||
const isNotEmpty = id_start_pos < id_end;
|
||||
if (isNotEmpty) {
|
||||
owner_display_name = owner[id_start_pos..id_end];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (strings.eql(inner_tag_name_or_tag_end, "RestoreStatus")) {
|
||||
if (strings.indexOf(xml[i..], "</RestoreStatus>")) |__tag_end| {
|
||||
const restore_status = xml[i .. i + __tag_end];
|
||||
i = i + __tag_end + 16;
|
||||
|
||||
if (strings.indexOf(restore_status, "<IsRestoreInProgress>")) |start| {
|
||||
const start_pos = start + 21;
|
||||
if (strings.indexOf(restore_status, "</IsRestoreInProgress>")) |_end| {
|
||||
const isNotEmpty = start_pos < _end;
|
||||
if (isNotEmpty) {
|
||||
const is_restore_in_progress_string = restore_status[start_pos.._end];
|
||||
|
||||
if (strings.eql(is_restore_in_progress_string, "true")) {
|
||||
is_restore_in_progress = true;
|
||||
} else if (strings.eql(is_restore_in_progress_string, "false")) {
|
||||
is_restore_in_progress = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (strings.indexOf(restore_status, "<RestoreExpiryDate>")) |start| {
|
||||
const start_pos = start + 19;
|
||||
if (strings.indexOf(restore_status, "</RestoreExpiryDate>")) |_end| {
|
||||
const isNotEmpty = start_pos < _end;
|
||||
if (isNotEmpty) {
|
||||
restore_expiry_date = restore_status[start_pos.._end];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else { // char is not >
|
||||
i += 1;
|
||||
}
|
||||
} else { // char is not <
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (object_key) |object_key_val| {
|
||||
var owner: ?ObjectOwner = null;
|
||||
|
||||
if (owner_id != null or owner_display_name != null) {
|
||||
owner = .{
|
||||
.id = owner_id,
|
||||
.display_name = owner_display_name,
|
||||
};
|
||||
}
|
||||
|
||||
var restore_status: ?ObjectRestoreStatus = null;
|
||||
|
||||
if (is_restore_in_progress != null or restore_expiry_date != null) {
|
||||
restore_status = .{
|
||||
.is_restore_in_progress = is_restore_in_progress,
|
||||
.restore_expiry_date = restore_expiry_date,
|
||||
};
|
||||
}
|
||||
|
||||
try contents.append(.{
|
||||
.key = object_key_val,
|
||||
.etag = etag,
|
||||
.checksum_type = checksum_type,
|
||||
.checksum_algorithme = checksum_algorithme,
|
||||
.last_modified = last_modified,
|
||||
.object_size = object_size,
|
||||
.storage_class = storage_class,
|
||||
.owner = owner,
|
||||
.restore_status = restore_status,
|
||||
});
|
||||
}
|
||||
} else if (strings.eql(tagName, "Name")) {
|
||||
if (strings.indexOf(xml[i..], "</Name>")) |_end| {
|
||||
result.name = xml[i .. i + _end];
|
||||
i = i + _end;
|
||||
}
|
||||
} else if (strings.eql(tagName, "Delimiter")) {
|
||||
if (strings.indexOf(xml[i..], "</Delimiter>")) |_end| {
|
||||
result.delimiter = xml[i .. i + _end];
|
||||
i = i + _end;
|
||||
}
|
||||
} else if (strings.eql(tagName, "NextContinuationToken")) {
|
||||
if (strings.indexOf(xml[i..], "</NextContinuationToken>")) |_end| {
|
||||
result.next_continuation_token = xml[i .. i + _end];
|
||||
i = i + _end;
|
||||
}
|
||||
} else if (strings.eql(tagName, "ContinuationToken")) {
|
||||
if (strings.indexOf(xml[i..], "</ContinuationToken>")) |_end| {
|
||||
result.continuation_token = xml[i .. i + _end];
|
||||
i = i + _end;
|
||||
}
|
||||
} else if (strings.eql(tagName, "StartAfter")) {
|
||||
if (strings.indexOf(xml[i..], "</StartAfter>")) |_end| {
|
||||
result.start_after = xml[i .. i + _end];
|
||||
i = i + _end;
|
||||
}
|
||||
} else if (strings.eql(tagName, "EncodingType")) {
|
||||
if (strings.indexOf(xml[i..], "</EncodingType>")) |_end| {
|
||||
result.encoding_type = xml[i .. i + _end];
|
||||
i = i + _end;
|
||||
}
|
||||
} else if (strings.eql(tagName, "KeyCount")) {
|
||||
if (strings.indexOf(xml[i..], "</KeyCount>")) |_end| {
|
||||
const key_count = xml[i .. i + _end];
|
||||
result.key_count = std.fmt.parseInt(i64, key_count, 10) catch null;
|
||||
|
||||
i = i + _end;
|
||||
}
|
||||
} else if (strings.eql(tagName, "MaxKeys")) {
|
||||
if (strings.indexOf(xml[i..], "</MaxKeys>")) |_end| {
|
||||
const max_keys = xml[i .. i + _end];
|
||||
result.max_keys = std.fmt.parseInt(i64, max_keys, 10) catch null;
|
||||
|
||||
i = i + _end;
|
||||
}
|
||||
} else if (strings.eql(tagName, "Prefix")) {
|
||||
if (strings.indexOf(xml[i..], "</Prefix>")) |_end| {
|
||||
const prefix = xml[i .. i + _end];
|
||||
|
||||
if (prefix.len != 0) {
|
||||
result.prefix = prefix;
|
||||
}
|
||||
|
||||
i = i + _end;
|
||||
}
|
||||
} else if (strings.eql(tagName, "IsTruncated")) {
|
||||
if (strings.indexOf(xml[i..], "</IsTruncated>")) |_end| {
|
||||
const is_truncated = xml[i .. i + _end];
|
||||
|
||||
if (strings.eql(is_truncated, "true")) {
|
||||
result.is_truncated = true;
|
||||
} else if (strings.eql(is_truncated, "false")) {
|
||||
result.is_truncated = false;
|
||||
}
|
||||
|
||||
i = i + _end;
|
||||
}
|
||||
} else if (strings.eql(tagName, "CommonPrefixes")) {
|
||||
if (strings.indexOf(xml[i..], "</CommonPrefixes>")) |_end| {
|
||||
const common_prefixes_string = xml[i .. i + _end];
|
||||
i = i + _end;
|
||||
|
||||
var j: usize = 0;
|
||||
while (j < common_prefixes_string.len) {
|
||||
if (strings.indexOf(common_prefixes_string[j..], "<Prefix>")) |start| {
|
||||
j = j + start + 8;
|
||||
|
||||
if (strings.indexOf(common_prefixes_string[j..], "</Prefix>")) |__end| {
|
||||
try common_prefixes.append(common_prefixes_string[j .. j + __end]);
|
||||
j = j + __end;
|
||||
}
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (contents.items.len != 0) {
|
||||
result.contents = contents;
|
||||
} else {
|
||||
contents.deinit();
|
||||
}
|
||||
|
||||
if (common_prefixes.items.len != 0) {
|
||||
result.common_prefixes = common_prefixes;
|
||||
} else {
|
||||
common_prefixes.deinit();
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
pub fn getListObjectsOptionsFromJS(globalThis: *JSC.JSGlobalObject, listOptions: JSValue) !S3ListObjectsOptions {
|
||||
var listObjectsOptions: S3ListObjectsOptions = .{
|
||||
.continuation_token = null,
|
||||
.delimiter = null,
|
||||
.encoding_type = null,
|
||||
.fetch_owner = null,
|
||||
.max_keys = null,
|
||||
.prefix = null,
|
||||
.start_after = null,
|
||||
|
||||
._continuation_token = null,
|
||||
._delimiter = null,
|
||||
._encoding_type = null,
|
||||
._prefix = null,
|
||||
._start_after = null,
|
||||
};
|
||||
|
||||
if (!listOptions.isObject()) {
|
||||
return listObjectsOptions;
|
||||
}
|
||||
|
||||
if (try listOptions.getTruthyComptime(globalThis, "continuationToken")) |val| {
|
||||
if (val.isString()) {
|
||||
const str = try bun.String.fromJS(val, globalThis);
|
||||
|
||||
if (str.tag != .Empty and str.tag != .Dead) {
|
||||
listObjectsOptions._continuation_token = str.toUTF8(bun.default_allocator);
|
||||
listObjectsOptions.continuation_token = listObjectsOptions._continuation_token.?.slice();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (try listOptions.getTruthyComptime(globalThis, "delimiter")) |val| {
|
||||
if (val.isString()) {
|
||||
const str = try bun.String.fromJS(val, globalThis);
|
||||
|
||||
if (str.tag != .Empty and str.tag != .Dead) {
|
||||
listObjectsOptions._delimiter = str.toUTF8(bun.default_allocator);
|
||||
listObjectsOptions.delimiter = listObjectsOptions._delimiter.?.slice();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (try listOptions.getTruthyComptime(globalThis, "encodingType")) |val| {
|
||||
if (val.isString()) {
|
||||
const str = try bun.String.fromJS(val, globalThis);
|
||||
|
||||
if (str.tag != .Empty and str.tag != .Dead) {
|
||||
listObjectsOptions._encoding_type = str.toUTF8(bun.default_allocator);
|
||||
listObjectsOptions.encoding_type = listObjectsOptions._encoding_type.?.slice();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (try listOptions.getBooleanLoose(globalThis, "fetchOwner")) |val| {
|
||||
listObjectsOptions.fetch_owner = val;
|
||||
}
|
||||
|
||||
if (try listOptions.getTruthyComptime(globalThis, "maxKeys")) |val| {
|
||||
if (val.isNumber()) {
|
||||
listObjectsOptions.max_keys = val.toInt32();
|
||||
}
|
||||
}
|
||||
|
||||
if (try listOptions.getTruthyComptime(globalThis, "prefix")) |val| {
|
||||
if (val.isString()) {
|
||||
const str = try bun.String.fromJS(val, globalThis);
|
||||
|
||||
if (str.tag != .Empty and str.tag != .Dead) {
|
||||
listObjectsOptions._prefix = str.toUTF8(bun.default_allocator);
|
||||
listObjectsOptions.prefix = listObjectsOptions._prefix.?.slice();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (try listOptions.getTruthyComptime(globalThis, "startAfter")) |val| {
|
||||
if (val.isString()) {
|
||||
const str = try bun.String.fromJS(val, globalThis);
|
||||
|
||||
if (str.tag != .Empty and str.tag != .Dead) {
|
||||
listObjectsOptions._start_after = str.toUTF8(bun.default_allocator);
|
||||
listObjectsOptions.start_after = listObjectsOptions._start_after.?.slice();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return listObjectsOptions;
|
||||
}
|
||||
@@ -9,6 +9,7 @@ const S3Credentials = @import("./credentials.zig").S3Credentials;
|
||||
const picohttp = bun.picohttp;
|
||||
const ACL = @import("./acl.zig").ACL;
|
||||
const StorageClass = @import("./storage_class.zig").StorageClass;
|
||||
const ListObjects = @import("./list_objects.zig");
|
||||
|
||||
pub const S3StatResult = union(enum) {
|
||||
success: struct {
|
||||
@@ -48,6 +49,14 @@ pub const S3DeleteResult = union(enum) {
|
||||
/// failure error is not owned and need to be copied if used after this callback
|
||||
failure: S3Error,
|
||||
};
|
||||
pub const S3ListObjectsResult = union(enum) {
|
||||
success: ListObjects.S3ListObjectsV2Result,
|
||||
not_found: S3Error,
|
||||
|
||||
/// failure error is not owned and need to be copied if used after this callback
|
||||
failure: S3Error,
|
||||
};
|
||||
|
||||
// commit result also fails if status 200 but with body containing an Error
|
||||
pub const S3CommitResult = union(enum) {
|
||||
success: void,
|
||||
@@ -86,6 +95,7 @@ pub const S3HttpSimpleTask = struct {
|
||||
download: *const fn (S3DownloadResult, *anyopaque) void,
|
||||
upload: *const fn (S3UploadResult, *anyopaque) void,
|
||||
delete: *const fn (S3DeleteResult, *anyopaque) void,
|
||||
listObjects: *const fn (S3ListObjectsResult, *anyopaque) void,
|
||||
commit: *const fn (S3CommitResult, *anyopaque) void,
|
||||
part: *const fn (S3PartResult, *anyopaque) void,
|
||||
|
||||
@@ -95,6 +105,7 @@ pub const S3HttpSimpleTask = struct {
|
||||
.download,
|
||||
.stat,
|
||||
.delete,
|
||||
.listObjects,
|
||||
.commit,
|
||||
.part,
|
||||
=> |callback| callback(.{
|
||||
@@ -110,6 +121,7 @@ pub const S3HttpSimpleTask = struct {
|
||||
inline .download,
|
||||
.stat,
|
||||
.delete,
|
||||
.listObjects,
|
||||
=> |callback| callback(.{
|
||||
.not_found = .{
|
||||
.code = code,
|
||||
@@ -255,6 +267,28 @@ pub const S3HttpSimpleTask = struct {
|
||||
},
|
||||
}
|
||||
},
|
||||
.listObjects => |callback| {
|
||||
switch (response.status_code) {
|
||||
200 => {
|
||||
if (this.result.body) |body| {
|
||||
const success = ListObjects.parseS3ListObjectsResult(body.slice()) catch {
|
||||
this.errorWithBody(.failure);
|
||||
return;
|
||||
};
|
||||
|
||||
callback(.{ .success = success }, this.callback_context);
|
||||
} else {
|
||||
this.errorWithBody(.failure);
|
||||
}
|
||||
},
|
||||
404 => {
|
||||
this.errorWithBody(.not_found);
|
||||
},
|
||||
else => {
|
||||
this.errorWithBody(.failure);
|
||||
},
|
||||
}
|
||||
},
|
||||
.upload => |callback| {
|
||||
switch (response.status_code) {
|
||||
200 => {
|
||||
@@ -351,7 +385,7 @@ pub fn executeSimpleS3Request(
|
||||
.content_disposition = options.content_disposition,
|
||||
.acl = options.acl,
|
||||
.storage_class = options.storage_class,
|
||||
}, null) catch |sign_err| {
|
||||
}, false, null) catch |sign_err| {
|
||||
if (options.range) |range_| bun.default_allocator.free(range_);
|
||||
const error_code_and_message = getSignErrorCodeAndMessage(sign_err);
|
||||
callback.fail(error_code_and_message.code, error_code_and_message.message, callback_context);
|
||||
|
||||
1169
test/js/bun/s3/s3-list-objects.test.ts
Normal file
1169
test/js/bun/s3/s3-list-objects.test.ts
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user