vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Split login into getty and login, like other UNIXen

Browse source
This commit is contained in:
Jeremy Soller 2016-09-29 15:32:32 -06:00
parent 5a99ba6863
commit cd47a60595
9 changed files with 133 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -28,6 +28,7 @@ clean:
cargo clean --manifest-path drivers/ps2d/Cargo.toml
cargo clean --manifest-path drivers/pcid/Cargo.toml
cargo clean --manifest-path drivers/vesad/Cargo.toml
cargo clean --manifest-path programs/getty/Cargo.toml
cargo clean --manifest-path programs/init/Cargo.toml
cargo clean --manifest-path programs/ion/Cargo.toml
cargo clean --manifest-path programs/login/Cargo.toml
@ -274,6 +275,7 @@ $(BUILD)/filesystem.bin: \
coreutils \
extrautils \
schemes \
filesystem/bin/getty \
filesystem/bin/ion \
filesystem/bin/login \
filesystem/bin/smith

6
filesystem/etc/issue Normal file
View file

@ -0,0 +1,6 @@
########## Redox OS ##########
# Login with the following: #
# `root` #
# `user`:`password` #
##############################

2
filesystem/etc/motd Normal file
View file

@ -0,0 +1,2 @@
Welcome to Redox OS!

4
filesystem/etc/passwd
View file

@ -1,2 +1,2 @@
root;A69F73CCA23A9AC5C8B567DC185A756E97C982164FE25859E0D1DCC1475C80A615B2123AF1F5F94C11E3E9402C3AC558F50199D95B6D3E31758586281DCD26;0;0;root;file:root;file:bin/ion
user;A69F73CCA23A9AC5C8B567DC185A756E97C982164FE25859E0D1DCC1475C80A615B2123AF1F5F94C11E3E9402C3AC558F50199D95B6D3E31758586281DCD26;1000;1000;user;file:home/user;file:bin/ion
root;;0;0;root;file:root;file:bin/ion
user;E9A75486736A55AF4FEA861E237835C4A555A05094DEE1DCA2F68AFEA49CC3A5E8DE6EA131EA521311F4D6FB054A146E8282F8E35FF2E6368C1A62E909716;1000;1000;user;file:home/user;file:bin/ion

2
initfs/etc/init.rc
View file

@ -2,4 +2,4 @@ initfs:bin/pcid initfs:etc/pcid.toml
initfs:bin/redoxfs disk:0
file:bin/vesad
file:bin/ps2d
file:bin/login display:
file:bin/getty display:

6
programs/getty/Cargo.toml Normal file
View file

@ -0,0 +1,6 @@
[package]
name = "getty"
version = "0.1.0"
[dependencies]
syscall = { path = "../../syscall/" }

52
programs/getty/src/main.rs Normal file
View file

@ -0,0 +1,52 @@
#![feature(question_mark)]
extern crate syscall;
use std::fs::File;
use std::io::{Read, Write};
use std::process::Command;
use std::{env, io, str, thread};
pub fn main() {
let mut args = env::args().skip(1);
let tty = args.next().expect("getty: no tty provided");
let _ = syscall::close(2);
let _ = syscall::close(1);
let _ = syscall::close(0);
let _ = syscall::open(&tty, syscall::flag::O_RDWR);
let _ = syscall::open(&tty, syscall::flag::O_RDWR);
let _ = syscall::open(&tty, syscall::flag::O_RDWR);
env::set_current_dir("file:").unwrap();
env::set_var("TTY", &tty);
{
let mut path = [0; 4096];
if let Ok(count) = syscall::fpath(0, &mut path) {
let path_str = str::from_utf8(&path[..count]).unwrap_or("");
let reference = path_str.split(':').nth(1).unwrap_or("");
let mut parts = reference.split('/');
env::set_var("COLUMNS", parts.next().unwrap_or("80"));
env::set_var("LINES", parts.next().unwrap_or("30"));
}
}
thread::spawn(move || {
let stdout = io::stdout();
let mut stdout = stdout.lock();
loop {
stdout.write(b"\x1Bc").unwrap();
let _ = stdout.flush();
match Command::new("file:bin/login").spawn() {
Ok(mut child) => match child.wait() {
Ok(_status) => (), //println!("getty: waited for login: {:?}", status.code()),
Err(err) => panic!("getty: failed to wait for login: {}", err)
},
Err(err) => panic!("getty: failed to execute login: {}", err)
}
}
});
}

