fix: 修复配额说明重复和undefined问题
- 在editStorageForm中初始化oss_storage_quota_value和oss_quota_unit - 删除重复的旧配额说明块,保留新的当前配额设置显示 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
39
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/classes/S3ExpressIdentityCache.js
generated
vendored
Normal file
39
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/classes/S3ExpressIdentityCache.js
generated
vendored
Normal file
@@ -0,0 +1,39 @@
|
||||
export class S3ExpressIdentityCache {
|
||||
data;
|
||||
lastPurgeTime = Date.now();
|
||||
static EXPIRED_CREDENTIAL_PURGE_INTERVAL_MS = 30_000;
|
||||
constructor(data = {}) {
|
||||
this.data = data;
|
||||
}
|
||||
get(key) {
|
||||
const entry = this.data[key];
|
||||
if (!entry) {
|
||||
return;
|
||||
}
|
||||
return entry;
|
||||
}
|
||||
set(key, entry) {
|
||||
this.data[key] = entry;
|
||||
return entry;
|
||||
}
|
||||
delete(key) {
|
||||
delete this.data[key];
|
||||
}
|
||||
async purgeExpired() {
|
||||
const now = Date.now();
|
||||
if (this.lastPurgeTime + S3ExpressIdentityCache.EXPIRED_CREDENTIAL_PURGE_INTERVAL_MS > now) {
|
||||
return;
|
||||
}
|
||||
for (const key in this.data) {
|
||||
const entry = this.data[key];
|
||||
if (!entry.isRefreshing) {
|
||||
const credential = await entry.identity;
|
||||
if (credential.expiration) {
|
||||
if (credential.expiration.getTime() < now) {
|
||||
delete this.data[key];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
14
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/classes/S3ExpressIdentityCacheEntry.js
generated
vendored
Normal file
14
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/classes/S3ExpressIdentityCacheEntry.js
generated
vendored
Normal file
@@ -0,0 +1,14 @@
|
||||
export class S3ExpressIdentityCacheEntry {
|
||||
_identity;
|
||||
isRefreshing;
|
||||
accessed;
|
||||
constructor(_identity, isRefreshing = false, accessed = Date.now()) {
|
||||
this._identity = _identity;
|
||||
this.isRefreshing = isRefreshing;
|
||||
this.accessed = accessed;
|
||||
}
|
||||
get identity() {
|
||||
this.accessed = Date.now();
|
||||
return this._identity;
|
||||
}
|
||||
}
|
||||
49
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/classes/S3ExpressIdentityProviderImpl.js
generated
vendored
Normal file
49
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/classes/S3ExpressIdentityProviderImpl.js
generated
vendored
Normal file
@@ -0,0 +1,49 @@
|
||||
import { S3ExpressIdentityCache } from "./S3ExpressIdentityCache";
|
||||
import { S3ExpressIdentityCacheEntry } from "./S3ExpressIdentityCacheEntry";
|
||||
export class S3ExpressIdentityProviderImpl {
|
||||
createSessionFn;
|
||||
cache;
|
||||
static REFRESH_WINDOW_MS = 60_000;
|
||||
constructor(createSessionFn, cache = new S3ExpressIdentityCache()) {
|
||||
this.createSessionFn = createSessionFn;
|
||||
this.cache = cache;
|
||||
}
|
||||
async getS3ExpressIdentity(awsIdentity, identityProperties) {
|
||||
const key = identityProperties.Bucket;
|
||||
const { cache } = this;
|
||||
const entry = cache.get(key);
|
||||
if (entry) {
|
||||
return entry.identity.then((identity) => {
|
||||
const isExpired = (identity.expiration?.getTime() ?? 0) < Date.now();
|
||||
if (isExpired) {
|
||||
return cache.set(key, new S3ExpressIdentityCacheEntry(this.getIdentity(key))).identity;
|
||||
}
|
||||
const isExpiringSoon = (identity.expiration?.getTime() ?? 0) < Date.now() + S3ExpressIdentityProviderImpl.REFRESH_WINDOW_MS;
|
||||
if (isExpiringSoon && !entry.isRefreshing) {
|
||||
entry.isRefreshing = true;
|
||||
this.getIdentity(key).then((id) => {
|
||||
cache.set(key, new S3ExpressIdentityCacheEntry(Promise.resolve(id)));
|
||||
});
|
||||
}
|
||||
return identity;
|
||||
});
|
||||
}
|
||||
return cache.set(key, new S3ExpressIdentityCacheEntry(this.getIdentity(key))).identity;
|
||||
}
|
||||
async getIdentity(key) {
|
||||
await this.cache.purgeExpired().catch((error) => {
|
||||
console.warn("Error while clearing expired entries in S3ExpressIdentityCache: \n" + error);
|
||||
});
|
||||
const session = await this.createSessionFn(key);
|
||||
if (!session.Credentials?.AccessKeyId || !session.Credentials?.SecretAccessKey) {
|
||||
throw new Error("s3#createSession response credential missing AccessKeyId or SecretAccessKey.");
|
||||
}
|
||||
const identity = {
|
||||
accessKeyId: session.Credentials.AccessKeyId,
|
||||
secretAccessKey: session.Credentials.SecretAccessKey,
|
||||
sessionToken: session.Credentials.SessionToken,
|
||||
expiration: session.Credentials.Expiration ? new Date(session.Credentials.Expiration) : undefined,
|
||||
};
|
||||
return identity;
|
||||
}
|
||||
}
|
||||
41
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/classes/SignatureV4S3Express.js
generated
vendored
Normal file
41
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/classes/SignatureV4S3Express.js
generated
vendored
Normal file
@@ -0,0 +1,41 @@
|
||||
import { SignatureV4 } from "@smithy/signature-v4";
|
||||
import { SESSION_TOKEN_HEADER, SESSION_TOKEN_QUERY_PARAM } from "../constants";
|
||||
export class SignatureV4S3Express extends SignatureV4 {
|
||||
async signWithCredentials(requestToSign, credentials, options) {
|
||||
const credentialsWithoutSessionToken = getCredentialsWithoutSessionToken(credentials);
|
||||
requestToSign.headers[SESSION_TOKEN_HEADER] = credentials.sessionToken;
|
||||
const privateAccess = this;
|
||||
setSingleOverride(privateAccess, credentialsWithoutSessionToken);
|
||||
return privateAccess.signRequest(requestToSign, options ?? {});
|
||||
}
|
||||
async presignWithCredentials(requestToSign, credentials, options) {
|
||||
const credentialsWithoutSessionToken = getCredentialsWithoutSessionToken(credentials);
|
||||
delete requestToSign.headers[SESSION_TOKEN_HEADER];
|
||||
requestToSign.headers[SESSION_TOKEN_QUERY_PARAM] = credentials.sessionToken;
|
||||
requestToSign.query = requestToSign.query ?? {};
|
||||
requestToSign.query[SESSION_TOKEN_QUERY_PARAM] = credentials.sessionToken;
|
||||
const privateAccess = this;
|
||||
setSingleOverride(privateAccess, credentialsWithoutSessionToken);
|
||||
return this.presign(requestToSign, options);
|
||||
}
|
||||
}
|
||||
function getCredentialsWithoutSessionToken(credentials) {
|
||||
const credentialsWithoutSessionToken = {
|
||||
accessKeyId: credentials.accessKeyId,
|
||||
secretAccessKey: credentials.secretAccessKey,
|
||||
expiration: credentials.expiration,
|
||||
};
|
||||
return credentialsWithoutSessionToken;
|
||||
}
|
||||
function setSingleOverride(privateAccess, credentialsWithoutSessionToken) {
|
||||
const id = setTimeout(() => {
|
||||
throw new Error("SignatureV4S3Express credential override was created but not called.");
|
||||
}, 10);
|
||||
const currentCredentialProvider = privateAccess.credentialProvider;
|
||||
const overrideCredentialsProviderOnce = () => {
|
||||
clearTimeout(id);
|
||||
privateAccess.credentialProvider = currentCredentialProvider;
|
||||
return Promise.resolve(credentialsWithoutSessionToken);
|
||||
};
|
||||
privateAccess.credentialProvider = overrideCredentialsProviderOnce;
|
||||
}
|
||||
13
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/constants.js
generated
vendored
Normal file
13
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/constants.js
generated
vendored
Normal file
@@ -0,0 +1,13 @@
|
||||
import { booleanSelector, SelectorType } from "@smithy/util-config-provider";
|
||||
export const S3_EXPRESS_BUCKET_TYPE = "Directory";
|
||||
export const S3_EXPRESS_BACKEND = "S3Express";
|
||||
export const S3_EXPRESS_AUTH_SCHEME = "sigv4-s3express";
|
||||
export const SESSION_TOKEN_QUERY_PARAM = "X-Amz-S3session-Token";
|
||||
export const SESSION_TOKEN_HEADER = SESSION_TOKEN_QUERY_PARAM.toLowerCase();
|
||||
export const NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_ENV_NAME = "AWS_S3_DISABLE_EXPRESS_SESSION_AUTH";
|
||||
export const NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_INI_NAME = "s3_disable_express_session_auth";
|
||||
export const NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_OPTIONS = {
|
||||
environmentVariableSelector: (env) => booleanSelector(env, NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_ENV_NAME, SelectorType.ENV),
|
||||
configFileSelector: (profile) => booleanSelector(profile, NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_INI_NAME, SelectorType.CONFIG),
|
||||
default: false,
|
||||
};
|
||||
39
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/functions/s3ExpressHttpSigningMiddleware.js
generated
vendored
Normal file
39
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/functions/s3ExpressHttpSigningMiddleware.js
generated
vendored
Normal file
@@ -0,0 +1,39 @@
|
||||
import { httpSigningMiddlewareOptions } from "@smithy/core";
|
||||
import { HttpRequest } from "@smithy/protocol-http";
|
||||
import { SMITHY_CONTEXT_KEY, } from "@smithy/types";
|
||||
import { getSmithyContext } from "@smithy/util-middleware";
|
||||
import { signS3Express } from "./signS3Express";
|
||||
const defaultErrorHandler = (signingProperties) => (error) => {
|
||||
throw error;
|
||||
};
|
||||
const defaultSuccessHandler = (httpResponse, signingProperties) => { };
|
||||
export const s3ExpressHttpSigningMiddlewareOptions = httpSigningMiddlewareOptions;
|
||||
export const s3ExpressHttpSigningMiddleware = (config) => (next, context) => async (args) => {
|
||||
if (!HttpRequest.isInstance(args.request)) {
|
||||
return next(args);
|
||||
}
|
||||
const smithyContext = getSmithyContext(context);
|
||||
const scheme = smithyContext.selectedHttpAuthScheme;
|
||||
if (!scheme) {
|
||||
throw new Error(`No HttpAuthScheme was selected: unable to sign request`);
|
||||
}
|
||||
const { httpAuthOption: { signingProperties = {} }, identity, signer, } = scheme;
|
||||
let request;
|
||||
if (context.s3ExpressIdentity) {
|
||||
request = await signS3Express(context.s3ExpressIdentity, signingProperties, args.request, await config.signer());
|
||||
}
|
||||
else {
|
||||
request = await signer.sign(args.request, identity, signingProperties);
|
||||
}
|
||||
const output = await next({
|
||||
...args,
|
||||
request,
|
||||
}).catch((signer.errorHandler || defaultErrorHandler)(signingProperties));
|
||||
(signer.successHandler || defaultSuccessHandler)(output.response, signingProperties);
|
||||
return output;
|
||||
};
|
||||
export const getS3ExpressHttpSigningPlugin = (config) => ({
|
||||
applyToStack: (clientStack) => {
|
||||
clientStack.addRelativeTo(s3ExpressHttpSigningMiddleware(config), httpSigningMiddlewareOptions);
|
||||
},
|
||||
});
|
||||
41
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/functions/s3ExpressMiddleware.js
generated
vendored
Normal file
41
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/functions/s3ExpressMiddleware.js
generated
vendored
Normal file
@@ -0,0 +1,41 @@
|
||||
import { setFeature } from "@aws-sdk/core";
|
||||
import { HttpRequest } from "@smithy/protocol-http";
|
||||
import { S3_EXPRESS_AUTH_SCHEME, S3_EXPRESS_BACKEND, S3_EXPRESS_BUCKET_TYPE, SESSION_TOKEN_HEADER } from "../constants";
|
||||
export const s3ExpressMiddleware = (options) => {
|
||||
return (next, context) => async (args) => {
|
||||
if (context.endpointV2) {
|
||||
const endpoint = context.endpointV2;
|
||||
const isS3ExpressAuth = endpoint.properties?.authSchemes?.[0]?.name === S3_EXPRESS_AUTH_SCHEME;
|
||||
const isS3ExpressBucket = endpoint.properties?.backend === S3_EXPRESS_BACKEND ||
|
||||
endpoint.properties?.bucketType === S3_EXPRESS_BUCKET_TYPE;
|
||||
if (isS3ExpressBucket) {
|
||||
setFeature(context, "S3_EXPRESS_BUCKET", "J");
|
||||
context.isS3ExpressBucket = true;
|
||||
}
|
||||
if (isS3ExpressAuth) {
|
||||
const requestBucket = args.input.Bucket;
|
||||
if (requestBucket) {
|
||||
const s3ExpressIdentity = await options.s3ExpressIdentityProvider.getS3ExpressIdentity(await options.credentials(), {
|
||||
Bucket: requestBucket,
|
||||
});
|
||||
context.s3ExpressIdentity = s3ExpressIdentity;
|
||||
if (HttpRequest.isInstance(args.request) && s3ExpressIdentity.sessionToken) {
|
||||
args.request.headers[SESSION_TOKEN_HEADER] = s3ExpressIdentity.sessionToken;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return next(args);
|
||||
};
|
||||
};
|
||||
export const s3ExpressMiddlewareOptions = {
|
||||
name: "s3ExpressMiddleware",
|
||||
step: "build",
|
||||
tags: ["S3", "S3_EXPRESS"],
|
||||
override: true,
|
||||
};
|
||||
export const getS3ExpressPlugin = (options) => ({
|
||||
applyToStack: (clientStack) => {
|
||||
clientStack.add(s3ExpressMiddleware(options), s3ExpressMiddlewareOptions);
|
||||
},
|
||||
});
|
||||
7
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/functions/signS3Express.js
generated
vendored
Normal file
7
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/functions/signS3Express.js
generated
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
export const signS3Express = async (s3ExpressIdentity, signingOptions, request, sigV4MultiRegionSigner) => {
|
||||
const signedRequest = await sigV4MultiRegionSigner.signWithCredentials(request, s3ExpressIdentity, {});
|
||||
if (signedRequest.headers["X-Amz-Security-Token"] || signedRequest.headers["x-amz-security-token"]) {
|
||||
throw new Error("X-Amz-Security-Token must not be set for s3-express requests.");
|
||||
}
|
||||
return signedRequest;
|
||||
};
|
||||
7
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/index.js
generated
vendored
Normal file
7
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/index.js
generated
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
export { S3ExpressIdentityCache } from "./classes/S3ExpressIdentityCache";
|
||||
export { S3ExpressIdentityCacheEntry } from "./classes/S3ExpressIdentityCacheEntry";
|
||||
export { S3ExpressIdentityProviderImpl } from "./classes/S3ExpressIdentityProviderImpl";
|
||||
export { SignatureV4S3Express } from "./classes/SignatureV4S3Express";
|
||||
export { NODE_DISABLE_S3_EXPRESS_SESSION_AUTH_OPTIONS } from "./constants";
|
||||
export { getS3ExpressPlugin, s3ExpressMiddleware, s3ExpressMiddlewareOptions } from "./functions/s3ExpressMiddleware";
|
||||
export { getS3ExpressHttpSigningPlugin, s3ExpressHttpSigningMiddleware, s3ExpressHttpSigningMiddlewareOptions, } from "./functions/s3ExpressHttpSigningMiddleware";
|
||||
1
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/interfaces/S3ExpressIdentity.js
generated
vendored
Normal file
1
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/interfaces/S3ExpressIdentity.js
generated
vendored
Normal file
@@ -0,0 +1 @@
|
||||
export {};
|
||||
1
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/interfaces/S3ExpressIdentityProvider.js
generated
vendored
Normal file
1
backend/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/s3-express/interfaces/S3ExpressIdentityProvider.js
generated
vendored
Normal file
@@ -0,0 +1 @@
|
||||
export {};
|
||||
Reference in New Issue
Block a user