d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve loader passwords:

Browse Source 
1. Be clear about which password is being requested
2. Remove extraneous whitespace between the prompt and the cursor
3. Move the twiddle to where the prompt is, instead of two characters to the right
4. Fix erasing the 'incorrect password' message when retrying; previously it was erased partially
5. Remove the unneeded exclamation mark

Reviewed by:	kevans
Approved by:	re (gjb)
MFC after:	2 weeks
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D17236
This commit is contained in:
Edward Tomasz Napierala 2018-09-22 13:14:44 +00:00
parent 334107b91b
commit 6c8e9a8471
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
stand/lua/password.lua
View File

@ -34,7 +34,7 @@ local screen = require("screen")
local password = {}
local INCORRECT_PASSWORD = "loader: incorrect password!"
local INCORRECT_PASSWORD = "loader: incorrect password"
-- Asterisks as a password mask
local show_password_mask = false
local twiddle_chars = {"/", "-", "\\", "|"}
@ -45,7 +45,7 @@ function password.read(prompt_length)
local twiddle_pos = 1
local function draw_twiddle()
printc(" " .. twiddle_chars[twiddle_pos])
printc(twiddle_chars[twiddle_pos])
-- Reset cursor to just after the password prompt
screen.setcursor(prompt_length + 2, screen.default_y)
twiddle_pos = (twiddle_pos % #twiddle_chars) + 1
@ -87,20 +87,19 @@ function password.check()
local attempts = 1
local function clear_incorrect_text_prompt()
printc("\n")
printc(string.rep(" ", #INCORRECT_PASSWORD))
printc("\r" .. string.rep(" ", #INCORRECT_PASSWORD))
end
while true do
if attempts > 1 then
clear_incorrect_text_prompt()
end
screen.defcursor()
printc(prompt)
local read_pwd = password.read(#prompt)
if pwd == nil or pwd == read_pwd then
-- Clear the prompt + twiddle
printc(string.rep(" ", #prompt + 5))
if attempts > 1 then
clear_incorrect_text_prompt()
end
return read_pwd
end
printc("\n" .. INCORRECT_PASSWORD)
@ -116,11 +115,11 @@ function password.check()
end
local boot_pwd = loader.getenv("bootlock_password")
compare("Boot password: ", boot_pwd)
compare("Bootlock password:", boot_pwd)
local geli_prompt = loader.getenv("geom_eli_passphrase_prompt")
if geli_prompt ~= nil and geli_prompt:lower() == "yes" then
local passphrase = doPrompt("GELI Passphrase: ")
local passphrase = doPrompt("GELI Passphrase:")
loader.setenv("kern.geom.eli.passphrase", passphrase)
end
@ -128,7 +127,7 @@ function password.check()
if pwd ~= nil then
core.autoboot()
end
compare("Password: ", pwd)
compare("Loader password:", pwd)
end
return password