solid-ui 2.4.27-dc50c4e2 → 2.4.27-e6d67dd8

package/lib/chat/keys.d.ts

@@ -1,5 +1,5 @@
 export declare function generatePrivateKey(): string;
 export declare function generatePublicKey(privateKey: string): string;
-export declare function getPublicKey(webId: any): string | undefined;
+export declare function getPublicKey(webId: any): Promise<string | undefined>;
 export declare function getPrivateKey(webId: string): Promise<string>;
 //# sourceMappingURL=keys.d.ts.map

package/lib/chat/keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/chat/keys.ts"],"names":[],"mappings":"AAQA,wBAAgB,kBAAkB,IAAK,MAAM,CAE5C;AAED,wBAAgB,iBAAiB,CAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,YAAY,CAAE,KAAK,KAAA,sBAGlC;AAsDD,wBAAsB,aAAa,CAAE,KAAK,EAAE,MAAM,mBAoCjD"}
+{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/chat/keys.ts"],"names":[],"mappings":"AAQA,wBAAgB,kBAAkB,IAAK,MAAM,CAE5C;AAED,wBAAgB,iBAAiB,CAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAsB,YAAY,CAAE,KAAK,KAAA,+BAaxC;AAED,wBAAsB,aAAa,CAAE,KAAK,EAAE,MAAM,mBAqDjD"}

package/lib/chat/keys.js

@@ -17,6 +17,7 @@ var _utils = require("@noble/hashes/utils");
 var _signature = require("./signature");
 var _solidLogic = require("solid-logic");
 var $rdf = _interopRequireWildcard(require("rdflib"));
+var _cryptoKeyHelpers = require("../utils/cryptoKeyHelpers");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function generatePrivateKey() {
@@ -25,133 +26,102 @@ function generatePrivateKey() {
 function generatePublicKey(privateKey) {
   return (0, _utils.bytesToHex)(_secp256k.schnorr.getPublicKey(privateKey));
 }
-function getPublicKey(webId) {
-  var publicKey = publicKeyExists(webId);
-  return publicKey;
+function getPublicKey(_x) {
+  return _getPublicKey.apply(this, arguments);
 }
-function publicKeyExists(webId) {
-  // find publickey
-  var url = new URL(webId);
-  url.hash = '';
-  /* debug.warn('Alain publicKeyExists')
-  debug.warn(webId)
-  debug.warn(url.href) */
-  _solidLogic.store.fetcher.load(url.href);
-  var publicKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PublicKey'));
-  return publicKey === null || publicKey === void 0 ? void 0 : publicKey.value; // as NamedNode
-}
-
-var privKeyUrl = function privKeyUrl(webId) {
-  var url = new URL(webId);
-  var privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl';
-  return privateKeyUrl;
-};
-function privateKeyExists(_x) {
-  return _privateKeyExists.apply(this, arguments);
-}
-function _privateKeyExists() {
-  _privateKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
-    var privateKeyUrl, privateKey, _err$response, data, contentType, response;
+function _getPublicKey() {
+  _getPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
+    var publicKeyDoc, key;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          /* const url = new URL(webId)
-          const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */
-          privateKeyUrl = privKeyUrl(webId);
-          /* debug.warn('Alain privateKeyExists')
-          debug.warn(webId)
-          debug.warn(privateKeyUrl) */
-          _context.prev = 1;
-          _solidLogic.store.fetcher.load(privateKeyUrl);
-          privateKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PrivateKey'));
-          return _context.abrupt("return", privateKey === null || privateKey === void 0 ? void 0 : privateKey.value);
-        case 7:
-          _context.prev = 7;
-          _context.t0 = _context["catch"](1);
-          if (!((_context.t0 === null || _context.t0 === void 0 ? void 0 : (_err$response = _context.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) === 404)) {
-            _context.next = 24;
-            break;
-          }
+          _context.next = 2;
+          return _solidLogic.store.fetcher.load(webId);
+        case 2:
+          publicKeyDoc = (0, _cryptoKeyHelpers.pubKeyUrl)(webId);
+          _context.prev = 3;
+          _context.next = 6;
+          return _solidLogic.store.fetcher.load(publicKeyDoc);
+        case 6:
+          // url.href)
+          key = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PublicKey'));
+          return _context.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
+        case 10:
           _context.prev = 10;
-          // create privateKey resource
-          data = '';
-          contentType = 'text/ttl';
-          _context.next = 15;
-          return _solidLogic.store.fetcher.webOperation('PUT', privateKeyUrl, {
-            data: data,
-            contentType: contentType
-          });
-        case 15:
-          response = _context.sent;
-          _context.next = 22;
-          break;
-        case 18:
-          _context.prev = 18;
-          _context.t1 = _context["catch"](10);
-          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context.t1);
-          throw _context.t1;
-        case 22:
-          delete _solidLogic.store.fetcher.requested[privateKeyUrl]; // delete cached 404 error
+          _context.t0 = _context["catch"](3);
           return _context.abrupt("return", undefined);
-        case 24:
-          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context.t0);
-          throw _context.t0;
-        case 26:
+        case 13:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[1, 7], [10, 18]]);
+    }, _callee, null, [[3, 10]]);
   }));
