/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2020-02-08 14:01:38 UTC
  • Revision ID: teddy@recompile.se-20200208140138-h3ett0amdelfpt90
mandos: If possible, use shlex.quote() instead of re.escape()

* mandos: Make sure shlex.quote() exists (falling back to assigning
  re.escape to it).
  (Client.start_checker): Use shlex.quote() instead of re.escape().

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
79
79
import codecs
80
80
import unittest
81
81
import random
 
82
import shlex
82
83
 
83
84
import dbus
84
85
import dbus.service
94
95
    __metaclass__ = type
95
96
    str = unicode
96
97
 
 
98
# Add collections.abc.Callable if it does not exist
 
99
try:
 
100
    collections.abc.Callable
 
101
except AttributeError:
 
102
    class abc:
 
103
        Callable = collections.Callable
 
104
    collections.abc = abc
 
105
    del abc
 
106
 
 
107
# Add shlex.quote if it does not exist
 
108
try:
 
109
    shlex.quote
 
110
except AttributeError:
 
111
    shlex.quote = re.escape
 
112
 
97
113
# Show warnings by default
98
114
if not sys.warnoptions:
99
115
    import warnings
1118
1134
        if self.checker is None:
1119
1135
            # Escape attributes for the shell
1120
1136
            escaped_attrs = {
1121
 
                attr: re.escape(str(getattr(self, attr)))
 
1137
                attr: shlex.quote(str(getattr(self, attr)))
1122
1138
                for attr in self.runtime_expansions}
1123
1139
            try:
1124
1140
                command = self.checker_command % escaped_attrs
2748
2764
        if command == 'getattr':
2749
2765
            attrname = request[1]
2750
2766
            if isinstance(client_object.__getattribute__(attrname),
2751
 
                          collections.Callable):
 
2767
                          collections.abc.Callable):
2752
2768
                parent_pipe.send(('function', ))
2753
2769
            else:
2754
2770
                parent_pipe.send((