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.

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

Jump to bottom

HTTP BASIC authentication #801

Merged
merged 8 commits into from Jun 2, 2023
Merged

HTTP BASIC authentication #801

merged 8 commits into from Jun 2, 2023

Conversation

dhoard
Copy link
Collaborator

@dhoard dhoard commented May 5, 2023

Changes

Implemented HTTP BASIC authentication.

The implementation consistents of 3 types of configuration providers:

  • plaintext
  • message digest (SHA-1, SHA-256, etc.)
  • secret key (PBKDF2WithHmacSHA1, PBKDF2WithHmacSHA256, etc.)

Refactored project to use Java 8 as a baseline (no Java 6 support)

Refactored integration tests to use smoke test containers when running in IntelliJ

@fstab please review

@dhoard dhoard force-pushed the basic-authentication branch 8 times, most recently from 76e397d to a2965d2 Compare May 8, 2023 00:44
@dhoard dhoard requested a review from fstab May 8, 2023 00:49
@dhoard dhoard force-pushed the basic-authentication branch 17 times, most recently from 008a758 to 125b2d8 Compare May 11, 2023 02:15
@dhoard
Copy link
Collaborator Author

dhoard commented May 16, 2023

Changes

  1. Changed project to remove Java 6 support
  2. Added jmx_prometheus_common module uses by both the javaagent version and httpserver version
  3. Implemented BASIC authentication, supporting plaintext as a configuration format, MessageDigest based algorithms as a configuration format, and PBKDF2WithHmac based algorithms as a configuration format.
  4. Refactored the integration test suite to use AntuBLUE Test Engine v4.0.0 - actual tests are about 1/2 of the previous code.
  5. Changed copyright notices in the integration test suite to only contain 2023 (since this is really when the code was introduced)

fstab
fstab requested changes May 19, 2023
View reviewed changes
Copy link
Member

@fstab fstab left a comment

Choose a reason for hiding this comment

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

Thanks a lot Doug! I found a few things to comment, mainly focusing on the production code (not tests) for now.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
collector/src/main/java/io/prometheus/jmx/util/map/MapAccessor.java Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@dhoard dhoard changed the base branch from main to development May 20, 2023 01:13
@dhoard
Basic authentication
88a2358 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Refactored to use AntuBLUE Test Engine v4.0.0
f862c99 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Fixed PBKDF2 and SHA based authenticators to match openssl and sha su…
8783bc2 
…m application output

Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Refactored configuration to use hash configuration key for PBKDF and …
ba4c31e 
…SHA based authentication

Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
PR review changes
bfbae1b 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard dhoard requested a review from fstab May 20, 2023 01:25
@dhoard
Updated AntuBLUE Test Engine v4.0.1
257916e 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Updated AntuBLUE Test Engine v4.1.0
f644332 
Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard
Replaced Java 19 versions for Java 20 versions
555bdd1 
Signed-off-by: dhoard <doug.hoard@gmail.com>
fstab
fstab approved these changes Jun 2, 2023
View reviewed changes
Copy link
Member

@fstab fstab left a comment

Choose a reason for hiding this comment

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

Thanks a lot Doug!

@dhoard dhoard merged commit 24395e6 into prometheus:development Jun 2, 2023
1 check passed
@dhoard dhoard deleted the basic-authentication branch June 2, 2023 16:05
dhoard added a commit to dhoard/jmx_exporter that referenced this pull request Jun 20, 2023
@dhoard
HTTP BASIC authentication (prometheus#801)
1d1f1a2 
* HTTP Basic authentication

Signed-off-by: dhoard <doug.hoard@gmail.com>
@dhoard dhoard mentioned this pull request Jun 30, 2023
Merged
dhoard added a commit that referenced this pull request Jun 30, 2023
@dhoard
HTTP BASIC authentication (#801)
4c0607a 
* HTTP Basic authentication

Signed-off-by: dhoard <doug.hoard@gmail.com>
Signed-off-by: Doug Hoard <doug.hoard@gmail.com>
dhoard added a commit that referenced this pull request Jun 30, 2023
@dhoard
HTTP BASIC authentication (#801)
cfcc119 
* HTTP Basic authentication

Signed-off-by: dhoard <doug.hoard@gmail.com>
Signed-off-by: Doug Hoard <doug.hoard@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fstab fstab fstab approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dhoard @fstab