Merge lp:~ross-ross-williams/duplicity/gpg-agent-fix into lp:duplicity/0.6

[Ross Williams]

Have gpg.py check whether use_agent is enabled before asking GnuPGInterface to create a passphrase file descriptor. This works around a GnuPG 2.x-related issue in which --passphrase-fd takes priority over --use-agent as the source of the passphrase. The opposite was true in GnuPG 1.x, so this bug only occurs when using gpg2.

[edso (ed.so)]

On 06.09.2011 20:59, Ross Williams wrote:
> Ross Williams has proposed merging lp:~ross-ross-williams/duplicity/gpg-agent-fix into lp:duplicity.
>
> Requested reviews:
> duplicity-team (duplicity-team)
> Related bugs:
> Bug #842990 in Duplicity: "use-agent doesn't work with gpg2"
> https://bugs.launchpad.net/duplicity/+bug/842990
>
> For more details, see:
> https://code.launchpad.net/~ross-ross-williams/duplicity/gpg-agent-fix/+merge/74278
>
> Have gpg.py check whether use_agent is enabled before asking GnuPGInterface to create a passphrase file descriptor. This works around a GnuPG 2.x-related issue in which --passphrase-fd takes priority over --use-agent as the source of the passphrase. The opposite was true in GnuPG 1.x, so this bug only occurs when using gpg2.

nice.. does it work for gpg1 and 2 now? ..ede/duply.net

[Ross Williams (ross-ross-williams)]

It doesn't break gpg1, and I'm successfully using gpg2 with separate encryption and signing keys. I have tested also without using gpg-agent, and that works fine.

On Sep 6, 2011, at 3:45 PM, edso <email address hidden> wrote:

> On 06.09.2011 20:59, Ross Williams wrote:
>> Ross Williams has proposed merging lp:~ross-ross-williams/duplicity/gpg-agent-fix into lp:duplicity.
>>
>> Requested reviews:
>> duplicity-team (duplicity-team)
>> Related bugs:
>> Bug #842990 in Duplicity: "use-agent doesn't work with gpg2"
>> https://bugs.launchpad.net/duplicity/+bug/842990
>>
>> For more details, see:
>> https://code.launchpad.net/~ross-ross-williams/duplicity/gpg-agent-fix/+merge/74278
>>
>> Have gpg.py check whether use_agent is enabled before asking GnuPGInterface to create a passphrase file descriptor. This works around a GnuPG 2.x-related issue in which --passphrase-fd takes priority over --use-agent as the source of the passphrase. The opposite was true in GnuPG 1.x, so this bug only occurs when using gpg2.
>
>
> nice.. does it work for gpg1 and 2 now? ..ede/duply.net
>
> --
> https://code.launchpad.net/~ross-ross-williams/duplicity/gpg-agent-fix/+merge/74278
> You are the owner of lp:~ross-ross-williams/duplicity/gpg-agent-fix.

=== modified file 'duplicity/gpg.py'
--- duplicity/gpg.py	2011-07-16 18:37:47 +0000
+++ duplicity/gpg.py	2011-09-06 19:10:12 +0000
@@ -131,25 +131,37 @@
                 cmdlist.append('--symmetric')
                 # use integrity protection
                 gnupg.options.extra_args.append('--force-mdc')
-            p1 = gnupg.run(cmdlist, create_fhs=['stdin', 'passphrase'],
+            # Skip the passphrase if using the agent
+            if globals.use_agent:
+                gnupg_fhs = ['stdin',]
+            else:
+                gnupg_fhs = ['stdin','passphrase']
+            p1 = gnupg.run(cmdlist, create_fhs=gnupg_fhs,
                            attach_fhs={'stdout': encrypt_path.open("wb"),
                                        'stderr': self.stderr_fp,
                                        'logger': self.logger_fp})
-            p1.handles['passphrase'].write(passphrase)
-            p1.handles['passphrase'].close()
+            if not(globals.use_agent):
+                p1.handles['passphrase'].write(passphrase)
+                p1.handles['passphrase'].close()
             self.gpg_input = p1.handles['stdin']
         else:
             if profile.recipients and profile.encrypt_secring:
                 cmdlist.append('--secret-keyring')
                 cmdlist.append(profile.encrypt_secring)
             self.status_fp = tempfile.TemporaryFile()
-            p1 = gnupg.run(['--decrypt'], create_fhs=['stdout', 'passphrase'],
+            # Skip the passphrase if using the agent
+            if globals.use_agent:
+                gnupg_fhs = ['stdout',]
+            else:
+                gnupg_fhs = ['stdout','passphrase']
+            p1 = gnupg.run(['--decrypt'], create_fhs=gnupg_fhs,
                            attach_fhs={'stdin': encrypt_path.open("rb"),
                                        'status': self.status_fp,
                                        'stderr': self.stderr_fp,
                                        'logger': self.logger_fp})
-            p1.handles['passphrase'].write(passphrase)
-            p1.handles['passphrase'].close()
+            if not(globals.use_agent):
+                p1.handles['passphrase'].write(passphrase)
+                p1.handles['passphrase'].close()
             self.gpg_output = p1.handles['stdout']
         self.gpg_process = p1
         self.encrypt = encrypt