solid-ui 2.4.27-20175fe3 → 2.4.27-2766a189

package/dist/solid-ui.js

@@ -4037,12 +4037,12 @@ exports.getPrivateKey = getPrivateKey;
 exports.getPublicKey = getPublicKey;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ "./node_modules/@babel/runtime/regenerator/index.js"));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ "./node_modules/@babel/runtime/helpers/asyncToGenerator.js"));
-var debug = _interopRequireWildcard(__webpack_require__(/*! ../debug */ "./lib/debug.js"));
 var _secp256k = __webpack_require__(/*! @noble/curves/secp256k1 */ "./node_modules/@noble/curves/secp256k1.js");
 var _utils = __webpack_require__(/*! @noble/hashes/utils */ "./node_modules/@noble/hashes/utils.js");
 var _signature = __webpack_require__(/*! ./signature */ "./lib/chat/signature.js");
 var _solidLogic = __webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js");
 var $rdf = _interopRequireWildcard(__webpack_require__(/*! rdflib */ "./node_modules/rdflib/esm/index.js"));
+var _cryptoKeyHelpers = __webpack_require__(/*! ../utils/cryptoKeyHelpers */ "./lib/utils/cryptoKeyHelpers.js");
 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() {
@@ -4051,133 +4051,96 @@ function generatePrivateKey() {
 function generatePublicKey(privateKey) {
   return (0, _utils.bytesToHex)(_secp256k.schnorr.getPublicKey(privateKey));
 }
-function getPublicKey(webId) {
-  var publicKey = publicKeyExists(webId);
-  return publicKey;
-}
-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 getPublicKey(_x) {
+  return _getPublicKey.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 publicKeyUrl, 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) */
+          publicKeyUrl = (0, _cryptoKeyHelpers.pubKeyUrl)(webId);
           _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.next = 4;
+          return _solidLogic.store.fetcher.load(publicKeyUrl);
+        case 4:
+          // 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 8:
+          _context.prev = 8;
           _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.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
           return _context.abrupt("return", undefined);
-        case 24:
-          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context.t0);
-          throw _context.t0;
-        case 26:
+        case 11:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[1, 7], [10, 18]]);
+    }, _callee, null, [[1, 8]]);
   }));
-  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 publicKeyUrl, privateKeyUrl, publicKey, privateKey, validPublicKey, del, add;
     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 = 6;
-          return privateKeyExists(webId);
-        case 6:
+          // find key url's
+          publicKeyUrl = (0, _cryptoKeyHelpers.pubKeyUrl)(webId);
+          privateKeyUrl = (0, _cryptoKeyHelpers.privKeyUrl)(webId); // find key pair
+          _context2.next = 4;
+          return (0, _cryptoKeyHelpers.publicKeyExists)(webId);
+        case 4:
+          publicKey = _context2.sent;
+          _context2.next = 7;
+          return (0, _cryptoKeyHelpers.privateKeyExists)(webId);
+        case 7:
           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) */
-
-          // create key pair
-          if (!(!privateKey || !publicKey)) {
-            _context2.next = 19;
+          // 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 or repair publicKey
+          if (!(!privateKey || !publicKey || !validPublicKey)) {
+            _context2.next = 17;
             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)));
-          privateKey = generatePrivateKey();
-          publicKey = generatePublicKey(privateKey);
-          /* debug.log('newPrivateKey-1 ' + privateKey)
+          add = []; // if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyUrl)))
+          if (!privateKey) {
+            privateKey = generatePrivateKey();
+            add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyUrl)));
+            // TODO delete privateKeyUrl.acl, it may exist !!!
+          }
+
+          if (!publicKey || !validPublicKey) {
+            // delete invalid public key
+            if (publicKey) {
+              del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(publicKeyUrl)));
+            }
+            // insert new valid key
+            publicKey = generatePublicKey(privateKey);
+            add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.literal(publicKey), $rdf.sym(publicKeyUrl)));
+            // TODO delete privateKeyUrl.acl, it may exist !!!
+          }
+          /* debug.log('new key pair ' + webId)
+          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;
+          /* debug.log('del')
+          debug.log(del)
+          debug.log('add')
+          debug.log(add) */
+          _context2.next = 17;
           return _solidLogic.store.updater.updateMany(del, add);
-        case 19:
+        case 17:
           return _context2.abrupt("return", privateKey);
-        case 20:
+        case 18:
         case "end":
           return _context2.stop();
       }
@@ -4315,10 +4278,9 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   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
   var msg = (0, _signature.getBlankMsg)();
@@ -4326,18 +4288,19 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   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 ?)
+  // get public key and check signature
+  else {
+    (0, _keys.getPublicKey)(creator.uri).then(function (publicKey) {
+      if (!publicKey) debug.warn('message is signed but ' + creator.uri + ' is missing publicKey');
+      // check publicKey is 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.value, msg, publicKey)) debug.warn('invalid signature\n' + msg.id);
+    });
   }
   var originalMessage = (0, _chatLogic.originalVersion)(message);
   var edited = !message.sameTerm(originalMessage);
