/mandos/release

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

« back to all changes in this revision

Viewing changes to plugins.d/splashy

  • Committer: Teddy Hogeborn
  • Date: 2019-03-07 20:28:17 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 382.
  • Revision ID: teddy@recompile.se-20190307202817-avhha20s3pl14j6y
mandos-ctl: Refactor; move parsing of intervals into argument parsing

* mandos-ctl (MillisecondsValueArgumentMixIn.value_to_set): Assume
  that an incoming value is datetime.timedelta(), not a string.
  (add_command_line_options): Add "type=string_to_delta" to --timeout,
  --extended-timeout, --interval, --approval-delay, and
  --approval-duration.
  (TestSetTimeoutCmd, TestSetExtendedTimeoutCmd, TestSetIntervalCmd,
  TestSetApprovalDelayCmd, TestSetApprovalDurationCmd): Change
  values_to_set to be datetime.timedelta() values, and change to more
  appropriate values to test.  Also adjust values_to_get accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/bin/sh -e
2
 
 
3
 
# If not on a tty, then get rid of possibly disrupting stderr output
4
 
if ! tty -s; then
5
 
    exec 2>/dev/null
6
 
fi
7
 
 
8
 
test -x /sbin/splashy_update
9
 
 
10
 
# We get some variables from cryptsetup:
11
 
# $cryptsource  the device node, like "/dev/sda3"
12
 
# $crypttarget  the device mapper name, like "sda3_crypt".
13
 
 
14
 
prompt="Enter passphrase to unlock"
15
 
if [ -n "$crypttarget" ]; then
16
 
    prompt="$prompt the disk $crypttarget"
17
 
fi
18
 
if [ -n "$cryptsource" ]; then
19
 
    prompt="$prompt ($cryptsource)"
20
 
fi
21
 
 
22
 
splash_input_password(){
23
 
    /sbin/splashy_update "getpass $1"
24
 
}
25
 
 
26
 
password="`splash_input_password \"$prompt: \"`"
27
 
 
28
 
echo -n "$password"