speed up decryption: only add relevant keystore entries to encrypted pages.

username/password pairs are added in total, because relevant entry can be found.

Author: unverbuggt

README.md

@@ -338,8 +338,6 @@ plugins:
         #    - 'logo.svg'
 ```
 
-title: Features
-
 # Features
 
 ### Override default templates
@@ -486,8 +484,6 @@ However if `sharelinks: True` is enabled in the plugin configuration you can gen
 > Then another condition applies: If non-aphanumeric characters are used in user/password,
 > they need to be URLencoded (f.ex. %20 = space character). Some browsers may do that automatically (Do a copy/paste from the browsers address bar then).
 
-title: Modify pages
-
 ## Modify generated pages
 
 ### Encrypt something
@@ -662,8 +658,6 @@ It ends with `///`. The meta tag `inject_id` defines which div id we would like
 (it also injects the decryption form here). And the div id found at `delete_id` will be deleted
 on successful decryption.
 
-title: Search encryption
-
 ## Search encryption
 
 ### Search index encryption
@@ -733,8 +727,6 @@ pip install --force-reinstall .
 
 > Note: this currently doesn't work with mkdocs-material-9.x.x
 
-title: Javascript extensions
-
 ## Javascript extensions
 
 ### Reload user-defined scripts
@@ -855,8 +847,6 @@ graph LR
 ````
 
 
-title: Security
-
 ## Security
 
 ### Crypto-js or webcrypto?

documentation/decrypt-form.tpl.html

@@ -25,7 +25,7 @@ <h1>{{ summary }}</h1>
         <p id="mkdocs-decrypt-msg"></p>
     </form>
 </div>
-
+<div id="encryptcontent-info"></div>
 <script type="text/javascript">
 var encryptcontent_id = "{{ encryptcontent_id }}";
 var encryptcontent_path = "{{ encryptcontent_path }}";
@@ -39,3 +39,7 @@ <h1>{{ summary }}</h1>
 <script type="text/javascript" src="{{ library }}"></script>
 {%- endfor %}
 <script type="text/javascript" src="{{ base_path }}assets/javascripts/decrypt-contents.js" defer></script>
+<script>
+var encryptcontent_info = document.getElementById('encryptcontent-info');
+encryptcontent_info.innerHTML = '<b>keystore length:</b> '+ encryptcontent_keystore.length + '<br>encryptcontent id:<b>:</b> ' + encryptcontent_id;
+</script>

documentation/docs/features/index.md

@@ -1,5 +1,3 @@
-title: Features
-
 # Features
 
 ### Override default templates

documentation/docs/features/jsext.md

@@ -1,5 +1,3 @@
-title: Javascript extensions
-
 ## Javascript extensions
 
 ### Reload user-defined scripts

documentation/docs/features/modifypages.md

@@ -1,5 +1,3 @@
-title: Modify pages
-
 ## Modify generated pages
 
 ### Encrypt something

documentation/docs/features/search.md

@@ -1,5 +1,3 @@
-title: Search encryption
-
 ## Search encryption
 
 ### Search index encryption

documentation/docs/features/security.md

@@ -1,5 +1,3 @@
-title: Security
-
 ## Security
 
 ### Crypto-js or webcrypto?

documentation/mkdocs.yml

@@ -24,10 +24,10 @@ nav:
     - 'usage.md'
     - Features:
       - 'features/index.md'
-      - 'features/modifypages.md'
-      - 'features/search.md'
-      - 'features/jsext.md'
-      - 'features/security.md'
+      - Modify pages: 'features/modifypages.md'
+      - Search encryption: 'features/search.md'
+      - Javascript extensions: 'features/jsext.md'
+      - Security: 'features/security.md'
     - How does it work?: 'explanations.md'
     - Test bench: 
       - 'testbench/index.md'

encryptcontent/plugin.py

@@ -254,34 +254,38 @@ def __encrypt_content__(self, content, base_path, encryptcontent_path, encryptco
         obfuscate_password = None
         encryptcontent_id = ''
 
+        encryptcontent_keystore = []
+
         if encryptcontent['type'] == 'password':
             # get 32-bit AES-256 key from password_keys
             key = encryptcontent['key']
             keystore = self.setup['password_keys'][encryptcontent['password']]
             encryptcontent_id = keystore['id']
-            encrypted_keystore = self.setup['keystore_password']
+            encryptcontent_keystore.append(self.setup['keystore_password'][(KS_PASSWORD, encryptcontent['password'])])
         elif encryptcontent['type'] == 'level':
             # get 32-bit AES-256 key from level_keys
             key = encryptcontent['key']
             keystore = self.setup['level_keys'][encryptcontent['level']]
             encryptcontent_id = keystore['id']
             if keystore.get('uname'):
                 encrypted_keystore = self.setup['keystore_userpass']
+                for entry in encrypted_keystore: # might as well add all credentials as keystore can be found by user name
+                    encryptcontent_keystore.append(encrypted_keystore[entry])
                 uname = 1
             else:
                 encrypted_keystore = self.setup['keystore_password']
+                for entry in encrypted_keystore:
+                    if entry[1] in self.setup['password_inventory'][encryptcontent['level']]:
+                        encryptcontent_keystore.append(encrypted_keystore[entry])
         elif encryptcontent['type'] == 'obfuscate':
             # get 32-bit AES-256 key from obfuscate_keys
             key = encryptcontent['key']
             keystore = self.setup['obfuscate_keys'][encryptcontent['obfuscate']]
             encryptcontent_id = keystore['id']
-            encrypted_keystore = self.setup['keystore_obfuscate']
+            encryptcontent_keystore.append(self.setup['keystore_obfuscate'][(KS_OBFUSCATE, encryptcontent['obfuscate'])])
             obfuscate = 1
             obfuscate_password = encryptcontent['obfuscate']
 
-        encryptcontent_keystore = []
-        for entry in encrypted_keystore:
-            encryptcontent_keystore.append(encrypted_keystore[entry])
 
         inject_something = encryptcontent['inject'] if 'inject' in encryptcontent else None
         delete_something = encryptcontent['delete_id'] if 'delete_id' in encryptcontent else None