Merge pull request #1156 from solid/fix/#1120

Fix/#1120

Author: jaxoncreed

README.md

@@ -104,7 +104,7 @@ $ solid start
 Otherwise, if you want to use flags, this would be the equivalent
 
 ```bash
-$ solid start --multiuser --port 8443 --cert /path/to/cert --key /path/to/key --root ./data
+$ solid start --multiuser --port 8443 --ssl-cert /path/to/cert --ssl-key /path/to/key --root ./data
 ```
 
 Your users will have a dedicated folder under `./data` at `./data/<username>.<yourdomain.tld>`. Also, your root domain's website will be in `./data/<yourdomain.tld>`. New users can create accounts on `/api/accounts/new` and create new certificates on `/api/accounts/cert`. An easy-to-use sign-up tool is found on `/api/accounts`.

lib/handlers/get.js

@@ -39,7 +39,8 @@ async function handler (req, res, next) {
     'path': path,
     'includeBody': includeBody,
     'possibleRDFType': possibleRDFType,
-    'range': req.headers.range
+    'range': req.headers.range,
+    'contentType': req.headers.accept
   }
 
   let ret

lib/ldp.js

@@ -329,7 +329,9 @@ class LDP {
   async get (options, searchIndex = true) {
     let path, contentType, stats
     try {
-      ({ path, contentType } = await this.resourceMapper.mapUrlToFile({ url: options, searchIndex }))
+      ({ path, contentType } = await this.resourceMapper.mapUrlToFile({
+        url: options, contentType: options.contentType, searchIndex
+      }))
       stats = await this.stat(path)
     } catch (err) {
       throw error(404, 'Can\'t find file requested: ' + options)

lib/resource-mapper.js

@@ -55,7 +55,6 @@ class ResourceMapper {
       }
       fullPath += this._indexFilename
     }
-
     // Create the path for a new file
     if (createIfNotExists) {
       path = fullPath
@@ -71,6 +70,14 @@ class ResourceMapper {
 
       // Find a file with the same name (minus the dollar extension)
       let match = searchIndex ? await this._getMatchingFile(folder, filename, isIndex) : ''
+      // Do not match with html if the content type won't allow it
+      if (
+        contentType &&
+        !(contentType.includes('text/html') || contentType.includes('*/*')) &&
+        match === this._indexFilename
+      ) {
+        match = ''
+      }
       if (match === undefined) {
         // Error if no match was found,
         // unless the URL ends with a '/',