solid-server 5.6.14 → 5.6.18

package/common/css/solid.css

@@ -1,3 +1,90 @@
+  .index-page {
+    background-color: #f8f8f8;
+    font-size: 1em;
+    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  }
+
+  .index-page dt {
+    font-weight: bold;
+  }
+
+  .index-page dd {
+    margin: 0;
+  }
+  
+  .index-page .header {
+    box-shadow: 0px 1px 4px rgba(0,0.0,0.2) !important;
+    -webkit-box-shadow: 0px 1px 4px rgba(0,0.0,0.2) !important;
+    text-align: center !important;
+    color: #7C4DFF;
+    padding: 10px;
+    display: inline-flex;
+    width: 99%;
+  }
+
+  .index-page .header-left {
+    text-align: left;
+    margin-top: 0.67em;
+    width: 19%;
+  }
+
+  .index-page .header-center {
+    margin: auto;
+  }
+
+  @media screen and (max-width: 1000px) {
+    .header-right {
+      display: block !important;
+    }
+  }
+
+  .header-right {
+    display: inline-flex;
+    margin-top: 0.67em;
+    min-width: 19%;
+  }
+
+  .index-page .logo-img {
+    width: 50px;
+  }
+  
+  .index-page .title {
+      color: #7C4DFF;
+      font-size: 2em;
+      line-height: 1em;
+  }
+  
+  .index-page .container {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: row wrap;
+    margin: auto;
+    width: 50%;
+    line-height: 1.6;
+  }
+
+  .index-page .content {
+    display: block;
+  }
+
+  .index-page .webId {
+    text-align: center;
+    -webkit-box-shadow: 0px 1px 4px #7C4DFF !important;
+  }
+  
+  .index-page .logo {
+    color: #f8f8f8;
+  }
+
+  .index-page .register-button {
+    padding: 1em; 
+    border-radius:0.5em; 
+    font-size: 100%;
+    background-color: #efe; 
+    margin-right: 1em;
+  }
+
 .panel-login-tls,
 .panel-already-registered{
     text-align: center;

package/common/img/solid-emblem.svg

@@ -0,0 +1,9 @@
+<svg width="352" height="322" xmlns="http://www.w3.org/2000/svg">
+  <g fill-rule="nonzero" fill="none">
+    <path d="M87.97296 282.3527L27.24133 177.02207c-5.62041-9.75765-5.62041-21.77908 0-31.53674L87.97296 40.2328c5.64643-9.78367 16.08061-15.79439 27.32143-15.79439h121.3852c11.26684 0 21.72704 6.01072 27.32143 15.7944l60.75765 105.30458c5.62041 9.75766 5.62041 21.77909 0 31.53674l-60.73163 105.33061c-5.64643 9.78367-16.08061 15.79439-27.32143 15.79439H115.37245c-11.31888-.05204-21.72704-6.08878-27.3995-15.84643z" fill="#FFF"/>
+    <path d="M93.15102 275.19708l-57.1148-99.0597c-5.30816-9.1852-5.30816-20.50408 0-29.66326l57.1148-99.08572c5.33418-9.21122 15.14388-14.85765 25.73418-14.85765h114.2296c10.5903 0 20.42602 5.64643 25.73418 14.85765l57.16684 99.03368c5.30816 9.1852 5.30816 20.50408 0 29.66326L258.875 275.2231c-5.33418 9.21122-15.14388 14.85765-25.73418 14.85765H118.93724c-10.64234 0-20.45204-5.67245-25.78622-14.88367z" fill="#7C4DFF"/>
+    <path d="M118.46888 142.2328h117.53418c1.48316 0 2.65408-1.19695 2.65408-2.65409v-22.03928c0-14.6495-11.89132-26.54085-26.54081-26.54085h-70.56735c-20.5301-.026-37.15722 16.60105-37.15722 37.13115-.02594 7.83214 6.271 14.10306 14.07712 14.10306zM129.99592 239.60116H200.225c21.20663 0 38.43214-17.22551 38.43214-38.43214 0-7.07755-5.72449-12.82806-12.82806-12.82806H106.94184c-1.45715 0-2.55005 1.17091-2.55005 2.55v23.05408c-.02597 14.18112 11.47505 25.65612 25.60413 25.65612z" fill="#F7F7F7"/>
+    <path d="M109.59592 139.3185l87.66275 87.66276c5.80255 5.80255 15.19592 5.80255 20.99847 0l15.19592-15.19592c5.80255-5.80255 5.80255-15.19591 0-20.99847l-87.63673-87.66275c-5.80255-5.80255-15.19592-5.80255-20.99847 0l-15.19592 15.19592c-5.8546 5.80255-5.8546 15.22194-.02602 20.99847z" fill="#F7F7F7"/>
+    <path fill="#444" opacity=".3" d="M198.6898 228.46443l-51.4944-40.12347h11.39695zM144.35918 101.66698l40.56582 40.56581h13.7648z"/>
+  </g>
+</svg>

package/common/js/index-buttons.js

@@ -0,0 +1,41 @@
+'use strict'
+var keyname = 'SolidServerRootRedirectLink';
+function register() { 
+    alert(2); window.location.href = "/register"; 
+}
+document.addEventListener('DOMContentLoaded', async function() {
+    if (!UI.authn.currentUser()) await UI.authn.checkUser();
+    let user = UI.authn.currentUser();
+
+    // IF LOGGED IN: SET SolidServerRootRedirectLink. LOGOUT
+    if( user ) {
+        window.localStorage.setItem(keyname, user.uri);
+        await UI.authn.authSession.logout();
+    }
+    else {
+        let webId = window.localStorage.getItem(keyname);
+
+        // IF NOT LOGGED IN AND COOKIE EXISTS: REMOVE COOKIE, HIDE WELCOME, SHOW LINK TO PROFILE
+        if( webId ) {
+        window.localStorage.removeItem(keyname);
+        document.getElementById('loggedIn').style.display = "block";
+        document.getElementById('loggedIn').innerHTML = `<p>Your WebID is : <a href="${webId}">${webId}</a>.</p> <p>Visit your profile to log into your Pod.</p>`;
+        }
+
+        // IF NOT LOGGED IN AND COOKIE DOES NOT EXIST  
+        //     SHOW WELCOME, SHOW LOGIN BUTTON
+        //     HIDE LOGIN BUTTON, ADD REGISTER BUTTON
+        else {
+        let loginArea = document.getElementById('loginStatusArea');
+        let html = `<input type="button" onclick="window.location.href='/register'" value="Register to get a Pod" class="register-button">`
+        let span = document.createElement("span")
+        span.innerHTML = html
+        loginArea.appendChild(span);
+        loginArea.appendChild(UI.authn.loginStatusBox(document, null, {}))
+        const logInButton = loginArea.querySelectorAll('input')[1];
+        logInButton.value = "Log in to see your WebID";
+        const signUpButton = loginArea.querySelectorAll('input')[2];
+        signUpButton.style.display = "none";
+        }                    
+    }
+})

package/default-templates/server/index.html

@@ -1,108 +1,54 @@
-<!doctype html><html><head>
+<!doctype html>
+<html>
+  <head>
   <meta charset="utf-8"/>
-  <link rel="stylesheet" href="/common/css/bootstrap.min.css">
   <link rel="stylesheet" href="/common/css/solid.css">
-  <script>
-    var keyname = 'SolidServerRootRedirectLink';
-    function register(){ alert(2); window.location.href="/register"; }
-    document.addEventListener('DOMContentLoaded', async function() {
-      if (!UI.authn.currentUser()) await UI.authn.checkUser();
-      let user = UI.authn.currentUser();
-
-// IF LOGGED IN: SET COOKIE. LOGOUT
-//
-      if( user ) {
-        window.localStorage.setItem(keyname,user.uri);
-        await UI.authn.authSession.logout();
-      }
-      else {
-        let webId = window.localStorage.getItem(keyname);
-
-// IF NOT LOGGED IN AND COOKIE EXISTS: REMOVE COOKIE, HIDE WELCOME, SHOW LINK TO PROFILE
-//
-        if( webId ) {
-          window.localStorage.removeItem(keyname);
-          document.getElementById('prototype').style.display = "none";
-          document.getElementById('loggedIn').style.display = "block";
-          document.getElementById('loggedIn').innerHTML = `<p>Your WebID and profile address are</p> <p> &lt;${webId}&gt.</p><a href="${webId}">Visit your profile to log in.</a></div>`;
-        }
-
-// IF NOT LOGGED IN AND COOKIE DOES NOT EXIST  
-//     SHOW WELCOME, SHOW LOGIN BUTTON
-//     HIDE LOGIN BUTTON, ADD REGISTER BUTTON
-//
-        else {
-          let loginArea = document.getElementById('loginStatusArea');
-          document.getElementById('prototype').style.display = "block";
-          let html = `<input type="button" onclick="window.location.href='/register'" value="register" style="padding: 1em; border-radius:0.5em; font-size: 100%;background-color: #efe;">`
-          let span = document.createElement("SPAN")
-          span.innerHTML=html
-          loginArea.appendChild(span);
-          loginArea.appendChild(UI.authn.loginStatusBox(document, null, {}))
-          const signUpButton = loginArea.querySelectorAll('input')[2];
-          signUpButton.style.display="none";
-        }                    
-      }
-    })
-  </script>
-  <link href="/mash.css" rel="stylesheet">
-</head><body class="db-layout">
-
-<h3 style="padding:2em; border:8px solid #7C4DFF; display:none" id="loggedIn" class="container"></h3>
-
-<div id="prototype" class="container">
-
-  <div class="page-header" style="display: inline-flex;">
-     <h1>Welcome to the Solid Prototype</h1>
-       <div id="loginStatusArea" class="pull-right" style="display: inline-flex;float: right;margin: 10px;"></div>
-     
- </div>
-
-  <p class="lead">
-    This is a prototype implementation of a Solid server.
-
-    It is a fully functional server, but there are no security or stability guarantees.
-
-    If you have not already done so, please create an account.
-  </p>
-
-  <section>
-    {{#if serverLogo}}
-    <img src="{{serverLogo}}" /> 
-    {{/if}}
-    <h2>Server info</h2>
-    <dl>
-      <dt>Name</dt>
-      <dd>{{serverName}}</dd>
-      {{#if serverDescription}}
-      <dt>Description</dt>
-      <dd>{{serverDescription}}</dd>
+  </head>
+<body class="index-page">
+  <div class="header">
+    <div class="header-left">
+      {{#if serverLogo}}
+        <img class="logo-img" src="{{serverLogo}}" /> 
       {{/if}}
-      <dt>Details</dt>
-      <dd>Running on <a href="https://github.com/solid/node-solid-server/releases/tag/v{{serverVersion}}">Solid {{serverVersion}}</a></dd>
-    </dl>
-  </section>
-</div>
-  <header class="db-layout__header header" id="PageHeader"></header>
-  <div class="TabulatorOutline db-layout__content" id="DummyUUID" role="main">
-    <table id="outline"></table>
-    <div id="GlobalDashboard"></div>
-  </div><footer class="db-layout__footer" id="PageFooter"></footer>
-  <style>
-  #prototype {
-    margin : 2em;
-    padding : 1em;
-  }
-  #prototype input {
-    margin : 1em;
-    padding : 0.5em !important;
-  }
-  #loginStatusArea {
-    float:right;
-    clear:right;
-    margin-top:-5em;
-  }
-  </style>
+    </div>
+    <div class="header-center">
+      <h1 class="title">Welcome to Solid prototype</h1>
+    </div>
+    <div class="header-right" id="loginStatusArea"></div>
+  </div>
+
+  <div class="container" id="prototype">
+
+    <h3 style="display:none" id="loggedIn" class="webId"></h3>
+
+    <div class="content">
+
+      <p class="lead">
+        This is a prototype implementation of a Solid server.
+        It is a fully functional server, but there are no security or stability guarantees.
+        If you have not already done so, please register.
+      </p>
+    
+      <section>
+        <h2>Server info</h2>
+        <dl>
+          <dt>Name</dt>
+          <dd>{{serverName}}</dd>
+          {{#if serverDescription}}
+          <dt>Description</dt>
+          <dd>{{serverDescription}}</dd>
+          {{/if}}
+          <dt>Details</dt>
+          <dd>Running on <a href="https://github.com/solid/node-solid-server/releases/tag/v{{serverVersion}}">Node Solid Server {{serverVersion}}</a></dd>
+        </dl>
+      </section>
+
+    </div> <!-- end content-->
+
+  </div> <!-- end container-->
 
   <script src="/mashlib.js"></script>
-</body></html> 
+  <script src="/common/js/index-buttons.js"></script>
+
+</body>
+</html> 

package/lib/acl-checker.js

@@ -87,15 +87,27 @@ class ACLChecker {
     }
     let accessDenied = aclCheck.accessDenied(acl.graph, resource, directory, aclFile, agent, modes, agentOrigin, trustedOrigins, originTrustedModes)
 
+    function accessDeniedForAccessTo (mode) {
+      const accessDeniedAccessTo = aclCheck.accessDenied(acl.graph, directory, null, aclFile, agent, [ACL(mode)], agentOrigin, trustedOrigins, originTrustedModes)
+      const accessResult = !accessDenied && !accessDeniedAccessTo
+      accessDenied = accessResult ? false : accessDenied || accessDeniedAccessTo
+      // debugCache('accessDenied result ' + accessDenied)
+    }
     // For create and update HTTP methods
     if ((method === 'PUT' || method === 'PATCH' || method === 'COPY') && directory) {
       // if resource and acl have same parent container,
       // and resource does not exist, then accessTo Append from parent is required
       if (directory.value === dirname(aclFile.value) + '/' && !resourceExists) {
-        const accessDeniedAccessTo = aclCheck.accessDenied(acl.graph, directory, null, aclFile, agent, [ACL('Append')], agentOrigin, trustedOrigins, originTrustedModes)
-        const accessResult = !accessDenied && !accessDeniedAccessTo
-        accessDenied = accessResult ? false : accessDenied || accessDeniedAccessTo
-        // debugCache('accessDenied result ' + accessDenied)
+        accessDeniedForAccessTo('Append')
+      }
+    }
+
+    // For delete HTTP method
+    if ((method === 'DELETE') && directory) {
+      // if resource and acl have same parent container,
+      // then accessTo Write from parent is required
+      if (directory.value === dirname(aclFile.value) + '/') {
+        accessDeniedForAccessTo('Write')
       }
     }
     if (accessDenied && user) {

package/lib/handlers/patch/n3-patch-parser.js

@@ -20,16 +20,26 @@ async function parsePatchDocument (targetURI, patchURI, patchText) {
 
   // Query the N3 document for insertions and deletions
   let firstResult
-  try {
+  try { // solid/protocol v0.9.0
     firstResult = await queryForFirstResult(patchGraph, `${PREFIXES}
     SELECT ?insert ?delete ?where WHERE {
-      ?patch solid:patches <${targetURI}>.
+      ?patch a solid:InsertDeletePatch.
       OPTIONAL { ?patch solid:inserts ?insert. }
       OPTIONAL { ?patch solid:deletes ?delete. }
       OPTIONAL { ?patch solid:where   ?where.  }
     }`)
   } catch (err) {
-    throw error(400, `No patch for ${targetURI} found.`, err)
+    try { // deprecated, kept for compatibility
+      firstResult = await queryForFirstResult(patchGraph, `${PREFIXES}
+      SELECT ?insert ?delete ?where WHERE {
+        ?patch solid:patches <${targetURI}>.
+        OPTIONAL { ?patch solid:inserts ?insert. }
+        OPTIONAL { ?patch solid:deletes ?delete. }
+        OPTIONAL { ?patch solid:where   ?where.  }
+      }`)
+    } catch (err) {
+      throw error(400, 'No n3-patch found.', err)
+    }
   }
 
   // Return the insertions and deletions as an rdflib patch document

package/lib/handlers/post.js

@@ -1,6 +1,6 @@
 module.exports = handler
 
-const Busboy = require('busboy')
+const Busboy = require('@fastify/busboy')
 const debug = require('debug')('solid:post')
 const path = require('path')
 const header = require('../header')

package/lib/header.js

@@ -66,7 +66,8 @@ async function linksHandler (req, res, next) {
     return next(error(404, 'Trying to access metadata file as regular file'))
   }
   const fileMetadata = new metadata.Metadata()
-  if (filename.endsWith('/')) {
+  if (req.path.endsWith('/')) {
+    // do not add storage header in serverUri
     if (req.path === '/') fileMetadata.isStorage = true
     fileMetadata.isContainer = true
     fileMetadata.isBasicContainer = true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-server",
   "description": "Solid server on top of the file-system",
-  "version": "5.6.14",
+  "version": "5.6.18",
   "author": {
     "name": "Tim Berners-Lee",
     "email": "timbl@w3.org"
@@ -45,6 +45,10 @@
       "name": "Arne Hassel",
       "email": "arne.hassel@inrupt.com",
       "url": "https://icanhasweb.net/"
+    },
+    {
+      "name": "Alain Bourgeois",
+      "url": "https://github.com/bourgeoa/"
     }
   ],
   "license": "MIT",
@@ -55,21 +59,21 @@
   "homepage": "https://github.com/solid/node-solid-server",
   "bugs": "https://github.com/solid/node-solid-server/issues",
   "dependencies": {
+    "@fastify/busboy": "^1.0.0",
     "@solid/acl-check": "^0.4.5",
     "@solid/oidc-auth-manager": "^0.24.1",
     "@solid/oidc-op": "0.11.5",
     "async-lock": "^1.3.0",
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.19.1",
     "bootstrap": "^3.4.1",
-    "busboy": "^0.3.1",
     "cached-path-relative": "^1.0.2",
     "camelize": "^1.0.0",
     "cheerio": "^1.0.0-rc.10",
     "colorette": "^2.0.16",
     "commander": "^8.3.0",
     "cors": "^2.8.5",
-    "debug": "^4.3.2",
-    "express": "^4.17.1",
+    "debug": "^4.3.3",
+    "express": "^4.17.2",
     "express-handlebars": "^5.3.4",
     "express-session": "^1.17.2",
     "extend": "^3.0.2",
@@ -85,15 +89,16 @@
     "ip-range-check": "0.2.0",
     "is-ip": "^3.1.0",
     "li": "^1.3.0",
-    "mashlib": "^1.7.9",
-    "mime-types": "^2.1.33",
+    "mashlib": "^1.7.16",
+    "mime-types": "^2.1.34",
     "negotiator": "^0.6.2",
     "node-fetch": "^2.6.6",
     "node-forge": "^0.10.0",
-    "nodemailer": "^6.7.0",
+    "node-mailer": "^0.1.1",
+    "nodemailer": "^6.7.2",
     "oidc-op-express": "^0.0.3",
     "owasp-password-strength-test": "^1.3.0",
-    "rdflib": "^2.2.10",
+    "rdflib": "^2.2.15",
     "recursive-readdir": "^2.2.2",
     "request": "^2.88.2",
     "rimraf": "^3.0.2",
@@ -118,14 +123,14 @@
     "eslint": "^7.32.0",
     "localstorage-memory": "1.0.3",
     "mocha": "9.1.3",
-    "nock": "13.1.4",
+    "nock": "^13.2.1",
     "node-mocks-http": "1.11.0",
     "nyc": "15.1.0",
     "pre-commit": "1.2.2",
     "randombytes": "2.1.0",
     "sinon": "12.0.1",
     "sinon-chai": "3.7.0",
-    "snyk": "1.752.0",
+    "snyk": "^1.809.0",
     "standard": "16.0.4",
     "supertest": "6.1.6",
     "turtle-validator": "1.1.1",

package/default-views/account/register-form-ori.hbs

@@ -1,134 +0,0 @@
-<div class="row">
-  <div class="col-md-6">
-    <div class="panel panel-default">
-      <div class="panel-body">
-        <form method="post" action="/api/accounts/new" id="RegisterForm">
-          {{> shared/error}}
-
-          <div class="form-group">
-            <label class="control-label" for="username">Username*</label>
-            <input type="text" class="form-control" name="username" id="username" placeholder="alice"
-                   required value="{{username}}"/>
-
-	    {{#if multiuser}}
-	    <p>Your username should be a lower-case word with only
-	    letters a-z and numbers 0-9 and without periods.</p>
-	    <p>Your public Solid POD URL will be:
-	    <tt>https://<span class="editable-username">alice</span>.<script type="text/javascript">
-              document.write(window.location.host)
-	    </script></tt></p>
-	    <p>Your public Solid WebID will be:
-	    <tt>https://<span class="editable-username">alice</span>.<script type="text/javascript">
-              document.write(window.location.host)
-	    </script>/profile/card#me</tt></p>
-
-	    <p>Your <em>POD URL</em> is like the homepage for your Solid
-	    pod. By default, it is readable by the public, but you can
-	    always change that if you like by changing the access
-	    control.</p>
-
-	    <p>Your <em>Solid WebID</em> is your globally unique name
-	    that you can use to identify and authenticate yourself with
-	    other PODs across the world.</p>
-	    {{/if}}
-
-	  </div>
-
-          <div class="form-group has-feedback">
-            <label class="control-label" for="password">Password*</label>
-            <input type="password" class="form-control control-progress{{#if disablePasswordStrengthCheck}} disable-password-strength-check{{/if}}" name="password" id="password" required/>
-            <span class="glyphicon glyphicon-remove form-control-feedback hidden" aria-hidden="true"></span>
-            <div class="progress">
-              <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="4"></div>
-            </div>
-            <div class="help-block"></div>
-          </div>
-
-
-          <div class="form-group has-feedback">
-            <label class="control-label" for="repeat_password">Repeat password*</label>
-            <input type="password" class="form-control" name="repeat_password" id="repeat_password" required/>
-            <span class="glyphicon glyphicon-remove form-control-feedback hidden"></span>
-          </div>
-
-
-          <div class="form-group">
-            <label class="control-label" for="name">Name*</label>
-            <input type="text" class="form-control" name="name" id="name" required value="{{name}}"/>
-          </div>
-
-          <div class="form-group">
-            <label class="control-label" for="email">Email*</label>
-            <input type="email" class="form-control" name="email" id="email" value="{{email}}"/>
-            <span class="help-block">Your email will only be used for account recovery</span>
-          </div>
-
-          {{#if enforceToc}}
-            {{#if tocUri}}
-              <div class="checkbox">
-                <label>
-                  <input type="checkbox" name="acceptToc" value="true" {{#if acceptToc}}checked{{/if}}>
-                  I agree to the <a href="{{tocUri}}" target="_blank">Terms &amp; Conditions</a> of this service
-                </label>
-              </div>
-            {{/if}}
-          {{/if}}
-
-
-          <button type="submit" class="btn btn-primary" id="register">Register</button>
-
-          <input type="hidden" name="returnToUrl" value="{{returnToUrl}}"/>
-          {{> auth/auth-hidden-fields}}
-
-        </form>
-      </div>
-    </div>
-  </div>
-
-  <!-- deprecated with inrupt/solid-client-auth
-  <div class="col-md-6">
-    <div class="panel panel-default panel-already-registered">
-      <div class="panel-body">
-        <h2>Already have an account?</h2>
-        <p>
-          <a class="btn btn-lg btn-success" href="{{{loginUrl}}}">
-            Please Log In
-          </a>
-        </p>
-      </div>
-    </div>
-  </div>
-  --->
-</div>
-
-<script src="/common/js/owasp-password-strength-test.js" defer></script>
-<script src="/common/js/text-encoder-lite.min.js" defer></script>
-<script src="/common/js/solid.js" defer></script>
-
-<script>
-  var username = document.getElementById('username');
-  username.onkeyup = function() {
-    var list = document.getElementsByClassName('editable-username');
-      for (let item of list) {
-      item.innerHTML = username.value.toLowerCase()
-    }
-  }
-
-  window.addEventListener('DOMContentLoaded', function () {
-    var connect = document.getElementById('ConnectExternalWebId')
-    var container = document.getElementById('ExternalWebId')
-    container.classList.toggle('hidden', !connect.checked)
-    connect.addEventListener('change', function () {
-      container.classList.toggle('hidden', !connect.checked)
-    })
-
-    var form = document.getElementById('RegisterForm')
-    var externalWebIdField = document.getElementById('externalWebId')
-    form.addEventListener('submit', function () {
-      if (!connect.checked) {
-        externalWebIdField.value = ''
-      }
-    })
-  })
-</script>
-