/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 bsnet
  • Date: 2010-09-15 17:21:04 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100915172104-eopud55s7dc6vkfj
* plugins.d/usplash.c (main): BUG FIX: allocate space for the final
                              NULL in cmdline_argv.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
60
60
import fcntl
61
61
import functools
62
62
import cPickle as pickle
63
 
import select
 
63
import multiprocessing
64
64
 
65
65
import dbus
66
66
import dbus.service
83
83
 
84
84
version = "1.0.14"
85
85
 
 
86
#logger = logging.getLogger(u'mandos')
86
87
logger = logging.Logger(u'mandos')
87
88
syslogger = (logging.handlers.SysLogHandler
88
89
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
156
157
                            u" after %i retries, exiting.",
157
158
                            self.rename_count)
158
159
            raise AvahiServiceError(u"Too many renames")
159
 
        self.name = self.server.GetAlternativeServiceName(self.name)
 
160
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
160
161
        logger.info(u"Changing Zeroconf service name to %r ...",
161
 
                    unicode(self.name))
 
162
                    self.name)
162
163
        syslogger.setFormatter(logging.Formatter
163
164
                               (u'Mandos (%s) [%%(process)d]:'
164
165
                                u' %%(levelname)s: %%(message)s'
165
166
                                % self.name))
166
167
        self.remove()
167
 
        self.add()
 
168
        try:
 
169
            self.add()
 
170
        except dbus.exceptions.DBusException, error:
 
171
            logger.critical(u"DBusException: %s", error)
 
172
            self.cleanup()
 
173
            os._exit(1)
168
174
        self.rename_count += 1
169
175
    def remove(self):
170
176
        """Derived from the Avahi example code"""
193
199
        self.group.Commit()
194
200
    def entry_group_state_changed(self, state, error):
195
201
        """Derived from the Avahi example code"""
196
 
        logger.debug(u"Avahi state change: %i", state)
 
202
        logger.debug(u"Avahi entry group state change: %i", state)
197
203
        
198
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
199
205
            logger.debug(u"Zeroconf service established.")
212
218
            self.group = None
213
219
    def server_state_changed(self, state):
214
220
        """Derived from the Avahi example code"""
 
221
        logger.debug(u"Avahi server state change: %i", state)
215
222
        if state == avahi.SERVER_COLLISION:
216
223
            logger.error(u"Zeroconf server name collision")
217
224
            self.remove()
258
265
                     runtime with vars(self) as dict, so that for
259
266
                     instance %(name)s can be used in the command.
260
267
    current_checker_command: string; current running checker_command
 
268
    approval_delay: datetime.timedelta(); Time to wait for approval
 
269
    _approved:   bool(); 'None' if not yet approved/disapproved
 
270
    approval_duration: datetime.timedelta(); Duration of one approval
261
271
    """
262
272
    
263
273
    @staticmethod
274
284
    def interval_milliseconds(self):
275
285
        "Return the 'interval' attribute in milliseconds"
276
286
        return self._timedelta_to_milliseconds(self.interval)
 
287
 
 
288
    def approval_delay_milliseconds(self):
 
289
        return self._timedelta_to_milliseconds(self.approval_delay)
277
290
    
278
291
    def __init__(self, name = None, disable_hook=None, config=None):
279
292
        """Note: the 'checker' key in 'config' sets the
314
327
        self.checker_command = config[u"checker"]
315
328
        self.current_checker_command = None
316
329
        self.last_connect = None
 
330
        self._approved = None
 
331
        self.approved_by_default = config.get(u"approved_by_default",
 
332
                                              True)
 
333
        self.approvals_pending = 0
 
334
        self.approval_delay = string_to_delta(
 
335
            config[u"approval_delay"])
 
336
        self.approval_duration = string_to_delta(
 
337
            config[u"approval_duration"])
 
338
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
317
339
    
 
340
    def send_changedstate(self):
 
341
        self.changedstate.acquire()
 
342
        self.changedstate.notify_all()
 
343
        self.changedstate.release()
 
344
        
318
345
    def enable(self):
319
346
        """Start this client's checker and timeout hooks"""
320
347
        if getattr(self, u"enabled", False):
321
348
            # Already enabled
322
349
            return
 
350
        self.send_changedstate()
323
351
        self.last_enabled = datetime.datetime.utcnow()
324
352
        # Schedule a new checker to be started an 'interval' from now,
325
353
        # and every interval from then on.
339
367
        if not getattr(self, "enabled", False):
340
368
            return False
341
369
        if not quiet:
 
370
            self.send_changedstate()
 
371
        if not quiet:
342
372
            logger.info(u"Disabling client %s", self.name)
343
373
        if getattr(self, u"disable_initiator_tag", False):
344
374
            gobject.source_remove(self.disable_initiator_tag)
477
507
                raise
478
508
        self.checker = None
479
509
 
480
 
 
481
510
def dbus_service_property(dbus_interface, signature=u"v",
482
511
                          access=u"readwrite", byte_arrays=False):