-  return _privateKeyExists.apply(this, arguments);
+  return _getPublicKey.apply(this, arguments);
 }
 function getPrivateKey(_x2) {
   return _getPrivateKey.apply(this, arguments);
 }
 function _getPrivateKey() {
   _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
-    var url, privateKeyUrl, publicKey, privateKey, del, add;
+    var publicKeyDoc, privateKeyDoc, publicKey, privateKey, validPublicKey, del, add, newPublicKey;
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          url = new URL(webId);
-          url.hash = '';
-          /* const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */
-          privateKeyUrl = privKeyUrl(webId); // find publickey
-          publicKey = publicKeyExists(webId); // debug.warn('publicKey ' + publicKey)
-          // find privateKey
+          _context2.next = 2;
+          return _solidLogic.store.fetcher.load(webId);
+        case 2:
+          // find keys url's
+          publicKeyDoc = (0, _cryptoKeyHelpers.pubKeyUrl)(webId);
+          privateKeyDoc = (0, _cryptoKeyHelpers.privKeyUrl)(webId); // find key pair
           _context2.next = 6;
-          return privateKeyExists(webId);
+          return (0, _cryptoKeyHelpers.publicKeyExists)(webId);
         case 6:
+          publicKey = _context2.sent;
+          _context2.next = 9;
+          return (0, _cryptoKeyHelpers.privateKeyExists)(webId);
+        case 9:
           privateKey = _context2.sent;
-          // debug.warn('privateKey ' + privateKey)
-          if (privateKey && publicKey !== generatePublicKey(privateKey)) debug.warn('publicKey is not valid');
-
-          // simulate new key pair
-          /* const newPrivateKey = generatePrivateKey()
-          const newPublicKey = generatePublicKey(newPrivateKey)
-          debug.log('newPrivateKey ' + newPrivateKey)
-          debug.log('newPublicKey ' + newPublicKey) */
+          // is publicKey valid ?
+          validPublicKey = true;
+          if (privateKey && publicKey !== generatePublicKey(privateKey)) {
+            if (confirm('This is strange the publicKey is not valid for\n' + webId + '\'shall we repair keeping the private key ?')) validPublicKey = false;
+          }
 
-          // create key pair
-          if (!(!privateKey || !publicKey)) {
-            _context2.next = 19;
+          // create key pair or repair publicKey
+          if (!(!privateKey || !publicKey || !validPublicKey)) {
+            _context2.next = 27;
             break;
           }
           del = [];
-          add = [];
-          if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyUrl)));
-          if (publicKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(url.href)));
+          add = []; // if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyDoc)))
+          if (privateKey) {
+            _context2.next = 20;
+            break;
+          }
+          // add = []
           privateKey = generatePrivateKey();
