Merge pull request #53 from digital-land/bugParty

Bug party
digital-land · Feb 6, 2024 · fb4fe14 · fb4fe14
2 parents 513cb39 + 6a53942
commit fb4fe14
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/config/default.yaml b/config/default.yaml
@@ -1,6 +1,6 @@
 port: 5000
 api: {
-    url: https://publish-api.development.digital-land.info,
+    url: https://publish-api.planning.data.gov.uk,
     port: 8082,
     validationEndpoint: /api/dataset/validate/file/request
 }

diff --git a/src/controllers/uploadController.js b/src/controllers/uploadController.js
@@ -32,9 +32,9 @@ class UploadController extends PageController {
       let jsonResult = {}
       try {
         jsonResult = await this.validateFile({
+          ...req.file,
           filePath: req.file.path,
           fileName: req.file.originalname,
-          originalname: req.file.originalname,
           dataset: req.sessionModel.get('dataset'),
           dataSubject: req.sessionModel.get('data-subject'),
           // organisation: 'local-authority-eng:CAT', // ToDo: this needs to be dynamic, not collected in the prototype, should it be?
@@ -94,7 +94,9 @@ class UploadController extends PageController {
       !UploadController.sizeIsValid(datafile) ||
       !UploadController.fileNameIsntTooLong(datafile) ||
       !UploadController.fileNameIsValid(datafile) ||
-      !UploadController.fileNameDoesntContainDoubleExtension(datafile)
+      !UploadController.fileNameDoesntContainDoubleExtension(datafile) ||
+      !UploadController.fileMimeTypeIsValid(datafile) ||
+      !UploadController.fileMimeTypeMatchesExtension(datafile)
     ) {
       return false
     }
@@ -169,7 +171,17 @@ class UploadController extends PageController {
   }
 
   static fileMimeTypeIsValid (datafile) {
-    const allowedMimeTypes = ['text/csv', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/json', 'application/vnd.geo+json', 'application/gml+xml', 'application/gpkg']
+    const allowedMimeTypes = [
+      'text/csv',
+      'application/vnd.ms-excel',
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      'application/json',
+      'application/vnd.geo+json',
+      'application/gml+xml',
+      'application/gpkg',
+      'application/geopackage+sqlite3',
+      'application/octet-stream' // This is a catch all for when the mime type is not recognised
+    ]
     if (!allowedMimeTypes.includes(datafile.mimetype)) {
       return false
     }

diff --git a/test/unit/uploadController.test.js b/test/unit/uploadController.test.js
@@ -73,7 +73,8 @@ describe('UploadController', () => {
       originalname: 'test.csv',
       dataset: 'test',
       dataSubject: 'test',
-      organization: 'local-authority-eng:CAT'
+      organization: 'local-authority-eng:CAT',
+      mimetype: 'text/csv'
     }
 
     const result = await uploadController.validateFile(params)