483
512
    """Decorators for marking methods of a DBusObjectWithProperties to
677
706
    # dbus.service.Object doesn't use super(), so we can't either.
678
707
    
679
708
    def __init__(self, bus = None, *args, **kwargs):
 
709
        self._approvals_pending = 0
680
710
        self.bus = bus
681
711
        Client.__init__(self, *args, **kwargs)
682
712
        # Only now, when this client is initialized, can it show up on
686
716
                                  + self.name.replace(u".", u"_")))
687
717
        DBusObjectWithProperties.__init__(self, self.bus,
688
718
                                          self.dbus_object_path)
 
719
        
 
720
    def _get_approvals_pending(self):
 
721
        return self._approvals_pending
 
722
    def _set_approvals_pending(self, value):
 
723
        old_value = self._approvals_pending
 
724
        self._approvals_pending = value
 
725
        bval = bool(value)
 
726
        if (hasattr(self, "dbus_object_path")
 
727
            and bval is not bool(old_value)):
 
728
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
729
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
730
                                 dbus_bool)
 
731
 
 
732
    approvals_pending = property(_get_approvals_pending,
 
733
                                 _set_approvals_pending)
 
734
    del _get_approvals_pending, _set_approvals_pending
689
735
    
690
736
    @staticmethod
691
737
    def _datetime_to_dbus(dt, variant_level=0):
698
744
        r = Client.enable(self)
699
745
        if oldstate != self.enabled:
700
746
            # Emit D-Bus signals
701
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
747
            self.PropertyChanged(dbus.String(u"Enabled"),
702
748
                                 dbus.Boolean(True, variant_level=1))
703
749
            self.PropertyChanged(
704
 
                dbus.String(u"last_enabled"),
 
750
                dbus.String(u"LastEnabled"),
705
751
                self._datetime_to_dbus(self.last_enabled,
706
752
                                       variant_level=1))
707
753
        return r
711
757
        r = Client.disable(self, quiet=quiet)
712
758
        if not quiet and oldstate != self.enabled:
713
759
            # Emit D-Bus signal
714
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
760
            self.PropertyChanged(dbus.String(u"Enabled"),
715
761
                                 dbus.Boolean(False, variant_level=1))
716
762
        return r
717
763
    
729
775
        self.checker_callback_tag = None
730
776
        self.checker = None
731
777
        # Emit D-Bus signal
732
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
778
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
733
779
                             dbus.Boolean(False, variant_level=1))
734
780
        if os.WIFEXITED(condition):
735
781
            exitstatus = os.WEXITSTATUS(condition)
750
796
        r = Client.checked_ok(self, *args, **kwargs)
751
797
        # Emit D-Bus signal
752
798
        self.PropertyChanged(
753
 
            dbus.String(u"last_checked_ok"),
 
799
            dbus.String(u"LastCheckedOK"),
754
800
            (self._datetime_to_dbus(self.last_checked_ok,
755
801
                                    variant_level=1)))
756
802
        return r
768
814
            # Emit D-Bus signal
769
815
            self.CheckerStarted(self.current_checker_command)
770
816
            self.PropertyChanged(
771
 
                dbus.String(u"checker_running"),
 
817
                dbus.String(u"CheckerRunning"),
772
818
                dbus.Boolean(True, variant_level=1))
773
819
        return r
774
820
    
777
823
        r = Client.stop_checker(self, *args, **kwargs)
778
824
        if (old_checker is not None
779
825
            and getattr(self, u"checker", None) is None):
780
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
826
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
781
827
                                 dbus.Boolean(False, variant_level=1))
782
828
        return r
 
829
 
 
830
    def _reset_approved(self):
 
831
        self._approved = None
 
832
        return False
 
833
    
 
834
    def approve(self, value=True):
 
835
        self.send_changedstate()
 
836
        self._approved = value
 
837
        gobject.timeout_add(self._timedelta_to_milliseconds
 
838
                            (self.approval_duration),
 
839
                            self._reset_approved)
 
840
    
783
841
    
784
842
    ## D-Bus methods, signals & properties
785
843
    _interface = u"se.bsnet.fukt.Mandos.Client"
807
865
    # GotSecret - signal
808
866
    @dbus.service.signal(_interface)
809
867
    def GotSecret(self):
810
 
        "D-Bus signal"
 
868
        """D-Bus signal
 
869
        Is sent after a successful transfer of secret from the Mandos
 
870
        server to mandos-client
 
