Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2025-01-14 11:03:11 +00:00
Code Issues Releases Activity

Do not check readonly on network locations (#1506)

Browse Source 
Do not try to analyze if the current process can write network location
on Windows. There's no way on Windows to tell if we can write a network
location because it's not being controlled by the OS itself. Thus now
the lock symbol is never shown on network locations.  

This PR introduces a new unsafe call.
This commit is contained in:
Alexey Chernyshov 2020-07-30 19:22:19 +03:00 committed by GitHub
parent 44885f571b
commit fbaeef8589
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/directory.rs
View File

@ -107,7 +107,7 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
.map(|variable| match variable { .map(|variable| match variable {
"path" => Some(Ok(&final_dir_string)), "path" => Some(Ok(&final_dir_string)),
"read_only" => { "read_only" => {
if is_readonly_dir(current_dir.to_str()?) { if is_readonly_dir(context.current_dir.to_str()?) {
Some(Ok(&lock_symbol)) Some(Ok(&lock_symbol))
} else { } else {
None None

27
src/modules/utils/directory_win.rs
View File

@ -10,21 +10,31 @@ use winapi::um::handleapi;
use winapi::um::processthreadsapi; use winapi::um::processthreadsapi;
use winapi::um::securitybaseapi; use winapi::um::securitybaseapi;
use winapi::um::winnt::{ use winapi::um::winnt::{
SecurityImpersonation, DACL_SECURITY_INFORMATION, FILE_ALL_ACCESS, FILE_GENERIC_EXECUTE, SecurityImpersonation, BOOLEAN, DACL_SECURITY_INFORMATION, FILE_ALL_ACCESS,
FILE_GENERIC_READ, FILE_GENERIC_WRITE, GENERIC_MAPPING, GROUP_SECURITY_INFORMATION, HANDLE, FILE_GENERIC_EXECUTE, FILE_GENERIC_READ, FILE_GENERIC_WRITE, GENERIC_MAPPING,
OWNER_SECURITY_INFORMATION, PRIVILEGE_SET, PSECURITY_DESCRIPTOR, STANDARD_RIGHTS_READ, GROUP_SECURITY_INFORMATION, HANDLE, LPCWSTR, OWNER_SECURITY_INFORMATION, PRIVILEGE_SET,
TOKEN_DUPLICATE, TOKEN_IMPERSONATE, TOKEN_QUERY, PSECURITY_DESCRIPTOR, STANDARD_RIGHTS_READ, TOKEN_DUPLICATE, TOKEN_IMPERSONATE, TOKEN_QUERY,
}; };
/// Checks if the current user has write access right to the `folder_path` /// Checks if the current user has write access right to the `folder_path`
/// ///
/// First, the function extracts DACL from the given directory and then calls `AccessCheck` against /// First, the function extracts DACL from the given directory and then calls `AccessCheck` against
/// the current process access token and directory's security descriptor. /// the current process access token and directory's security descriptor.
/// Does not work for network drives and always returns true
pub fn is_write_allowed(folder_path: &str) -> std::result::Result<bool, &'static str> { pub fn is_write_allowed(folder_path: &str) -> std::result::Result<bool, &'static str> {
let folder_name: Vec<u16> = OsStr::new(folder_path) let folder_name: Vec<u16> = OsStr::new(folder_path)
.encode_wide() .encode_wide()
.chain(iter::once(0)) .chain(iter::once(0))
.collect(); .collect();
if is_network_path(&folder_name) {
log::info!(
"Directory '{:?}' is a network drive, unable to check write permissions. See #1506 for details",
folder_path
);
return Ok(true);
}
let mut length: DWORD = 0; let mut length: DWORD = 0;
let rc = unsafe { let rc = unsafe {
@ -115,3 +125,12 @@ pub fn is_write_allowed(folder_path: &str) -> std::result::Result<bool, &'static
Ok(result != 0) Ok(result != 0)
} }
#[link(name = "Shlwapi")]
extern "system" {
fn PathIsNetworkPathW(pszPath: LPCWSTR) -> BOOLEAN;
}
fn is_network_path(folder_path: &Vec<u16>) -> bool {
return unsafe { PathIsNetworkPathW(folder_path.as_ptr()) } == 1;
}