130
124
def __init__(self, server_proxy_object=None, update_hook=None,
131
delete_hook=None, **kwargs):
125
delete_hook=None, logger=None, **kwargs):
132
126
# Called on update
133
127
self.update_hook = update_hook
134
128
# Called on delete
135
129
self.delete_hook = delete_hook
136
130
# Mandos Server proxy object
137
131
self.server_proxy_object = server_proxy_object
139
135
self._update_timer_callback_tag = None
176
173
if flag and self._update_timer_callback_tag is None:
177
174
# Will update the shown timer value every second
178
self._update_timer_callback_tag = (
179
GLib.timeout_add(1000,
180
glib_safely(self.update_timer)))
175
self._update_timer_callback_tag = (GLib.timeout_add
181
178
elif not (flag or self._update_timer_callback_tag is None):
182
179
GLib.source_remove(self._update_timer_callback_tag)
183
180
self._update_timer_callback_tag = None
185
182
def checker_completed(self, exitstatus, condition, command):
186
183
if exitstatus == 0:
187
log.debug('Checker for client %s (command "%s")'
188
' succeeded', self.properties["Name"], command)
184
self.logger('Checker for client {} (command "{}")'
185
' succeeded'.format(self.properties["Name"],
192
190
if os.WIFEXITED(condition):
193
log.info('Checker for client %s (command "%s") failed'
194
' with exit code %d', self.properties["Name"],
195
command, os.WEXITSTATUS(condition))
191
self.logger('Checker for client {} (command "{}") failed'
193
.format(self.properties["Name"], command,
194
os.WEXITSTATUS(condition)))
196
195
elif os.WIFSIGNALED(condition):
197
log.info('Checker for client %s (command "%s") was'
198
' killed by signal %d', self.properties["Name"],
199
command, os.WTERMSIG(condition))
196
self.logger('Checker for client {} (command "{}") was'
197
' killed by signal {}'
198
.format(self.properties["Name"], command,
199
os.WTERMSIG(condition)))
202
202
def checker_started(self, command):
203
203
"""Server signals that a checker started."""
204
log.debug('Client %s started checker "%s"',
205
self.properties["Name"], command)
204
self.logger('Client {} started checker "{}"'
205
.format(self.properties["Name"],
207
208
def got_secret(self):
208
log.info("Client %s received its secret",
209
self.properties["Name"])
209
self.logger('Client {} received its secret'
210
.format(self.properties["Name"]))
211
212
def need_approval(self, timeout, default):
213
message = "Client %s needs approval within %f seconds"
214
message = 'Client {} needs approval within {} seconds'
215
message = "Client %s will get its secret in %f seconds"
216
log.info(message, self.properties["Name"], timeout/1000)
216
message = 'Client {} will get its secret in {} seconds'
217
self.logger(message.format(self.properties["Name"],
218
220
def rejected(self, reason):
219
log.info("Client %s was rejected; reason: %s",
220
self.properties["Name"], reason)
221
self.logger('Client {} was rejected; reason: {}'
222
.format(self.properties["Name"], reason))
222
224
def selectable(self):
223
225
"""Make this a "selectable" widget.
464
458
self.log_visible = True
465
459
self.log_wrap = "any"
467
self.loghandler = UILogHandler(self)
470
self.add_log_line(("bold",
471
"Mandos Monitor version " + version))
472
self.add_log_line(("bold", "q: Quit ?: Help"))
462
self.log_message_raw(("bold",
463
"Mandos Monitor version " + version))
464
self.log_message_raw(("bold",
474
467
self.busname = domain + '.Mandos'
475
468
self.main_loop = GLib.MainLoop()
477
470
def client_not_found(self, key_id, address):
478
log.info("Client with address %s and key ID %s could"
479
" not be found", address, key_id)
471
self.log_message("Client with address {} and key ID {} could"
472
" not be found".format(address, key_id))
481
474
def rebuild(self):
482
475
"""This rebuilds the User Interface.
493
486
self.uilist.append(self.logbox)
494
487
self.topwidget = urwid.Pile(self.uilist)
496
def add_log_line(self, markup):
489
def log_message(self, message, level=1):
490
"""Log message formatted with timestamp"""
491
if level < self.log_level:
493
timestamp = datetime.datetime.now().isoformat()
494
self.log_message_raw("{}: {}".format(timestamp, message),
497
def log_message_raw(self, markup, level=1):
498
"""Add a log message to the log buffer."""
499
if level < self.log_level:
497
501
self.log.append(urwid.Text(markup, wrap=self.log_wrap))
498
502
if self.max_log_length:
499
503
if len(self.log) > self.max_log_length:
500
del self.log[0:(len(self.log) - self.max_log_length)]
504
del self.log[0:len(self.log)-self.max_log_length-1]
501
505
self.logbox.set_focus(len(self.logbox.body.contents)-1,
502
506
coming_from="above")
589
592
mandos_clients = (self.mandos_serv
590
593
.GetAllClientsWithProperties())
591
594
if not mandos_clients:
592
log.warning("Note: Server has no clients.")
595
self.log_message_raw(("bold",
596
"Note: Server has no clients."))
593
597
except dbus.exceptions.DBusException:
594
log.warning("Note: No Mandos server running.")
598
self.log_message_raw(("bold",
599
"Note: No Mandos server running."))
595
600
mandos_clients = dbus.Dictionary()
597
602
(self.mandos_serv
702
707
self.topwidget.set_focus(self.logbox)
705
if log.level < logging.INFO:
706
log.setLevel(logging.INFO)
707
log.info("Verbose mode: Off")
710
if self.log_level == 0:
712
self.log_message("Verbose mode: Off")
709
log.setLevel(logging.NOTSET)
710
log.info("Verbose mode: On")
715
self.log_message("Verbose mode: On")
711
716
# elif (key == "end" or key == "meta >" or key == "G"
712
717
# or key == ">"):
713
718
# pass # xxx end-of-buffer
735
class UILogHandler(logging.Handler):
736
def __init__(self, ui, *args, **kwargs):
738
super(UILogHandler, self).__init__(*args, **kwargs)
740
logging.Formatter("%(asctime)s: %(message)s"))
741
def emit(self, record):
742
msg = self.format(record)
743
if record.levelno > logging.INFO:
745
self.ui.add_log_line(msg)
748
740
ui = UserInterface()
751
743
except KeyboardInterrupt:
752
with warnings.catch_warnings():
753
warnings.filterwarnings("ignore", "", BytesWarning)
756
with warnings.catch_warnings():
757
warnings.filterwarnings("ignore", "", BytesWarning)
745
except Exception as e:
746
ui.log_message(str(e))