871
        """
811
872
        pass
812
873
    
813
874
    # Rejected - signal
814
 
    @dbus.service.signal(_interface)
815
 
    def Rejected(self):
 
875
    @dbus.service.signal(_interface, signature=u"s")
 
876
    def Rejected(self, reason):
 
877
        "D-Bus signal"
 
878
        pass
 
879
    
 
880
    # NeedApproval - signal
 
881
    @dbus.service.signal(_interface, signature=u"tb")
 
882
    def NeedApproval(self, timeout, default):
816
883
        "D-Bus signal"
817
884
        pass
818
885
    
819
886
    ## Methods
820
 
    
 
887
 
 
888
    # Approve - method
 
889
    @dbus.service.method(_interface, in_signature=u"b")
 
890
    def Approve(self, value):
 
891
        self.approve(value)
 
892
 
821
893
    # CheckedOK - method
822
894
    @dbus.service.method(_interface)
823
895
    def CheckedOK(self):
848
920
    
849
921
    ## Properties
850
922
    
851
 
    # name - property
 
923
    # ApprovalPending - property
 
924
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
925
    def ApprovalPending_dbus_property(self):
 
926
        return dbus.Boolean(bool(self.approvals_pending))
 
927
    
 
928
    # ApprovedByDefault - property
 
929
    @dbus_service_property(_interface, signature=u"b",
 
930
                           access=u"readwrite")
 
931
    def ApprovedByDefault_dbus_property(self, value=None):
 
932
        if value is None:       # get
 
933
            return dbus.Boolean(self.approved_by_default)
 
934
        self.approved_by_default = bool(value)
 
935
        # Emit D-Bus signal
 
936
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
937
                             dbus.Boolean(value, variant_level=1))
 
938
    
 
939
    # ApprovalDelay - property
 
940
    @dbus_service_property(_interface, signature=u"t",
 
941
                           access=u"readwrite")
 
942
    def ApprovalDelay_dbus_property(self, value=None):
 
943
        if value is None:       # get
 
944
            return dbus.UInt64(self.approval_delay_milliseconds())
 
945
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
946
        # Emit D-Bus signal
 
947
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
948
                             dbus.UInt64(value, variant_level=1))
 
949
    
 
950
    # ApprovalDuration - property
 
951
    @dbus_service_property(_interface, signature=u"t",
 
952
                           access=u"readwrite")
 
953
    def ApprovalDuration_dbus_property(self, value=None):
 
954
        if value is None:       # get
 
955
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
956
                    self.approval_duration))
 
957
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
958
        # Emit D-Bus signal
 
959
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
960
                             dbus.UInt64(value, variant_level=1))
 
961
    
 
962
    # Name - property
852
963
    @dbus_service_property(_interface, signature=u"s", access=u"read")
853
 
    def name_dbus_property(self):
 
964
    def Name_dbus_property(self):
854
965
        return dbus.String(self.name)
855
966
    
856
 
    # fingerprint - property
 
967
    # Fingerprint - property
857
968
    @dbus_service_property(_interface, signature=u"s", access=u"read")
858
 
    def fingerprint_dbus_property(self):
 
969
    def Fingerprint_dbus_property(self):
859
970
        return dbus.String(self.fingerprint)
860
971
    
861
 
    # host - property
 
972
    # Host - property
862
973
    @dbus_service_property(_interface, signature=u"s",
863
974
                           access=u"readwrite")
864
 
    def host_dbus_property(self, value=None):
 
975
    def Host_dbus_property(self, value=None):
865
976
        if value is None:       # get
866
977
            return dbus.String(self.host)
867
978
        self.host = value
868
979
        # Emit D-Bus signal
869
 
        self.PropertyChanged(dbus.String(u"host"),
 
980
        self.PropertyChanged(dbus.String(u"Host"),
870
981
                             dbus.String(value, variant_level=1))
871
982
    
872
 
    # created - property
 
983
    # Created - property
873
984
    @dbus_service_property(_interface, signature=u"s", access=u"read")
874
 
    def created_dbus_property(self):
 
985
    def Created_dbus_property(self):
875
986
        return dbus.String(self._datetime_to_dbus(self.created))
876
987
    
877
 
    # last_enabled - property
 
988
    # LastEnabled - property
878
989
    @dbus_service_property(_interface, signature=u"s", access=u"read")
879
 
    def last_enabled_dbus_property(self):
 
990
    def LastEnabled_dbus_property(self):
880
991
        if self.last_enabled is None:
881
992
            return dbus.String(u"")
882
993
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
883
994
    
884
 
    # enabled - property
 
995
    # Enabled - property
885
996
    @dbus_service_property(_interface, signature=u"b",
886
997
                           access=u"readwrite")
887
 
    def enabled_dbus_property(self, value=None):
 
998
    def Enabled_dbus_property(self, value=None):
888
999
        if value is None:       # get
889
1000
            return dbus.Boolean(self.enabled)
890
1001
        if value:
892
1003
        else:
893
1004
            self.disable()
894
1005
    
895
 
    # last_checked_ok - property
 
1006
    # LastCheckedOK - property
896
1007
    @dbus_service_property(_interface, signature=u"s",
897
1008
                           access=u"readwrite")
898
 
    def last_checked_ok_dbus_property(self, value=None):
 
1009
    def LastCheckedOK_dbus_property(self, value=None):
899
1010
        if value is not None:
900
1011
            self.checked_ok()
901
1012
            return
904
1015
        return dbus.String(self._datetime_to_dbus(self
905
1016
                                                  .last_checked_ok))
906
1017
    
907
 
    # timeout - property
 
1018
    # Timeout - property
908
1019
    @dbus_service_property(_interface, signature=u"t",
909
1020
                           access=u"readwrite")
910
 
    def timeout_dbus_property(self, value=None):
 
1021
    def Timeout_dbus_property(self, value=None):
911
1022
        if value is None:       # get
912
1023
            return dbus.UInt64(self.timeout_milliseconds())
913
1024
        self.timeout = datetime.timedelta(0, 0, 0, value)
914
1025
        # Emit D-Bus signal
915
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1026
        self.PropertyChanged(dbus.String(u"Timeout"),
916
1027
                             dbus.UInt64(value, variant_level=1))
917
1028
        if getattr(self, u"disable_initiator_tag", None) is None:
918
1029
            return
932
1043
            self.disable_initiator_tag = (gobject.timeout_add
933
1044
                                          (time_to_die, self.disable))
934
1045
    
935
 
    # interval - property
 
1046
    # Interval - property
936
1047
    @dbus_service_property(_interface, signature=u"t",
937
1048
                           access=u"readwrite")
938
 
    def interval_dbus_property(self, value=None):
 
1049
    def Interval_dbus_property(self, value=None):
939
1050
        if value is None:       # get
940
1051
            return dbus.UInt64(self.interval_milliseconds())
941
1052
        self.interval = datetime.timedelta(0, 0, 0, value)
942
1053
        # Emit D-Bus signal
943
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1054
        self.PropertyChanged(dbus.String(u"Interval"),
944
1055
                             dbus.UInt64(value, variant_level=1))
945
1056
        if getattr(self, u"checker_initiator_tag", None) is None:
946
1057
            return
950
1061
                                      (value, self.start_checker))
951
1062
        self.start_checker()    # Start one now, too
952
1063
 
953
 
    # checker - property
 
1064
    # Checker - property
954
1065
    @dbus_service_property(_interface, signature=u"s",
955
1066
                           access=u"readwrite")
956
 
    def checker_dbus_property(self, value=None):
 
1067
    def Checker_dbus_property(self, value=None):
957
1068
        if value is None:       # get
958
1069
            return dbus.String(self.checker_command)
959
1070
        self.checker_command = value
960
1071
        # Emit D-Bus signal
961
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1072
        self.PropertyChanged(dbus.String(u"Checker"),
962
1073
                             dbus.String(self.checker_command,
963
1074
                                         variant_level=1))
964
1075
    
965
 
    # checker_running - property
 
1076
    # CheckerRunning - property
966
1077
    @dbus_service_property(_interface, signature=u"b",
967
1078
                           access=u"readwrite")
968
 
    def checker_running_dbus_property(self, value=None):
 
1079
    def CheckerRunning_dbus_property(self, value=None):
969
1080
        if value is None:       # get
970
1081
            return dbus.Boolean(self.checker is not None)
971
1082
        if value:
973
1084
        else:
974
1085
            self.stop_checker()
975
1086
    
976
 
    # object_path - property
 
1087
    # ObjectPath - property
977
1088
    @dbus_service_property(_interface, signature=u"o", access=u"read")
978
 
    def object_path_dbus_property(self):
 
1089
    def ObjectPath_dbus_property(self):
979
1090
        return self.dbus_object_path # is already a dbus.ObjectPath
980
1091
    
981
 
    # secret = property
 
1092
    # Secret = property
982
1093
    @dbus_service_property(_interface, signature=u"ay",
983
1094
                           access=u"write", byte_arrays=True)
984
 
    def secret_dbus_property(self, value):
 
1095
    def Secret_dbus_property(self, value):
985
1096
        self.secret = str(value)
986
1097
    
987
1098
    del _interface
988
1099
 
989
1100
 
 
1101
class ProxyClient(object):
 
1102
    def __init__(self, child_pipe, fpr, address):
 
1103
        self._pipe = child_pipe
 
1104
        self._pipe.send(('init', fpr, address))
 
1105
        if not self._pipe.recv():
 
1106
            raise KeyError()
 
1107
 
 
1108
    def __getattribute__(self, name):
 
1109
        if(name == '_pipe'):
 
1110
            return super(ProxyClient, self).__getattribute__(name)
 
1111
        self._pipe.send(('getattr', name))
 
1112
        data = self._pipe.recv()
 
1113
        if data[0] == 'data':
 
1114
            return data[1]
 
1115
        if data[0] == 'function':
 
1116
            def func(*args, **kwargs):
 
1117
                self._pipe.send(('funcall', name, args, kwargs))
 
1118
                return self._pipe.recv()[1]
 
1119
            return func
 
1120
 
 
1121
    def __setattr__(self, name, value):
 
1122
        if(name == '_pipe'):
 
1123
            return super(ProxyClient, self).__setattr__(name, value)
 
1124
        self._pipe.send(('setattr', name, value))
 
1125
 
 
1126
 
990
1127
class ClientHandler(socketserver.BaseRequestHandler, object):
991
1128
    """A class to handle client connections.
