/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-23 20:14:08 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100923201408-4vcvjmml000fr8y5
* Makefile (DOCS): Added "plymouth.8mandos".
  (install-server): Also install "mandos-monitor.8" and
                    "mandos-ctl.8".
  (install-client-nokey): Also install "plymouth.8mandos".
  (uninstall-server): Also remove "mandos-monitor.8" and
                      "mandos-ctl.8".
  (uninstall-client): Also remove "plymouth.8mandos".
* plugins.d/plymouth.xml: New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
import fcntl
61
61
import functools
62
62
import cPickle as pickle
 
63
import multiprocessing
63
64
 
64
65
import dbus
65
66
import dbus.service
82
83
 
83
84
version = "1.0.14"
84
85
 
 
86
#logger = logging.getLogger(u'mandos')
85
87
logger = logging.Logger(u'mandos')
86
88
syslogger = (logging.handlers.SysLogHandler
87
89
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
155
157
                            u" after %i retries, exiting.",
156
158
                            self.rename_count)
157
159
            raise AvahiServiceError(u"Too many renames")
158
 
        self.name = self.server.GetAlternativeServiceName(self.name)
 
160
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
159
161
        logger.info(u"Changing Zeroconf service name to %r ...",
160
 
                    unicode(self.name))
 
162
                    self.name)
161
163
        syslogger.setFormatter(logging.Formatter
162
164
                               (u'Mandos (%s) [%%(process)d]:'
163
165
                                u' %%(levelname)s: %%(message)s'
164
166
                                % self.name))
165
167
        self.remove()
166
 
        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)
167
174
        self.rename_count += 1
168
175
    def remove(self):
169
176
        """Derived from the Avahi example code"""
192
199
        self.group.Commit()
193
200
    def entry_group_state_changed(self, state, error):
194
201
        """Derived from the Avahi example code"""
195
 
        logger.debug(u"Avahi state change: %i", state)
 
202
        logger.debug(u"Avahi entry group state change: %i", state)
196
203
        
197
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
198
205
            logger.debug(u"Zeroconf service established.")
211
218
            self.group = None
212
219
    def server_state_changed(self, state):
213
220
        """Derived from the Avahi example code"""
 
221
        logger.debug(u"Avahi server state change: %i", state)
214
222
        if state == avahi.SERVER_COLLISION:
215
223
            logger.error(u"Zeroconf server name collision")
216
224
            self.remove()
257
265
                     runtime with vars(self) as dict, so that for
258
266
                     instance %(name)s can be used in the command.
259
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
260
271
    """
261
272
    
262
273
    @staticmethod
273
284
    def interval_milliseconds(self):
274
285
        "Return the 'interval' attribute in milliseconds"
275
286
        return self._timedelta_to_milliseconds(self.interval)
 
287
 
 
288
    def approval_delay_milliseconds(self):
 
289
        return self._timedelta_to_milliseconds(self.approval_delay)
276
290
    
277
291
    def __init__(self, name = None, disable_hook=None, config=None):
278
292
        """Note: the 'checker' key in 'config' sets the
313
327
        self.checker_command = config[u"checker"]
314
328
        self.current_checker_command = None
315
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())
316
339
    
 
340
    def send_changedstate(self):
 
341
        self.changedstate.acquire()
 
342
        self.changedstate.notify_all()
 
343
        self.changedstate.release()
 
344
        
317
345
    def enable(self):
318
346
        """Start this client's checker and timeout hooks"""
319
347
        if getattr(self, u"enabled", False):
320
348
            # Already enabled
321
349
            return
 
350
        self.send_changedstate()
322
351
        self.last_enabled = datetime.datetime.utcnow()
323
352
        # Schedule a new checker to be started an 'interval' from now,
324
353
        # and every interval from then on.
338
367
        if not getattr(self, "enabled", False):
339
368
            return False
340
369
        if not quiet:
 
370
            self.send_changedstate()
 
371
        if not quiet:
341
372
            logger.info(u"Disabling client %s", self.name)
342
373
        if getattr(self, u"disable_initiator_tag", False):
343
374
            gobject.source_remove(self.disable_initiator_tag)
476
507
                raise
477
508
        self.checker = None
478
509
 
479
 
 
480
510
def dbus_service_property(dbus_interface, signature=u"v",
481
511
                          access=u"readwrite", byte_arrays=False):
