v0.2-dev into master #32
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ on: | |
| permissions: | ||
| id-token: write | ||
| attestations: write | ||
| contents: write | ||
|
|
||
| jobs: | ||
| build-and-release: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| use directories::ProjectDirs; | ||
| use std::fs; | ||
| use std::path::{Path, PathBuf}; | ||
|
|
||
| const QUALIFIER: &str = ""; // Typically empty on macOS and Linux | ||
| const ORGANIZATION: &str = ""; | ||
| const APPLICATION: &str = "DashEvoTool"; | ||
|
|
||
| pub fn app_user_data_dir_path() -> Result<PathBuf, std::io::Error> { | ||
| let proj_dirs = ProjectDirs::from(QUALIFIER, ORGANIZATION, APPLICATION).ok_or_else(|| { | ||
| std::io::Error::new( | ||
| std::io::ErrorKind::NotFound, | ||
| "Failed to determine project directories", | ||
| ) | ||
| })?; | ||
| Ok(proj_dirs.config_dir().to_path_buf()) | ||
| } | ||
| pub fn create_app_user_data_directory_if_not_exists() -> Result<(), std::io::Error> { | ||
| let app_data_dir = app_user_data_dir_path()?; | ||
| fs::create_dir_all(&app_data_dir)?; | ||
|
|
||
| // Verify directory permissions | ||
| let metadata = fs::metadata(&app_data_dir)?; | ||
| if !metadata.is_dir() { | ||
| return Err(std::io::Error::new( | ||
| std::io::ErrorKind::Other, | ||
| "Created path is not a directory", | ||
| )); | ||
| } | ||
| Ok(()) | ||
| } | ||
|
|
||
| pub fn app_user_data_file_path(filename: &str) -> Result<PathBuf, std::io::Error> { | ||
| if filename.is_empty() || filename.contains(std::path::is_separator) { | ||
| return Err(std::io::Error::new( | ||
| std::io::ErrorKind::InvalidInput, | ||
| "Invalid filename", | ||
| )); | ||
| } | ||
| let app_data_dir = app_user_data_dir_path()?; | ||
| Ok(app_data_dir.join(filename)) | ||
| } | ||
|
Comment on lines
+33
to
+42
Contributor
There was a problem hiding this comment. 🛠️ Refactor suggestion Enhance filename validation. While the function checks for path separators, consider adding validation for:
+const MAX_FILENAME_LENGTH: usize = 255;
+
pub fn app_user_data_file_path(filename: &str) -> Result<PathBuf, std::io::Error> {
- if filename.is_empty() || filename.contains(std::path::is_separator) {
+ if filename.is_empty()
+ || filename.contains(std::path::is_separator)
+ || filename.len() > MAX_FILENAME_LENGTH
+ || filename.chars().any(|c| c.is_control())
+ || cfg!(windows) && is_windows_reserved_filename(filename)
+ {
return Err(std::io::Error::new(
std::io::ErrorKind::InvalidInput,
- "Invalid filename",
+ "Invalid filename: must not be empty, contain separators, exceed length limit, or be a reserved name",
));
}
|
||
|
|
||
| pub fn copy_env_file_if_not_exists() { | ||
| let app_data_dir = | ||
| app_user_data_dir_path().expect("Failed to determine application data directory"); | ||
| let env_file_in_app_dir = app_data_dir.join(".env".to_string()); | ||
| if env_file_in_app_dir.exists() && env_file_in_app_dir.is_file() { | ||
| } else { | ||
| let env_example_file_in_exe_dir = PathBuf::from(".env.example"); | ||
| if env_example_file_in_exe_dir.exists() && env_example_file_in_exe_dir.is_file() { | ||
| fs::copy(&env_example_file_in_exe_dir, env_file_in_app_dir) | ||
| .expect("Failed to copy main net env file"); | ||
| } else { | ||
| let env_file_in_exe_dir = PathBuf::from(".env"); | ||
| fs::copy(&env_file_in_exe_dir, env_file_in_app_dir) | ||
| .expect("Failed to copy main net env file"); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Consider adding permission checks for Unix systems.
While the function correctly creates and verifies the directory, it might be worth adding permission checks on Unix systems to ensure the directory is readable and writable by the current user.
if !metadata.is_dir() { return Err(std::io::Error::new( std::io::ErrorKind::Other, "Created path is not a directory", )); } + #[cfg(unix)] + { + use std::os::unix::fs::PermissionsExt; + let perms = metadata.permissions(); + if perms.mode() & 0o600 != 0o600 { + return Err(std::io::Error::new( + std::io::ErrorKind::PermissionDenied, + "Insufficient directory permissions", + )); + } + } Ok(())📝 Committable suggestion