fix another problem with multiple runs

Author: unverbuggt

documentation/docs/testbench/obfuscate.de.md

@@ -1,5 +1,5 @@
 title: Verschleiern
-obfuscate: Crawler be gone!
+obfuscate: Kriechtier hau ab!
 encryption_summary: Menschen dürfen ENTER klicken
 encryption_info_message: Diese Seite ist nur für Webcrawler unkenntlich gemacht.
 

encryptcontent/plugin.py

@@ -112,8 +112,6 @@ class encryptContentPlugin(BasePlugin):
 
     setup = {}
 
-    keystore_id = 0
-
     def __hash_md5_file__(self, fname):
         hash_md5 = MD5.new()
         with open(fname, "rb") as f:
@@ -490,6 +488,7 @@ def on_config(self, config, **kwargs):
         if 'obfuscate_keys' not in self.setup: self.setup['obfuscate_keys'] = {}
         if 'level_keys' not in self.setup: self.setup['level_keys'] = {}
 
+        if 'keystore_id' not in self.setup: self.setup['keystore_id'] = 0
         if 'keystore' not in self.setup: self.setup['keystore'] = {}
         if 'keystore_password' not in self.setup: self.setup['keystore_password'] = {}
         if 'keystore_userpass' not in self.setup: self.setup['keystore_userpass'] = {}
@@ -516,8 +515,8 @@ def on_config(self, config, **kwargs):
 
                 for level in self.setup['password_inventory'].keys():
                     new_entry = {}
-                    self.keystore_id += 1
-                    new_entry['id'] = quote(self.config['remember_prefix'] + str(self.keystore_id), safe='~()*!\'')
+                    self.setup['keystore_id'] += 1
+                    new_entry['id'] = quote(self.config['remember_prefix'] + str(self.setup['keystore_id']), safe='~()*!\'')
                     new_entry['key'] = get_random_bytes(32)
                     credentials = self.setup['password_inventory'][level]
                     if isinstance(credentials, list):
@@ -701,8 +700,8 @@ def on_page_markdown(self, markdown, page, config, **kwargs):
             index = encryptcontent['password']
             if index not in self.setup['password_keys']:
                 new_entry = {}
-                self.keystore_id += 1
-                new_entry['id'] = quote(self.config['remember_prefix'] + str(self.keystore_id), safe='~()*!\'')
+                self.setup['keystore_id'] += 1
+                new_entry['id'] = quote(self.config['remember_prefix'] + str(self.setup['keystore_id']), safe='~()*!\'')
                 new_entry['key'] = get_random_bytes(32)
                 self.__add_to_keystore__((KS_PASSWORD,index), new_entry['key'], new_entry['id'])
                 self.setup['password_keys'][index] = new_entry
@@ -723,8 +722,8 @@ def on_page_markdown(self, markdown, page, config, **kwargs):
             index = encryptcontent['obfuscate']
             if index not in self.setup['obfuscate_keys']:
                 new_entry = {}
-                self.keystore_id += 1
-                new_entry['id'] = quote(self.config['remember_prefix'] + str(self.keystore_id), safe='~()*!\'')
+                self.setup['keystore_id'] += 1
+                new_entry['id'] = quote(self.config['remember_prefix'] + str(self.setup['keystore_id']), safe='~()*!\'')
                 new_entry['key'] = get_random_bytes(32)
                 self.__add_to_keystore__((KS_OBFUSCATE,index), new_entry['key'], new_entry['id'])
                 self.setup['obfuscate_keys'][index] = new_entry