-          publicKey = generatePublicKey(privateKey);
-          /* debug.log('newPrivateKey-1 ' + privateKey)
-          debug.log('newPublicKey-1 ' + publicKey) */
-          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyUrl)));
-          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.literal(publicKey), $rdf.sym(url.href)));
-          _context2.next = 19;
-          return _solidLogic.store.updater.updateMany(del, add);
-        case 19:
-          return _context2.abrupt("return", privateKey);
+          add = [$rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyDoc))];
+          _context2.next = 20;
+          return saveKey(privateKeyDoc, [], add, webId);
         case 20:
+          if (!(!publicKey || !validPublicKey)) {
+            _context2.next = 27;
+            break;
+          }
+          del = [];
+          // delete invalid public key
+          if (publicKey) {
+            del = [$rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(publicKeyDoc))];
+            debug.log(del);
+          }
+          // update new valid key
+          newPublicKey = generatePublicKey(privateKey);
+          add = [$rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.literal(newPublicKey), $rdf.sym(publicKeyDoc))];
+          _context2.next = 27;
+          return saveKey(publicKeyDoc, del, add);
+        case 27:
+          return _context2.abrupt("return", privateKey);
+        case 28:
         case "end":
           return _context2.stop();
       }
@@ -159,4 +129,106 @@ function _getPrivateKey() {
   }));
   return _getPrivateKey.apply(this, arguments);
 }
+function setAcl(_x3) {
+  return _setAcl.apply(this, arguments);
+}
+function _setAcl() {
+  _setAcl = (0, _asyncToGenerator2["default"])(function (keyDoc) {
+    var me = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    return /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+      var keyAclDoc, keyAgent, aclBody, 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:
+            keyAclDoc = _solidLogic.store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'));
+            if (keyAclDoc) {
+              _context3.next = 5;
+              break;
+            }
+            throw new Error('Key ACL doc not found!');
+          case 5:
+            keyAgent = 'acl:agentClass foaf:agent';
+            if (me !== null && me !== void 0 && me.length) keyAgent = "acl:agent <".concat(me, ">");
+            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");
+            _context3.next = 10;
+            return _solidLogic.store.fetcher.webOperation('PUT', keyAclDoc.value, {
+              data: aclBody,
+              contentType: 'text/turtle'
+            });
+          case 10:
+            aclResponse = _context3.sent;
+          case 11:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    })();
+  });
+  return _setAcl.apply(this, arguments);
+}
+function saveKey(_x4, _x5, _x6) {
+  return _saveKey.apply(this, arguments);
+}
+function _saveKey() {
+  _saveKey = (0, _asyncToGenerator2["default"])(function (keyDoc, del, add) {
+    var me = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
+    return /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+      var keyAclDoc, response;
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.prev = 0;
+            // get keyAcldoc
+            keyAclDoc = _solidLogic.store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'));
+            if (keyAclDoc) {
+              _context4.next = 4;
+              break;
+            }
+            throw new Error("".concat(keyDoc, " ACL doc not found!"));
+          case 4:
+            _context4.prev = 4;
+            _context4.next = 7;
+            return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
+          case 7:
+            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 = 16;
+            break;
+          case 11:
+            _context4.prev = 11;
+            _context4.t0 = _context4["catch"](4);
+            if (!(_context4.t0.response.status !== 404)) {
+              _context4.next = 15;
+              break;
+            }
+            throw new Error(_context4.t0);
+          case 15:
+            debug.log('delete ' + keyAclDoc.value + ' ' + _context4.t0.response.status); // should test 404 and 2xx
+          case 16:
+            _context4.next = 18;
+            return _solidLogic.store.updater.updateMany(del, add);
+          case 18:
+            _context4.next = 20;
+            return setAcl(keyDoc, me);
+          case 20:
+            _context4.next = 25;
+            break;
+          case 22:
+            _context4.prev = 22;
+            _context4.t1 = _context4["catch"](0);
+            throw new Error(_context4.t1);
+          case 25:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, null, [[0, 22], [4, 11]]);
+    })();
+  });
+  return _saveKey.apply(this, arguments);
+}
 //# sourceMappingURL=keys.js.map