992
1129
    
994
1131
    Note: This will run in its own forked process."""
995
1132
    
996
1133
    def handle(self):
997
 
        logger.info(u"TCP connection from: %s",
998
 
                    unicode(self.client_address))
999
 
        logger.debug(u"IPC Pipe FD: %d",
1000
 
                     self.server.child_pipe[1].fileno())
1001
 
        # Open IPC pipe to parent process
1002
 
        with contextlib.nested(self.server.child_pipe[1],
1003
 
                               self.server.parent_pipe[0]
1004
 
                               ) as (ipc, ipc_return):
 
1134
        with contextlib.closing(self.server.child_pipe) as child_pipe:
 
1135
            logger.info(u"TCP connection from: %s",
 
1136
                        unicode(self.client_address))
 
1137
            logger.debug(u"Pipe FD: %d",
 
1138
                         self.server.child_pipe.fileno())
 
1139
 
1005
1140
            session = (gnutls.connection
1006
1141
                       .ClientSession(self.request,
1007
1142
                                      gnutls.connection
1008
1143
                                      .X509Credentials()))
1009
 
            
 
1144
 
1010
1145
            # Note: gnutls.connection.X509Credentials is really a
1011
1146
            # generic GnuTLS certificate credentials object so long as
1012
1147
            # no X.509 keys are added to it.  Therefore, we can use it
1013
1148
            # here despite using OpenPGP certificates.
1014
 
            
 
1149
 
1015
1150
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1016
1151
            #                      u"+AES-256-CBC", u"+SHA1",
1017
1152
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1023
1158
            (gnutls.library.functions
1024
1159
             .gnutls_priority_set_direct(session._c_object,
1025
1160
                                         priority, None))
1026
 
            
 
1161
 
1027
1162
            # Start communication using the Mandos protocol
1028
1163
            # Get protocol number
1029
1164
            line = self.request.makefile().readline()
1034
1169
            except (ValueError, IndexError, RuntimeError), error:
1035
1170
                logger.error(u"Unknown protocol version: %s", error)
1036
1171
                return
1037
 
            
 
1172
 
1038
1173
            # Start GnuTLS connection
1039
1174
            try:
1040
1175
                session.handshake()
1044
1179
                # established.  Just abandon the request.
1045
1180
                return
1046
1181
            logger.debug(u"Handshake succeeded")
 
1182
 
 
1183
            approval_required = False
1047
1184
            try:
1048
1185
                try:
1049
1186
                    fpr = self.fingerprint(self.peer_certificate
1053
1190
                    return
1054
1191
                logger.debug(u"Fingerprint: %s", fpr)
1055
1192
 
1056
 
                for c in self.server.clients:
1057
 
                    if c.fingerprint == fpr:
1058
 
                        client = c
 
1193
                try:
 
1194
                    client = ProxyClient(child_pipe, fpr,
 
1195
                                         self.client_address)
 
1196
                except KeyError:
 
1197
                    return
 
1198
                
 
1199
                if client.approval_delay:
 
1200
                    delay = client.approval_delay
 
1201
                    client.approvals_pending += 1
 
1202
                    approval_required = True
 
1203
                
 
1204
                while True:
 
1205
                    if not client.enabled:
 
1206
                        logger.warning(u"Client %s is disabled",
 
1207
                                       client.name)
 
1208
                        if self.server.use_dbus:
 
1209
                            # Emit D-Bus signal
 
1210
                            client.Rejected("Disabled")                    
 
1211
                        return
 
1212
                    
 
1213
                    if client._approved or not client.approval_delay:
 
1214
                        #We are approved or approval is disabled
1059
1215
                        break
1060
 
                else:
1061
 
                    ipc.write(u"NOTFOUND %s %s\n"
1062
 
                              % (fpr, unicode(self.client_address)))
1063
 
                    return
1064
 
                
1065
 
                class ClientProxy(object):
1066
 
                    """Client proxy object.  Not for calling methods."""
1067
 
                    def __init__(self, client):
1068
 
                        self.client = client
1069
 
                    def __getattr__(self, name):
1070
 
                        if name.startswith("ipc_"):
1071
 
                            def tempfunc():
1072
 
                                ipc.write("%s %s\n" % (name[4:].upper(),
1073
 
                                                       self.client.name))
1074
 
                            return tempfunc
1075
 
                        if not hasattr(self.client, name):
1076
 
                            raise AttributeError
1077
 
                        ipc.write(u"GETATTR %s %s\n"
1078
 
                                  % (name, self.client.fingerprint))
1079
 
                        return pickle.load(ipc_return)
1080
 
                clientproxy = ClientProxy(client)
1081
 
                # Have to check if client.enabled, since it is
1082
 
                # possible that the client was disabled since the
1083
 
                # GnuTLS session was established.
1084
 
                if not clientproxy.enabled:
1085
 
                    clientproxy.ipc_disabled()
1086
 
                    return
1087
 
                
1088
 
                clientproxy.ipc_sending()
 
1216
                    elif client._approved is None:
 
1217
                        logger.info(u"Client %s needs approval",
 
1218
                                    client.name)
 
1219
                        if self.server.use_dbus:
 
1220
                            # Emit D-Bus signal
 
1221
                            client.NeedApproval(
 
1222
                                client.approval_delay_milliseconds(),
 
1223
                                client.approved_by_default)
 
1224
                    else:
 
1225
                        logger.warning(u"Client %s was not approved",
 
1226
                                       client.name)
 
1227
                        if self.server.use_dbus:
 
1228
                            # Emit D-Bus signal
 
1229
                            client.Rejected("Denied")
 
1230
                        return
 
1231
                    
 
1232
                    #wait until timeout or approved
 
1233
                    #x = float(client._timedelta_to_milliseconds(delay))
 
1234
                    time = datetime.datetime.now()
 
1235
                    client.changedstate.acquire()
 
1236
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1237
                    client.changedstate.release()
 
1238
                    time2 = datetime.datetime.now()
 
1239
                    if (time2 - time) >= delay:
 
1240
                        if not client.approved_by_default:
 
1241
                            logger.warning("Client %s timed out while"
 
1242
                                           " waiting for approval",
 
1243
                                           client.name)
 
1244
                            if self.server.use_dbus:
 
1245
                                # Emit D-Bus signal
 
1246
                                client.Rejected("Approval timed out")
 
1247
                            return
 
1248
                        else:
 
1249
                            break
 
1250
                    else:
 
1251
                        delay -= time2 - time
 
1252
                
1089
1253
                sent_size = 0
1090
1254
                while sent_size < len(client.secret):
1091
 
                    sent = session.send(client.secret[sent_size:])
 
1255
                    try:
 
1256
                        sent = session.send(client.secret[sent_size:])
 
1257
                    except (gnutls.errors.GNUTLSError), error:
 
1258
                        logger.warning("gnutls send failed")
 
1259
                        return
1092
1260
                    logger.debug(u"Sent: %d, remaining: %d",
1093
1261
                                 sent, len(client.secret)
1094
1262
                                 - (sent_size + sent))
1095
1263
                    sent_size += sent
 
1264
 
 
1265
                logger.info(u"Sending secret to %s", client.name)
 
1266
                # bump the timeout as if seen
 
1267
                client.checked_ok()
 
1268
                if self.server.use_dbus:
 
1269
                    # Emit D-Bus signal
 
1270
                    client.GotSecret()
 
1271
            
1096
1272
            finally:
1097
 
                session.bye()
 
1273
                if approval_required:
 
1274
                    client.approvals_pending -= 1
 
1275
                try:
 
1276
                    session.bye()
 
1277
                except (gnutls.errors.GNUTLSError), error:
 
1278
                    logger.warning("GnuTLS bye failed")
1098
1279
    
1099
1280
    @staticmethod
1100
1281
    def peer_certificate(session):
1160
1341
        return hex_fpr
1161
1342
 
1162
1343
 
1163
 
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1164
 
    """Like socketserver.ForkingMixIn, but also pass a pipe pair."""
 
1344
class MultiprocessingMixIn(object):
 
1345
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1346
    def sub_process_main(self, request, address):
 
1347
        try:
 
1348
            self.finish_request(request, address)
 
1349
        except:
 
1350
            self.handle_error(request, address)
 
1351
        self.close_request(request)
 
1352
            
 
1353
    def process_request(self, request, address):
 
1354
        """Start a new process to process the request."""
 
1355
        multiprocessing.Process(target = self.sub_process_main,
 
1356
                                args = (request, address)).start()
 
1357
 
 
1358
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
 
1359
    """ adds a pipe to the MixIn """
1165
1360
    def process_request(self, request, client_address):
1166
1361
        """Overrides and wraps the original process_request().
