Chat proof

dist/solid-ui.js

@@ -37875,6 +37875,11 @@ function _getPublicKey() {
 function getPrivateKey(_x2) {
   return _getPrivateKey.apply(this, arguments);
 }
+/**
+ * key container ACL
+ * @param me
+ * @returns aclBody
+ */
 function _getPrivateKey() {
   _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
     var publicKeyDoc, privateKeyDoc, publicKey, privateKey, validPublicKey, del, add, newPublicKey, keyContainer;
@@ -37948,47 +37953,86 @@ function _getPrivateKey() {
   return _getPrivateKey.apply(this, arguments);
 }
 var keyContainerAclBody = function keyContainerAclBody(me) {
-  var aclBody = "\n@prefix : <#>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix key: <./>.\n\n:ReadWrite\n    a acl:Authorization;\n    acl:accessTo key:;\n    acl:agent <".concat(me, ">;\n    acl:mode acl:Read, acl:Write.\n:Read\n    a acl:Authorization;\n    acl:accessTo key:;\n    acl:default key:;\n    acl:agentClass foaf:Agent;\n    acl:mode acl:Read.\n");
+  var aclBody = "\n@prefix : <#>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix key: <./>.\n\n:ReadWrite\n    a acl:Authorization;\n    acl:accessTo key:;\n    acl:default key:;\n    acl:agent <".concat(me, ">;\n    acl:mode acl:Read, acl:Write.\n");
   return aclBody;
 };
+
+/**
+ * Read only ACL
+ * @param keyDoc
+ * @param me
+ * @returns aclBody
+ */
 var keyAclBody = function keyAclBody(keyDoc, me) {
   var keyAgent = 'acl:agentClass foaf:Agent'; // publicKey
   if (me !== null && me !== void 0 && me.length) keyAgent = "acl:agent <".concat(me, ">"); // privateKey
-  var aclBody = "\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n<#Read>\n    a acl:Authorization;\n    ".concat(keyAgent, ";\n    acl:accessTo <").concat(keyDoc.split('/').pop(), ">;\n    acl:mode acl:Read, acl:Control. # NSS issue: missing acl link header with READ only\n");
+  var aclBody = "\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n<#Read>\n    a acl:Authorization;\n    ".concat(keyAgent, ";\n    acl:accessTo <").concat(keyDoc.split('/').pop(), ">;\n    acl:mode acl:Read.\n");
   return aclBody;
 };
+
+/**
+ * set ACL
+ * @param keyDoc
+ * @param aclBody
+ */
 function setAcl(_x3, _x4) {
   return _setAcl.apply(this, arguments);
 }
+/**
+ * delete acl if keydoc exists
+ * create/edit keyDoc
+ * set keyDoc acl
+ */
 function _setAcl() {
   _setAcl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(keyDoc, aclBody) {
-    var keyAclDoc, aclResponse;
+    var keyAclDoc, response, aclResponse;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           _context3.next = 2;
           return _solidLogic.store.fetcher.load(keyDoc);
         case 2:
           // FIXME: check the Why value on this quad:
+          debug.log(_solidLogic.store.statementsMatching($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl')));
           keyAclDoc = _solidLogic.store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'));
           if (keyAclDoc) {
-            _context3.next = 5;
+            _context3.next = 6;
             break;
           }
           throw new Error('Key ACL doc not found!');
-        case 5:
-          _context3.next = 7;
+        case 6:
+          _context3.prev = 6;
+          _context3.next = 9;
+          return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
+        case 9:
+          response = _context3.sent;
+          // this may fail if webId is not an owner
+          debug.log('delete ' + keyAclDoc.value + ' ' + response.status); // should test 404 and 2xx
+          _context3.next = 18;
+          break;
+        case 13:
+          _context3.prev = 13;
+          _context3.t0 = _context3["catch"](6);
+          if (!(_context3.t0.response.status !== 404)) {
+            _context3.next = 17;
+            break;
+          }
+          throw new Error(_context3.t0);
+        case 17:
+          debug.log('delete ' + keyAclDoc.value + ' ' + _context3.t0.response.status); // should test 404 and 2xx
+        case 18:
+          _context3.next = 20;
           return _solidLogic.store.fetcher.webOperation('PUT', keyAclDoc.value, {
             data: aclBody,
             contentType: 'text/turtle'
           });
-        case 7:
+        case 20:
           aclResponse = _context3.sent;
-        case 8:
+        case 21:
         case "end":
           return _context3.stop();
       }
-    }, _callee3);
+    }, _callee3, null, [[6, 13]]);
   }));
   return _setAcl.apply(this, arguments);
 }
