Skip to content

Allow TOKEN_FILE to specifiy a token instead of using TOKEN #15

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.

Sign up for GitHub

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

Open
CodeLongAndProsper90 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow TOKEN_FILE to specifiy a token instead of using TOKEN #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,16 @@ impl<'r> FromRequest<'r> for ShortyToken {
}
};

let actual_token = match env::var("TOKEN") {
Ok(x) => x,
Err(_) => {
return Outcome::Failure((Status::Unauthorized, String::from("Invalid API token.")))
let actual_token = if let Ok(token) = env::var("TOKEN") {
token
} else if let Ok(token_file) = env::var("TOKEN_FILE") {
let read_result = std::fs::read_to_string(token_file);
if read_result.is_err() {
return Outcome::Failure((Status::Unauthorized, String::from("Invalid API token.")));
}
read_result.expect("")

@cjdenio cjdenio Apr 15, 2022

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Ideally this condition wouldn't cause the app to crash

@CodeLongAndProsper90 CodeLongAndProsper90 Apr 26, 2022

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

It wouldn't, because we already checked is_err().

} else {
return Outcome::Failure((Status::Unauthorized, String::from("Invalid API token.")));
};

if provided_token != actual_token {
Expand Down