Skip to content

Make Authentikos log token creation error messages. #3370

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

Merged
howardjohn merged 3 commits into from
Jun 3, 2021
Merged

Make Authentikos log token creation error messages. #3370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b3e57d
Make Authentikos log token creation error messages.
cjwagner Jun 3, 2021
51d3392
Add error handling to authentikos unit tests to figure out why this i…
cjwagner Jun 3, 2021
ea20af4
Remove test case for unreadable template file that doesn't pass when …
cjwagner Jun 3, 2021
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
3 changes: 3 additions & 0 deletions authentikos/authentikos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,16 +306,19 @@ func getOauthTokenCreator(o options) (tokenCreator, error) {

client, err := clientCreator(forceRefresh)
if err != nil {
printVerbose(fmt.Sprintf("Failed to create oauth token client: %v.", err), o.verbose)
return withBackoff(1, maxTries-tries, create).(tokenCreator)(forceRefresh, tries-1)
}

token, err := client.TokenSource.Token()
if err != nil {
printVerbose(fmt.Sprintf("Failed to get oauth token from client: %v.", err), o.verbose)
return withBackoff(1, maxTries-tries, create).(tokenCreator)(forceRefresh, tries-1)
}

if isExpired(o, token) {
// Force recreate the token if it will expire before the next reconciliation.
printVerbose("Token will expire before next reconciliation.", o.verbose)
return withBackoff(1, maxTries-tries, create).(tokenCreator)(true, tries-1)
}

Expand Down
30 changes: 16 additions & 14 deletions authentikos/authentikos_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,37 @@ import (
"golang.org/x/oauth2"
)

func makeFile(data string, readable bool) string {
func makeFile(data string, readable bool) (string, error) {
f, _ := ioutil.TempFile("", "")
fname := f.Name()

_ = ioutil.WriteFile(fname, []byte(data), 0644)
if err := ioutil.WriteFile(fname, []byte(data), 0644); err != nil {
return "", fmt.Errorf("failed to write file: %w", err)
}

if !readable {
_ = os.Chmod(fname, 0000)
if err := os.Chmod(fname, 0000); err != nil {
return "", fmt.Errorf("failed to make file unreadable: %w", err)
}
}

return fname
return fname, nil
}

func TestValidateFlags(t *testing.T) {
creds := "super secret data"
template := "{{.Token}}"

deletedCredsFile := makeFile(creds, true)
validTFile := makeFile(template, true)
invalidTFile := makeFile(template, false)

deletedCredsFile, err := makeFile(creds, true)
if err != nil {
t.Errorf("Error making deleted creds file: %v.", err)
}
validTFile, err := makeFile(template, true)
if err != nil {
t.Errorf("Error making valid template file: %v.", err)
}
os.Remove(deletedCredsFile)
defer os.Remove(validTFile)
defer os.Remove(invalidTFile)

testCases := []struct {
name string
Expand Down Expand Up @@ -106,11 +113,6 @@ func TestValidateFlags(t *testing.T) {
args: []string{"--template=" + template, "--template-file=/path/to/file"},
expectedErr: true,
},
{
name: "error: template-file unreadable",
args: []string{"--template-file=" + invalidTFile},
expectedErr: true,
},
{
name: "error: creds does not exist",
args: []string{"--creds=" + deletedCredsFile},
Expand Down