pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: minor system improvements (#1328)

Browse source
This commit is contained in:
Jae-Heon Ji 2022-04-16 16:11:46 +09:00 • committed by GitHub
parent 348740f5fa
commit f2a7e73687
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/commands.rs
View file

@ -25,7 +25,7 @@ pub(crate) use crate::sessions::list_sessions;
pub(crate) fn kill_all_sessions(yes: bool) { pub(crate) fn kill_all_sessions(yes: bool) {
match get_sessions() { match get_sessions() {
Ok(sessions) if sessions.is_empty() => { Ok(sessions) if sessions.is_empty() => {
println!("No active zellij sessions found."); eprintln!("No active zellij sessions found.");
process::exit(1); process::exit(1);
} }
Ok(sessions) => { Ok(sessions) => {
@ -119,7 +119,7 @@ fn attach_with_session_index(config_options: Options, index: usize, create: bool
if create { if create {
create_new_client() create_new_client()
} else { } else {
println!("No active zellij sessions found."); eprintln!("No active zellij sessions found.");
process::exit(1); process::exit(1);
} }
} }
@ -151,7 +151,7 @@ fn attach_with_session_name(
None => match get_active_session() { None => match get_active_session() {
ActiveSession::None if create => create_new_client(), ActiveSession::None if create => create_new_client(),
ActiveSession::None => { ActiveSession::None => {
println!("No active zellij sessions found."); eprintln!("No active zellij sessions found.");
process::exit(1); process::exit(1);
} }
ActiveSession::One(session_name) => ClientInfo::Attach(session_name, config_options), ActiveSession::One(session_name) => ClientInfo::Attach(session_name, config_options),

2
src/install.rs
View file

@ -36,7 +36,7 @@ pub(crate) fn populate_data_dir(data_dir: &Path) {
// We already have the path and the parent through `data_dir` // We already have the path and the parent through `data_dir`
if let Some(parent_path) = path.parent() { if let Some(parent_path) = path.parent() {
fs::create_dir_all(parent_path).unwrap_or_else(|e| log::error!("{:?}", e)); fs::create_dir_all(parent_path).unwrap_or_else(|e| log::error!("{:?}", e));
set_permissions(parent_path).unwrap_or_else(|e| log::error!("{:?}", e)); set_permissions(parent_path, 0o700).unwrap_or_else(|e| log::error!("{:?}", e));
if out_of_date || !path.exists() { if out_of_date || !path.exists() {
fs::write(path, bytes) fs::write(path, bytes)
.unwrap_or_else(|e| log::error!("Failed to install default assets! {:?}", e)); .unwrap_or_else(|e| log::error!("Failed to install default assets! {:?}", e));

2
zellij-server/src/lib.rs
View file

@ -230,7 +230,7 @@ pub fn start_server(mut os_input: Box<dyn ServerOsApi>, socket_path: PathBuf) {
move || { move || {
drop(std::fs::remove_file(&socket_path)); drop(std::fs::remove_file(&socket_path));
let listener = LocalSocketListener::bind(&*socket_path).unwrap(); let listener = LocalSocketListener::bind(&*socket_path).unwrap();
set_permissions(&socket_path).unwrap(); set_permissions(&socket_path, 0o700).unwrap();
for stream in listener.incoming() { for stream in listener.incoming() {
match stream { match stream {
Ok(stream) => { Ok(stream) => {

2
zellij-utils/src/consts.rs
View file

@ -46,7 +46,7 @@ lazy_static! {
pub static ref ZELLIJ_IPC_PIPE: PathBuf = { pub static ref ZELLIJ_IPC_PIPE: PathBuf = {
let mut sock_dir = ZELLIJ_SOCK_DIR.clone(); let mut sock_dir = ZELLIJ_SOCK_DIR.clone();
fs::create_dir_all(&sock_dir).unwrap(); fs::create_dir_all(&sock_dir).unwrap();
set_permissions(&sock_dir).unwrap(); set_permissions(&sock_dir, 0o700).unwrap();
sock_dir.push(envs::get_session_name().unwrap()); sock_dir.push(envs::get_session_name().unwrap());
sock_dir sock_dir
}; };

6
zellij-utils/src/logging.rs
View file

@ -70,7 +70,7 @@ pub fn atomic_create_file(file_name: &Path) -> io::Result<()> {
.append(true) .append(true)
.create(true) .create(true)
.open(file_name)?; .open(file_name)?;
set_permissions(file_name) set_permissions(file_name, 0o600)
} }
pub fn atomic_create_dir(dir_name: &Path) -> io::Result<()> { pub fn atomic_create_dir(dir_name: &Path) -> io::Result<()> {
@ -84,7 +84,7 @@ pub fn atomic_create_dir(dir_name: &Path) -> io::Result<()> {
Ok(()) Ok(())
}; };
if result.is_ok() { if result.is_ok() {
set_permissions(dir_name)?; set_permissions(dir_name, 0o700)?;
} }
result result
} }
@ -98,6 +98,6 @@ pub fn debug_to_file(message: &[u8], pid: RawFd) -> io::Result<()> {
.append(true) .append(true)
.create(true) .create(true)
.open(&path)?; .open(&path)?;
set_permissions(&path)?; set_permissions(&path, 0o600)?;
file.write_all(message) file.write_all(message)
} }

6
zellij-utils/src/shared.rs
View file

@ -11,11 +11,9 @@ use strip_ansi_escapes::strip;
use unicode_width::UnicodeWidthStr; use unicode_width::UnicodeWidthStr;
use zellij_tile::data::{Palette, PaletteColor, PaletteSource, ThemeHue}; use zellij_tile::data::{Palette, PaletteColor, PaletteSource, ThemeHue};
const UNIX_PERMISSIONS: u32 = 0o700; pub fn set_permissions(path: &Path, mode: u32) -> io::Result<()> {
pub fn set_permissions(path: &Path) -> io::Result<()> {
let mut permissions = fs::metadata(path)?.permissions(); let mut permissions = fs::metadata(path)?.permissions();
permissions.set_mode(UNIX_PERMISSIONS); permissions.set_mode(mode);
fs::set_permissions(path, permissions) fs::set_permissions(path, permissions)
} }