/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-monitor

  • Committer: Teddy Hogeborn
  • Date: 2010-09-12 03:08:51 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912030851-f48xth0u8yck0wrv
* mandos-monitor (MandosClientWidget.checker_completed): Do not log a
                                                         successful
                                                         checker.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
 
4
 
# Mandos Monitor - Control and monitor the Mandos server
5
 
6
 
# Copyright © 2009,2010 Teddy Hogeborn
7
 
# Copyright © 2009,2010 Björn Påhlsson
8
 
9
 
# This program is free software: you can redistribute it and/or modify
10
 
# it under the terms of the GNU General Public License as published by
11
 
# the Free Software Foundation, either version 3 of the License, or
12
 
# (at your option) any later version.
13
 
#
14
 
#     This program is distributed in the hope that it will be useful,
15
 
#     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
 
#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
 
#     GNU General Public License for more details.
18
 
19
 
# You should have received a copy of the GNU General Public License
20
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
 
22
 
# Contact the authors at <mandos@fukt.bsnet.se>.
23
 
24
3
 
25
4
from __future__ import division, absolute_import, with_statement
26
5
 
51
30
domain = 'se.bsnet.fukt'
52
31
server_interface = domain + '.Mandos'
53
32
client_interface = domain + '.Mandos.Client'
54
 
version = "1.2"
 
33
version = "1.0.15"
55
34
 
56
35
# Always run in monochrome mode
57
36
urwid.curses_display.curses.has_colors = lambda : False
123
102
        self.logger = logger
124
103
        
125
104
        self._update_timer_callback_tag = None
126
 
        self._update_timer_callback_lock = 0
127
105
        self.last_checker_failed = False
128
106
        
129
107
        # The widget shown normally
135
113
            *args, **kwargs)
136
114
        self.update()
137
115
        self.opened = False
138
 
        
 
116
        self.proxy.connect_to_signal(u"CheckerCompleted",
 
117
                                     self.checker_completed,
 
118
                                     client_interface,
 
119
                                     byte_arrays=True)
 
120
        self.proxy.connect_to_signal(u"CheckerStarted",
 
121
                                     self.checker_started,
 
122
                                     client_interface,
 
123
                                     byte_arrays=True)
 
124
        self.proxy.connect_to_signal(u"GotSecret",
 
125
                                     self.got_secret,
 
126
                                     client_interface,
 
127
                                     byte_arrays=True)
 
128
        self.proxy.connect_to_signal(u"NeedApproval",
 
129
                                     self.need_approval,
 
130
                                     client_interface,
 
131
                                     byte_arrays=True)
 
132
        self.proxy.connect_to_signal(u"Rejected",
 
133
                                     self.rejected,
 
134
                                     client_interface,
 
135
                                     byte_arrays=True)
139
136
        last_checked_ok = isoformat_to_datetime(self.properties
140
137
                                                [u"LastCheckedOK"])
141
138
        if last_checked_ok is None:
147
144
                                        (milliseconds=
148
145
                                         self.properties
149
146
                                         [u"Interval"]))
150
 
        
151
147
        if self.last_checker_failed:
152
 
            self.using_timer(True)
153
 
        
154
 
        if self.need_approval:
155
 
            self.using_timer(True)
156
 
        
157
 
        self.proxy.connect_to_signal(u"CheckerCompleted",
158
 
                                     self.checker_completed,
159
 
                                     client_interface,
160
 
                                     byte_arrays=True)
161
 
        self.proxy.connect_to_signal(u"CheckerStarted",
162
 
                                     self.checker_started,
163
 
                                     client_interface,
164
 
                                     byte_arrays=True)
165
 
        self.proxy.connect_to_signal(u"GotSecret",
166
 
                                     self.got_secret,
167
 
                                     client_interface,
168
 
                                     byte_arrays=True)
169
 
        self.proxy.connect_to_signal(u"NeedApproval",
170
 
                                     self.need_approval,
171
 
                                     client_interface,
172
 
                                     byte_arrays=True)
173
 
        self.proxy.connect_to_signal(u"Rejected",
174
 
                                     self.rejected,
175
 
                                     client_interface,
176
 
                                     byte_arrays=True)
177
 
    
178
 
    def property_changed(self, property=None, value=None):
179
 
        super(self, MandosClientWidget).property_changed(property,
180
 
                                                         value)
181
 
        if property == u"ApprovalPending":
182
 
            using_timer(bool(value))
183
 
        
184
 
    def using_timer(self, flag):
185
 
        """Call this method with True or False when timer should be
186
 
        activated or deactivated.
187
 
        """
188
 
        old = self._update_timer_callback_lock
189
 
        if flag:
190
 
            self._update_timer_callback_lock += 1
191
 
        else:
192
 
            self._update_timer_callback_lock -= 1
193
 
        if old == 0 and self._update_timer_callback_lock:
194
148
            self._update_timer_callback_tag = (gobject.timeout_add
195
149
                                               (1000,
196
150
                                                self.update_timer))
197
 
        elif old and self._update_timer_callback_lock == 0:
