diff --git a/assets/debian/group_denylist.txt b/assets/debian/group_denylist.txt index 222c5e4..d09cf88 100644 --- a/assets/debian/group_denylist.txt +++ b/assets/debian/group_denylist.txt @@ -1,5 +1,5 @@ # These are the default system groups on debian. -# You can alos add groups by gid by prefixing the line with 'gid:'. +# You can also add groups by gid by prefixing the line with 'gid:'. group:_ssh group:adm diff --git a/docs/suid-sgid-mode.md b/docs/suid-sgid-mode.md index eed1daf..78574bf 100644 --- a/docs/suid-sgid-mode.md +++ b/docs/suid-sgid-mode.md @@ -4,8 +4,8 @@ > This will be deprecated in a future release, see https://git.pvv.ntnu.no/Projects/muscl/issues/101 > > We do not recommend you use this mode unless you absolutely have to. The biggest reason why `muscl` was rewritten from scratch -> was to fix an architectural issue that easily caused vulnerabilites due to reliance on SUID/SGID. Althought the architecture now -> is more resistant against such vulnerabilites, it is not failsafe. +> was to fix an architectural issue that easily caused vulnerabilities due to reliance on SUID/SGID. Although the architecture now +> is more resistant against such vulnerabilities, it is not failsafe. For backwards compatibility reasons, it is possible to run the program without a daemon by utilizing SUID/SGID. diff --git a/src/bin/muscl.rs b/src/bin/muscl.rs index 897e4bc..9e5845c 100644 --- a/src/bin/muscl.rs +++ b/src/bin/muscl.rs @@ -376,7 +376,7 @@ fn handle_mysql_admutils_command() -> anyhow::Result> { } } -/// Run the given commmand (from the client side) using Tokio. +/// Run the given command (from the client side) using Tokio. fn tokio_run_command( command: ClientCommand, server_connection: StdUnixStream, diff --git a/src/client/mysql_admutils_compatibility/mysql_dbadm.rs b/src/client/mysql_admutils_compatibility/mysql_dbadm.rs index 27981eb..d1cee05 100644 --- a/src/client/mysql_admutils_compatibility/mysql_dbadm.rs +++ b/src/client/mysql_admutils_compatibility/mysql_dbadm.rs @@ -35,7 +35,7 @@ spawn the editor stored in the $EDITOR environment variable. (pico will be used if the variable is unset) The file should contain one line per user, starting with the -username and followed by ten Y/N-values seperated by whitespace. +username and followed by ten Y/N-values separated by whitespace. Lines starting with # are ignored. The Y/N-values corresponds to the following mysql privileges: diff --git a/src/core/common.rs b/src/core/common.rs index 3e1a4bd..1e0c42e 100644 --- a/src/core/common.rs +++ b/src/core/common.rs @@ -100,7 +100,7 @@ impl UnixUser { }) } - // pub fn from_enviroment() -> anyhow::Result { + // pub fn from_environment() -> anyhow::Result { // let libc_uid = nix::unistd::getuid(); // UnixUser::from_uid(libc_uid.as_raw()) // } diff --git a/src/server/supervisor.rs b/src/server/supervisor.rs index 71fc3ab..2c8df20 100644 --- a/src/server/supervisor.rs +++ b/src/server/supervisor.rs @@ -140,7 +140,7 @@ impl Supervisor { let (tx, rx) = broadcast::channel(1); - // TODO: try to detech systemd socket before using the provided socket path + // TODO: try to detect systemd socket before using the provided socket path #[cfg(target_os = "linux")] let listener = Arc::new(RwLock::new(match config.socket_path { Some(ref path) => create_unix_listener_with_socket_path(path.clone()).await?,