vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from MggMuggins/master

Browse Source 
Implemented groupadd, fix for passwd compile
This commit is contained in:
Jeremy Soller
2017-11-28 21:12:39 -07:00
committed by GitHub
parent 6b951a8bdc 65817077ee
commit dcf35e3548
8 changed files with 287 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+20 -4
View File
@@ -8,10 +8,18 @@ name = "argon2rs"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"blake2-rfc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
"blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"scoped_threadpool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "arrayvec"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "bitflags"
version = "0.7.0"
@@ -19,9 +27,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "blake2-rfc"
version = "0.2.17"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -65,6 +74,11 @@ dependencies = [
"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "nodrop"
version = "0.1.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "rand"
version = "0.3.18"
@@ -90,7 +104,7 @@ dependencies = [
[[package]]
name = "redox_users"
version = "0.1.0"
source = "git+https://github.com/redox-os/users.git#77ce04ba3c2a1e4731e75eb58984598fa8937880"
source = "git+https://github.com/redox-os/users.git#83ea6d2c6d3ea1e3082e4bd8d15633d0f03d3137"
dependencies = [
"argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"extra 0.1.0 (git+https://github.com/redox-os/libextra.git)",
@@ -135,14 +149,16 @@ dependencies = [
[metadata]
"checksum arg_parser 0.1.0 (git+https://github.com/redox-os/arg-parser.git)" = "<none>"
"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
"checksum arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f0ef4a9820019a0c91d918918c93dc71d469f581a49b47ddc1d285d4270bbe2"
"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
"checksum blake2-rfc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0c6a476f32fef3402f1161f89d0d39822809627754a126f8441ff2a9d45e2d59"
"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
"checksum extra 0.1.0 (git+https://github.com/redox-os/libextra.git)" = "<none>"
"checksum fuchsia-zircon 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f6c0581a4e363262e52b87f59ee2afe3415361c6ec35e665924eb08afe8ff159"
"checksum fuchsia-zircon-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "43f3795b4bae048dc6123a6b972cadde2e676f9ded08aef6bb77f5f157684a82"
"checksum libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "5ba3df4dcb460b9dfbd070d41c94c19209620c191b0340b929ce748a2bcd42d2"
"checksum liner 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f9e406164c25b420480023985bdf65cef366855666ad4cb12cd3eaee82dcb399"
"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
"checksum rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "6475140dfd8655aeb72e1fd4b7a1cc1c202be65d71669476e392fe62532b9edd"
"checksum redox_syscall 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509"
"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
Cargo.toml
+10 -2
View File
@@ -2,13 +2,17 @@
name = "userutils"
version = "0.1.0"
[[bin]]
name = "id"
path = "src/bin/id.rs"
[[bin]]
name = "getty"
path = "src/bin/getty.rs"
[[bin]]
name = "id"
path = "src/bin/id.rs"
name = "groupadd"
path = "src/bin/groupadd.rs"
[[bin]]
name = "login"
@@ -26,6 +30,10 @@ path = "src/bin/su.rs"
name = "sudo"
path = "src/bin/sudo.rs"
[[bin]]
name = "useradd"
path = "src/bin/useradd.rs"
[[bin]]
name = "whoami"
path = "src/bin/whoami.rs"
README.md
+2 -1
View File
@@ -16,4 +16,5 @@ inspiration by BSD systems. They are indeed small, by choice.
- `passwd`: Allows users to modify their passwords.
- `su`: Allows users to substitute identity.
- `sudo`: Enables users to execute a command as another user.
- `whoami`: Display effective user ID.
- `groupadd`: Add a user group
- `whoami`: Display effective user ID.
src/bin/groupadd.rs
+83
View File
@@ -0,0 +1,83 @@
#![deny(warnings)]
extern crate arg_parser;
extern crate extra;
extern crate redox_users;
use extra::option::OptionalExt;
use std::{io, env};
use std::io::Write;
use std::process::exit;
use arg_parser::ArgParser;
use redox_users::{add_group, get_unique_group_id};
const MAN_PAGE: &'static str = /* @MANSTART{groupadd} */ r#"
NAME
groupadd - add a user group
SYNOPSIS
groupadd [ -f | --force ] group
groupadd [ -h | --help ]
DESCRIPTION
The groupadd utility adds a new user group using values
passed on the command line and system defaults.
OPTIONS
-f, --force
Simply forces the exit status of the program to 0
even if the group already exists. A message is still
printed to stdout.
-h, --help
Display this help and exit.
AUTHOR
Written by Wesley Hershberger.
"#; /* @MANEND */
fn main() {
let stdout = io::stdout();
let mut stdout = stdout.lock();
let mut stderr = io::stderr();
let mut parser = ArgParser::new(1)
.add_flag(&["h", "help"])
.add_flag(&["f", "force"]);
parser.parse(env::args());
// Shows the help
if parser.found("help") {
stdout.write_all(MAN_PAGE.as_bytes()).try(&mut stderr);
stdout.flush().try(&mut stderr);
exit(0);
}
let groupname = if parser.args.is_empty() {
eprintln!("groupadd: no group name specified");
exit(1);
} else {
&parser.args[0]
};
let gid = match get_unique_group_id() {
Some(gid) => gid,
None => {
eprintln!("groupadd: no available gid");
exit(1);
}
};
match add_group(groupname, gid, &[""]) {
Ok(_) => {},
Err(ref err) if err.kind() == io::ErrorKind::AlreadyExists && parser.found("force") => {
exit(0);
},
Err(err) => {
eprintln!("groupadd: {}: group {}", err, groupname);
exit(1);
}
}
}
src/bin/login.rs
-1
View File
@@ -114,4 +114,3 @@ pub fn main() {
}
}
}
src/bin/passwd.rs
+1 -1
View File
@@ -136,4 +136,4 @@ fn main() {
eprintln!("passwd: you do not have permission to set the password of '{}'", user.user);
exit(1);
}
}
}
src/bin/sudo.rs
+1 -1
View File
@@ -150,4 +150,4 @@ fn run_command_as_root(cmd: &str, args: &Vec<String>) {
exit(1);
}
}
}
}
src/bin/useradd.rs
+170
View File
@@ -0,0 +1,170 @@
#![deny(warnings)]
extern crate arg_parser;
extern crate redox_users;
use std::{env, io};
use std::io::Write;
use std::fs::DirBuilder;
use std::os::unix::fs::DirBuilderExt;
use std::process::exit;
use arg_parser::ArgParser;
use redox_users::{add_group, add_user, get_unique_group_id, get_unique_user_id};
const MAN_PAGE: &'static str = /* @MANSTART{useradd} */ r#"
NAME
useradd - add a new user
SYNOPSYS
useradd [ options ] LOGIN
useradd [ -h | --help ]
DESCRIPTION
The useradd utility creates a new user based on
system defaults and values passed on the command line.
Useradd creates a new group for the user by default and
can also be instructed to create the user's home directory.
OPTIONS
-h, --help
Display this help and exit.
-c, --comment
Any text string, usually used as the user's full name.
-d, --home-dir HOME_DIR
The new user will be created with HOME_DIR as their home
directory. The default value is LOGIN prepended with "/home".
This flag DOES NOT create the home directory. See --create-home.
-m, --create-home
Creates the user's home directory if it does not already exist.
This option is not enabled by default. This option must be specified
for a home directory to be created.
-N, --no-user-group
Do not attempt to create the user's user group.
-s, --shell SHELL
The path to the user's default login shell. If left blank, the
default shell is set as /bin/ion
AUTHORS
Written by Wesley Hershberger.
"#; /* @MANEND */
const DEFAULT_SHELL: &'static str = "/bin/ion";
const DEFAULT_HOME: &'static str = "/home";
const DEFAULT_MODE: u32 = 0o700;
fn main() {
let mut stdout = io::stdout();
let mut parser = ArgParser::new(1)
.add_flag(&["h", "help"])
.add_opt("c", "comment")
.add_opt("d", "home-dir")
.add_flag(&["m", "create-home"])
.add_flag(&["N", "no-user-group"])
.add_opt("s", "shell");
parser.parse(env::args());
if parser.found("help") {
stdout.write_all(MAN_PAGE.as_bytes()).unwrap();
stdout.flush().unwrap();
exit(0);
}
let login = if parser.args.is_empty() {
eprintln!("useradd: no login specified");
exit(1);
} else {
&parser.args[0]
};
let uid = match get_unique_user_id() {
Some(id) => id,
None => {
eprintln!("useradd: no available uid");
exit(1);
}
};
let gid = match get_unique_group_id() {
Some(id) => id,
None => {
eprintln!("useradd: no available gid");
exit(1);
}
};
let username = if parser.found("comment") {
match parser.get_opt("comment") {
Some(user) => user,
None => {
eprintln!("useradd: invalid argument: -c");
exit(1);
}
}
} else {
login.to_owned()
};
let userhome = if parser.found("home-dir") {
match parser.get_opt("home-dir") {
Some(dir) => dir,
None => {
eprintln!("useradd: invalid argument: -d");
exit(1);
}
}
} else {
format!("{}/{}", DEFAULT_HOME, login)
};
let shell = if parser.found("shell") {
match parser.get_opt("shell") {
Some(sh) => sh,
None => {
eprintln!("useradd: invalid argument: -s");
exit(1);
}
}
} else {
DEFAULT_SHELL.to_string()
};
if !parser.found("no-user-group") {
match add_group(login, gid, &[login]) {
Ok(_) => {},
Err(err) => {
eprintln!("useradd: error creating group {}: {}", login, err);
exit(1);
}
}
}
match add_user(login, uid, gid, username.as_str(), userhome.as_str(), shell.as_str()) {
Ok(_) => {},
Err(err) => {
eprintln!("useradd: {}: {}", err, login);
exit(1);
}
}
if parser.found("create-home") {
let mut builder = DirBuilder::new();
builder.mode(DEFAULT_MODE);
match builder.create(&userhome) {
Ok(_) => {},
Err(ref err) if err.kind() == io::ErrorKind::AlreadyExists => {},
Err(err) => {
eprintln!("useradd: failed to create home dir: {}", err);
exit(1);
}
};
}
}