[prev in list] [next in list] [prev in thread] [next in thread] 

List:       password-store
Subject:    Re: Password-Store Digest, Vol 72, Issue 1
From:       Michael Kesper <mkesper () schokokeks ! org>
Date:       2019-05-17 7:36:47
Message-ID: 0437f1cd-0bc1-b327-d82c-65ddfbb50918 () schokokeks ! org
[Download RAW message or body]

This is a MIME-formatted message.  If you see this text it means that your
E-mail software does not support MIME-formatted messages.

[Attachment #2 (multipart/signed)]
This is a MIME-formatted message.  If you see this text it means that your
E-mail software does not support MIME-formatted messages.

[Attachment #4 (multipart/mixed)]

[Attachment #6 (multipart/mixed)]


Hi Eddie,

thanks for trying the patch!

On 16.05.19 14:07, Eddie Barraco wrote:
> I got problem with applying patch. Does someone can explain me ?
> 
> I'm trying to `| git am` from mutt
> 
> $ neomutt
> Applying: Password-Store Digest, Vol 71, Issue 6
> error: patch failed: contrib/importers/keepassx2pass.py:1
> error: contrib/importers/keepassx2pass.py: patch does not apply
> Patch failed at 0001 Password-Store Digest, Vol 71, Issue 6
> hint: Use 'git am --show-current-patch' to see the failed patch

I believe this is because thunderbird quoted the patch when I replied.
I'll attach it as a file.
If it still fails to apply I'd be interested in the output of
git am --show-current-patch

Best wishes
Michael

["0001-keepassx2pass-Extract-binary-attachments.patch" (text/x-patch)]

From 5f94e257b8d5bfb3f88c93c5c7d1b9e8246c4351 Mon Sep 17 00:00:00 2001
From: Michael Kesper <mkesper@sysfive.com>
Date: Mon, 8 Apr 2019 10:11:04 +0200
Subject: [PATCH] keepassx2pass: Extract binary attachments

In keepassx, it's possible to store one binary attachment per entry.
In XML export, these are included as base64-encoded text.
This patch will export these binaries as binary content into pass.
Files will be saved as <path_to/entry>_<name of attachment>.gpg, e.g.
for an attachment "order_2019-04-08.pdf" in entry "Orders/order001" it will be
"Orders/order001_order_2019-04-08.pdf.gpg".
The files can be decrypted directly with gpg --decrypt-files.
---
 contrib/importers/keepassx2pass.py | 35 ++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/contrib/importers/keepassx2pass.py b/contrib/importers/keepassx2pass.py
index 197375f..9daac91 100755
--- a/contrib/importers/keepassx2pass.py
+++ b/contrib/importers/keepassx2pass.py
@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 #
 # Copyright (C) 2012 Juhamatti Niemelä <iiska@iki.fi>. All Rights Reserved.
+# Copyright  © 2019 Michael Kesper <mkesper@sysfive.com>.
 # This file is licensed under the GPLv2+. Please see COPYING for more information.
 #
 # Usage ./keepassx2pass.py export.xml
 
+import base64
 import sys
 import re
 
@@ -43,9 +45,11 @@ def path_for(element, path=''):
 
 def password_data(element):
     """ Return password data and additional info if available from
-    password entry element. """
+    password entry element.
+    Extract any base64-encoded attachment.
+    """
     passwd = element.find('password').text
-    ret = (passwd + "\n") if passwd else "\n"
+    ret = (passwd + "\n") if passwd is not None else "\n"
     for field in ['username', 'url', 'comment']:
         fel = element.find(field)
         children = [(e.text or '') + (e.tail or '') for e in list(fel)]
@@ -54,17 +58,34 @@ def password_data(element):
         text = (fel.text or '') + "\n".join(children)
         if len(text) > 0:
             ret = "%s%s: %s\n" % (ret, fel.tag, text)
-    return ret
+    attachment = element.find('bin')
+    attachment_name = element.find('bindesc')
+    if attachment is not None:
+        attachment = base64.b64decode(attachment.text)
+        attachment_name = attachment_name.text
+    return ret, attachment_name, attachment
+
 
 def import_entry(element, path=''):
     """ Import new password entry to password-store using pass insert
-    command """
-    print("Importing " + path_for(element, path))
+    command, exctract attachment if any.
+    """
+    path_name = path_for(element, path)
+    print("Importing {}".format(path_name))
+    pass_text, attachment_name, attachment = password_data(element)
     proc = Popen(['pass', 'insert', '--multiline', '--force',
-                  path_for(element, path)],
+                  path_name],
                   stdin=PIPE, stdout=PIPE)
-    proc.communicate(password_data(element).encode())
+    proc.communicate(pass_text.encode())
     proc.wait()
+    if attachment is not None:
+        print("Extracting binary data: {}".format(attachment_name))
+        proc = Popen(['pass', 'insert', '--multiline', '--force',
+                      '{}_{}'.format(path_name, attachment_name)],
+                      stdin=PIPE, stdout=PIPE)
+        proc.communicate(attachment)
+        proc.wait()
+
 
 def import_group(element, path=''):
     """ Import all entries and sub-groups from given group """
-- 
2.20.1


["signature.asc" (application/pgp-signature)]

_______________________________________________
Password-Store mailing list
Password-Store@lists.zx2c4.com
https://lists.zx2c4.com/mailman/listinfo/password-store


[prev in list] [next in list] [prev in thread] [next in thread]