Be more liberal in our license acceptance checking. #6574
Conversation
Now if you're running hab commands as a non-privileged user and a privileged user has already accepted the license, it won't prompt you twice. Signed-off-by: Josh Black <raskchanky@gmail.com>
raskchanky
requested review from
baumanj,
chefsalim,
christophermaier and
eeyun
as code owners
|
Hello raskchanky! Thanks for the pull request! Here is what will happen next:
Thank you for contributing! |
| fn superuser_license_root() -> PathBuf { PathBuf::from(&*FS_ROOT_PATH).join("hab") } | ||
|
|
||
| fn user_license_root() -> PathBuf { | ||
| if let Some(home) = dirs::home_dir() { | ||
| home.join(".hab") | ||
| } else { | ||
| panic!("No home directory available. Unable to find a suitable place to write a license \ |
There was a problem hiding this comment.
Just a question on whether panic is what we want here.. I realize its code thats not specifically for this change but it seems odd to have a panic in that path
There was a problem hiding this comment.
Yeah the panic is intentional. If we hit that code path, something is super wrong because it means that hab is being run by a user that doesn't have a home directory. Users without home directories tend to be ones that are reserved for running services and as such, wouldn't be appropriate for accepting a license, since there's no sensible place to persist the license acceptance file.
Signed-off-by: Josh Black <raskchanky@gmail.com>
components/hab/src/license.rs
Outdated
| pub fn license_exists() -> bool { license_file().is_file() } | ||
| pub fn license_exists() -> bool { | ||
| license_file(&license_path(&superuser_license_root())).is_file() | ||
| || license_file(&license_path(&user_license_root())).is_file() |
There was a problem hiding this comment.
Though I doubt it ends up making a huge difference, it seems like we should check the user license first, then the superuser license, since that's going from more specific to more general.
Signed-off-by: Josh Black <raskchanky@gmail.com>
Obvious fix; these changes are the result of automation not creative thinking.
Now if you're running hab commands as a non-privileged user and
a privileged user has already accepted the license, it won't prompt you
twice.
Signed-off-by: Josh Black raskchanky@gmail.com