174
174
    def password_encode(self, password):
 
175
175
        # Passphrase can not be empty and can not contain newlines or
 
176
176
        # NUL bytes.  So we prefix it and hex encode it.
 
177
 
        return b"mandos" + binascii.hexlify(password)
 
 
177
        encoded = b"mandos" + binascii.hexlify(password)
 
 
178
        if len(encoded) > 2048:
 
 
179
            # GnuPG can't handle long passwords, so encode differently
 
 
180
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
 
181
                       .replace(b"\n", b"\\n")
 
 
182
                       .replace(b"\0", b"\\x00"))
 
179
185
    def encrypt(self, data, password):
 
180
 
        self.gnupg.passphrase = self.password_encode(password)
 
181
 
        with open(os.devnull, "w") as devnull:
 
183
 
                proc = self.gnupg.run(['--symmetric'],
 
184
 
                                      create_fhs=['stdin', 'stdout'],
 
185
 
                                      attach_fhs={'stderr': devnull})
 
186
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
188
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
189
 
                    ciphertext = f.read()
 
193
 
        self.gnupg.passphrase = None
 
 
186
        passphrase = self.password_encode(password)
 
 
187
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
 
189
            passfile.write(passphrase)
 
 
191
            proc = subprocess.Popen(['gpg', '--symmetric',
 
 
195
                                    stdin = subprocess.PIPE,
 
 
196
                                    stdout = subprocess.PIPE,
 
 
197
                                    stderr = subprocess.PIPE)
 
 
198
            ciphertext, err = proc.communicate(input = data)
 
 
199
        if proc.returncode != 0:
 
194
201
        return ciphertext
 
196
203
    def decrypt(self, data, password):
 
197
 
        self.gnupg.passphrase = self.password_encode(password)
 
198
 
        with open(os.devnull, "w") as devnull:
 
200
 
                proc = self.gnupg.run(['--decrypt'],
 
201
 
                                      create_fhs=['stdin', 'stdout'],
 
202
 
                                      attach_fhs={'stderr': devnull})
 
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
205
 
                with contextlib.closing(proc.handles['stdout']) as f:
 
206
 
                    decrypted_plaintext = f.read()
 
210
 
        self.gnupg.passphrase = None
 
 
204
        passphrase = self.password_encode(password)
 
 
205
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
 
207
            passfile.write(passphrase)
 
 
209
            proc = subprocess.Popen(['gpg', '--decrypt',
 
 
213
                                    stdin = subprocess.PIPE,
 
 
214
                                    stdout = subprocess.PIPE,
 
 
215
                                    stderr = subprocess.PIPE)
 
 
216
            decrypted_plaintext, err = proc.communicate(input
 
 
218
        if proc.returncode != 0:
 
211
220
        return decrypted_plaintext
 
 
446
456
                          "fingerprint", "host", "interval",
 
447
457
                          "last_approval_request", "last_checked_ok",
 
448
458
                          "last_enabled", "name", "timeout")
 
449
 
    client_defaults = { "timeout": "5m",
 
450
 
                        "extended_timeout": "15m",
 
 
459
    client_defaults = { "timeout": "PT5M",
 
 
460
                        "extended_timeout": "PT15M",
 
452
462
                        "checker": "fping -q -- %%(host)s",
 
454
 
                        "approval_delay": "0s",
 
455
 
                        "approval_duration": "1s",
 
 
464
                        "approval_delay": "PT0S",
 
 
465
                        "approval_duration": "PT1S",
 
456
466
                        "approved_by_default": "True",
 
457
467
                        "enabled": "True",
 
 
710
724
                # in normal mode, that is already done by daemon(),
 
711
725
                # and in debug mode we don't want to.  (Stdin is
 
712
726
                # always replaced by /dev/null.)
 
 
727
                # The exception is when not debugging but nevertheless
 
 
728
                # running in the foreground; use the previously
 
 
731
                if (not self.server_settings["debug"]
 
 
732
                    and self.server_settings["foreground"]):
 
 
733
                    popen_args.update({"stdout": wnull,
 
713
735
                self.checker = subprocess.Popen(command,
 
716
739
            except OSError as error:
 
717
740
                logger.error("Failed to start subprocess",
 
719
743
            self.checker_callback_tag = (gobject.child_watch_add
 
720
744
                                         (self.checker.pid,
 
721
745
                                          self.checker_callback,
 
723
747
            # The checker may have completed before the gobject
 
724
748
            # watch was added.  Check for this.
 
725
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
750
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
 
751
            except OSError as error:
 
 
752
                if error.errno == errno.ECHILD:
 
 
753
                    # This should never happen
 
 
754
                    logger.error("Child process vanished",
 
727
759
                gobject.source_remove(self.checker_callback_tag)
 
728
760
                self.checker_callback(pid, status, command)
 
 
 
2123
def rfc3339_duration_to_delta(duration):
 
 
2124
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
 
2126
    >>> rfc3339_duration_to_delta("P7D")
 
 
2127
    datetime.timedelta(7)
 
 
2128
    >>> rfc3339_duration_to_delta("PT60S")
 
 
2129
    datetime.timedelta(0, 60)
 
 
2130
    >>> rfc3339_duration_to_delta("PT60M")
 
 
2131
    datetime.timedelta(0, 3600)
 
 
2132
    >>> rfc3339_duration_to_delta("PT24H")
 
 
2133
    datetime.timedelta(1)
 
 
2134
    >>> rfc3339_duration_to_delta("P1W")
 
 
2135
    datetime.timedelta(7)
 
 
2136
    >>> rfc3339_duration_to_delta("PT5M30S")
 
 
2137
    datetime.timedelta(0, 330)
 
 
2138
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
 
2139
    datetime.timedelta(1, 200)
 
 
2142
    # Parsing an RFC 3339 duration with regular expressions is not
 
 
2143
    # possible - there would have to be multiple places for the same
 
 
2144
    # values, like seconds.  The current code, while more esoteric, is
 
 
2145
    # cleaner without depending on a parsing library.  If Python had a
 
 
2146
    # built-in library for parsing we would use it, but we'd like to
 
 
2147
    # avoid excessive use of external libraries.
 
 
2149
    # New type for defining tokens, syntax, and semantics all-in-one
 
 
2150
    Token = collections.namedtuple("Token",
 
 
2151
                                   ("regexp", # To match token; if
 
 
2152
                                              # "value" is not None,
 
 
2153
                                              # must have a "group"
 
 
2155
                                    "value",  # datetime.timedelta or
 
 
2157
                                    "followers")) # Tokens valid after
 
 
2159
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
 
2160
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
 
2161
    token_end = Token(re.compile(r"$"), None, frozenset())
 
 
2162
    token_second = Token(re.compile(r"(\d+)S"),
 
 
2163
                         datetime.timedelta(seconds=1),
 
 
2164
                         frozenset((token_end,)))
 
 
2165
    token_minute = Token(re.compile(r"(\d+)M"),
 
 
2166
                         datetime.timedelta(minutes=1),
 
 
2167
                         frozenset((token_second, token_end)))
 
 
2168
    token_hour = Token(re.compile(r"(\d+)H"),
 
 
2169
                       datetime.timedelta(hours=1),
 
 
2170
                       frozenset((token_minute, token_end)))
 
 
2171
    token_time = Token(re.compile(r"T"),
 
 
2173
                       frozenset((token_hour, token_minute,
 
 
2175
    token_day = Token(re.compile(r"(\d+)D"),
 
 
2176
                      datetime.timedelta(days=1),
 
 
2177
                      frozenset((token_time, token_end)))
 
 
2178
    token_month = Token(re.compile(r"(\d+)M"),
 
 
2179
                        datetime.timedelta(weeks=4),
 
 
2180
                        frozenset((token_day, token_end)))
 
 
2181
    token_year = Token(re.compile(r"(\d+)Y"),
 
 
2182
                       datetime.timedelta(weeks=52),
 
 
2183
                       frozenset((token_month, token_end)))
 
 
2184
    token_week = Token(re.compile(r"(\d+)W"),
 
 
2185
                       datetime.timedelta(weeks=1),
 
 
2186
                       frozenset((token_end,)))
 
 
2187
    token_duration = Token(re.compile(r"P"), None,
 
 
2188
                           frozenset((token_year, token_month,
 
 
2189
                                      token_day, token_time,
 
 
2191
    # Define starting values
 
 
2192
    value = datetime.timedelta() # Value so far
 
 
2194
    followers = frozenset(token_duration,) # Following valid tokens
 
 
2195
    s = duration                # String left to parse
 
 
2196
    # Loop until end token is found
 
 
2197
    while found_token is not token_end:
 
 
2198
        # Search for any currently valid tokens
 
 
2199
        for token in followers:
 
 
2200
            match = token.regexp.match(s)
 
 
2201
            if match is not None:
 
 
2203
                if token.value is not None:
 
 
2204
                    # Value found, parse digits
 
 
2205
                    factor = int(match.group(1), 10)
 
 
2206
                    # Add to value so far
 
 
2207
                    value += factor * token.value
 
 
2208
                # Strip token from string
 
 
2209
                s = token.regexp.sub("", s, 1)
 
 
2212
                # Set valid next tokens
 
 
2213
                followers = found_token.followers
 
 
2216
            # No currently valid tokens were found
 
 
2217
            raise ValueError("Invalid RFC 3339 duration")
 
2093
2222
def string_to_delta(interval):
 
2094
2223
    """Parse a string and return a datetime.timedelta
 
 
2188
2323
    parser.add_argument("--no-dbus", action="store_false",
 
2189
2324
                        dest="use_dbus", help="Do not provide D-Bus"
 
2190
 
                        " system bus interface")
 
 
2325
                        " system bus interface", default=None)
 
2191
2326
    parser.add_argument("--no-ipv6", action="store_false",
 
2192
 
                        dest="use_ipv6", help="Do not use IPv6")
 
 
2327
                        dest="use_ipv6", help="Do not use IPv6",
 
2193
2329
    parser.add_argument("--no-restore", action="store_false",
 
2194
2330
                        dest="restore", help="Do not restore stored"
 
 
2331
                        " state", default=None)
 
2196
2332
    parser.add_argument("--socket", type=int,
 
2197
2333
                        help="Specify a file descriptor to a network"
 
2198
2334
                        " socket to use instead of creating one")
 
2199
2335
    parser.add_argument("--statedir", metavar="DIR",
 
2200
2336
                        help="Directory to save/restore state in")
 
2201
2337
    parser.add_argument("--foreground", action="store_true",
 
2202
 
                        help="Run in foreground")
 
 
2338
                        help="Run in foreground", default=None)
 
2204
2340
    options = parser.parse_args()
 
2206
2342
    if options.check:
 
 
2344
        fail_count, test_count = doctest.testmod()
 
 
2345
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2211
2347
    # Default values for config file for server-global settings
 
2212
2348
    server_defaults = { "interface": "",