itizawa 5 лет назад
Родитель
Сommit
ccc3005cc0

+ 4 - 4
src/server/service/config-loader.js

@@ -338,9 +338,9 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    TYPES.BOOLEAN,
     default: false,
   },
-  S3_PROVIDE_SEC_FOR_TEMPORARY_URL: {
+  S3_LIFETIME_SEC_FOR_TEMPORARY_URL: {
     ns:      'crowi',
-    key:     'aws:provideSecForTemporaryUrl',
+    key:     'aws:lifetimeSecForTemporaryUrl',
     type:    TYPES.NUMBER,
     default: 120,
   },
@@ -374,9 +374,9 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    TYPES.BOOLEAN,
     default: false,
   },
-  GCS_PROVIDE_SEC_FOR_TEMPORARY_URL: {
+  GCS_LIFETIME_SEC_FOR_TEMPORARY_URL: {
     ns:      'crowi',
-    key:     'gcs:provideSecForTemporaryUrl',
+    key:     'gcs:lifetimeSecForTemporaryUrl',
     type:    TYPES.NUMBER,
     default: 120,
   },

+ 3 - 3
src/server/service/file-uploader/aws.js

@@ -88,21 +88,21 @@ module.exports = function(crowi) {
     const s3 = S3Factory();
     const awsConfig = getAwsConfig();
     const filePath = getFilePathOnStorage(attachment);
-    const provideSecForTemporaryUrl = this.configManager.getConfig('crowi', 'aws:provideSecForTemporaryUrl');
+    const lifetimeSecForTemporaryUrl = this.configManager.getConfig('crowi', 'aws:lifetimeSecForTemporaryUrl');
 
     // issue signed url (default: expires 120 seconds)
     // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#getSignedUrl-property
     const params = {
       Bucket: awsConfig.bucket,
       Key: filePath,
-      Expires: provideSecForTemporaryUrl,
+      Expires: lifetimeSecForTemporaryUrl,
     };
     const signedUrl = s3.getSignedUrl('getObject', params);
 
     res.redirect(signedUrl);
 
     try {
-      return attachment.cashTemporaryUrlByProvideSec(signedUrl, provideSecForTemporaryUrl);
+      return attachment.cashTemporaryUrlByProvideSec(signedUrl, lifetimeSecForTemporaryUrl);
     }
     catch (err) {
       logger.error(err);

+ 3 - 3
src/server/service/file-uploader/gcs.js

@@ -67,19 +67,19 @@ module.exports = function(crowi) {
     const myBucket = gcs.bucket(getGcsBucket());
     const filePath = getFilePathOnStorage(attachment);
     const file = myBucket.file(filePath);
-    const provideSecForTemporaryUrl = this.configManager.getConfig('crowi', 'gcs:provideSecForTemporaryUrl');
+    const lifetimeSecForTemporaryUrl = this.configManager.getConfig('crowi', 'gcs:lifetimeSecForTemporaryUrl');
 
     // issue signed url (default: expires 120 seconds)
     // https://cloud.google.com/storage/docs/access-control/signed-urls
     const signedUrl = await file.getSignedUrl({
       action: 'read',
-      expires: Date.now() + provideSecForTemporaryUrl * 1000,
+      expires: Date.now() + lifetimeSecForTemporaryUrl * 1000,
     });
 
     res.redirect(signedUrl);
 
     try {
-      return attachment.cashTemporaryUrlByProvideSec(signedUrl, provideSecForTemporaryUrl);
+      return attachment.cashTemporaryUrlByProvideSec(signedUrl, lifetimeSecForTemporaryUrl);
     }
     catch (err) {
       logger.error(err);