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

move security protocol out of isSecured block #202

Merged
merged 3 commits into from
Feb 5, 2022
Merged

move security protocol out of isSecured block #202

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64eb8a0
move security protocol out of isSecured block
krishna-prasad-s Oct 26, 2020
cc71e61
add protocol config only when isSecured or when securityprotocol is d…
krishna-prasad-s Oct 26, 2020
88a5798
Merge branch 'obsidiandynamics:master' into master
krishna-prasad-s Jan 27, 2022
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
5 changes: 4 additions & 1 deletion src/main/java/kafdrop/config/KafkaConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,13 @@ public void applyCommon(Properties properties) {
properties.setProperty(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, brokerConnect);
if (isSecured) {
LOG.warn("The 'isSecured' property is deprecated; consult README.md on the preferred way to configure security");
properties.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, securityProtocol);
properties.put(SaslConfigs.SASL_MECHANISM, saslMechanism);
}

if(isSecured || securityProtocol.equals("SSL")) {
davideicardi marked this conversation as resolved.
Show resolved Hide resolved
properties.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, securityProtocol);
}

LOG.info("Checking truststore file {}", truststoreFile);
if (new File(truststoreFile).isFile()) {
LOG.info("Assigning truststore location to {}", truststoreFile);
Expand Down