Merge pull request #19 from netlify/fix-encoding-algo

encodeURI the file upload path

Author: bcomnes

src/deploy/upload-files.js

@@ -9,6 +9,7 @@ async function uploadFiles(api, deployId, uploadList, { concurrentUpload, status
     msg: `Uploading ${uploadList.length} files`,
     phase: 'start'
   })
+
   const uploadFile = async (fileObj, index) => {
     const { normalizedPath, assetType, runtime } = fileObj
     const readStream = fs.createReadStream(fileObj.filepath)
@@ -24,15 +25,15 @@ async function uploadFiles(api, deployId, uploadList, { concurrentUpload, status
         response = await api.uploadDeployFile({
           body: readStream,
           deployId,
-          path: normalizedPath
+          path: encodeURI(normalizedPath)
         })
         break
       }
       case 'function': {
         response = await api.uploadDeployFunction({
           body: readStream,
           deployId,
-          name: normalizedPath,
+          name: encodeURI(normalizedPath),
           runtime
         })
         break

src/deploy/util.js

@@ -22,10 +22,13 @@ exports.defaultFilter = filename => {
 
 // normalize windows paths to unix paths
 exports.normalizePath = relname => {
+  if (relname.includes('#') || relname.includes('?')) {
+    throw new Error(`Invalid filename ${relname}. Deployed filenames cannot contain # or ? characters`)
+  }
   return (
     relname
       .split(path.sep)
-      // .map(segment => encodeURIComponent(segment)) // TODO Messes up for paths with @ in them
+      // .map(segment => encodeURI(segment)) // TODO I'm fairly certain we shouldn't encodeURI here, thats only for the file upload step
       .join('/')
   )
 }