Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
5bf953ed
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5bf953ed
编写于
8月 27, 2013
作者:
W
weijun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8015669: KerberosPrincipal::equals should ignore name-type
Reviewed-by: mullan
上级
169ce6c7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
59 addition
and
10 deletion
+59
-10
src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
...asses/javax/security/auth/kerberos/KerberosPrincipal.java
+4
-10
test/sun/security/krb5/auto/KPEquals.java
test/sun/security/krb5/auto/KPEquals.java
+55
-0
未找到文件。
src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
浏览文件 @
5bf953ed
...
@@ -197,8 +197,7 @@ public final class KerberosPrincipal
...
@@ -197,8 +197,7 @@ public final class KerberosPrincipal
* {@code KerberosPrincipal} and the two
* {@code KerberosPrincipal} and the two
* {@code KerberosPrincipal} instances are equivalent.
* {@code KerberosPrincipal} instances are equivalent.
* More formally two {@code KerberosPrincipal} instances are equal
* More formally two {@code KerberosPrincipal} instances are equal
* if the values returned by {@code getName()} are equal and the
* if the values returned by {@code getName()} are equal.
* values returned by {@code getNameType()} are equal.
*
*
* @param other the Object to compare to
* @param other the Object to compare to
* @return true if the Object passed in represents the same principal
* @return true if the Object passed in represents the same principal
...
@@ -211,15 +210,10 @@ public final class KerberosPrincipal
...
@@ -211,15 +210,10 @@ public final class KerberosPrincipal
if
(!
(
other
instanceof
KerberosPrincipal
))
{
if
(!
(
other
instanceof
KerberosPrincipal
))
{
return
false
;
return
false
;
}
else
{
String
myFullName
=
getName
();
String
otherFullName
=
((
KerberosPrincipal
)
other
).
getName
();
if
(
nameType
==
((
KerberosPrincipal
)
other
).
nameType
&&
myFullName
.
equals
(
otherFullName
))
{
return
true
;
}
}
}
return
false
;
String
myFullName
=
getName
();
String
otherFullName
=
((
KerberosPrincipal
)
other
).
getName
();
return
myFullName
.
equals
(
otherFullName
);
}
}
/**
/**
...
...
test/sun/security/krb5/auto/KPEquals.java
0 → 100644
浏览文件 @
5bf953ed
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8015669
* @summary KerberosPrincipal::equals should ignore name-type
* @compile -XDignore.symbol.file KPEquals.java
* @run main/othervm KPEquals
*/
import
sun.security.jgss.GSSUtil
;
import
javax.security.auth.kerberos.KerberosKey
;
import
javax.security.auth.kerberos.KerberosPrincipal
;
import
javax.security.auth.kerberos.KeyTab
;
public
class
KPEquals
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
new
OneKDC
(
null
).
writeJAASConf
();
Context
c
=
Context
.
fromJAAS
(
"client"
);
Context
s
=
Context
.
fromThinAir
();
KerberosPrincipal
kp
=
new
KerberosPrincipal
(
OneKDC
.
SERVER
+
"@"
+
OneKDC
.
REALM
,
KerberosPrincipal
.
KRB_NT_SRV_INST
);
s
.
s
().
getPrincipals
().
add
(
kp
);
for
(
KerberosKey
k:
KeyTab
.
getInstance
(
kp
).
getKeys
(
kp
))
{
s
.
s
().
getPrivateCredentials
().
add
(
k
);
}
c
.
startAsClient
(
OneKDC
.
SERVER
,
GSSUtil
.
GSS_KRB5_MECH_OID
);
s
.
startAsServer
(
OneKDC
.
SERVER
,
GSSUtil
.
GSS_KRB5_MECH_OID
);
Context
.
handshake
(
c
,
s
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录