From 5e92c7ba9115d681f6cf87619d5466a766b5e006 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sun, 14 Feb 2021 12:14:30 +0100
Subject: [PATCH 1/2] add bwpass to requirements

---
 .gitignore       | 1 +
 Jenkinsfile      | 2 ++
 requirements.txt | 1 +
 3 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6feee2d..5738e39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .secrets.cfg
 __pycache__
 *.swp
+src/
diff --git a/Jenkinsfile b/Jenkinsfile
index 8c37603..ef990d1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,6 +31,7 @@ pipeline {
                             . venv/bin/activate
 
                             export BW_VAULT_DUMMY_MODE=1
+                            export BW_PASS_DUMMY_MODE=1
                             bw test --metadata-determinism 3 --config-determinism 3
                         """
                     }
@@ -43,6 +44,7 @@ pipeline {
                             bw test --ignore-missing-faults
 
                             export BW_VAULT_DUMMY_MODE=1
+                            export BW_PASS_DUMMY_MODE=1
                             bw test
                         """
                     }
diff --git a/requirements.txt b/requirements.txt
index 5ccd17c..ad81628 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 bundlewrap>=4.5.1
 PyNaCl
+bundlewrap-pass @ git+https://git.kunsmann.eu/kunsi/bundlewrap-pass.git#egg=bundlewrap-pass
-- 
2.39.2


From 5476c9c8f29cc241619e1be051597c2ffa36cb0a Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Fri, 16 Apr 2021 16:25:34 +0200
Subject: [PATCH 2/2] nodes/htz.ex42-1048908: get passwords from bwpass

---
 nodes.py                  | 2 ++
 nodes/htz/ex42-1048908.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nodes.py b/nodes.py
index 810ec8e..8b2bd13 100644
--- a/nodes.py
+++ b/nodes.py
@@ -1,6 +1,8 @@
 from os.path import join
 from pathlib import Path
 
+import bwpass
+
 nodes = {}
 for node in Path(join(repo_path, "nodes")).rglob("*.py"):
     with open(node, 'r') as f:
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index febe41e..e8a1b94 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -370,7 +370,7 @@ nodes['htz.ex42-1048908'] = {
         },
         'radicale': {
             'users': {
-                'kunsi': vault.decrypt('encrypt$gAAAAABgJ3tp1DTK0ssglKSsHxlf7p3soDtdSPpgBqyABcHTFGPdnb7ym1an7WXK7idWhx1Tyqf_CLL0IcoMPPoOR-sgzGQJBKXKhPtib6JoPjCzAUphmbo='),
+                'kunsi': bwpass.password('dav.kunsmann.eu/kunsi'),
             },
         },
         'rspamd': {
@@ -395,7 +395,7 @@ nodes['htz.ex42-1048908'] = {
                 '217.197.80.134',
                 '2001:bf0:c000:a::2:134',
             },
-            'password': vault.decrypt('encrypt$gAAAAABfp7qzym32R6Go1A6oax0NGQM7EBMckbEbnZC6-RSKx-klSJsL57XbSUTD-AJM-gBIPzlmor-3bfVxPWLRYXtO8uTVw6jNQ1yt15ReHkOTijVqV2ACk-LTDBG3p4YKBn0pQgNvvjXhWV_J1-Pgjywbl4sHXc0zqjCGZ6xtEn6ywj0Pd599JJjREF4QCIFVZVWuKvo1'),
+            'password': bwpass.password('rspamd.mx0.kunbox.net'),
         },
         'smartd': {
             'disks': {
-- 
2.39.2