Merge branch 'master' into dz_oidc

Author: dmitrizagidulin

lib/handlers/get.js

@@ -8,6 +8,7 @@ var S = require('string')
 var async = require('async')
 var Negotiator = require('negotiator')
 const url = require('url')
+const mime = require('mime-types')
 
 var debug = require('debug')('solid:get')
 var debugGlob = require('debug')('solid:glob')
@@ -76,13 +77,20 @@ function handler (req, res, next) {
     }
 
     // Handle fileBrowser and dataBrowser
-    if (requestedType.indexOf('text/html') === 0) {
+    if (requestedType && requestedType.includes('text/html')) {
       if (container && ldp.fileBrowser) {
         var address = req.protocol + '/' + req.get('host') + req.originalUrl
         return res.redirect(303, ldp.fileBrowser + address)
       }
 
-      if (RDFs.indexOf(contentType) >= 0 && !ldp.suppressDataBrowser && ldp.dataBrowserPath) {
+      let mimeTypeByExt = mime.lookup(_path.basename(path))
+      let isHtmlResource = mimeTypeByExt && mimeTypeByExt.includes('html')
+      let useDataBrowser = RDFs.includes(contentType) &&
+        !isHtmlResource &&  // filter out .html which IS an RDF type, but does not use data browser
+        !ldp.suppressDataBrowser &&
+        ldp.dataBrowserPath
+
+      if (useDataBrowser) {
         res.set('Content-Type', 'text/html')
         var defaultDataBrowser = _path.join(__dirname, '../../static/databrowser.html')
         var dataBrowserPath = ldp.dataBrowserPath === 'default' ? defaultDataBrowser : ldp.dataBrowserPath