482
512
    """Decorators for marking methods of a DBusObjectWithProperties to
676
706
    # dbus.service.Object doesn't use super(), so we can't either.
677
707
    
678
708
    def __init__(self, bus = None, *args, **kwargs):
 
709
        self._approvals_pending = 0
679
710
        self.bus = bus
680
711
        Client.__init__(self, *args, **kwargs)
681
712
        # Only now, when this client is initialized, can it show up on
685
716
                                  + self.name.replace(u".", u"_")))
686
717
        DBusObjectWithProperties.__init__(self, self.bus,
687
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
688
735
    
689
736
    @staticmethod
690
737
    def _datetime_to_dbus(dt, variant_level=0):
697
744
        r = Client.enable(self)
698
745
        if oldstate != self.enabled:
699
746
            # Emit D-Bus signals
700
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
747
            self.PropertyChanged(dbus.String(u"Enabled"),
701
748
                                 dbus.Boolean(True, variant_level=1))
702
749
            self.PropertyChanged(
703
 
                dbus.String(u"last_enabled"),
 
750
                dbus.String(u"LastEnabled"),
704
751
                self._datetime_to_dbus(self.last_enabled,
705
752
                                       variant_level=1))
706
753
        return r
710
757
        r = Client.disable(self, quiet=quiet)
711
758
        if not quiet and oldstate != self.enabled:
712
759
            # Emit D-Bus signal
713
 
            self.PropertyChanged(dbus.String(u"enabled"),
 
760
            self.PropertyChanged(dbus.String(u"Enabled"),
714
761
                                 dbus.Boolean(False, variant_level=1))
715
762
        return r
716
763
    
728
775
        self.checker_callback_tag = None
729
776
        self.checker = None
730
777
        # Emit D-Bus signal
731
 
        self.PropertyChanged(dbus.String(u"checker_running"),
 
778
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
732
779
                             dbus.Boolean(False, variant_level=1))
733
780
        if os.WIFEXITED(condition):
734
781
            exitstatus = os.WEXITSTATUS(condition)
749
796
        r = Client.checked_ok(self, *args, **kwargs)
750
797
        # Emit D-Bus signal
751
798
        self.PropertyChanged(
752
 
            dbus.String(u"last_checked_ok"),
 
799
            dbus.String(u"LastCheckedOK"),
753
800
            (self._datetime_to_dbus(self.last_checked_ok,
754
801
                                    variant_level=1)))
755
802
        return r
767
814
            # Emit D-Bus signal
768
815
            self.CheckerStarted(self.current_checker_command)
769
816
            self.PropertyChanged(
770
 
                dbus.String(u"checker_running"),
 
817
                dbus.String(u"CheckerRunning"),
771
818
                dbus.Boolean(True, variant_level=1))
772
819
        return r
773
820
    
776
823
        r = Client.stop_checker(self, *args, **kwargs)
777
824
        if (old_checker is not None
778
825
            and getattr(self, u"checker", None) is None):
779
 
            self.PropertyChanged(dbus.String(u"checker_running"),
 
826
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
780
827
                                 dbus.Boolean(False, variant_level=1))
781
828
        return r
782
 
    
783
 
    ## D-Bus methods & signals
 
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
    
 
841
    
 
842
    ## D-Bus methods, signals & properties
784
843
    _interface = u"se.bsnet.fukt.Mandos.Client"
785
844
    
786
 
    # CheckedOK - method
787
 
    @dbus.service.method(_interface)
788
 
    def CheckedOK(self):
789
 
        return self.checked_ok()
 
845
    ## Signals
790
846
    
791
847
    # CheckerCompleted - signal
792
848
    @dbus.service.signal(_interface, signature=u"nxs")
809
865
    # GotSecret - signal
810
866
    @dbus.service.signal(_interface)
811
867
    def GotSecret(self):
812
 
        "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
        """
813
872
        pass
814
873
    
815
874
    # Rejected - signal
816
 
    @dbus.service.signal(_interface)
817
 
    def Rejected(self):
818
 
        "D-Bus signal"
819
 
        pass
 
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):
 
883
        "D-Bus signal"
 
884
        pass
 
885
    
 
886
    ## Methods
 
887
 
 
888
    # Approve - method
 
889
    @dbus.service.method(_interface, in_signature=u"b")
 
890
    def Approve(self, value):
 
891
        self.approve(value)
 
892
 
 
893
    # CheckedOK - method
 
894
    @dbus.service.method(_interface)
 
