sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

login: rework login mechanism 

We used to have the login functionality in the /env/bin/init script.
This is hard to review and it's too easy to break the login functionality
with changes to this script. Move the places to ask for a password to
C code where we have only a few places where we have to ask for a password.
Mainly these are run_shell() and the menutree command.

This patch introduces a login() function which will only return if the correct
password has been entered. Following calls will return immediately without
asking for a password again.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2015-08-27 15:29:58 +02:00
parent f38ba32965
commit 90e766a78f
12 changed files with 94 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
commands/login.c
View File

@ -19,89 +19,23 @@
#include <command.h>
#include <complete.h>
#include <password.h>
#include <getopt.h>
#include <environment.h>
#include <globalvar.h>
#include <magicvar.h>
#include <init.h>
#include <console.h>
#define PASSWD_MAX_LENGTH (128 + 1)
#if defined(CONFIG_PASSWD_MODE_STAR)
#define LOGIN_MODE STAR
#elif defined(CONFIG_PASSWD_MODE_CLEAR)
#define LOGIN_MODE CLEAR
#else
#define LOGIN_MODE HIDE
#endif
static int login_timeout = 0;
static int do_login(int argc, char *argv[])
{
unsigned char passwd[PASSWD_MAX_LENGTH];
int passwd_len, opt;
int timeout = login_timeout;
char *timeout_cmd = "boot";
console_allow_input(true);
if (!is_passwd_enable()) {
puts("login: password not set\n");
return 0;
}
while((opt = getopt(argc, argv, "t:")) > 0) {
switch(opt) {
case 't':
timeout = simple_strtoul(optarg, NULL, 10);
break;
}
}
if (optind != argc)
timeout_cmd = argv[optind];
do {
puts("Password: ");
passwd_len = password(passwd, PASSWD_MAX_LENGTH, LOGIN_MODE, timeout);
if (passwd_len < 0) {
console_allow_input(false);
run_command(timeout_cmd);
}
if (check_passwd(passwd, passwd_len) == 1)
return 0;
} while(1);
login();
return 0;
}
BAREBOX_CMD_HELP_START(login)
BAREBOX_CMD_HELP_TEXT("Asks for a password from the console before script execution continues.")
BAREBOX_CMD_HELP_TEXT("The password can be set with the 'passwd' command. Instead of specifying")
BAREBOX_CMD_HELP_TEXT("a TIMEOUT the magic variable 'global.login.timeout' could be set.")
BAREBOX_CMD_HELP_TEXT("")
BAREBOX_CMD_HELP_TEXT("Options:")
BAREBOX_CMD_HELP_OPT("-t TIMEOUT", "Execute COMMAND if no login withing TIMEOUT seconds")
BAREBOX_CMD_HELP_TEXT("The password can be set with the 'passwd' command.")
BAREBOX_CMD_HELP_END
BAREBOX_CMD_START(login)
.cmd = do_login,
BAREBOX_CMD_DESC("ask for a password")
BAREBOX_CMD_OPTS("[-t TIMEOUT] COMMAND")
BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE)
BAREBOX_CMD_HELP(cmd_login_help)
BAREBOX_CMD_COMPLETE(empty_complete)
BAREBOX_CMD_END
static int login_global_init(void)
{
globalvar_add_simple_int("login.timeout", &login_timeout, "%d");
return 0;
}
late_initcall(login_global_init);
BAREBOX_MAGICVAR_NAMED(global_login_timeout, global.login.timeout, "timeout to type the password");

3
commands/menutree.c
View File

