added config observers, delete plaintext blocks when plaintext storage is disabled

src/config/__init__.py

@@ -1,9 +1,12 @@
-'''
-    Onionr - Private P2P Communication
+"""Onionr - Private P2P Communication.
 
-    This file deals with configuration management.
-'''
-'''
+This file deals with configuration management.
+"""
+import os, json, logger
+import filepaths
+
+from . import onboarding
+"""
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
@@ -16,20 +19,14 @@
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
-'''
-
-import os, json, logger
-import filepaths
-
-from . import onboarding
+"""
 
 _configfile = filepaths.config_file
 _config = {}
 
+
 def get(key, default = None, save = False):
-    '''
-        Gets the key from configuration, or returns `default`
-    '''
+    """Gets the key from configuration, or returns `default`"""
 
     key = str(key).split('.')
     data = _config
@@ -41,20 +38,24 @@ def get(key, default = None, save = False):
             return default
         data = data[item]
 
-    if not last in data:
+    if last not in data:
         if save:
             set(key, default, savefile = True)
         return default
 
     return data[last]
 
+
 def set(key, value = None, savefile = False):
-    '''
-        Sets the key in configuration to `value`
-    '''
+    """Sets the key in configuration to `value`"""
+    from . import observers
+    config_set_observers = {
+        'general.store_plaintext_blocks': [observers.delete_plaintext]
+    }
 
     global _config
 
+    whole_key = key
     key = str(key).split('.')
     data = _config
 
@@ -64,6 +65,11 @@ def set(key, value = None, savefile = False):
         if (not item in data) or (not type(data[item]) == dict):
             data[item] = dict()
         data = data[item]
+        try:
+            for observer in config_set_observers[whole_key]:
+                observer(value)
+        except KeyError:
+            pass
 
     if value is None:
         del data[last]
@@ -73,6 +79,7 @@ def set(key, value = None, savefile = False):
     if savefile:
         save()
 
+
 def is_set(key):
     key = str(key).split('.')
     data = _config
@@ -89,18 +96,16 @@ def is_set(key):
 
     return True
 
+
 def check():
-    '''
-        Checks if the configuration file exists, creates it if not
-    '''
+    """Checks if the configuration file exists, creates it if not"""
 
     if not os.path.exists(os.path.dirname(get_config_file())):
         os.makedirs(os.path.dirname(get_config_file()))
 
+
 def save():
-    '''
-        Saves the configuration data to the configuration file
-    '''
+    """Saves the configuration data to the configuration file"""
 
     check()
     try:
@@ -109,10 +114,9 @@ def save():
     except json.JSONDecodeError:
         logger.warn('Failed to write to configuration file.')
 
+
 def reload():
-    '''
-        Reloads the configuration data in memory from the file
-    '''
+    """Reloads the configuration data in memory from the file"""
     check()
     try:
         with open(get_config_file(), 'r', encoding="utf8") as configfile:
@@ -121,28 +125,24 @@ def reload():
         pass
         #logger.debug('Failed to parse configuration file.')
 
+
 def get_config():
-    '''
-        Gets the entire configuration as an array
-    '''
+    """Gets the entire configuration as an array"""
     return _config
 
+
 def set_config(config):
-    '''
-        Sets the configuration to the array in arguments
-    '''
+    """Sets the configuration to the array in arguments"""
     global _config
     _config = config
 
+
 def get_config_file():
-    '''
-        Returns the absolute path to the configuration file
-    '''
+    """Returns the absolute path to the configuration file"""
     return _configfile
 
+
 def set_config_file(configfile):
-    '''
-        Sets the path to the configuration file
-    '''
+    """Sets the path to the configuration file."""
     global _configfile
     _configfile = os.abs.abspath(configfile)

src/config/observers/__init__.py

@@ -0,0 +1,2 @@
+from . import plaintextdelete
+delete_plaintext = plaintextdelete.delete_plaintext

src/config/observers/plaintextdelete.py

@@ -0,0 +1,36 @@
+"""Onionr - Private P2P Communication.
+
+Delete plaintext blocks, used when plaintext is disabled in config
+"""
+from onionrblocks import onionrblockapi
+from coredb import blockmetadb
+from onionrstorage.removeblock import remove_block
+import onionrstorage
+"""
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+"""
+
+
+def delete_plaintext(dont_delete: bool):
+    """Delete, but do not blacklist, plaintext blocks."""
+    if dont_delete:
+        return
+
+    block_list = blockmetadb.get_block_list()
+
+    for block in block_list:
+        block = onionrblockapi.Block(hash=block)
+        if not block.isEncrypted:
+            remove_block(block.hash)
+            onionrstorage.deleteBlock(block.hash)