@@ -12439,6 +12402,148 @@ function isLight(x) {
 
 /***/ }),
 
+/***/ "./lib/utils/cryptoKeyHelpers.js":
+/*!***************************************!*\
+  !*** ./lib/utils/cryptoKeyHelpers.js ***!
+  \***************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ "./node_modules/@babel/runtime/helpers/interopRequireDefault.js");
+var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_modules/@babel/runtime/helpers/typeof.js");
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.privKeyUrl = void 0;
+exports.privateKeyExists = privateKeyExists;
+exports.pubKeyUrl = void 0;
+exports.publicKeyExists = publicKeyExists;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ "./node_modules/@babel/runtime/regenerator/index.js"));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ "./node_modules/@babel/runtime/helpers/asyncToGenerator.js"));
+var debug = _interopRequireWildcard(__webpack_require__(/*! ../debug */ "./lib/debug.js"));
+var _signature = __webpack_require__(/*! ../chat/signature */ "./lib/chat/signature.js");
+var _solidLogic = __webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js");
+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; }
+var pubKeyUrl = function pubKeyUrl(webId) {
+  var url = new URL(webId);
+  var publicKeyUrl = url.origin + '/profile/keys/publicKey.ttl';
+  return publicKeyUrl;
+};
+exports.pubKeyUrl = pubKeyUrl;
+function publicKeyExists(_x) {
+  return _publicKeyExists.apply(this, arguments);
+}
+function _publicKeyExists() {
+  _publicKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
+    var publicKeyUrl;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          // find publickey
+          publicKeyUrl = pubKeyUrl(webId);
+          _context.next = 3;
+          return keyExists(webId, publicKeyUrl, 'PublicKey');
+        case 3:
+          return _context.abrupt("return", _context.sent);
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _publicKeyExists.apply(this, arguments);
+}
+var privKeyUrl = function privKeyUrl(webId) {
+  var url = new URL(webId);
+  var privateKeyUrl = url.origin + '/profile/keys/privateKey.ttl';
+  return privateKeyUrl;
+};
+exports.privKeyUrl = privKeyUrl;
+function privateKeyExists(_x2) {
+  return _privateKeyExists.apply(this, arguments);
+}
+function _privateKeyExists() {
+  _privateKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
+    var privateKeyUrl;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          // find privateKey
+          privateKeyUrl = privKeyUrl(webId);
+          _context2.next = 3;
+          return keyExists(webId, privateKeyUrl, 'PrivateKey');
+        case 3:
+          return _context2.abrupt("return", _context2.sent);
+        case 4:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _privateKeyExists.apply(this, arguments);
+}
+function keyExists(_x3, _x4, _x5) {
+  return _keyExists.apply(this, arguments);
+}
+function _keyExists() {
+  _keyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId, keyUrl, keyType) {
+    var key, _err$response, data, contentType, response;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.prev = 0;
+          _context3.next = 3;
+          return _solidLogic.store.fetcher.load(keyUrl);
+        case 3:
+          // url.href)
+          key = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + keyType));
+          return _context3.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
+        case 7:
+          _context3.prev = 7;
+          _context3.t0 = _context3["catch"](0);
+          if (!((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : (_err$response = _context3.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) === 404)) {
+            _context3.next = 24;
+            break;
+          }
+          _context3.prev = 10;
+          // create privateKey resource
+          data = '';
+          contentType = 'text/turtle';
+          _context3.next = 15;
+          return _solidLogic.store.fetcher.webOperation('PUT', keyUrl, {
+            data: data,
+            contentType: contentType
+          });
+        case 15:
+          response = _context3.sent;
+          _context3.next = 22;
+          break;
+        case 18:
+          _context3.prev = 18;
+          _context3.t1 = _context3["catch"](10);
+          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context3.t1);
+          throw _context3.t1;
+        case 22:
+          delete _solidLogic.store.fetcher.requested[keyUrl]; // delete cached 404 error
+          return _context3.abrupt("return", undefined);
+        case 24:
+          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context3.t0);
+          throw _context3.t0;
+        case 26:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[0, 7], [10, 18]]);
+  }));
+  return _keyExists.apply(this, arguments);
+}
+//# sourceMappingURL=cryptoKeyHelpers.js.map
+
+/***/ }),
+
 /***/ "./lib/utils/headerFooterHelpers.js":
 /*!******************************************!*\
   !*** ./lib/utils/headerFooterHelpers.js ***!
@@ -13285,8 +13390,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-04-21T21:20:00Z',
-  commit: '20175fe34b116218e9d7838365c079aa30ed7459',
+  buildTime: '2023-04-27T18:48:41Z',
+  commit: '2766a18921371fdd8973e038c654ebdd72f8b347',
   npmInfo: {
     'solid-ui': '2.4.27',
     npm: '8.19.4',