@ -12,12 +12,15 @@
#include <common.h>
#include <getopt.h>
#include <menu.h>
#include <password.h>
static int do_menutree(int argc, char *argv[])
{
int opt, ret;
char *path = "/env/menu";
login();
while ((opt = getopt(argc, argv, "m:")) > 0) {
switch (opt) {
case 'm':

6
common/console.c
View File

@ -344,9 +344,6 @@ int getc(void)
unsigned char ch;
uint64_t start;
if (unlikely(!console_is_input_allow()))
return -EPERM;
/*
* For 100us we read the characters from the serial driver
* into a kfifo. This helps us not to lose characters
@ -381,9 +378,6 @@ EXPORT_SYMBOL(fgetc);
int tstc(void)
{
if (unlikely(!console_is_input_allow()))
return 0;
return kfifo_len(console_input_fifo) || tstc_raw();
}
EXPORT_SYMBOL(tstc);

27
common/console_common.c
View File

@ -33,33 +33,6 @@
#ifndef CONFIG_CONSOLE_NONE
static int console_input_allow;
static int console_global_init(void)
{
if (IS_ENABLED(CONFIG_CMD_LOGIN) && is_passwd_enable())
console_input_allow = 0;
else
console_input_allow = 1;
globalvar_add_simple_bool("console.input_allow", &console_input_allow);
return 0;
}
late_initcall(console_global_init);
BAREBOX_MAGICVAR_NAMED(global_console_input_allow, global.console.input_allow, "console input allowed");
bool console_is_input_allow(void)
{
return console_input_allow;
}
void console_allow_input(bool val)
{
console_input_allow = val;
}
int barebox_loglevel = CONFIG_DEFAULT_LOGLEVEL;
LIST_HEAD(barebox_logbuf);

6
common/console_simple.c
View File

@ -41,9 +41,6 @@ EXPORT_SYMBOL(console_putc);
int tstc(void)
{
if (unlikely(!console_is_input_allow()))
return 0;
if (!console)
return 0;
@ -53,9 +50,6 @@ EXPORT_SYMBOL(tstc);
int getc(void)
{
if (unlikely(!console_is_input_allow()))
return -EPERM;
if (!console)
return -EINVAL;
return console->getc(console);

3
common/hush.c
View File

@ -116,6 +116,7 @@
#include <errno.h>
#include <fs.h>
#include <libbb.h>
#include <password.h>
#include <glob.h>
#include <getopt.h>
#include <libfile.h>
@ -1914,6 +1915,8 @@ int run_shell(void)
struct p_context ctx;
int exit = 0;
login();
do {
setup_file_in_str(&input);
rcode = parse_stream_outer(&ctx, &input, FLAG_PARSE_SEMICOLON);

3
common/parser.c
View File

@ -1,5 +1,6 @@
#include <common.h>
#include <command.h>
#include <password.h>
#include <environment.h>
#include <shell.h>
@ -266,6 +267,8 @@ int run_shell(void)
int len;
int rc = 1;
login();
for (;;) {
len = readline (CONFIG_PROMPT, console_buffer, CONFIG_CBSIZE);

75
common/password.c
View File

@ -24,8 +24,11 @@
#include <digest.h>
#include <malloc.h>
#include <xfuncs.h>
#include <magicvar.h>
#include <clock.h>
#include <init.h>
#include <stdlib.h>
#include <globalvar.h>
#include <generated/passwd.h>
#include <crypto/pbkdf2.h>
@ -73,7 +76,7 @@ int password(unsigned char *passwd, size_t length, int flags, int timeout)
case CTL_CH('c'):
passwd[0] = '\0';
puts("\r\n");
return 0;
return -EINTR;
case CTL_CH('h'):
case BB_KEY_DEL7:
case BB_KEY_DEL:
@ -104,7 +107,7 @@ int password(unsigned char *passwd, size_t length, int flags, int timeout)
}
} while (!is_timeout(start, timeout * SECOND) || timeout == 0);
return -1;
return -ETIMEDOUT;
}
EXPORT_SYMBOL(password);
@ -374,6 +377,8 @@ int set_env_passwd(unsigned char* passwd, size_t length)
hash_len = PBKDF2_LENGTH;
} else {
d = digest_alloc(PASSWD_SUM);
if (!d)
return -EINVAL;
hash_len = digest_length(d);
}
@ -406,3 +411,69 @@ err:
return ret;
}
EXPORT_SYMBOL(set_env_passwd);
#define PASSWD_MAX_LENGTH (128 + 1)
#if defined(CONFIG_PASSWD_MODE_STAR)
#define LOGIN_MODE STAR
#elif defined(CONFIG_PASSWD_MODE_CLEAR)
#define LOGIN_MODE CLEAR
#else
#define LOGIN_MODE HIDE
#endif
static int logged_in;
static int login_timeout;
static char *login_fail_command;
/**
* login() - Prompt for password
*
* This function only returns when the correct password has been entered or
* no password is necessary because either no password is configured or the
* correct password has been entered in a previous call to this function.
*/
void login(void)
{
unsigned char passwd[PASSWD_MAX_LENGTH];
int ret;
if (!is_passwd_enable())
return;
if (logged_in)
return;
while (1) {
printf("Password: ");
ret = password(passwd, PASSWD_MAX_LENGTH, LOGIN_MODE, login_timeout);
if (ret < 0)
run_command(login_fail_command);
if (ret < 0)
continue;
if (check_passwd(passwd, ret) != 1)
continue;
logged_in = 1;
return;
}
}
static int login_global_init(void)
{
login_fail_command = xstrdup("boot");
globalvar_add_simple_int("login.timeout", &login_timeout, "%d");
globalvar_add_simple_string("login.fail_command", &login_fail_command);
return 0;
}
late_initcall(login_global_init);
BAREBOX_MAGICVAR_NAMED(global_login_fail_command, global.login.fail_command,
"command to run when password entry failed");
BAREBOX_MAGICVAR_NAMED(global_login_timeout, global.login.timeout,
"timeout to type the password");

7
common/startup.c
View File

@ -108,13 +108,10 @@ void __noreturn start_barebox(void)
if (IS_ENABLED(CONFIG_COMMAND_SUPPORT)) {
pr_info("running /env/bin/init...\n");
if (!stat("/env/bin/init", &s)) {
if (!stat("/env/bin/init", &s))
run_command("source /env/bin/init");
} else {
else
pr_err("/env/bin/init not found\n");
if (IS_ENABLED(CONFIG_CMD_LOGIN))
while(run_command("login -t 0"));
}
}
if (!barebox_main) {

18
defaultenv/defaultenv-2-base/bin/init
View File

@ -27,25 +27,15 @@ magicvar -a global.allow_color "Allow color on the console (boolean)"
[ -e /env/config-board ] && /env/config-board
/env/config
# request password to login if a timeout is specified and password set
if [ -n ${global.login.timeout} ]; then
[ ${global.login.timeout} -gt 0 ] && login_cmd=login
fi
# allow the input if not
[ -n ${global.console.input_allow} ] && global.console.input_allow=1
# allow to stop the boot before execute the /env/init/*
# but without waiting
timeout -s -a -v key 0
autoboot="$?"
if [ "${key}" = "q" ]; then
${login_cmd}
exit
fi
[ -n ${login_cmd} ] && global.console.input_allow=0
for i in /env/init/*; do
. $i
done
@ -56,17 +46,12 @@ else
echo -e -n "\nHit any key to stop autoboot: "
fi
[ -n ${login_cmd} ] && global.console.input_allow=1
if [ "$autoboot" = 0 ]; then
timeout -a $global.autoboot_timeout -v key
autoboot="$?"
fi
[ -n ${login_cmd} ] && global.console.input_allow=0
if [ "${key}" = "q" ]; then
${login_cmd}
exit
fi
@ -75,12 +60,9 @@ if [ "$autoboot" = 0 ]; then
fi
if [ -e /env/menu ]; then
${login_cmd}
if [ "${key}" != "m" ]; then
echo -e "\ntype exit to get to the menu"
sh
fi
/env/menu/mainmenu
fi
${login_cmd}

3
include/console.h
View File

@ -71,9 +71,6 @@ extern struct list_head console_list;
#define CFG_PBSIZE (CONFIG_CBSIZE+sizeof(CONFIG_PROMPT)+16)
bool console_is_input_allow(void);
void console_allow_input(bool val);
extern int barebox_loglevel;
struct console_device *console_get_first_active(void);

8
include/password.h
View File

@ -42,6 +42,14 @@ int passwd_env_disable(void);
int check_env_passwd(unsigned char* passwd, size_t length);
int set_env_passwd(unsigned char* passwd, size_t length);
#ifdef CONFIG_PASSWORD
void login(void);
#else
static inline void login(void)
{
}
#endif
static inline int is_passwd_enable(void)
{
return is_passwd_default_enable() || is_passwd_env_enable();