Skip to content

[SPARK-45541][CORE] Add SSLFactory #43386

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

Closed
hasnain-db wants to merge 5 commits into from
Closed

[SPARK-45541][CORE] Add SSLFactory #43386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e96ca1
working
hasnain-db Oct 14, 2023
0a103f5
comments
hasnain-db Oct 19, 2023
c38552f
missed one
hasnain-db Oct 19, 2023
edf1a02
comments
hasnain-db Oct 20, 2023
8f09157
comment
hasnain-db Oct 21, 2023
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
2 changes: 1 addition & 1 deletion common/network-common/src/main/java/org/apache/spark/network/protocol/SslMessageEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
@ChannelHandler.Sharable
public final class SslMessageEncoder extends MessageToMessageEncoder<Message> {

private final Logger logger = LoggerFactory.getLogger(SslMessageEncoder.class);
private static final Logger logger = LoggerFactory.getLogger(SslMessageEncoder.class);

private SslMessageEncoder() {}

Expand Down
5 changes: 3 additions & 2 deletions .../network-common/src/main/java/org/apache/spark/network/ssl/ReloadingX509TrustManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
public final class ReloadingX509TrustManager
implements X509TrustManager, Runnable {

private final Logger logger = LoggerFactory.getLogger(ReloadingX509TrustManager.class);
private static final Logger logger = LoggerFactory.getLogger(ReloadingX509TrustManager.class);

private final String type;
private final File file;
Expand Down Expand Up @@ -180,7 +180,8 @@ X509TrustManager loadTrustManager()
canonicalPath = latestCanonicalFile.getPath();
lastLoaded = latestCanonicalFile.lastModified();
try (FileInputStream in = new FileInputStream(latestCanonicalFile)) {
ks.load(in, password.toCharArray());
char[] passwordCharacters = password != null? password.toCharArray() : null;
ks.load(in, passwordCharacters);
logger.debug("Loaded truststore '" + file + "'");
}

Expand Down
Loading