-
Notifications
You must be signed in to change notification settings - Fork 81
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
basic auth: add option to exclude bcrypt at build time #258
Draft
jan--f
wants to merge
1
commit into
prometheus:master
Choose a base branch
from
jan--f:optional-bcrypt
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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,37 @@ | ||
// Copyright 2024 The Prometheus Authors | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
//go:build !nobcrypt | ||
// +build !nobcrypt | ||
|
||
package basic_auth | ||
|
||
import ( | ||
config_util "github.com/prometheus/common/config" | ||
"golang.org/x/crypto/bcrypt" | ||
) | ||
|
||
func Validate(users map[string]config_util.Secret) error { | ||
for _, p := range users { | ||
_, err := bcrypt.Cost([]byte(p)) | ||
if err != nil { | ||
return err | ||
} | ||
} | ||
|
||
return nil | ||
} | ||
|
||
func CompareAndHash(hashedPassword, pass []byte) error { | ||
return bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(pass)) | ||
} |
This file contains 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,35 @@ | ||
// Copyright 2024 The Prometheus Authors | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
//go:build nobcrypt | ||
// +build nobcrypt | ||
|
||
package basic_auth | ||
|
||
import ( | ||
"fmt" | ||
"log/slog" | ||
|
||
config_util "github.com/prometheus/common/config" | ||
) | ||
|
||
func Validate(users map[string]config_util.Secret) error { | ||
if len(users) > 0 { | ||
slog.Info("basic auth via bcrypt hashes not implemented") | ||
} | ||
return nil | ||
} | ||
|
||
func CompareAndHash(hashedPassword, pass []byte) error { | ||
return fmt.Errorf("basic auth via bcrypt hashes not implemented") | ||
} |
This file contains 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 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 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 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,91 @@ | ||
// Copyright 2019 The Prometheus Authors | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
//go:build go1.14 && !nobcrypt | ||
// +build go1.14,!nobcrypt | ||
|
||
package web | ||
|
||
import "testing" | ||
|
||
func TestYAMLFilesUsers(t *testing.T) { | ||
testTables := []*TestInputs{ | ||
{ | ||
Name: `invalid config yml (invalid user list)`, | ||
YAMLConfigPath: "testdata/web_config_auth_user_list_invalid.bad.yml", | ||
ExpectedError: ErrorMap["Bad password"], | ||
}, | ||
} | ||
for _, testInputs := range testTables { | ||
t.Run("run/"+testInputs.Name, testInputs.Test) | ||
t.Run("validate/"+testInputs.Name, testInputs.TestValidate) | ||
} | ||
} | ||
|
||
func TestUsers(t *testing.T) { | ||
testTables := []*TestInputs{ | ||
{ | ||
Name: `without basic auth`, | ||
YAMLConfigPath: "testdata/web_config_users_noTLS.good.yml", | ||
ExpectedError: ErrorMap["Unauthorized"], | ||
}, | ||
{ | ||
Name: `with correct basic auth`, | ||
YAMLConfigPath: "testdata/web_config_users_noTLS.good.yml", | ||
Username: "dave", | ||
Password: "dave123", | ||
ExpectedError: nil, | ||
}, | ||
{ | ||
Name: `without basic auth and TLS`, | ||
YAMLConfigPath: "testdata/web_config_users.good.yml", | ||
UseTLSClient: true, | ||
ExpectedError: ErrorMap["Unauthorized"], | ||
}, | ||
{ | ||
Name: `with correct basic auth and TLS`, | ||
YAMLConfigPath: "testdata/web_config_users.good.yml", | ||
UseTLSClient: true, | ||
Username: "dave", | ||
Password: "dave123", | ||
ExpectedError: nil, | ||
}, | ||
{ | ||
Name: `with another correct basic auth and TLS`, | ||
YAMLConfigPath: "testdata/web_config_users.good.yml", | ||
UseTLSClient: true, | ||
Username: "carol", | ||
Password: "carol123", | ||
ExpectedError: nil, | ||
}, | ||
{ | ||
Name: `with bad password and TLS`, | ||
YAMLConfigPath: "testdata/web_config_users.good.yml", | ||
UseTLSClient: true, | ||
Username: "dave", | ||
Password: "bad", | ||
ExpectedError: ErrorMap["Unauthorized"], | ||
}, | ||
{ | ||
Name: `with bad username and TLS`, | ||
YAMLConfigPath: "testdata/web_config_users.good.yml", | ||
UseTLSClient: true, | ||
Username: "nonexistent", | ||
Password: "nonexistent", | ||
ExpectedError: ErrorMap["Unauthorized"], | ||
}, | ||
} | ||
for _, testInputs := range testTables { | ||
t.Run(testInputs.Name, testInputs.Test) | ||
} | ||
} |
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.
This cloud also return an error so a server without bcrypt support can not start with a config that includes authorized users.
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.
I think that would be better, if we know at startup time that a configuration cannot work, failing explicitly lets the operator figure out what they want to do about it.