/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2019-07-30 18:17:10 UTC
  • mfrom: (237.7.681 trunk)
  • Revision ID: teddy@recompile.se-20190730181710-0ph4iwqdijdy41uv
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
586
586
        def __init__(self, socket, credentials=None):
587
587
            self._c_object = gnutls.session_t()
588
588
            gnutls_flags = gnutls.CLIENT
589
 
            if gnutls.check_version("3.5.6"):
 
589
            if gnutls.check_version(b"3.5.6"):
590
590
                gnutls_flags |= gnutls.NO_TICKETS
591
591
            if gnutls.has_rawpk:
592
592
                gnutls_flags |= gnutls.ENABLE_RAWPK
794
794
                                                    ctypes.c_size_t)]
795
795
        openpgp_crt_get_fingerprint.restype = _error_code
796
796
 
797
 
    if check_version("3.6.4"):
 
797
    if check_version(b"3.6.4"):
798
798
        certificate_type_get2 = _library.gnutls_certificate_type_get2
799
799
        certificate_type_get2.argtypes = [session_t, ctypes.c_int]
800
800
        certificate_type_get2.restype = _error_code
821
821
    approved:   bool(); 'None' if not yet approved/disapproved
822
822
    approval_delay: datetime.timedelta(); Time to wait for approval
823
823
    approval_duration: datetime.timedelta(); Duration of one approval
824
 
    checker:    subprocess.Popen(); a running checker process used
825
 
                                    to see if the client lives.
826
 
                                    'None' if no process is running.
 
824
    checker: multiprocessing.Process(); a running checker process used
 
825
             to see if the client lives. 'None' if no process is
 
826
             running.
827
827
    checker_callback_tag: a GLib event source tag, or None
828
828
    checker_command: string; External command which is run to check
829
829
                     if client lives.  %() expansions are done at
1036
1036
    def checker_callback(self, source, condition, connection,
1037
1037
                         command):
1038
1038
        """The checker has completed, so take appropriate actions."""
1039
 
        self.checker_callback_tag = None
1040
 
        self.checker = None
1041
1039
        # Read return code from connection (see call_pipe)
1042
1040
        returncode = connection.recv()
1043
1041
        connection.close()
 
1042
        self.checker.join()
 
1043
        self.checker_callback_tag = None
 
1044
        self.checker = None
1044
1045
 
1045
1046
        if returncode >= 0:
1046
1047
            self.last_checker_status = returncode
2287
2288
            approval_required = False
2288
2289
            try:
2289
2290
                if gnutls.has_rawpk:
2290
 
                    fpr = ""
 
2291
                    fpr = b""
2291
2292
                    try:
2292
2293
                        key_id = self.key_id(
2293
2294
                            self.peer_certificate(session))
2297
2298
                    logger.debug("Key ID: %s", key_id)
2298
2299
 
2299
2300
                else:
2300
 
                    key_id = ""
 
2301
                    key_id = b""
2301
2302
                    try:
2302
2303
                        fpr = self.fingerprint(
2303
2304
                            self.peer_certificate(session))
2605
2606
                    raise
2606
2607
        # Only bind(2) the socket if we really need to.
2607
2608
        if self.server_address[0] or self.server_address[1]:
 
2609
            if self.server_address[1]:
 
2610
                self.allow_reuse_address = True
2608
2611
            if not self.server_address[0]:
2609
2612
                if self.address_family == socket.AF_INET6:
2610
2613
                    any_address = "::"  # in6addr_any
3242
3245
                        for k in ("name", "host"):
3243
3246
                            if isinstance(value[k], bytes):
3244
3247
                                value[k] = value[k].decode("utf-8")
3245
 
                        if not value.has_key("key_id"):
 
3248
                        if "key_id" not in value:
3246
3249
                            value["key_id"] = ""
3247
 
                        elif not value.has_key("fingerprint"):
 
3250
                        elif "fingerprint" not in value:
3248
3251
                            value["fingerprint"] = ""
3249
3252
                    #  old_client_settings
3250
3253
                    # .keys()