/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/gpg.py

  • Committer: John Arbash Meinel
  • Date: 2006-02-14 18:36:30 UTC
  • mto: (1185.79.1 bzr-jam-pending)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: john@arbash-meinel.com-20060214183630-bf533b848ea5edce
Updated gpg to use a named file, rather than using stdin, so that gpg-agent will work properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/gpg.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005 by Canonical Ltd
2
2
#   Authors: Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
"""GPG signing and checking logic."""
19
19
 
20
 
import os
21
 
import sys
22
 
 
23
 
from bzrlib.lazy_import import lazy_import
24
 
lazy_import(globals(), """
25
20
import errno
26
21
import subprocess
 
22
import tempfile
27
23
 
28
 
from bzrlib import (
29
 
    errors,
30
 
    trace,
31
 
    ui,
32
 
    )
33
 
""")
 
24
import bzrlib.errors as errors
34
25
 
35
26
 
36
27
class DisabledGPGStrategy(object):
50
41
        """Real strategies take a configuration."""
51
42
 
52
43
    def sign(self, content):
53
 
        return ("-----BEGIN PSEUDO-SIGNED CONTENT-----\n" + content +
54
 
                "-----END PSEUDO-SIGNED CONTENT-----\n")
55
 
 
56
 
 
57
 
def _set_gpg_tty():
58
 
    tty = os.environ.get('TTY')
59
 
    if tty is not None:
60
 
        os.environ['GPG_TTY'] = tty
61
 
        trace.mutter('setting GPG_TTY=%s', tty)
62
 
    else:
63
 
        # This is not quite worthy of a warning, because some people
64
 
        # don't need GPG_TTY to be set. But it is worthy of a big mark
65
 
        # in ~/.bzr.log, so that people can debug it if it happens to them
66
 
        trace.mutter('** Env var TTY empty, cannot set GPG_TTY.'
67
 
                     '  Is TTY exported?')
 
44
        return content
68
45
 
69
46
 
70
47
class GPGStrategy(object):
71
48
    """GPG Signing and checking facilities."""
72
 
 
 
49
        
73
50
    def _command_line(self):
74
 
        return [self._config.gpg_signing_command(), '--clearsign']
 
51
        return [self._config.gpg_signing_command(),
 
52
                '--output', '-', '--clearsign']
75
53
 
76
54
    def __init__(self, config):
77
55
        self._config = config
78
56
 
79
57
    def sign(self, content):
80
 
        if isinstance(content, unicode):
81
 
            raise errors.BzrBadParameterUnicode('content')
82
 
        ui.ui_factory.clear_term()
83
 
 
84
 
        preexec_fn = _set_gpg_tty
85
 
        if sys.platform == 'win32':
86
 
            # Win32 doesn't support preexec_fn, but wouldn't support TTY anyway.
87
 
            preexec_fn = None
 
58
        f = tempfile.NamedTemporaryFile()
 
59
        cmd = self._command_line() + [f.name]
 
60
        f.write(content)
 
61
        f.flush()
88
62
        try:
89
 
            process = subprocess.Popen(self._command_line(),
90
 
                                       stdin=subprocess.PIPE,
91
 
                                       stdout=subprocess.PIPE,
92
 
                                       preexec_fn=preexec_fn)
 
63
            process = subprocess.Popen(cmd,
 
64
                                       stdout=subprocess.PIPE)
93
65
            try:
94
 
                result = process.communicate(content)[0]
 
66
                result = process.communicate()[0]
95
67
                if process.returncode is None:
96
68
                    process.wait()
97
69
                if process.returncode != 0:
98
 
                    raise errors.SigningFailed(self._command_line())
 
70
                    raise errors.SigningFailed(cmd)
99
71
                return result
100
72
            except OSError, e:
101
73
                if e.errno == errno.EPIPE:
102
 
                    raise errors.SigningFailed(self._command_line())
 
74
                    raise errors.SigningFailed(cmd)
103
75
                else:
104
76
                    raise
105
77
        except ValueError:
108
80
        except OSError, e:
109
81
            if e.errno == errno.ENOENT:
110
82
                # gpg is not installed
111
 
                raise errors.SigningFailed(self._command_line())
 
83
                raise errors.SigningFailed(cmd)
112
84
            else:
113
85
                raise
 
86
        f.close()