@@ -38004,56 +38048,55 @@ function _saveKey() {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _context4.next = 2;
-            return _solidLogic.store.updater.updateMany(del, add);
-          case 2:
-            _context4.next = 4;
             return _solidLogic.store.fetcher.load(keyDoc);
-          case 4:
-            _context4.prev = 4;
+          case 2:
+            _context4.prev = 2;
             // get keyAcldoc
             keyAclDoc = _solidLogic.store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'));
-            if (keyAclDoc) {
-              _context4.next = 8;
+            if (!keyAclDoc) {
+              _context4.next = 17;
               break;
             }
-            throw new Error("".concat(keyDoc, " ACL doc not found!"));
-          case 8:
-            _context4.prev = 8;
-            _context4.next = 11;
+            _context4.prev = 5;
+            _context4.next = 8;
             return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
-          case 11:
+          case 8:
             response = _context4.sent;
             // this may fail if webId is not an owner
             debug.log('delete ' + keyAclDoc.value + ' ' + response.status); // should test 404 and 2xx
-            _context4.next = 20;
+            _context4.next = 17;
             break;
-          case 15:
-            _context4.prev = 15;
-            _context4.t0 = _context4["catch"](8);
+          case 12:
+            _context4.prev = 12;
+            _context4.t0 = _context4["catch"](5);
             if (!(_context4.t0.response.status !== 404)) {
-              _context4.next = 19;
+              _context4.next = 16;
               break;
             }
             throw new Error(_context4.t0);
-          case 19:
+          case 16:
             debug.log('delete ' + keyAclDoc.value + ' ' + _context4.t0.response.status); // should test 404 and 2xx
-          case 20:
+          case 17:
+            _context4.next = 19;
+            return _solidLogic.store.updater.updateMany(del, add);
+          case 19:
+            // or a promise store.updater.update ?
             // create READ only ACL
             aclBody = keyAclBody(keyDoc, me);
-            _context4.next = 23;
+            _context4.next = 22;
             return setAcl(keyDoc, aclBody);
-          case 23:
-            _context4.next = 28;
+          case 22:
+            _context4.next = 27;
             break;
-          case 25:
-            _context4.prev = 25;
-            _context4.t1 = _context4["catch"](4);
+          case 24:
+            _context4.prev = 24;
+            _context4.t1 = _context4["catch"](2);
             throw new Error(_context4.t1);
-          case 28:
+          case 27:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[4, 25], [8, 15]]);
+      }, _callee4, null, [[2, 24], [5, 12]]);
     })();
   });
   return _saveKey.apply(this, arguments);
@@ -47332,8 +47375,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-04-30T18:20:26Z',
-  commit: '2166356d833035248d9cab576a91a9db267c426f',
+  buildTime: '2023-05-01T17:58:14Z',
+  commit: 'eed9bea818c9a1a52b4631274b5251b239530355',
   npmInfo: {
     'solid-ui': '2.4.27',
     npm: '8.19.4',

src/chat/keys.ts

@@ -71,21 +71,16 @@ export async function getPrivateKey (webId: string) {
       await saveKey(publicKeyDoc, del, add)
     }
     const keyContainer = privateKeyDoc.substring(0, privateKeyDoc.lastIndexOf('/') + 1)
-    await setAcl(keyContainer, keyContainerAclBody(webId))
-    /* debug.log('new key pair ' + webId)
-    debug.log('newPrivateKey-1 ' + privateKey)
-    debug.log('newPublicKey-1 ' + publicKey) */
-    /* debug.log('del')
-    debug.log(del)
-    debug.log('add')
-    debug.log(add) */
-    // await store.updater.updateMany(del, add)
-    // TODO create READ ACL's
-    // await setAcl() // depends on which key has been updated
+    await setAcl(keyContainer, keyContainerAclBody(webId)) // includes DELETE and PUT
   }
   return privateKey as string
 }
 
+/**
+ * key container ACL
+ * @param me
+ * @returns aclBody
+ */
 const keyContainerAclBody = (me: string) => {
   const aclBody = `
 @prefix : <#>.
@@ -96,18 +91,19 @@ const keyContainerAclBody = (me: string) => {
 :ReadWrite
     a acl:Authorization;
     acl:accessTo key:;
+    acl:default key:;
     acl:agent <${me}>;
     acl:mode acl:Read, acl:Write.
-:Read
-    a acl:Authorization;
-    acl:accessTo key:;
-    acl:default key:;
-    acl:agentClass foaf:Agent;
-    acl:mode acl:Read.
 `
   return aclBody
 }
 