198
 
            gobject.source_remove(self._update_timer_callback_tag)
199
 
            self._update_timer_callback_tag = None
200
151
    
201
152
    def checker_completed(self, exitstatus, condition, command):
202
153
        if exitstatus == 0:
203
154
            if self.last_checker_failed:
204
155
                self.last_checker_failed = False
205
 
                self.using_timer(False)
 
156
                gobject.source_remove(self._update_timer_callback_tag)
 
157
                self._update_timer_callback_tag = None
206
158
            #self.logger(u'Checker for client %s (command "%s")'
207
159
            #            u' was successful'
208
160
            #            % (self.properties[u"Name"], command))
211
163
        # Checker failed
212
164
        if not self.last_checker_failed:
213
165
            self.last_checker_failed = True
214
 
            self.using_timer(True)
 
166
            self._update_timer_callback_tag = (gobject.timeout_add
 
167
                                               (1000,
 
168
                                                self.update_timer))
215
169
        if os.WIFEXITED(condition):
216
170
            self.logger(u'Checker for client %s (command "%s")'
217
171
                        u' failed with exit code %s'
248
202
            message = u'Client %s will get its secret in %s seconds'
249
203
        self.logger(message
250
204
                    % (self.properties[u"Name"], timeout/1000))
251
 
        self.using_timer(True)
252
205
    
253
206
    def rejected(self, reason):
254
207
        self.logger(u'Client %s was rejected; reason: %s'
289
242
        if not self.properties[u"Enabled"]:
290
243
            message = u"DISABLED"
291
244
        elif self.properties[u"ApprovalPending"]:
292
 
            timeout = datetime.timedelta(milliseconds
293
 
                                         = self.properties
294
 
                                         [u"ApprovalDelay"])
295
 
            last_approval_request = isoformat_to_datetime(
296
 
                self.properties[u"LastApprovalRequest"])
297
 
            if last_approval_request is not None:
298
 
                timer = timeout - (datetime.datetime.utcnow()
299
 
                                   - last_approval_request)
300
 
            else:
301
 
                timer = datetime.timedelta()
302
245
            if self.properties[u"ApprovedByDefault"]:
303
 
                message = u"Approval in %s. (d)eny?"
 
246
                message = u"Connection established to client. (d)eny?"
304
247
            else:
305
 
                message = u"Denial in %s. (a)pprove?"
306
 
            message = message % unicode(timer).rsplit(".", 1)[0]
 
248
                message = u"Seeks approval to send secret. (a)pprove?"
307
249
        elif self.last_checker_failed:
308
250
            timeout = datetime.timedelta(milliseconds
309
251
                                         = self.properties
314
256
                    self.properties[u"LastEnabled"]))
315
257
            timer = timeout - (datetime.datetime.utcnow() - last_ok)
316
258
            message = (u'A checker has failed! Time until client'
317
 
                       u' gets disabled: %s'
 
259
                       u' gets diabled: %s'
318
260
                           % unicode(timer).rsplit(".", 1)[0])
319
261
        else:
320
262
            message = u"enabled"
367
309
        elif key == u"d":
368
310
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
311
                                  dbus_interface = client_interface)
370
 
        elif key == u"R" or key == u"_" or key == u"ctrl k":
 
312
        elif key == u"r" or key == u"_" or key == u"ctrl k":
371
313
            self.server_proxy_object.RemoveClient(self.proxy
372
314
                                                  .object_path)
373
315
        elif key == u"s":
383
325
#             self.proxy.unpause()
384
326
#         elif key == u"RET":
385
327
#             self.open()
 
328
#        elif key == u"+":
 
329
#            self.proxy.Approve(True)
 
330
#        elif key == u"-":
 
331
#            self.proxy.Approve(False)
386
332
        else:
387
333
            return key
388
334
    
558
504
        """Toggle visibility of the log buffer."""
559
505
        self.log_visible = not self.log_visible
560
506
        self.rebuild()
561
 
        #self.log_message(u"Log visibility changed to: "
562
 
        #                 + unicode(self.log_visible))
 
507
        self.log_message(u"Log visibility changed to: "
 
508
                         + unicode(self.log_visible))
563
509
    
564
510
    def change_log_display(self):
565
511
        """Change type of log display.
570
516
            self.log_wrap = u"clip"
571
517
        for textwidget in self.log:
572
518
            textwidget.set_wrap_mode(self.log_wrap)
573
 
        #self.log_message(u"Wrap mode: " + self.log_wrap)
 
519
        self.log_message(u"Wrap mode: " + self.log_wrap)
574
520
    
575
521
    def find_and_remove_client(self, path, name):
576
522
        """Find an client from its object path and remove it.
686
632
                                      .join((u"Clients:",
687
633
                                             u"+: Enable",
688
634
                                             u"-: Disable",
689
 
                                             u"R: Remove",
 
635
                                             u"r: Remove",
690
636
                                             u"s: Start new checker",
691
637
                                             u"S: Stop checker",
692
638
                                             u"C: Checker OK",