1167
1362
        
1168
1363
        This function creates a new pipe in self.pipe
1169
1364
        """
1170
 
        # Child writes to child_pipe
1171
 
        self.child_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
1172
 
        # Parent writes to parent_pipe
1173
 
        self.parent_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
1174
 
        super(ForkingMixInWithPipes,
 
1365
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1366
 
 
1367
        super(MultiprocessingMixInWithPipe,
1175
1368
              self).process_request(request, client_address)
1176
 
        # Close unused ends for parent
1177
 
        self.parent_pipe[0].close() # close read end
1178
 
        self.child_pipe[1].close()  # close write end
1179
 
        self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
1180
 
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
1369
        self.child_pipe.close()
 
1370
        self.add_pipe(parent_pipe)
 
1371
 
 
1372
    def add_pipe(self, parent_pipe):
1181
1373
        """Dummy function; override as necessary"""
1182
 
        child_pipe_fd.close()
1183
 
        parent_pipe_fd.close()
1184
 
 
1185
 
 
1186
 
class IPv6_TCPServer(ForkingMixInWithPipes,
 
1374
        pass
 
1375
 
 
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1187
1377
                     socketserver.TCPServer, object):
1188
1378
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1189
1379
    
1274
1464
            return socketserver.TCPServer.server_activate(self)
1275
1465
    def enable(self):
1276
1466
        self.enabled = True
1277
 
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
1467
    def add_pipe(self, parent_pipe):
1278
1468
        # Call "handle_ipc" for both data and EOF events
1279
 
        gobject.io_add_watch(child_pipe_fd.fileno(),
 
1469
        gobject.io_add_watch(parent_pipe.fileno(),
1280
1470
                             gobject.IO_IN | gobject.IO_HUP,
1281
1471
                             functools.partial(self.handle_ipc,
1282
 
                                               reply = parent_pipe_fd,
1283
 
                                               sender= child_pipe_fd))
1284
 
    def handle_ipc(self, source, condition, reply=None, sender=None):
 
1472
                                               parent_pipe = parent_pipe))
 
1473
        
 
1474
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1475
                   client_object=None):
1285
1476
        condition_names = {
1286
1477
            gobject.IO_IN: u"IN",   # There is data to read.
1287
1478
            gobject.IO_OUT: u"OUT", # Data can be written (without
1296
1487
                                       for cond, name in
1297
1488
                                       condition_names.iteritems()
1298
1489
                                       if cond & condition)
1299
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1300
 
                     conditions_string)
1301
 
        
1302
 
        # Read a line from the file object
1303
 
        cmdline = sender.readline()
1304
 
        if not cmdline:             # Empty line means end of file
1305
 
            # close the IPC pipes
1306
 
            sender.close()
1307
 
            reply.close()
1308
 
            
1309
 
            # Stop calling this function
1310
 
            return False
1311
 
        
1312
 
        logger.debug(u"IPC command: %r", cmdline)
1313
 
        
1314
 
        # Parse and act on command
1315
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1316
 
        
1317
 
        if cmd == u"NOTFOUND":
1318
 
            fpr, address = args.split(None, 1)
1319
 
            logger.warning(u"Client not found for fingerprint: %s, ad"
1320
 
                           u"dress: %s", fpr, address)
1321
 
            if self.use_dbus:
1322
 
                # Emit D-Bus signal
1323
 
                mandos_dbus_service.ClientNotFound(fpr, address)
1324
 
        elif cmd == u"DISABLED":
1325
 
            for client in self.clients:
1326
 
                if client.name == args:
1327
 
                    logger.warning(u"Client %s is disabled", args)
1328
 
                    if self.use_dbus:
1329
 
                        # Emit D-Bus signal
1330
 
                        client.Rejected()
1331
 
                    break
1332
 
            else:
1333
 
                logger.error(u"Unknown client %s is disabled", args)
1334
 
        elif cmd == u"SENDING":
1335
 
            for client in self.clients:
1336
 
                if client.name == args:
1337
 
                    logger.info(u"Sending secret to %s", client.name)
1338
 
                    client.checked_ok()
1339
 
                    if self.use_dbus:
1340
 
                        # Emit D-Bus signal
1341
 
                        client.GotSecret()
1342
 
                    break
1343
 
            else:
1344
 
                logger.error(u"Sending secret to unknown client %s",
1345
 
                             args)
1346
 
        elif cmd == u"GETATTR":
1347
 
            attr_name, fpr = args.split(None, 1)
1348
 
            for client in self.clients:
1349
 
                if client.fingerprint == fpr:
1350
 
                    attr_value = getattr(client, attr_name, None)
1351
 
                    logger.debug("IPC reply: %r", attr_value)
1352
 
                    pickle.dump(attr_value, reply)
1353
 
                    break
1354
 
            else:
1355
 
                logger.error(u"Client %s on address %s requesting "
1356
 
                             u"attribute %s not found", fpr, address,
1357
 
                             attr_name)
1358
 
                pickle.dump(None, reply)
1359
 
        else:
1360
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1361
 
        
1362
 
        # Keep calling this function
 
1490
        # error or the other end of multiprocessing.Pipe has closed
 
1491
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1492
            return False
 
1493
        
 
1494
        # Read a request from the child
 
1495
        request = parent_pipe.recv()
 
1496
        command = request[0]
 
1497
        
 
1498
        if command == 'init':
 
1499
            fpr = request[1]
 
1500
            address = request[2]
 
1501
            
 
1502
            for c in self.clients:
 
1503
                if c.fingerprint == fpr:
 
1504
                    client = c
 
1505
                    break
 
1506
            else:
 
1507
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1508
                               u"dress: %s", fpr, address)
 
1509
                if self.use_dbus:
 
1510
                    # Emit D-Bus signal
 
1511
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
1512
                parent_pipe.send(False)
 
1513
                return False
 
1514
            
 
1515
            gobject.io_add_watch(parent_pipe.fileno(),
 
1516
                                 gobject.IO_IN | gobject.IO_HUP,
 
1517
                                 functools.partial(self.handle_ipc,
 
1518
                                                   parent_pipe = parent_pipe,
 
1519
                                                   client_object = client))
 
1520
            parent_pipe.send(True)
 
1521
            # remove the old hook in favor of the new above hook on same fileno
 
1522
            return False
 
1523
        if command == 'funcall':
 
1524
            funcname = request[1]
 
1525
            args = request[2]
 
1526
            kwargs = request[3]
 
1527
            
 
1528
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1529
 
 
1530
        if command == 'getattr':
 
1531
            attrname = request[1]
 
1532
            if callable(client_object.__getattribute__(attrname)):
 
1533
                parent_pipe.send(('function',))
 
1534
            else:
 
1535
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1536
        
 
1537
        if command == 'setattr':
 
1538
            attrname = request[1]
 
1539
            value = request[2]
 
1540
            setattr(client_object, attrname, value)
 
1541
 
1363
1542
        return True
1364
1543
 
1365
1544
 
1468
1647
    parser.add_option("--debug", action=u"store_true",
1469
1648
                      help=u"Debug mode; run in foreground and log to"
1470
1649
                      u" terminal")
 
1650
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1651
                      help=u"Debug level for stdout output")
1471
1652
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1472
1653
                      u" priority string (see GnuTLS documentation)")
1473
1654
    parser.add_option("--servicename", type=u"string",
1498
1679
                        u"servicename": u"Mandos",
1499
1680
                        u"use_dbus": u"True",
1500
1681
                        u"use_ipv6": u"True",
 
1682
                        u"debuglevel": u"",
1501
1683
                        }
1502
1684
    
1503
1685
    # Parse config file for server-global settings
1520
1702
    # options, if set.
1521
1703
    for option in (u"interface", u"address", u"port", u"debug",
1522
1704
                   u"priority", u"servicename", u"configdir",
1523
 
                   u"use_dbus", u"use_ipv6"):
 
1705
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1524
1706
        value = getattr(options, option)
1525
1707
        if value is not None:
1526
1708
            server_settings[option] = value
1535
1717
    
1536
1718
    # For convenience
1537
1719
    debug = server_settings[u"debug"]
 
1720
    debuglevel = server_settings[u"debuglevel"]
1538
1721
    use_dbus = server_settings[u"use_dbus"]
1539
1722
    use_ipv6 = server_settings[u"use_ipv6"]
1540
 
    
1541
 
    if not debug:
1542
 
        syslogger.setLevel(logging.WARNING)
1543
 
        console.setLevel(logging.WARNING)
1544
 
    
 
1723
 
1545
1724
    if server_settings[u"servicename"] != u"Mandos":
1546
1725
        syslogger.setFormatter(logging.Formatter
1547
1726
                               (u'Mandos (%s) [%%(process)d]:'
1553
1732
                        u"interval": u"5m",
1554
1733
                        u"checker": u"fping -q -- %%(host)s",
1555
1734
                        u"host": u"",
 
1735
                        u"approval_delay": u"0s",
 
1736
                        u"approval_duration": u"1s",
1556
1737
                        }
1557
1738
    client_config = configparser.SafeConfigParser(client_defaults)
1558
1739
    client_config.read(os.path.join(server_settings[u"configdir"],
1564
1745
    tcp_server = MandosServer((server_settings[u"address"],
1565
1746
                               server_settings[u"port"]),
1566
1747
                              ClientHandler,
1567
 
                              interface=server_settings[u"interface"],
 
1748
                              interface=(server_settings[u"interface"]
 
1749
                                         or None),
1568
1750
                              use_ipv6=use_ipv6,
1569
1751
                              gnutls_priority=
1570
1752
                              server_settings[u"priority"],
1596
1778
        if error[0] != errno.EPERM:
1597
1779
            raise error
1598
1780
    
1599
 
    # Enable all possible GnuTLS debugging
 
1781
    if not debug and not debuglevel:
 
1782
        syslogger.setLevel(logging.WARNING)
 
1783
        console.setLevel(logging.WARNING)
 
1784
    if debuglevel:
 
1785
        level = getattr(logging, debuglevel.upper())
 
1786
        syslogger.setLevel(level)
 
1787
        console.setLevel(level)
 
1788
 
1600
1789
    if debug:
 
1790
        # Enable all possible GnuTLS debugging
 
1791
        
1601
1792
        # "Use a log level over 10 to enable all debugging options."
1602
1793
        # - GnuTLS manual
1603
1794
        gnutls.library.functions.gnutls_global_set_log_level(11)
1608
1799
        
1609
1800
        (gnutls.library.functions
1610
1801
         .gnutls_global_set_log_function(debug_gnutls))
 
1802
        
 
1803
        # Redirect stdin so all checkers get /dev/null
 
1804
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
1805
        os.dup2(null, sys.stdin.fileno())
 
1806
        if null > 2:
 
1807
            os.close(null)
 
1808
    else:
 
1809
        # No console logging
 
1810
        logger.removeHandler(console)
 
1811
    
1611
1812
    
1612
1813
    global main_loop
1613
1814
    # From the Avahi example code
1631
1832
    if server_settings["interface"]:
1632
1833
        service.interface = (if_nametoindex
1633
1834
                             (str(server_settings[u"interface"])))
 
1835
 
 
1836
    if not debug:
 
1837
        # Close all input and output, do double fork, etc.
 
1838
        daemon()
 
1839
        
 
1840
    global multiprocessing_manager
 
1841
    multiprocessing_manager = multiprocessing.Manager()
1634
1842
    
1635
1843
    client_class = Client
1636
1844
    if use_dbus:
1637
1845
        client_class = functools.partial(ClientDBus, bus = bus)
 
1846
    def client_config_items(config, section):
 
1847
        special_settings = {
 
1848
            "approved_by_default":
 
1849
                lambda: config.getboolean(section,
 
1850
                                          "approved_by_default"),
 
1851
            }
 
1852
        for name, value in config.items(section):
 
1853
            try:
 
1854
                yield (name, special_settings[name]())
 
1855
            except KeyError:
 
1856
                yield (name, value)
 
1857
    
1638
1858
    tcp_server.clients.update(set(
1639
1859
            client_class(name = section,
1640
 
                         config= dict(client_config.items(section)))
 
1860
                         config= dict(client_config_items(
 
1861
                        client_config, section)))
1641
1862
            for section in client_config.sections()))
1642
1863
    if not tcp_server.clients:
1643
1864
        logger.warning(u"No clients defined")
1644
 
    
1645
 
    if debug:
1646
 
        # Redirect stdin so all checkers get /dev/null
1647
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1648
 
        os.dup2(null, sys.stdin.fileno())
1649
 
        if null > 2:
1650
 
            os.close(null)
1651
 
    else:
1652
 
        # No console logging
1653
 
        logger.removeHandler(console)
1654
 
        # Close all input and output, do double fork, etc.
1655
 
        daemon()
1656
 
    
 
1865
        
1657
1866
    try:
1658
1867
        with pidfile:
1659
1868
            pid = os.getpid()