Improve error handling on upload (#126)

* Improve error handling on upload * Lint love
eik-lib · May 8, 2020 · 8eb52f6 · 8eb52f6
1 parent 6d21a86
commit 8eb52f6
Show file tree

Hide file tree

Showing 24 changed files with 565 additions and 236 deletions.
diff --git a/examples/pkg.alias.put.js b/examples/pkg.alias.put.js
@@ -23,11 +23,11 @@ const put = async (address) => {
     const auth = await authenticate(address);
 
     const formData = new FormData();
-    formData.append('version', '8.4.1');
+    formData.append('version', '1.2.1');
 
     const headers = {'Authorization': `Bearer ${auth.token}`, ...formData.getHeaders()};
 
-    const res = await fetch(`${address}/pkg/fuzz/v8`, {
+    const res = await fetch(`${address}/npm/lit-html/v1`, {
         method: 'PUT',
         body: formData,
         headers,

diff --git a/examples/pkg.put.js b/examples/pkg.put.js
@@ -24,11 +24,11 @@ const put = async (address) => {
     const auth = await authenticate(address);
 
     const formData = new FormData();
-    formData.append('package', fs.createReadStream('../fixtures/archive.tgz'));
+    formData.append('package', fs.createReadStream('./lit-html.tar'));
 
     const headers = {'Authorization': `Bearer ${auth.token}`, ...formData.getHeaders()};
 
-    const res = await fetch(`${address}/pkg/fuzz/8.4.1`, {
+    const res = await fetch(`${address}/npm/lit-html/1.2.1`, {
         method: 'PUT',
         body: formData,
         headers,

diff --git a/fixtures/package.tar b/fixtures/package.tar
diff --git a/fixtures/package.tar.bz2 b/fixtures/package.tar.bz2
diff --git a/fixtures/package.tar.gz b/fixtures/package.tar.gz
diff --git a/lib/classes/asset.js b/lib/classes/asset.js
@@ -21,7 +21,7 @@ const Asset = class Asset {
         type = '',
         org = '',
     } = {}) {
-        this._mimeType = mime.getType(pathname) || '';
+        this._mimeType = mime.getType(pathname) || 'application/octet-stream';
         this._type = type.toLowerCase();
         this._size = -1;
 

diff --git a/lib/handlers/alias.delete.js b/lib/handlers/alias.delete.js
@@ -49,16 +49,6 @@ const AliasDel = class AliasDel {
     async handler(req, user, type, name, alias) {
         const end = this._histogram.timer();
 
-        const url = originalUrl(req);
-        const org = this._orgRegistry.get(url.hostname);
-
-        if (!org) {
-            this._log.info(`alias:del - Hostname does not match a configured organization - ${url.hostname}`);
-            const e = new HttpError.InternalServerError();
-            end({ labels: { success: false, status: e.status } });
-            throw e;
-        }
-
         try {
             validators.alias(alias);
             validators.name(name);
@@ -70,6 +60,16 @@ const AliasDel = class AliasDel {
             throw e;
         }
 
+        const url = originalUrl(req);
+        const org = this._orgRegistry.get(url.hostname);
+
+        if (!org) {
+            this._log.info(`alias:del - Hostname does not match a configured organization - ${url.hostname}`);
+            const e = new HttpError.InternalServerError();
+            end({ labels: { success: false, status: e.status } });
+            throw e;
+        }
+
         const path = createFilePathToAlias({ org, type, name, alias });
         const exist = await this._exist(path);
         if (!exist) {

diff --git a/lib/handlers/alias.get.js b/lib/handlers/alias.get.js
@@ -42,16 +42,6 @@ const AliasGet = class AliasGet {
     async handler(req, type, name, alias, extra) {
         const end = this._histogram.timer();
 
-        const url = originalUrl(req);
-        const org = this._orgRegistry.get(url.hostname);
-
-        if (!org) {
-            this._log.info(`alias:get - Hostname does not match a configured organization - ${url.hostname}`);
-            const e = new HttpError.InternalServerError();
-            end({ labels: { success: false, status: e.status } });
-            throw e;
-        }
-
         try {
             validators.alias(alias);
             validators.extra(extra);
@@ -64,6 +54,16 @@ const AliasGet = class AliasGet {
             throw e;
         }
 
+        const url = originalUrl(req);
+        const org = this._orgRegistry.get(url.hostname);
+
+        if (!org) {
+            this._log.info(`alias:get - Hostname does not match a configured organization - ${url.hostname}`);
+            const e = new HttpError.InternalServerError();
+            end({ labels: { success: false, status: e.status } });
+            throw e;
+        }
+
         const path = createFilePathToAlias({ org, type, name, alias });
 
         try {

diff --git a/lib/handlers/alias.post.js b/lib/handlers/alias.post.js
@@ -139,16 +139,6 @@ const AliasPost = class AliasPost {
     async handler(req, user, type, name, alias) {
         const end = this._histogram.timer();
 
-        const url = originalUrl(req);
-        const org = this._orgRegistry.get(url.hostname);
-
-        if (!org) {
-            this._log.info(`alias:post - Hostname does not match a configured organization - ${url.hostname}`);
-            const e = new HttpError.InternalServerError();
-            end({ labels: { success: false, status: e.status } });
-            throw e;
-        }
-
         try {
             validators.alias(alias);
             validators.name(name);
@@ -160,6 +150,16 @@ const AliasPost = class AliasPost {
             throw e;
         }
 
+        const url = originalUrl(req);
+        const org = this._orgRegistry.get(url.hostname);
+
+        if (!org) {
+            this._log.info(`alias:post - Hostname does not match a configured organization - ${url.hostname}`);
+            const e = new HttpError.InternalServerError();
+            end({ labels: { success: false, status: e.status } });
+            throw e;
+        }
+
         const author = new Author(user);
 
         const incoming = new HttpIncoming(req, {

diff --git a/lib/handlers/alias.put.js b/lib/handlers/alias.put.js
@@ -139,16 +139,6 @@ const AliasPut = class AliasPut {
     async handler(req, user, type, name, alias) {
         const end = this._histogram.timer();
 
-        const url = originalUrl(req);
-        const org = this._orgRegistry.get(url.hostname);
-
-        if (!org) {
-            this._log.info(`alias:put - Hostname does not match a configured organization - ${url.hostname}`);
-            const e = new HttpError.InternalServerError();
-            end({ labels: { success: false, status: e.status } });
-            throw e;
-        }
-
         try {
             validators.alias(alias);
             validators.name(name);
@@ -160,6 +150,16 @@ const AliasPut = class AliasPut {
             throw e;
         }
 
+        const url = originalUrl(req);
+        const org = this._orgRegistry.get(url.hostname);
+
+        if (!org) {
+            this._log.info(`alias:put - Hostname does not match a configured organization - ${url.hostname}`);
+            const e = new HttpError.InternalServerError();
+            end({ labels: { success: false, status: e.status } });
+            throw e;
+        }
+
         const author = new Author(user);
 
         const incoming = new HttpIncoming(req, {

diff --git a/lib/handlers/map.get.js b/lib/handlers/map.get.js
@@ -43,16 +43,6 @@ const MapGet = class MapGet {
     async handler(req, name, version) {
         const end = this._histogram.timer();
 
-        const url = originalUrl(req);
-        const org = this._orgRegistry.get(url.hostname);
-
-        if (!org) {
-            this._log.info(`map:get - Hostname does not match a configured organization - ${url.hostname}`);
-            const e = new HttpError.InternalServerError();
-            end({ labels: { success: false, status: e.status } });
-            throw e;
-        }
-
         try {
             validators.version(version);
             validators.name(name);
@@ -63,6 +53,16 @@ const MapGet = class MapGet {
             throw e;
         }
 
+        const url = originalUrl(req);
+        const org = this._orgRegistry.get(url.hostname);
+
+        if (!org) {
+            this._log.info(`map:get - Hostname does not match a configured organization - ${url.hostname}`);
+            const e = new HttpError.InternalServerError();
+            end({ labels: { success: false, status: e.status } });
+            throw e;
+        }
+
         const path = createFilePathToImportMap({ org, name, version });
 
         try {

diff --git a/lib/handlers/map.put.js b/lib/handlers/map.put.js
@@ -161,16 +161,6 @@ const MapPut = class MapPut {
     async handler(req, user, name, version) {
         const end = this._histogram.timer();
 
-        const url = originalUrl(req);
-        const org = this._orgRegistry.get(url.hostname);
-
-        if (!org) {
-            this._log.info(`map:put - Hostname does not match a configured organization - ${url.hostname}`);
-            const e = new HttpError.InternalServerError();
-            end({ labels: { success: false, status: e.status } });
-            throw e;
-        }
-
         try {
             validators.version(version);
             validators.name(name);
@@ -181,6 +171,16 @@ const MapPut = class MapPut {
             throw e;
         }
 
+        const url = originalUrl(req);
+        const org = this._orgRegistry.get(url.hostname);
+
+        if (!org) {
+            this._log.info(`map:put - Hostname does not match a configured organization - ${url.hostname}`);
+            const e = new HttpError.InternalServerError();
+            end({ labels: { success: false, status: e.status } });
+            throw e;
+        }
+
         const author = new Author(user);
 
         const incoming = new HttpIncoming(req, {

diff --git a/lib/handlers/pkg.get.js b/lib/handlers/pkg.get.js
@@ -44,16 +44,6 @@ const PkgGet = class PkgGet {
     async handler(req, type, name, version, extra) {
         const end = this._histogram.timer();
 
-        const url = originalUrl(req);
-        const org = this._orgRegistry.get(url.hostname);
-
-        if (!org) {
-            this._log.info(`pkg:get - Hostname does not match a configured organization - ${url.hostname}`);
-            const e = new HttpError.InternalServerError();
-            end({ labels: { success: false, status: e.status } });
-            throw e;
-        }
-
         try {
             validators.version(version);
             validators.extra(extra);
@@ -66,6 +56,16 @@ const PkgGet = class PkgGet {
             throw e;
         }
 
+        const url = originalUrl(req);
+        const org = this._orgRegistry.get(url.hostname);
+
+        if (!org) {
+            this._log.info(`pkg:get - Hostname does not match a configured organization - ${url.hostname}`);
+            const e = new HttpError.InternalServerError();
+            end({ labels: { success: false, status: e.status } });
+            throw e;
+        }
+
         const asset = new Asset({
             pathname: extra,
             version,

diff --git a/lib/handlers/pkg.log.js b/lib/handlers/pkg.log.js
@@ -42,16 +42,6 @@ const PkgLog = class PkgLog {
     async handler(req, type, name, version) {
         const end = this._histogram.timer();
 
-        const url = originalUrl(req);
-        const org = this._orgRegistry.get(url.hostname);
-
-        if (!org) {
-            this._log.info(`pkg:log - Hostname does not match a configured organization - ${url.hostname}`);
-            const e = new HttpError.InternalServerError();
-            end({ labels: { success: false, status: e.status } });
-            throw e;
-        }
-
         try {
             validators.version(version);
             validators.name(name);
@@ -63,6 +53,16 @@ const PkgLog = class PkgLog {
             throw e;
         }
 
+        const url = originalUrl(req);
+        const org = this._orgRegistry.get(url.hostname);
+
+        if (!org) {
+            this._log.info(`pkg:log - Hostname does not match a configured organization - ${url.hostname}`);
+            const e = new HttpError.InternalServerError();
+            end({ labels: { success: false, status: e.status } });
+            throw e;
+        }
+
         const path = createFilePathToPackage({ org, type, name, version });
 
         try {