Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
pulsar
提交
c9a36993
pulsar
项目概览
apache
/
pulsar
通知
129
Star
40
Fork
3
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
pulsar
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Pages
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
提交
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
c9a36993
编写于
5月 28, 2018
作者:
J
Jai Asher
提交者:
GitHub
5月 28, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixing resource leak due to open file descriptors in SecurityUtility.java (#1851)
上级
b3d52562
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
6 deletion
+10
-6
pulsar-common/src/main/java/org/apache/pulsar/common/util/SecurityUtility.java
...n/java/org/apache/pulsar/common/util/SecurityUtility.java
+10
-6
未找到文件。
pulsar-common/src/main/java/org/apache/pulsar/common/util/SecurityUtility.java
浏览文件 @
c9a36993
...
...
@@ -58,7 +58,7 @@ public class SecurityUtility {
}
public
static
SslContext
createNettySslContextForClient
(
boolean
allowInsecureConnection
,
String
trustCertsFilePath
)
throws
GeneralSecurityException
,
SSLException
,
FileNotFoundException
{
throws
IOException
,
GeneralSecurityException
,
SSLException
,
FileNotFoundException
{
return
createNettySslContextForClient
(
allowInsecureConnection
,
trustCertsFilePath
,
(
Certificate
[])
null
,
(
PrivateKey
)
null
);
}
...
...
@@ -73,7 +73,7 @@ public class SecurityUtility {
public
static
SslContext
createNettySslContextForClient
(
boolean
allowInsecureConnection
,
String
trustCertsFilePath
,
String
certFilePath
,
String
keyFilePath
)
throws
GeneralSecurityException
,
SSLException
,
FileNotFoundException
{
throws
IOException
,
GeneralSecurityException
,
SSLException
,
FileNotFoundException
{
X509Certificate
[]
certificates
=
loadCertificatesFromPemFile
(
certFilePath
);
PrivateKey
privateKey
=
loadPrivateKeyFromPemFile
(
keyFilePath
);
return
createNettySslContextForClient
(
allowInsecureConnection
,
trustCertsFilePath
,
certificates
,
privateKey
);
...
...
@@ -81,13 +81,15 @@ public class SecurityUtility {
public
static
SslContext
createNettySslContextForClient
(
boolean
allowInsecureConnection
,
String
trustCertsFilePath
,
Certificate
[]
certificates
,
PrivateKey
privateKey
)
throws
GeneralSecurityException
,
SSL
Exception
,
FileNotFoundException
{
throws
GeneralSecurityException
,
IO
Exception
,
FileNotFoundException
{
SslContextBuilder
builder
=
SslContextBuilder
.
forClient
();
if
(
allowInsecureConnection
)
{
builder
.
trustManager
(
InsecureTrustManagerFactory
.
INSTANCE
);
}
else
{
if
(
trustCertsFilePath
!=
null
&&
trustCertsFilePath
.
length
()
!=
0
)
{
builder
.
trustManager
(
new
FileInputStream
(
trustCertsFilePath
));
try
(
FileInputStream
input
=
new
FileInputStream
(
trustCertsFilePath
))
{
builder
.
trustManager
(
input
);
}
}
}
builder
.
keyManager
(
privateKey
,
(
X509Certificate
[])
certificates
);
...
...
@@ -96,7 +98,7 @@ public class SecurityUtility {
public
static
SslContext
createNettySslContextForServer
(
boolean
allowInsecureConnection
,
String
trustCertsFilePath
,
String
certFilePath
,
String
keyFilePath
)
throws
GeneralSecurityException
,
SSLException
,
FileNotFoundException
{
throws
IOException
,
GeneralSecurityException
,
SSLException
,
FileNotFoundException
{
X509Certificate
[]
certificates
=
loadCertificatesFromPemFile
(
certFilePath
);
PrivateKey
privateKey
=
loadPrivateKeyFromPemFile
(
keyFilePath
);
...
...
@@ -105,7 +107,9 @@ public class SecurityUtility {
builder
.
trustManager
(
InsecureTrustManagerFactory
.
INSTANCE
);
}
else
{
if
(
trustCertsFilePath
!=
null
&&
trustCertsFilePath
.
length
()
!=
0
)
{
builder
.
trustManager
(
new
FileInputStream
(
trustCertsFilePath
));
try
(
FileInputStream
input
=
new
FileInputStream
(
trustCertsFilePath
))
{
builder
.
trustManager
(
input
);
}
}
else
{
builder
.
trustManager
((
File
)
null
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录