package/lib/chat/keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"keys.js","names":["debug","_interopRequireWildcard","require","_secp256k","_utils","_signature","_solidLogic","$rdf","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","generatePrivateKey","bytesToHex","schnorr","utils","randomPrivateKey","generatePublicKey","privateKey","getPublicKey","webId","publicKey","publicKeyExists","url","URL","hash","store","fetcher","load","href","any","sym","CERT","value","privKeyUrl","privateKeyUrl","protocol","host","privateKeyExists","_x","_privateKeyExists","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","_err$response","data","contentType","response","wrap","_callee$","_context","prev","next","abrupt","t0","status","webOperation","sent","t1","log","requested","undefined","stop","getPrivateKey","_x2","_getPrivateKey","_callee2","del","add","_callee2$","_context2","warn","push","st","lit","literal","updater","updateMany"],"sources":["../../src/chat/keys.ts"],"sourcesContent":["import * as debug from '../debug'\r\nimport { schnorr } from '@noble/curves/secp256k1'\r\nimport { bytesToHex } from '@noble/hashes/utils'\r\nimport { CERT } from './signature'\r\nimport { store } from 'solid-logic'\r\nimport * as $rdf from 'rdflib'\r\nimport { NamedNode, literal } from 'rdflib'\r\n\r\nexport function generatePrivateKey (): string {\r\n  return bytesToHex(schnorr.utils.randomPrivateKey())\r\n}\r\n\r\nexport function generatePublicKey (privateKey: string): string {\r\n  return bytesToHex(schnorr.getPublicKey(privateKey))\r\n}\r\n\r\nexport function getPublicKey (webId) {\r\n  const publicKey = publicKeyExists(webId)\r\n  return publicKey\r\n}\r\n\r\nfunction publicKeyExists (webId: string) {\r\n  // find publickey\r\n  const url = new URL(webId)\r\n  url.hash = ''\r\n  /* debug.warn('Alain publicKeyExists')\r\n  debug.warn(webId)\r\n  debug.warn(url.href) */\r\n  store.fetcher.load(url.href)\r\n  const publicKey = store.any(store.sym(webId), store.sym(CERT + 'PublicKey'))\r\n  return publicKey?.value // as NamedNode\r\n}\r\n\r\nconst privKeyUrl = (webId: string) => {\r\n  const url = new URL(webId)\r\n  const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl'\r\n  return privateKeyUrl\r\n}\r\n\r\nasync function privateKeyExists (webId: string) {\r\n  /* const url = new URL(webId)\r\n  const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */\r\n  const privateKeyUrl = privKeyUrl(webId)\r\n  /* debug.warn('Alain privateKeyExists')\r\n  debug.warn(webId)\r\n  debug.warn(privateKeyUrl) */\r\n  try {\r\n    store.fetcher.load(privateKeyUrl)\r\n    const privateKey = store.any(store.sym(webId), store.sym(CERT + 'PrivateKey'))\r\n    return privateKey?.value // as NamedNode\r\n  } catch (err) {\r\n    if (err?.response?.status === 404) {\r\n      try {\r\n        // create privateKey resource\r\n        const data = ''\r\n        const contentType = 'text/ttl'\r\n        const response = await store.fetcher.webOperation('PUT', privateKeyUrl, {\r\n          data,\r\n          contentType\r\n        })\r\n        // create ACL resource\r\n      } catch (err) {\r\n        debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + err)\r\n        throw err\r\n      }\r\n      delete store.fetcher.requested[privateKeyUrl] // delete cached 404 error\r\n      return undefined\r\n    }\r\n    debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + err)\r\n    throw err\r\n  }\r\n}\r\n\r\nexport async function getPrivateKey (webId: string) {\r\n  const url = new URL(webId)\r\n  url.hash = ''\r\n  /* const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */\r\n  const privateKeyUrl = privKeyUrl(webId)\r\n\r\n  // find publickey\r\n  let publicKey = publicKeyExists(webId)\r\n  // debug.warn('publicKey ' + publicKey)\r\n  // find privateKey\r\n  let privateKey = await privateKeyExists(webId)\r\n  // debug.warn('privateKey ' + privateKey)\r\n  if (privateKey && (publicKey !== generatePublicKey(privateKey as string))) debug.warn('publicKey is not valid')\r\n\r\n  // simulate new key pair\r\n  /* const newPrivateKey = generatePrivateKey()\r\n  const newPublicKey = generatePublicKey(newPrivateKey)\r\n  debug.log('newPrivateKey ' + newPrivateKey)\r\n  debug.log('newPublicKey ' + newPublicKey) */\r\n\r\n  // create key pair\r\n  if (!privateKey || !publicKey) {\r\n    const del: any[] = []\r\n    const add: any[] = []\r\n    if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyUrl)))\r\n    if (publicKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(url.href)))\r\n\r\n    privateKey = generatePrivateKey()\r\n    publicKey = generatePublicKey(privateKey)\r\n    /* debug.log('newPrivateKey-1 ' + privateKey)\r\n    debug.log('newPublicKey-1 ' + publicKey) */\r\n    add.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyUrl)))\r\n    add.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PublicKey'), $rdf.literal(publicKey), $rdf.sym(url.href)))\r\n    await store.updater.updateMany(del, add)\r\n  }\r\n  return privateKey as string\r\n}\r\n"],"mappings":"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"}
+{"version":3,"file":"keys.js","names":["debug","_interopRequireWildcard","require","_secp256k","_utils","_signature","_solidLogic","$rdf","_cryptoKeyHelpers","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","generatePrivateKey","bytesToHex","schnorr","utils","randomPrivateKey","generatePublicKey","privateKey","getPublicKey","_x","_getPublicKey","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","webId","publicKeyDoc","wrap","_callee$","_context","prev","next","store","fetcher","load","pubKeyUrl","any","sym","CERT","abrupt","value","t0","undefined","stop","getPrivateKey","_x2","_getPrivateKey","_callee2","privateKeyDoc","publicKey","validPublicKey","del","add","newPublicKey","_callee2$","_context2","privKeyUrl","publicKeyExists","sent","privateKeyExists","confirm","st","literal","saveKey","lit","log","setAcl","_x3","_setAcl","keyDoc","me","length","_callee3","keyAclDoc","keyAgent","aclBody","aclResponse","_callee3$","_context3","Error","concat","split","pop","webOperation","data","contentType","_x4","_x5","_x6","_saveKey","_callee4","response","_callee4$","_context4","status","updater","updateMany","t1"],"sources":["../../src/chat/keys.ts"],"sourcesContent":["import * as debug from '../debug'\r\nimport { schnorr } from '@noble/curves/secp256k1'\r\nimport { bytesToHex } from '@noble/hashes/utils'\r\nimport { CERT } from './signature'\r\nimport { store } from 'solid-logic'\r\nimport * as $rdf from 'rdflib'\r\nimport { publicKeyExists, pubKeyUrl, privKeyUrl, privateKeyExists } from '../utils/cryptoKeyHelpers'\r\n\r\nexport function generatePrivateKey (): string {\r\n  return bytesToHex(schnorr.utils.randomPrivateKey())\r\n}\r\n\r\nexport function generatePublicKey (privateKey: string): string {\r\n  return bytesToHex(schnorr.getPublicKey(privateKey))\r\n}\r\n\r\nexport async function getPublicKey (webId) {\r\n  await store.fetcher.load(webId)\r\n  const publicKeyDoc = pubKeyUrl(webId)\r\n  try {\r\n    await store.fetcher.load(publicKeyDoc) // url.href)\r\n    const key = store.any(store.sym(webId), store.sym(CERT + 'PublicKey'))\r\n    return key?.value // as NamedNode\r\n  } catch (err) {\r\n    return undefined\r\n  }\r\n  // this is called in display message and should not try to create a publicKeyDoc\r\n  // const publicKey = await publicKeyExists(webId)\r\n  // return publicKey\r\n}\r\n\r\nexport async function getPrivateKey (webId: string) {\r\n  await store.fetcher.load(webId)\r\n  // find keys url's\r\n  const publicKeyDoc = pubKeyUrl(webId)\r\n  const privateKeyDoc = privKeyUrl(webId)\r\n\r\n  // find key pair\r\n  const publicKey = await publicKeyExists(webId)\r\n  let privateKey = await privateKeyExists(webId)\r\n\r\n  // is publicKey valid ?\r\n  let validPublicKey = true\r\n  if (privateKey && (publicKey !== generatePublicKey(privateKey as string))) {\r\n    if (confirm('This is strange the publicKey is not valid for\\n' + webId +\r\n     '\\'shall we repair keeping the private key ?')) validPublicKey = false\r\n  }\r\n\r\n  // create key pair or repair publicKey\r\n  if (!privateKey || !publicKey || !validPublicKey) {\r\n    let del: any[] = []\r\n    let add: any[] = []\r\n    // if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyDoc)))\r\n\r\n    if (!privateKey) {\r\n      // add = []\r\n      privateKey = generatePrivateKey()\r\n      add = [$rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyDoc))]\r\n      await saveKey(privateKeyDoc, [], add, webId)\r\n    }\r\n    if (!publicKey || !validPublicKey) {\r\n      del = []\r\n      // delete invalid public key\r\n      if (publicKey) {\r\n        del = [$rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(publicKeyDoc))]\r\n        debug.log(del)\r\n      }\r\n      // update new valid key\r\n      const newPublicKey = generatePublicKey(privateKey)\r\n      add = [$rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PublicKey'), $rdf.literal(newPublicKey), $rdf.sym(publicKeyDoc))]\r\n      await saveKey(publicKeyDoc, del, add)\r\n    }\r\n    /* debug.log('new key pair ' + webId)\r\n    debug.log('newPrivateKey-1 ' + privateKey)\r\n    debug.log('newPublicKey-1 ' + publicKey) */\r\n    /* debug.log('del')\r\n    debug.log(del)\r\n    debug.log('add')\r\n    debug.log(add) */\r\n    // await store.updater.updateMany(del, add)\r\n    // TODO create READ ACL's\r\n    // await setAcl() // depends on which key has been updated\r\n  }\r\n  return privateKey as string\r\n}\r\n\r\nasync function setAcl (keyDoc, me = '') {\r\n  // Some servers don't present a Link http response header\r\n  // if the container doesn't exist yet, so refetch the container\r\n  // now that it has been created:\r\n  await store.fetcher.load(keyDoc)\r\n\r\n  // FIXME: check the Why value on this quad:\r\n  const keyAclDoc = store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'))\r\n  if (!keyAclDoc) {\r\n    throw new Error('Key ACL doc not found!')\r\n  }\r\n\r\n  let keyAgent = 'acl:agentClass foaf:agent'\r\n  if (me?.length) keyAgent = `acl:agent <${me}>`\r\n  const aclBody = `\r\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\r\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\r\n<#Read>\r\n    a acl:Authorization;\r\n    ${keyAgent};\r\n    acl:accessTo <${keyDoc.split('/').pop()}>;\r\n    acl:mode acl:Read.\r\n`\r\n  const aclResponse = await store.fetcher.webOperation('PUT', keyAclDoc.value, {\r\n    data: aclBody,\r\n    contentType: 'text/turtle'\r\n  })\r\n}\r\n\r\nasync function saveKey (keyDoc, del, add, me = '') {\r\n  try {\r\n    // get keyAcldoc\r\n    const keyAclDoc = store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'))\r\n    if (!keyAclDoc) {\r\n      throw new Error(`${keyDoc} ACL doc not found!`)\r\n    }\r\n    // delete READ only keyAclDoc. This is possible if the webId is an owner\r\n    try {\r\n      const response = await store.fetcher.webOperation('DELETE', keyAclDoc.value) // this may fail if webId is not an owner\r\n      debug.log('delete ' + keyAclDoc.value + ' ' + response.status) // should test 404 and 2xx\r\n    } catch (err) {\r\n      if (err.response.status !== 404) { throw new Error(err) }\r\n      debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx\r\n    }\r\n\r\n    // save key\r\n    await store.updater.updateMany(del, add) // or a promise store.updater.update ?\r\n\r\n    // create READ only ACL\r\n    await setAcl(keyDoc, me)\r\n  } catch (err) { throw new Error(err) }\r\n}\r\n"],"mappings":"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"}

