Merge pull request #1064 from joachimvh/release/v5.0.0

Release/v5.0.0

Author: kjetilk

CHANGELOG.md

@@ -50,6 +50,13 @@
     This fixes many of the old Content-Type-related bugs.
     _More information: https://www.w3.org/DesignIssues/HTTPFilenameMapping.html_
 
+## 4.4.0
+
+- Introduce a quota system. Delete the /settings/serverSide.ttl in the
+  user's POD to disable, or edit to fit your resource constraints.
+
+#### Changelog is incomplete for much of the 4.x series
+
 ## 4.1.0
 
 - Add support for Group Access Control Lists.

CONTRIBUTORS.md

@@ -0,0 +1,36 @@
+# Contributors to the solid-server npm module
+
+The Solid community wants to acknowledge the hard work and dedication put in by many people, several of whom are listed below.
+
+Please [let us know](https://github.com/solid/node-solid-server/edit/master/CONTRIBUTORS.md) if anyone is missing from this list, or if you wish to add yourself.
+
+## Project lead
+- [Tim Berners-Lee](https://www.w3.org/People/Berners-Lee/)
+
+## Current code contributors
+People with significant code contributions over the past couple of months, in alphabetical order:
+
+- [Arne Hassel](http://icanhasweb.net/)
+- [Kjetil Kjernsmo](http://kjetil.kjernsmo.net/)
+- [Ruben Taelman](https://www.rubensworks.net/)
+
+## Previous code contributors
+People with significant code contributions further in the past, in alphabetical order:
+
+- [Nicola Greco](https://nicola.io/)
+- [Martin Martinez Rivera](https://github.com/martinmr)
+- [Andrei Sambra](https://deiu.me/)
+- [Ruben Verborgh](https://ruben.verborgh.org/)
+- [Dmitri Zagidulin](http://computingjoy.com/)
+
+## Project contributors
+People who have significantly contributed to issues, testing, and/or discussions, in alphabetical order:
+- [Justin Bingham](https://github.com/justinwb)
+- [Sarven Capadisli](http://csarven.ca/)
+- [Melvin Carvalho](https://melvincarvalho.com/)
+- [Amy Guy](https://rhiaro.co.uk/)
+- [Kingsley Idehen](https://github.com/kidehen)
+
+## Community contributors
+Thanks to everyone who has tried solid-server, discussed about it, created issues and/or pull requests.
+Your input is necessary to help Solid grow!

EXAMPLES.md

@@ -1,6 +1,8 @@
 The MIT License (MIT)
 
-Copyright © 2014 
+Copyright © 2014–present Arne Hassel, Nicola Greco, Kjetil Kjernsmo,
+Martin Martinez Rivera, Andrei Sambra, Ruben Taelman, Ruben Verborgh,
+and Dmitri Zagidulin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -15,8 +17,7 @@ copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

LICENSE renamed to LICENSE.md

@@ -104,7 +104,7 @@ $ solid start
 Otherwise, if you want to use flags, this would be the equivalent
 
 ```bash
-$ solid --multiuser --port 8443 --cert /path/to/cert --key /path/to/key --root ./data
+$ solid start --multiuser --port 8443 --cert /path/to/cert --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`.
@@ -286,7 +286,7 @@ for more complex ones
 
 ##### Simple Example
 
-You can create an `solid` server ready to use using `solid.createServer(opts)`
+You can create a `solid` server ready to use using `solid.createServer(opts)`
 
 ```javascript
 var solid = require('solid-server')
@@ -402,64 +402,12 @@ it. It is currently adviceable to remove it or set it inactive rather
 than set a large quota, because the current implementation will impair
 write performance if there is a lot of data.
 
-## Contributing
-
-`solid` is has been made possible due to contributions from many individuals, these are some of the key contributors:
-
-<table>
-  <tbody>
-    <tr>
-      <th align="left">Tim Berners-Lee</th>
-      <td><a href="https://github.com/timbl">GitHub/timbl</a></td>
-      <td><a href="http://twitter.com/timberners_lee">Twitter/@timberners_lee</a></td>
-      <td><a href="https://www.w3.org/People/Berners-Lee/card#i">WebID</a></td>
-    </tr>
-    <tr>
-      <th align="left">Nicola Greco</th>
-      <td><a href="https://github.com/nicola">GitHub/nicola</a></td>
-      <td><a href="http://twitter.com/nicolagreco">Twitter/@nicolagreco</a></td>
-      <td><a href="https://nicola.databox.me/profile/card#me">WebID</a></td>
-    </tr>
-    <tr>
-      <th align="left">Martin Martinez Rivera</th>
-      <td><a href="https://github.com/martinmr">GitHub/martinmr</a></td>
-      <td></td>
-      <td></td>
-    </tr>
-    <tr>
-      <th align="left">Andrei Sambra</th>
-      <td><a href="https://github.com/deiu">GitHub/deiu</a></td>
-      <td><a href="http://twitter.com/deiu">Twitter/@deiu</a></td>
-      <td><a href="https://deiu.me/profile#me">WebID</a></td>
-    </tr>
-    <tr>
-      <th align="left">Dmitri Zagidulin</th>
-      <td><a href="https://github.com/dmitrizagidulin/">GitHub/dmitrizagidulin</a></td>
-      <td><a href="https://twitter.com/codenamedmitri">Twitter/@codenamedmitri</a></td>
-      <td></td>
-    </tr>
-    <tr>
-      <th align="left">Ruben Verborgh</th>
-      <td><a href="https://github.com/RubenVerborgh/">GitHub/RubenVerborgh</a></td>
-      <td><a href="https://twitter.com/RubenVerborgh">Twitter/@RubenVerborgh</a></td>
-      <td><a href="https://ruben.verborgh.org/profile/#me">WebID</a></td>
-    </tr>
-    <tr>
-      <th align="left">Kjetil Kjernsmo</th>
-      <td><a href="https://github.com/kjetilk">GitHub/kjetilk</a></td>
-      <td><a href="https://twitter.com/KKjernsmo">Twitter/@KKjernsmo</a></td>
-      <td><a href="https://solid.kjernsmo.net/profile/card#me">WebID</a></td>
-    </tr>
-    <tr>
-      <th align="left">Justin Bingham</th>
-      <td><a href="https://github.com/justinwb">GitHub/justinwb</a></td>
-      <td><a href="https://twitter.com/justinwb">Twitter/@justinwb</a></td>
-      <td><a href="https://justin.janeirodigital.exchange/profile/card#me">WebID</a></td>
-    </tr>
-  </tbody>
-</table>
-
-#### Do you want to contribute?
+## Contribute to Solid
+
+Solid is only possible because of a large community of [contributors](https://github.com/solid/node-solid-server/blob/master/CONTRIBUTORS.md).
+A heartfelt thank you to everyone for all of your efforts!
+
+You can help us too:
 
 - [Join us in Gitter](https://gitter.im/solid/chat) to help with development or to hang out with us :)
 - [Create a new issue](https://github.com/solid/node-solid-server/issues/new) to report bugs
@@ -469,4 +417,4 @@ Have a look at [CONTRIBUTING.md](https://github.com/solid/node-solid-server/blob
 
 ## License
 
-MIT
+[The MIT License](https://github.com/solid/node-solid-server/blob/master/LICENSE.md)

README.md

@@ -4,6 +4,7 @@ const path = require('path')
 const debug = require('debug')('solid:index')
 const Negotiator = require('negotiator')
 const url = require('url')
+const URI = require('urijs')
 
 async function handler (req, res, next) {
   const indexFile = 'index.html'
@@ -20,7 +21,7 @@ async function handler (req, res, next) {
     }
     // redirect to the right container if missing trailing /
     if (req.path.lastIndexOf('/') !== req.path.length - 1) {
-      return res.redirect(301, req.path + '/')
+      return res.redirect(301, URI.joinPaths(req.path, '/').toString())
     }
 
     if (requestedType && requestedType.indexOf('text/html') !== 0) {

lib/handlers/index.js

@@ -16,6 +16,7 @@ const ldpContainer = require('./ldp-container')
 const parse = require('./utils').parse
 const fetch = require('node-fetch')
 const { promisify } = require('util')
+const URI = require('urijs')
 
 const RDF_MIME_TYPES = new Set([
   'text/turtle',            // .ttl
@@ -454,13 +455,13 @@ class LDP {
       // Verify whether the new path already exists
       return self.exists(host, newPath).then(
         // If it does, generate another one
-        () => ensureNotExists(self, path.join(containerURI,
-                `${uuid.v1().split('-')[0]}-${filename}`)),
+        () => ensureNotExists(self, URI.joinPaths(containerURI,
+                `${uuid.v1().split('-')[0]}-${filename}`).toString()),
         // If not, we found an appropriate path
         () => newPath
       )
     }
-    return ensureNotExists(this, path.join(containerURI, filename))
+    return ensureNotExists(this, URI.joinPaths(containerURI, filename).toString())
   }
 
   static mimeTypeIsRdf (mimeType) {

lib/ldp.js

@@ -93,7 +93,8 @@ class ResourceMapper {
   // Maps a given server file to a URL
   async mapFileToUrl ({ path, hostname }) {
     // Determine the URL by chopping off everything after the dollar sign
-    const pathname = this._removeDollarExtension(path.substring(this._rootPath.length))
+    let pathname = this._removeDollarExtension(path.substring(this._rootPath.length))
+    pathname = this._replaceBackslashes(pathname)
     const url = `${this.resolveUrl(hostname)}${encodeURI(pathname)}`
     return { url, contentType: this._getContentTypeByExtension(path) }
   }
@@ -152,6 +153,10 @@ class ResourceMapper {
     const dollarPos = path.lastIndexOf('$')
     return dollarPos < 0 ? path : path.substr(0, dollarPos)
   }
+
+  _replaceBackslashes (path) {
+    return path.replace(/\\/g, '/')
+  }
 }
 
 module.exports = ResourceMapper