Bläddra i källkod

companion: don't send error stack to client

Ifedapo Olarewaju 5 år sedan
förälder
incheckning
2a47486019

+ 4 - 2
packages/@uppy/companion/src/server/Uploader.js

@@ -317,10 +317,12 @@ class Uploader {
    * @param {object=} extraData
    */
   emitError (err, extraData = {}) {
+    const serializedErr = serializeError(err)
+    // delete stack to avoid sending server info to client
+    delete serializedErr.stack
     const dataToEmit = {
       action: 'error',
-      // TODO: consider removing the stack property
-      payload: Object.assign(extraData, { error: serializeError(err) })
+      payload: Object.assign(extraData, { error: serializedErr })
     }
     this.saveState(dataToEmit)
     emitter().emit(this.token, dataToEmit)

+ 1 - 1
packages/@uppy/companion/src/server/provider/index.js

@@ -149,7 +149,7 @@ module.exports.addProviderOptions = (options, grantConfig) => {
       } else if (server.path) {
         grantConfig[authProvider].callback = `${server.path}${grantConfig[authProvider].callback}`
       }
-    } else if (authProvider !== 's3') { // TODO: there should be a cleaner way to do this.
+    } else if (authProvider !== 's3') {
       logger.warn(`skipping one found unsupported provider "${authProvider}".`, 'provider.options.skip')
     }
   })

+ 0 - 2
packages/@uppy/companion/src/standalone/helper.js

@@ -28,7 +28,6 @@ const getConfigFromEnv = () => {
   const validHosts = domains ? domains.split(',') : []
 
   return {
-    // TODO: Rename providerOptions to providers.
     providerOptions: {
       google: {
         key: process.env.COMPANION_GOOGLE_KEY,
@@ -105,7 +104,6 @@ const getConfigFromFile = () => {
   if (!path) return {}
 
   const rawdata = fs.readFileSync(getConfigPath())
-  // TODO validate the json object fields to match the uppy config schema
   // @ts-ignore
   return JSON.parse(rawdata)
 }