package/lib/chat/message.js

@@ -116,30 +116,37 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   var date = _solidLogic.store.any(message, ns.dct('created'));
   var latestVersion = (0, _chatLogic.mostRecentVersion)(message);
   var latestVersionCreator = _solidLogic.store.any(latestVersion, ns.foaf('maker'));
+
   // use latest content if same owner, else use original
-  var msgId = creator === latestVersionCreator ? latestVersion : message;
+  var msgId = creator.uri === latestVersionCreator.uri ? latestVersion : message;
   var content = _solidLogic.store.any(msgId, ns.sioc('content'));
   var signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "Proof")));
-  debug.log('alain ' + (signature === null || signature === void 0 ? void 0 : signature.value));
 
-  // verify signature
+  // set message object
   var msg = (0, _signature.getBlankMsg)();
   msg.id = msgId.uri;
   msg.created = _solidLogic.store.any(msgId, ns.dct('created')).value;
   msg.content = content.value;
   msg.maker = creator.uri;
-  try {
-    // pubKey could be store in a cache for all makers
-    var pubKey = (0, _keys.getPublicKey)(creator.uri);
-    /* const pubKey0 = '023a9da707bee1302f66083c9d95673ff969b41607a66f52686fa774d64ceb87'
-    debug.warn('publicKeys\n' + pubKey0 + '\n' + pubKey)
-    const privKey0 = getPrivateKey(creator.uri) // alain to remove
-    // unsigned messages should be signaled as unsecured
-    debug.warn(msg)
-    debug.warn(signature?.value) */
-    if (signature !== null && signature !== void 0 && signature.value && !(0, _signature.verifySignature)(signature.value, msg, pubKey)) throw new Error('invalid signature');
-  } catch (err) {
-    debug.log(err);
+
+  // unsigned message
+  if (!(signature !== null && signature !== void 0 && signature.value)) debug.warn(msgId.uri + ' is unsigned'); // TODO replace with UI (colored message ?)
+
+  // signed message, get public key and check signature
+  else {
+    (0, _keys.getPublicKey)(creator.uri).then(function (publicKey) {
+      debug.log(creator.uri + '\n' + msg.created + '\n' + msg.id + '\n' + publicKey);
+      if (!publicKey) {
+        // TODO try to recreate the publicKey
+        // if(me.uri === creator.uri) await getPrivateKey(creator.uri)
+        debug.warn('message is signed but ' + creator.uri + ' is missing publicKey');
+      }
+      // check that publicKey is a valid hex string
+      var regex = /[0-9A-Fa-f]{6}/g;
+      if (!(publicKey !== null && publicKey !== void 0 && publicKey.match(regex))) debug.warn('invalid publicKey hex string\n' + creator.uri + '\n' + publicKey);
+      // verify signature
+      else if (signature !== null && signature !== void 0 && signature.value && !(0, _signature.verifySignature)(signature === null || signature === void 0 ? void 0 : signature.value, msg, publicKey)) debug.warn('invalid signature\n' + msg.id);
+    });
   }
   var originalMessage = (0, _chatLogic.originalVersion)(message);
   var edited = !message.sameTerm(originalMessage);