Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for PAM_USER env and more #11

Merged
merged 9 commits into from Aug 16, 2021
Merged

Fix for PAM_USER env and more #11

merged 9 commits into from Aug 16, 2021

Conversation

kiavash-at-work
Copy link
Contributor

@kiavash-at-work kiavash-at-work commented Aug 14, 2021

This PR contains:

  1. Fix for bug [bug] Command line parse error #7
    • NOTE: The associated unit test is still not able to test for this bug and possible regression can happen.
  2. Refactored code to make main() only for entry and exit. This helps in integration test implementation.
  3. Added Option<> support to Sargs and related codes.
  4. Refactored key calculation into a separate function to eliminate repeated codes.

`args.rs` updated to:
* Fix for bug #7 is implemented
* for multichoice variables use `enum` instead of `String`
* `Sarg` now has `Option` for variables that may have `None` values
`main.rs` updated to
* `main()` only implements entry and exit code, the rest is moved to `run()`.
   * This change make it easier to implement Integration Test.
   * Refactor all the error message into a single function.
* implemented `enum` instead of `String`
The code now accepts variables with `Option`
1. The common code for key calculation is refactored to separate functions and reused.
2. Variables now accept `Option` .
Wrapped the dataset with `Some()`
// append the value from "PAM_USER" to the end of dataset, if it exists
// otherwise keep None
dataset = dataset
.map(|d| {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like the comment on line 138, here is an example using map.

Remember that this code is closure and captures the environment variables.

to speed up the file hash is generated while waiting for user to enter password
replace `file` argument with `filehash` for parallel filehash generation (while user is entering password)
@ashuio
Copy link
Owner

ashuio commented Aug 16, 2021

Well all this changes Look good to me, Thanks for this PR.

I'll merge it right away

@ashuio ashuio closed this Aug 16, 2021
@ashuio ashuio reopened this Aug 16, 2021
@ashuio ashuio linked an issue Aug 16, 2021 that may be closed by this pull request
@ashuio ashuio merged commit 3547585 into ashuio:0.1.4 Aug 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[bug] Command line parse error
2 participants