1
programs/login/Cargo.toml
View file

@ -3,7 +3,6 @@ name = "login"
version = "0.1.0"
[dependencies]
syscall = { path = "../../syscall/" }
termion = "*"
[dependencies.octavo]

75
programs/login/src/main.rs
View file

@ -1,7 +1,6 @@
#![feature(question_mark)]
extern crate octavo;
extern crate syscall;
extern crate termion;
use octavo::octavo_digest::Digest;
@ -47,48 +46,43 @@ impl<'a> Passwd<'a> {
}
pub fn main() {
let mut args = env::args().skip(1);
let tty = args.next().expect("login: no tty provided");
let _ = syscall::close(2);
let _ = syscall::close(1);
let _ = syscall::close(0);
let _ = syscall::open(&tty, syscall::flag::O_RDWR);
let _ = syscall::open(&tty, syscall::flag::O_RDWR);
let _ = syscall::open(&tty, syscall::flag::O_RDWR);
env::set_current_dir("file:").unwrap();
env::set_var("TTY", &tty);
{
let mut path = [0; 4096];
if let Ok(count) = syscall::fpath(0, &mut path) {
let path_str = str::from_utf8(&path[..count]).unwrap_or("");
let reference = path_str.split(':').nth(1).unwrap_or("");
let mut parts = reference.split('/');
env::set_var("COLUMNS", parts.next().unwrap_or("80"));
env::set_var("LINES", parts.next().unwrap_or("30"));
}
}
thread::spawn(move || {
let stdin = io::stdin();
let mut stdin = stdin.lock();
let stdout = io::stdout();
let mut stdout = stdout.lock();
if let Ok(mut issue) = File::open("/etc/issue") {
io::copy(&mut issue, &mut stdout).unwrap();
let _ = stdout.flush();
}
loop {
stdout.write_all(b"\x1B[1mredox login:\x1B[0m ").unwrap();
let _ = stdout.flush();
let user = (&mut stdin as &mut Read).read_line().unwrap().unwrap_or(String::new());
if ! user.is_empty() {
let mut passwd_string = String::new();
File::open("file:etc/passwd").unwrap().read_to_string(&mut passwd_string).unwrap();
let mut passwd_option = None;
for line in passwd_string.lines() {
if let Ok(passwd) = Passwd::parse(line) {
if user == passwd.user && "" == passwd.hash {
passwd_option = Some(passwd);
break;
}
}
}
if passwd_option.is_none() {
stdout.write_all(b"\x1B[1mpassword:\x1B[0m ").unwrap();
let _ = stdout.flush();
if let Some(password) = stdin.read_passwd(&mut stdout).unwrap() {
stdout.write(b"\n").unwrap();
let _ = stdout.flush();
let password_hash = {
let mut output = vec![0; Sha512::output_bytes()];
let mut hash = Sha512::default();
@ -101,15 +95,10 @@ pub fn main() {
encoded
};
{
let mut debug = File::open("debug:").unwrap();
write!(debug, "{};{}\n", user, password_hash).unwrap();
if let Ok(mut debug) = File::open("debug:") {
let _ = write!(debug, "{};{}\n", user, password_hash);
}
let mut passwd_string = String::new();
File::open("file:etc/passwd").unwrap().read_to_string(&mut passwd_string).unwrap();
let mut passwd_option = None;
for line in passwd_string.lines() {
if let Ok(passwd) = Passwd::parse(line) {
if user == passwd.user && password_hash == passwd.hash {
@ -118,10 +107,14 @@ pub fn main() {
}
}
}
}
}
if let Some(passwd) = passwd_option {
stdout.write(b"\n").unwrap();
if let Ok(mut motd) = File::open("/etc/motd") {
io::copy(&mut motd, &mut stdout).unwrap();
let _ = stdout.flush();
}
let mut command = Command::new(passwd.shell);
@ -139,16 +132,14 @@ pub fn main() {
Err(err) => panic!("login: failed to execute '{}': {}", passwd.shell, err)
}
env::set_current_dir("file:").unwrap();
stdout.write(b"\x1Bc").unwrap();
let _ = stdout.flush();
break;
} else {
stdout.write(b"\nLogin failed\n").unwrap();
let _ = stdout.flush();
}
} else {
stdout.write(b"\n").unwrap();
let _ = stdout.flush();
}
}
}
});
}