@eluvio/elv-client-js 3.1.87 → 3.1.88

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.1.87",
+  "version": "3.1.88",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "3.1.87",
+  "version": "3.1.88",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/ElvClient.js",
   "author": "Kevin Talmadge",

package/src/UserProfileClient.js

@@ -438,14 +438,19 @@ await client.userProfileClient.UserMetadata()
    * Note: This method is not accessible to applications. Eluvio core will drop the request.
    *
    * @namedParams
-   * @param level
+   * @param {string} id - The tenant ID in hash format
+   * @param {string} address - The group address to use in the hash if id is not provided
    */
   async SetTenantId({id, address}) {
-    if(id && !id.startsWith("iten")) {
+    if(id && (!id.startsWith("iten") || !Utils.ValidHash(id))) {
       throw Error(`Invalid tenant ID: ${id}`);
     }
 
     if(address) {
+      if(!Utils.ValidAddress(address)) {
+        throw Error(`Invalid address: ${address}`);
+      }
+
       id = `iten${Utils.AddressToHash(address)}`;
     }
 

package/src/Utils.js

@@ -6,7 +6,8 @@ const VarInt = require("varint");
 const URI = require("urijs");
 
 const {
-  keccak256
+  keccak256,
+  getAddress
 } = require("ethers").utils;
 
 /**
@@ -245,6 +246,34 @@ const Utils = {
     return (Utils.HashToAddress(firstHash) === Utils.HashToAddress(secondHash));
   },
 
+  /**
+   * Determine whether the address is valid
+   *
+   * @param {string} address - Address to validate
+   *
+   * @returns {boolean} - Whether or not the address is valid
+   */
+  ValidAddress: (address) => {
+    try {
+      getAddress(address);
+      return true;
+    } catch(error) {
+      this.Log(error);
+      return false;
+    }
+  },
+
+  /**
+   * Determine whether the hash is valid
+   *
+   * @param {string} hash - Hash to validate
+   *
+   * @returns {boolean} - Whether or not the hash is valid
+   */
+  ValidHash: (hash) => {
+    return Utils.ValidAddress(Utils.HashToAddress(hash));
+  },
+
   /**
    * Convert the specified string to a bytes32 string
    *

package/src/client/ContentManagement.js

@@ -271,6 +271,10 @@ exports.CreateContentLibrary = async function({
   }
 
   if(tenantId) {
+    if(!this.utils.ValidHash(tenantId)) {
+      throw Error(`Invalid tenant ID: ${tenantId}`);
+    }
+
     await this.CallContractMethod({
       contractAddress,
       methodName: "putMeta",