fix: prtoection against subscribing to yourself

Chia-Network · Sep 12, 2022 · c0cfaaa · c0cfaaa
1 parent 4bbccba
commit c0cfaaa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/controllers/fileStore.controller.js b/src/controllers/fileStore.controller.js
@@ -53,7 +53,8 @@ export const deleteFile = async (req, res) => {
   try {
     await FileStore.deleteFileStoreItem(req.body.fileId);
     res.status(200).json({
-      message: 'File deleted from filestore',
+      message:
+        'File will be delete from the filestore, but it will take a few mins to confirm.',
     });
   } catch (error) {
     res.status(400).json({

diff --git a/src/datalayer/persistance.js b/src/datalayer/persistance.js
@@ -259,6 +259,13 @@ const subscribeToStoreOnDataLayer = async (storeId) => {
     return false;
   }
 
+  const homeOrg = await Organization.getHomeOrg();
+
+  if ([homeOrg.orgUid, homeOrg.registryId].includes(storeId)) {
+    logger.info(`Cant subscribe to self: ${storeId}`);
+    return { success: true };
+  }
+
   const subscriptions = await getSubscriptions();
 
   if (subscriptions.includes(storeId)) {
@@ -463,7 +470,7 @@ const getSubscriptions = async () => {
     const data = JSON.parse(response);
 
     if (data.success) {
-      console.log('Your Subscriptions:', data.store_ids);
+      // console.log('Your Subscriptions:', data.store_ids);
       return data.store_ids;
     }
 

diff --git a/src/datalayer/syncService.js b/src/datalayer/syncService.js
@@ -206,7 +206,6 @@ const getSubscribedStoreData = async (storeId, retry = 0) => {
 
   const subscriptions = await dataLayer.getSubscriptions(storeId);
   const alreadySubscribed = subscriptions.includes(storeId);
-  console.log('%%%%%%%%%%%%', alreadySubscribed);
 
   if (!alreadySubscribed) {
     logger.info(`No Subscription Found for ${storeId}, Subscribing...`);
@@ -297,7 +296,7 @@ const getStoreData = async (storeId, callback, onFail, retry = 0) => {
   if (retry <= 10) {
     const encodedData = await dataLayer.getStoreData(storeId);
     if (_.isEmpty(encodedData?.keys_values)) {
-      await new Promise((resolve) => setTimeout(() => resolve(), 60000));
+      await new Promise((resolve) => setTimeout(() => resolve(), 120000));
       return getStoreData(storeId, callback, onFail, retry + 1);
     } else {
       callback(decodeDataLayerResponse(encodedData));

diff --git a/src/models/organizations/organizations.model.js b/src/models/organizations/organizations.model.js
@@ -246,8 +246,6 @@ class Organization extends Model {
       console.log('Importing organization ' + orgUid);
       const orgData = await datalayer.getSubscribedStoreData(orgUid);
 
-      console.log('!!!!!!!!!!!!', orgData);
-
       if (!orgData.registryId) {
         throw new Error(
           'Currupted organization, no registryId on the datalayer, can not import',