895
    def CheckedOK(self):
 
896
        return self.checked_ok()
820
897
    
821
898
    # Enable - method
822
899
    @dbus.service.method(_interface)
841
918
    def StopChecker(self):
842
919
        self.stop_checker()
843
920
    
844
 
    # name - property
 
921
    ## Properties
 
922
    
 
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
845
963
    @dbus_service_property(_interface, signature=u"s", access=u"read")
846
 
    def name_dbus_property(self):
 
964
    def Name_dbus_property(self):
847
965
        return dbus.String(self.name)
848
966
    
849
 
    # fingerprint - property
 
967
    # Fingerprint - property
850
968
    @dbus_service_property(_interface, signature=u"s", access=u"read")
851
 
    def fingerprint_dbus_property(self):
 
969
    def Fingerprint_dbus_property(self):
852
970
        return dbus.String(self.fingerprint)
853
971
    
854
 
    # host - property
 
972
    # Host - property
855
973
    @dbus_service_property(_interface, signature=u"s",
856
974
                           access=u"readwrite")
857
 
    def host_dbus_property(self, value=None):
 
975
    def Host_dbus_property(self, value=None):
858
976
        if value is None:       # get
859
977
            return dbus.String(self.host)
860
978
        self.host = value
861
979
        # Emit D-Bus signal
