diff --git a/dbrepo-gateway-service/dbrepo.conf b/dbrepo-gateway-service/dbrepo.conf index 944cab09389f49ea3991def5782d61cab7038c9e..38f846d0c67eeff3e0f9c885d0a4287bf33d00ed 100644 --- a/dbrepo-gateway-service/dbrepo.conf +++ b/dbrepo-gateway-service/dbrepo.conf @@ -87,6 +87,8 @@ server { } location /api/upload { +# allow 128.130.0.0/16; +# deny all; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/dbrepo-ui/api/upload.service.js b/dbrepo-ui/api/upload.service.js index 40362959068b85bad15f3f7b0df9e85b53240083..c5499bbc07efcd628a0c5b6292617d8b9e53c1c4 100644 --- a/dbrepo-ui/api/upload.service.js +++ b/dbrepo-ui/api/upload.service.js @@ -7,6 +7,11 @@ class UploadService { return new Promise((resolve, reject) => { const protocol = config.api.useSsl ? 'https' : 'http' const baseUrl = `${protocol}://${config.api.endpoint}:${config.api.port}` + if (!tus.isSupported) { + console.error('Your browser does not support uploads!') + Vue.$toast.error('Your browser does not support uploads!') + return + } const upload = new tus.Upload(file, { endpoint: `${baseUrl}/api/upload/files`, retryDelays: [0, 3000, 5000, 10000, 20000], diff --git a/dbrepo-ui/pages/database/_database_id/table/import.vue b/dbrepo-ui/pages/database/_database_id/table/import.vue index dfd826ba9ecaa0a1076a94261c2c90d6bba75c81..fdcf96391eba222149d97577ebc72be0c74086f5 100644 --- a/dbrepo-ui/pages/database/_database_id/table/import.vue +++ b/dbrepo-ui/pages/database/_database_id/table/import.vue @@ -341,7 +341,7 @@ export default { }) .catch((error) => { this.loading = false - this.$toast.error(`Failed to upload file: ${error}`) + this.$toast.error('Failed to upload file') reject(error) }) .finally(() => {