+/**
+ * Read only ACL
+ * @param keyDoc
+ * @param me
+ * @returns aclBody
+ */
 const keyAclBody = (keyDoc, me) => {
   let keyAgent = 'acl:agentClass foaf:Agent' // publicKey
   if (me?.length) keyAgent = `acl:agent <${me}>` // privateKey
@@ -118,61 +114,68 @@ const keyAclBody = (keyDoc, me) => {
     a acl:Authorization;
     ${keyAgent};
     acl:accessTo <${keyDoc.split('/').pop()}>;
-    acl:mode acl:Read, acl:Control. # NSS issue: missing acl link header with READ only
+    acl:mode acl:Read.
 `
   return aclBody
 }
 
+/**
+ * set ACL
+ * @param keyDoc
+ * @param aclBody
+ */
 async function setAcl (keyDoc, aclBody) {
   // Some servers don't present a Link http response header
-  // if the container doesn't exist yet, so refetch the container
-  // now that it has been created:
+  // if the container doesn't exist yet, so refetch the resource
   await store.fetcher.load(keyDoc)
 
   // FIXME: check the Why value on this quad:
+  debug.log(store.statementsMatching($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl')))
   const keyAclDoc = store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'))
   if (!keyAclDoc) {
     throw new Error('Key ACL doc not found!')
   }
 
-  /* let keyAgent = `acl:agent <${me}>;\n` // privateKey
-  if (!me?.length) keyAgent = `acl:agent <${me}>;\n` + '    acl:agentClass foaf:Agent' // publicKey NSS issue
-  const aclBody = `
-@prefix foaf: <http://xmlns.com/foaf/0.1/>.
-@prefix acl: <http://www.w3.org/ns/auth/acl#>.
-<#Read>
-    a acl:Authorization;
-    acl:agent <${me}>;
-    ${keyAgent};
-    acl:accessTo <${keyDoc.split('/').pop()}>;
-    acl:mode acl:Read, acl:Control. # NSS issue: missing acl link header with READ only
-` */
+  // delete READ only keyAclDoc. This is possible if the webId is an owner
+  try {
+    const response = await store.fetcher.webOperation('DELETE', keyAclDoc.value) // this may fail if webId is not an owner
+    debug.log('delete ' + keyAclDoc.value + ' ' + response.status) // should test 404 and 2xx
+  } catch (err) {
+    if (err.response.status !== 404) { throw new Error(err) }
+    debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx
+  }
+
   const aclResponse = await store.fetcher.webOperation('PUT', keyAclDoc.value, {
     data: aclBody,
     contentType: 'text/turtle'
   })
 }
 
+/**
+ * delete acl if keydoc exists
+ * create/edit keyDoc
+ * set keyDoc acl
+ */
 async function saveKey (keyDoc, del, add, me = '') {
-  // save key
-  await store.updater.updateMany(del, add) // or a promise store.updater.update ?
   await store.fetcher.load(keyDoc)
-
+  // delete keyAclDoc
   try {
     // get keyAcldoc
     const keyAclDoc = store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'))
-    if (!keyAclDoc) {
-      throw new Error(`${keyDoc} ACL doc not found!`)
-    }
-    // delete READ only keyAclDoc. This is possible if the webId is an owner
-    try {
-      const response = await store.fetcher.webOperation('DELETE', keyAclDoc.value) // this may fail if webId is not an owner
-      debug.log('delete ' + keyAclDoc.value + ' ' + response.status) // should test 404 and 2xx
-    } catch (err) {
-      if (err.response.status !== 404) { throw new Error(err) }
-      debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx
+    if (keyAclDoc) {
+      // delete READ only keyAclDoc. This is possible if the webId is an owner
+      try {
+        const response = await store.fetcher.webOperation('DELETE', keyAclDoc.value) // this may fail if webId is not an owner
+        debug.log('delete ' + keyAclDoc.value + ' ' + response.status) // should test 404 and 2xx
+      } catch (err) {
+        if (err.response.status !== 404) { throw new Error(err) }
+        debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx
+      }
     }
 
+    // save key
+    await store.updater.updateMany(del, add) // or a promise store.updater.update ?
+
     // create READ only ACL
     const aclBody = keyAclBody(keyDoc, me)
     await setAcl(keyDoc, aclBody)