862
 
        self.PropertyChanged(dbus.String(u"host"),
 
980
        self.PropertyChanged(dbus.String(u"Host"),
863
981
                             dbus.String(value, variant_level=1))
864
982
    
865
 
    # created - property
 
983
    # Created - property
866
984
    @dbus_service_property(_interface, signature=u"s", access=u"read")
867
 
    def created_dbus_property(self):
 
985
    def Created_dbus_property(self):
868
986
        return dbus.String(self._datetime_to_dbus(self.created))
869
987
    
870
 
    # last_enabled - property
 
988
    # LastEnabled - property
871
989
    @dbus_service_property(_interface, signature=u"s", access=u"read")
872
 
    def last_enabled_dbus_property(self):
 
990
    def LastEnabled_dbus_property(self):
873
991
        if self.last_enabled is None:
874
992
            return dbus.String(u"")
875
993
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
876
994
    
877
 
    # enabled - property
 
995
    # Enabled - property
878
996
    @dbus_service_property(_interface, signature=u"b",
879
997
                           access=u"readwrite")
880
 
    def enabled_dbus_property(self, value=None):
 
998
    def Enabled_dbus_property(self, value=None):
881
999
        if value is None:       # get
882
1000
            return dbus.Boolean(self.enabled)
883
1001
        if value:
885
1003
        else:
886
1004
            self.disable()
887
1005
    
888
 
    # last_checked_ok - property
 
1006
    # LastCheckedOK - property
889
1007
    @dbus_service_property(_interface, signature=u"s",
890
1008
                           access=u"readwrite")
891
 
    def last_checked_ok_dbus_property(self, value=None):
 
1009
    def LastCheckedOK_dbus_property(self, value=None):
892
1010
        if value is not None:
893
1011
            self.checked_ok()
894
1012
            return
897
1015
        return dbus.String(self._datetime_to_dbus(self
898
1016
                                                  .last_checked_ok))
899
1017
    
900
 
    # timeout - property
 
1018
    # Timeout - property
901
1019
    @dbus_service_property(_interface, signature=u"t",
902
1020
                           access=u"readwrite")
903
 
    def timeout_dbus_property(self, value=None):
 
1021
    def Timeout_dbus_property(self, value=None):
904
1022
        if value is None:       # get
905
1023
            return dbus.UInt64(self.timeout_milliseconds())
906
1024
        self.timeout = datetime.timedelta(0, 0, 0, value)
907
1025
        # Emit D-Bus signal
908
 
        self.PropertyChanged(dbus.String(u"timeout"),
 
1026
        self.PropertyChanged(dbus.String(u"Timeout"),
909
1027
                             dbus.UInt64(value, variant_level=1))
910
1028
        if getattr(self, u"disable_initiator_tag", None) is None:
911
1029
            return
925
1043
            self.disable_initiator_tag = (gobject.timeout_add
926
1044
                                          (time_to_die, self.disable))
927
1045
    
928
 
    # interval - property
 
1046
    # Interval - property
929
1047
    @dbus_service_property(_interface, signature=u"t",
930
1048
                           access=u"readwrite")
931
 
    def interval_dbus_property(self, value=None):
 
1049
    def Interval_dbus_property(self, value=None):
932
1050
        if value is None:       # get
933
1051
            return dbus.UInt64(self.interval_milliseconds())
934
1052
        self.interval = datetime.timedelta(0, 0, 0, value)
935
1053
        # Emit D-Bus signal
936
 
        self.PropertyChanged(dbus.String(u"interval"),
 
1054
        self.PropertyChanged(dbus.String(u"Interval"),
937
1055
                             dbus.UInt64(value, variant_level=1))
938
1056
        if getattr(self, u"checker_initiator_tag", None) is None:
939
1057
            return
943
1061
                                      (value, self.start_checker))
944
1062
        self.start_checker()    # Start one now, too
945
1063
 
946
 
    # checker - property
 
1064
    # Checker - property
947
1065
    @dbus_service_property(_interface, signature=u"s",
948
1066
                           access=u"readwrite")
949
 
    def checker_dbus_property(self, value=None):
 
1067
    def Checker_dbus_property(self, value=None):
950
1068
        if value is None:       # get
951
1069
            return dbus.String(self.checker_command)
952
1070
        self.checker_command = value
953
1071
        # Emit D-Bus signal
954
 
        self.PropertyChanged(dbus.String(u"checker"),
 
1072
        self.PropertyChanged(dbus.String(u"Checker"),
955
1073
                             dbus.String(self.checker_command,
956
1074
                                         variant_level=1))
957
1075
    
958
 
    # checker_running - property
 
1076
    # CheckerRunning - property
959
1077
    @dbus_service_property(_interface, signature=u"b",
960
1078
                           access=u"readwrite")
961
 
    def checker_running_dbus_property(self, value=None):
 
1079
    def CheckerRunning_dbus_property(self, value=None):
962
1080
        if value is None:       # get
963
1081
            return dbus.Boolean(self.checker is not None)
964
1082
        if value:
966
1084
        else:
967
1085
            self.stop_checker()
968
1086
    
969
 
    # object_path - property
 
1087
    # ObjectPath - property
970
1088
    @dbus_service_property(_interface, signature=u"o", access=u"read")
971
 
    def object_path_dbus_property(self):
 
1089
    def ObjectPath_dbus_property(self):
972
1090
        return self.dbus_object_path # is already a dbus.ObjectPath
973
1091
    
974
 
    # secret = property
 
1092
    # Secret = property
975
1093
    @dbus_service_property(_interface, signature=u"ay",
976
1094
                           access=u"write", byte_arrays=True)
977
 
    def secret_dbus_property(self, value):
 
1095
    def Secret_dbus_property(self, value):
978
1096
        self.secret = str(value)
979
1097
    
980
1098
    del _interface
981
1099
 
982
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
 
983
1127
class ClientHandler(socketserver.BaseRequestHandler, object):
984
1128
    """A class to handle client connections.
985
1129
    
987
1131
    Note: This will run in its own forked process."""
988
1132
    
989
1133
    def handle(self):
990
 
        logger.info(u"TCP connection from: %s",
991
 
                    unicode(self.client_address))
992
 
        logger.debug(u"IPC Pipe FD: %d", self.server.child_pipe[1])
993
 
        # Open IPC pipe to parent process
994
 
        with contextlib.nested(os.fdopen(self.server.child_pipe[1],
995
 
                                         u"w", 1),
996
 
                               os.fdopen(self.server.parent_pipe[0],
997
 
                                         u"r", 0)) as (ipc,
998
 
                                                       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
 
999
1140
            session = (gnutls.connection
1000
1141
                       .ClientSession(self.request,
1001
1142
                                      gnutls.connection
1002
1143
                                      .X509Credentials()))
1003
 
            
1004
 
            line = self.request.makefile().readline()
1005
 
            logger.debug(u"Protocol version: %r", line)
1006
 
            try:
1007
 
                if int(line.strip().split()[0]) > 1:
1008
 
                    raise RuntimeError
1009
 
            except (ValueError, IndexError, RuntimeError), error:
1010
 
                logger.error(u"Unknown protocol version: %s", error)
1011
 
                return
1012
 
            
 
1144
 
1013
1145
            # Note: gnutls.connection.X509Credentials is really a
1014
1146
            # generic GnuTLS certificate credentials object so long as
1015
1147
            # no X.509 keys are added to it.  Therefore, we can use it
1016
1148
            # here despite using OpenPGP certificates.
1017
 
            
 
1149
 
1018
1150
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1019
1151
            #                      u"+AES-256-CBC", u"+SHA1",
1020
1152
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1026
1158
            (gnutls.library.functions
1027
1159
             .gnutls_priority_set_direct(session._c_object,
1028
1160
                                         priority, None))
1029
 
            
 
1161
 
 
1162
            # Start communication using the Mandos protocol
 
1163
            # Get protocol number
 
1164
            line = self.request.makefile().readline()
 
1165
            logger.debug(u"Protocol version: %r", line)
 
1166
            try:
 
1167
                if int(line.strip().split()[0]) > 1:
 
1168
                    raise RuntimeError
 
1169
            except (ValueError, IndexError, RuntimeError), error:
 
1170
                logger.error(u"Unknown protocol version: %s", error)
 
1171
                return
 
1172
 
 
1173
            # Start GnuTLS connection
1030
1174
            try:
1031
1175
                session.handshake()
1032
1176
            except gnutls.errors.GNUTLSError, error:
1035
1179
                # established.  Just abandon the request.
1036
1180
                return
1037
1181
            logger.debug(u"Handshake succeeded")
 
1182
 
 
1183
            approval_required = False
1038
1184
            try:
1039
1185
                try:
1040
1186
                    fpr = self.fingerprint(self.peer_certificate
1044
1190
                    return
1045
1191
                logger.debug(u"Fingerprint: %s", fpr)
1046
1192
 
1047
 
                for c in self.server.clients:
1048
 
                    if c.fingerprint == fpr:
1049
 
                        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
1050
1215
                        break
1051
 
                else:
1052
 
                    ipc.write(u"NOTFOUND %s %s\n"
1053
 
                              % (fpr, unicode(self.client_address)))
1054
 
                    return
1055
 
                # Have to check if client.enabled, since it is
1056
 
                # possible that the client was disabled since the
1057
 
                # GnuTLS session was established.
1058
 
                ipc.write(u"GETATTR enabled %s\n" % fpr)
1059
 
                enabled = pickle.load(ipc_return)
1060
 
                if not enabled:
1061
 
                    ipc.write(u"DISABLED %s\n" % client.name)
1062
 
                    return
1063
 
                ipc.write(u"SENDING %s\n" % client.name)
 
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
                
1064
1253
                sent_size = 0
1065
1254
                while sent_size < len(client.secret):
1066
 
                    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
1067
1260
                    logger.debug(u"Sent: %d, remaining: %d",
1068
1261
                                 sent, len(client.secret)
1069
1262
                                 - (sent_size + sent))
1070
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
            
1071
1272
            finally:
1072
 
                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")
1073
1279
    
1074
1280
    @staticmethod
1075
1281
    def peer_certificate(session):
1135
1341
        return hex_fpr
1136
1342
 
1137
1343
 
1138
 
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1139
 
    """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 """
1140
1360
    def process_request(self, request, client_address):
1141
1361
        """Overrides and wraps the original process_request().
1142
1362
        
1143
1363
        This function creates a new pipe in self.pipe
1144
1364
        """
1145
 
        self.child_pipe = os.pipe() # Child writes here
1146
 
        self.parent_pipe = os.pipe() # Parent writes here
1147
 
        super(ForkingMixInWithPipes,
 
1365
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
 
1366
 
 
1367
        super(MultiprocessingMixInWithPipe,
1148
1368
              self).process_request(request, client_address)
1149
 
        # Close unused ends for parent
1150
 
        os.close(self.parent_pipe[0]) # close read end
1151
 
        os.close(self.child_pipe[1])  # close write end
1152
 
        self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
1153
 
    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):
1154
1373
        """Dummy function; override as necessary"""
1155
 
        os.close(child_pipe_fd)
1156
 
        os.close(parent_pipe_fd)
1157
 
 
1158
 
 
1159
 
class IPv6_TCPServer(ForkingMixInWithPipes,
 
1374
        pass
 
1375
 
 
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1160
1377
                     socketserver.TCPServer, object):
1161
1378
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1162
1379
    
1247
1464
            return socketserver.TCPServer.server_activate(self)
1248
1465
    def enable(self):
1249
1466
        self.enabled = True
1250
 
    def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
 
1467
    def add_pipe(self, parent_pipe):
1251
1468
        # Call "handle_ipc" for both data and EOF events
1252
 
        gobject.io_add_watch(child_pipe_fd,
 
1469
        gobject.io_add_watch(parent_pipe.fileno(),
1253
1470
                             gobject.IO_IN | gobject.IO_HUP,
1254
1471
                             functools.partial(self.handle_ipc,
1255
 
                                               reply_fd
1256
 
                                               =parent_pipe_fd))
1257
 
    def handle_ipc(self, source, condition, reply_fd=None,
1258
 
                   file_objects={}):
 
1472
                                               parent_pipe = parent_pipe))
 
1473
        
 
1474
    def handle_ipc(self, source, condition, parent_pipe=None,
 
1475
                   client_object=None):
1259
1476
        condition_names = {
1260
1477
            gobject.IO_IN: u"IN",   # There is data to read.
1261
1478
            gobject.IO_OUT: u"OUT", # Data can be written (without
1270
1487
                                       for cond, name in
1271
1488
                                       condition_names.iteritems()
1272
1489
                                       if cond & condition)
1273
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1274
 
                     conditions_string)
1275
 
        
1276
 
        # Turn the pipe file descriptors into Python file objects
1277
 
        if source not in file_objects:
1278
 
            file_objects[source] = os.fdopen(source, u"r", 1)
1279
 
        if reply_fd not in file_objects:
1280
 
            file_objects[reply_fd] = os.fdopen(reply_fd, u"w", 0)
1281
 
        
1282
 
        # Read a line from the file object
1283
 
        cmdline = file_objects[source].readline()
1284
 
        if not cmdline:             # Empty line means end of file
1285
 
            # close the IPC pipes
1286
 
            file_objects[source].close()
1287
 
            del file_objects[source]
1288
 
            file_objects[reply_fd].close()
1289
 
            del file_objects[reply_fd]
1290
 
            
1291
 
            # Stop calling this function
1292
 
            return False
1293
 
        
1294
 
        logger.debug(u"IPC command: %r", cmdline)
1295
 
        
1296
 
        # Parse and act on command
1297
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1298
 
        
1299
 
        if cmd == u"NOTFOUND":
1300
 
            fpr, address = args.split(None, 1)
1301
 
            logger.warning(u"Client not found for fingerprint: %s, ad"
1302
 
                           u"dress: %s", fpr, address)
1303
 
            if self.use_dbus:
1304
 
                # Emit D-Bus signal
1305
 
                mandos_dbus_service.ClientNotFound(fpr, address)
1306
 
        elif cmd == u"DISABLED":
1307
 
            for client in self.clients:
1308
 
                if client.name == args:
1309
 
                    logger.warning(u"Client %s is disabled", args)
1310
 
                    if self.use_dbus:
1311
 
                        # Emit D-Bus signal
1312
 
                        client.Rejected()
1313
 
                    break
1314
 
            else:
1315
 
                logger.error(u"Unknown client %s is disabled", args)
1316
 
        elif cmd == u"SENDING":
1317
 
            for client in self.clients:
1318
 
                if client.name == args:
1319
 
                    logger.info(u"Sending secret to %s", client.name)
1320
 
                    client.checked_ok()
1321
 
                    if self.use_dbus:
1322
 
                        # Emit D-Bus signal
1323
 
                        client.GotSecret()
1324
 
                    break
1325
 
            else:
1326
 
                logger.error(u"Sending secret to unknown client %s",
1327
 
                             args)
1328
 
        elif cmd == u"GETATTR":
1329
 
            attr_name, fpr = args.split(None, 1)
1330
 
            for client in self.clients:
1331
 
                if client.fingerprint == fpr:
1332
 
                    attr_value = getattr(client, attr_name, None)
1333
 
                    logger.debug("IPC reply: %r", attr_value)
1334
 
                    pickle.dump(attr_value, file_objects[reply_fd])
1335
 
                    break
1336
 
            else:
1337
 
                logger.error(u"Client %s on address %s requesting "
1338
 
                             u"attribute %s not found", fpr, address,
1339
 
                             attr_name)
1340
 
                pickle.dump(None, file_objects[reply_fd])
1341
 
        else:
1342
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1343
 
        
1344
 
        # 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
 
1345
1542
        return True
1346
1543
 
1347
1544
 
1450
1647
    parser.add_option("--debug", action=u"store_true",
1451
1648
                      help=u"Debug mode; run in foreground and log to"
1452
1649
                      u" terminal")
 
1650
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1651
                      help=u"Debug level for stdout output")
1453
1652
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1454
1653
                      u" priority string (see GnuTLS documentation)")
1455
1654
    parser.add_option("--servicename", type=u"string",
1480
1679
                        u"servicename": u"Mandos",
1481
1680
                        u"use_dbus": u"True",
1482
1681
                        u"use_ipv6": u"True",
 
1682
                        u"debuglevel": u"",
1483
1683
                        }
1484
1684
    
1485
1685
    # Parse config file for server-global settings
1502
1702
    # options, if set.
1503
1703
    for option in (u"interface", u"address", u"port", u"debug",
1504
1704
                   u"priority", u"servicename", u"configdir",
1505
 
                   u"use_dbus", u"use_ipv6"):
 
1705
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1506
1706
        value = getattr(options, option)
1507
1707
        if value is not None:
1508
1708
            server_settings[option] = value
1517
1717
    
1518
1718
    # For convenience
1519
1719
    debug = server_settings[u"debug"]
 
1720
    debuglevel = server_settings[u"debuglevel"]
1520
1721
    use_dbus = server_settings[u"use_dbus"]
1521
1722
    use_ipv6 = server_settings[u"use_ipv6"]
1522
 
    
1523
 
    if not debug:
1524
 
        syslogger.setLevel(logging.WARNING)
1525
 
        console.setLevel(logging.WARNING)
1526
 
    
 
1723
 
1527
1724
    if server_settings[u"servicename"] != u"Mandos":
1528
1725
        syslogger.setFormatter(logging.Formatter
1529
1726
                               (u'Mandos (%s) [%%(process)d]:'
1535
1732
                        u"interval": u"5m",
1536
1733
                        u"checker": u"fping -q -- %%(host)s",
1537
1734
                        u"host": u"",
 
1735
                        u"approval_delay": u"0s",
 
1736
                        u"approval_duration": u"1s",
1538
1737
                        }
1539
1738
    client_config = configparser.SafeConfigParser(client_defaults)
1540
1739
    client_config.read(os.path.join(server_settings[u"configdir"],
1546
1745
    tcp_server = MandosServer((server_settings[u"address"],
1547
1746
                               server_settings[u"port"]),
1548
1747
                              ClientHandler,
1549
 
                              interface=server_settings[u"interface"],
 
1748
                              interface=(server_settings[u"interface"]
 
1749
                                         or None),
1550
1750
                              use_ipv6=use_ipv6,
1551
1751
                              gnutls_priority=
1552
1752
                              server_settings[u"priority"],
1578
1778
        if error[0] != errno.EPERM:
1579
1779
            raise error
1580
1780
    
1581
 
    # 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
 
1582
1789
    if debug:
 
1790
        # Enable all possible GnuTLS debugging
 
1791
        
1583
1792
        # "Use a log level over 10 to enable all debugging options."
1584
1793
        # - GnuTLS manual
1585
1794
        gnutls.library.functions.gnutls_global_set_log_level(11)
1590
1799
        
1591
1800
        (gnutls.library.functions
1592
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
    
1593
1812
    
1594
1813
    global main_loop
1595
1814
    # From the Avahi example code
1613
1832
    if server_settings["interface"]:
1614
1833
        service.interface = (if_nametoindex
1615
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()
1616
1842
    
1617
1843
    client_class = Client
1618
1844
    if use_dbus:
1619
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
    
1620
1858
    tcp_server.clients.update(set(
1621
1859
            client_class(name = section,
1622
 
                         config= dict(client_config.items(section)))
 
1860
                         config= dict(client_config_items(
 
1861
                        client_config, section)))
1623
1862
            for section in client_config.sections()))
1624
1863
    if not tcp_server.clients:
1625
1864
        logger.warning(u"No clients defined")
1626
 
    
1627
 
    if debug:
1628
 
        # Redirect stdin so all checkers get /dev/null
1629
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1630
 
        os.dup2(null, sys.stdin.fileno())
1631
 
        if null > 2:
1632
 
            os.close(null)
1633
 
    else:
1634
 
        # No console logging
1635
 
        logger.removeHandler(console)
1636
 
        # Close all input and output, do double fork, etc.
1637
 
        daemon()
1638
 
    
 
1865
        
1639
1866
    try:
1640
1867
        with pidfile:
1641
1868
            pid = os.getpid()