-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8284910: Buffer clean in PasswordCallback
Reviewed-by: mullan
- Loading branch information
Showing
3 changed files
with
147 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
test/jdk/javax/security/auth/callback/PasswordCallback/CheckCleanerBound.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/* | ||
* Copyright (C) 2022 THL A29 Limited, a Tencent company. 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 8284910 | ||
* @summary Check that the cleaner is not bound to the PasswordCallback object | ||
*/ | ||
|
||
import javax.security.auth.callback.PasswordCallback; | ||
import java.util.WeakHashMap; | ||
|
||
public final class CheckCleanerBound { | ||
private final static WeakHashMap<PasswordCallback, ?> weakHashMap = | ||
new WeakHashMap<>(); | ||
|
||
public static void main(String[] args) throws Exception { | ||
// Create an object | ||
PasswordCallback passwordCallback = | ||
new PasswordCallback("Password: ", false); | ||
passwordCallback.setPassword("ThisIsAPassword".toCharArray()); | ||
|
||
weakHashMap.put(passwordCallback, null); | ||
passwordCallback = null; | ||
|
||
// Check if the PasswordCallback object could be collected. | ||
// Wait to trigger the cleanup. | ||
for (int i = 0; i < 10 && weakHashMap.size() != 0; i++) { | ||
System.gc(); | ||
} | ||
|
||
// Check if the object has been collected. The collection will not | ||
// happen if the cleaner implementation in PasswordCallback is bound | ||
// to the PasswordCallback object. | ||
if (weakHashMap.size() > 0) { | ||
throw new RuntimeException( | ||
"PasswordCallback object is not released"); | ||
} | ||
} | ||
} | ||
|
52 changes: 52 additions & 0 deletions
52
test/jdk/javax/security/auth/callback/PasswordCallback/PasswordCleanup.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* | ||
* Copyright (C) 2022 THL A29 Limited, a Tencent company. 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 8284910 | ||
* @summary Check that PasswordCallback.clearPassword() clears the password | ||
*/ | ||
|
||
import javax.security.auth.callback.PasswordCallback; | ||
import java.util.Arrays; | ||
|
||
public final class PasswordCleanup { | ||
public static void main(String[] args) throws Exception { | ||
// Create an object | ||
PasswordCallback passwordCallback = | ||
new PasswordCallback("Password: ", false); | ||
passwordCallback.setPassword("ThisIsAPassword".toCharArray()); | ||
char[] originPassword = passwordCallback.getPassword(); | ||
|
||
// Use password clear method. | ||
passwordCallback.clearPassword(); | ||
|
||
// Check that the password is cleared. | ||
char[] clearedPassword = passwordCallback.getPassword(); | ||
if (Arrays.equals(originPassword, clearedPassword)) { | ||
throw new RuntimeException( | ||
"PasswordCallback.clearPassword() does not clear passwords"); | ||
} | ||
} | ||
} | ||
|
89fd6d3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues