[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-openam-commit
Subject: [CommitOpenAM] [10813] trunk/openam/openam-datastore/src: OPENAM-4227 CR-4693 Encode password correc
From: noreply () forgerock ! org
Date: 2014-09-30 13:48:08
Message-ID: 20140930134808.38B4740934 () sources ! internal ! forgerock ! com
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[10813] trunk/openam/openam-datastore/src: OPENAM-4227 CR-4693 Encode password \
correctly during password reset on AD</title> </head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/openam/?cs=10813">10813</a></dd> \
<dt>Author</dt> <dd>peter.major</dd> <dt>Date</dt> <dd>2014-09-30 14:48:08 +0100 \
(Tue, 30 Sep 2014)</dd> </dl>
<h3>Log Message</h3>
<pre><a href="https://bugster.forgerock.org/jira/browse/OPENAM-4227">OPENAM-4227</a> \
CR-4693 Encode password correctly during password reset on AD</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkopenamopenamdatastoresrcmainjavaorgforgerockopenamidrepoldapDJLDAPv \
3Repojava">trunk/openam/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/DJLDAPv3Repo.java</a></li>
<li><a href="#trunkopenamopenamdatastoresrcmainjavaorgforgerockopenamidrepoldaphelper \
sDirectoryHelperjava">trunk/openam/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/helpers/DirectoryHelper.java</a></li>
<li><a href="#trunkopenamopenamdatastoresrctestjavaorgforgerockopenamidrepoldaphelper \
sADAMHelperTestjava">trunk/openam/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/ADAMHelperTest.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkopenamopenamdatastoresrcmainjavaorgforgerockopenamidrepoldapDJLDAPv3Repojava"></a>
<div class="modfile"><h4>Modified: \
trunk/openam/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/DJLDAPv3Repo.java \
(10812 => 10813)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openam/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/DJLDAPv3Repo.java 2014-09-30 \
13:23:05 UTC (rev 10812)
+++ trunk/openam/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/DJLDAPv3Repo.java 2014-09-30 \
13:48:08 UTC (rev 10813) </span><span class="lines">@@ -903,15 +903,6 @@
</span><span class="cx"> boolean isAdd, boolean isString, boolean \
changeOCs) throws IdRepoException { </span><span class="cx"> ModifyRequest \
modifyRequest = Requests.newModifyRequest(getDN(type, name)); </span><span \
class="cx"> attributes = removeUndefinedAttributes(type, attributes); \
</span><del>- //TODO should we really allow to use #setAttributes instead of \
#changePassword for changing passwords?
- byte[] encodedPwd = helper.encodePassword(type, attributes);
- if (encodedPwd != null) {
- if (isAdd) {
- modifyRequest.addModification(ModificationType.ADD, \
AD_UNICODE_PWD_ATTR, encodedPwd);
- } else {
- modifyRequest.addModification(ModificationType.REPLACE, \
AD_UNICODE_PWD_ATTR, encodedPwd);
- }
- }
</del><span class="cx">
</span><span class="cx"> if (type.equals(IdType.USER)) {
</span><span class="cx"> Object status = \
attributes.get(DEFAULT_USER_STATUS_ATTR); </span><span class="lines">@@ -937,8 \
+928,15 @@ </span><span class="cx">
</span><span class="cx"> for (Map.Entry<String, Object> entry : \
(Set<Map.Entry<String, Object>>) attributes.entrySet()) { </span><span \
class="cx"> Object values = entry.getValue(); </span><del>- \
Attribute attr = new LinkedAttribute(entry.getKey());
- if (values instanceof byte[][]) {
</del><ins>+ String attrName = entry.getKey();
+ Attribute attr = new LinkedAttribute(attrName);
+ if (AD_UNICODE_PWD_ATTR.equalsIgnoreCase(attrName)) {
+ if (values instanceof byte[][]) {
+ attr.add(ByteString.valueOf(helper.encodePassword(IdType.USER, \
(byte[][]) values))); + } else {
+ attr.add(ByteString.valueOf(helper.encodePassword(IdType.USER, \
(Set) values))); + }
+ } else if (values instanceof byte[][]) {
</ins><span class="cx"> for (byte[] bytes : (byte[][]) values) {
</span><span class="cx"> attr.add(ByteString.valueOf(bytes));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkopenamopenamdatastoresrcmainjavaorgforgerockopenamidrepoldaphelpersDirectoryHelperjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openam/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/helpers/DirectoryHelper.java \
(10812 => 10813)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openam/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/helpers/DirectoryHelper.java 2014-09-30 \
13:23:05 UTC (rev 10812)
+++ trunk/openam/openam-datastore/src/main/java/org/forgerock/openam/idrepo/ldap/helpers/DirectoryHelper.java 2014-09-30 \
13:48:08 UTC (rev 10813) </span><span class="lines">@@ -32,25 +32,17 @@
</span><span class="cx"> protected static final Debug DEBUG = \
Debug.getInstance("DJLDAPv3Repo"); </span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Encodes the password to use the "correct" character \
encoding. </del><ins>+ * Encodes the password to use the "correct" \
character encoding for AD. </ins><span class="cx"> *
</span><span class="cx"> * @param type The type of the identity, which should be \
always USER. </span><del>- * @param attrValue The password value either in string \
or binary format. If binary, it is assumed that the value
- * is already correctly encoded. May be null.
</del><ins>+ * @param binaryValues The password value in binary format which is \
assumed to be correctly encoded already. May + * be null.
</ins><span class="cx"> * @return The encoded password, or null if the input was \
null. </span><span class="cx"> */
</span><del>- public byte[] encodePassword(IdType type, Object attrValue) {
</del><ins>+ public byte[] encodePassword(IdType type, byte[][] binaryValues) {
</ins><span class="cx"> if (type.equals(IdType.USER)) {
</span><del>- if (attrValue instanceof Set) {
- Set<String> password = (Set<String>) attrValue;
- if (!password.isEmpty()) {
- return encodePassword(password.iterator().next());
- }
- } else if (attrValue instanceof byte[][]) {
- byte[][] binaryAttr = (byte[][]) attrValue;
- if (binaryAttr.length > 0) {
- return binaryAttr[0];
- }
</del><ins>+ if (binaryValues != null && binaryValues.length > \
0) { + return binaryValues[0];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -58,6 +50,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Encodes the password to use the "correct" character \
encoding for AD. + *
+ * @param type The type of the identity, which should be always USER.
+ * @param passwordValues The password value in string format to be encoded. May \
be null. + * @return The encoded password, or null if the input was null.
+ */
+ public byte[] encodePassword(IdType type, Set<String> passwordValues) {
+ if (type.equals(IdType.USER)) {
+ if (passwordValues != null && !passwordValues.isEmpty()) {
+ return encodePassword(passwordValues.iterator().next());
+ }
+ }
+
+ return null;
+ }
+
+ /**
</ins><span class="cx"> * Encodes the password to use the "correct" \
character encoding. </span><span class="cx"> *
</span><span class="cx"> * @param password The password in string format. May be \
null. </span></span></pre></div>
<a id="trunkopenamopenamdatastoresrctestjavaorgforgerockopenamidrepoldaphelpersADAMHelperTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openam/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/ADAMHelperTest.java \
(10812 => 10813)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openam/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/ADAMHelperTest.java 2014-09-30 \
13:23:05 UTC (rev 10812)
+++ trunk/openam/openam-datastore/src/test/java/org/forgerock/openam/idrepo/ldap/helpers/ADAMHelperTest.java 2014-09-30 \
13:48:08 UTC (rev 10813) </span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> import org.testng.annotations.Test;
</span><span class="cx">
</span><span class="cx"> import static org.fest.assertions.Assertions.*;
</span><ins>+import org.forgerock.openam.utils.CollectionUtils;
</ins><span class="cx"> import static org.forgerock.openam.utils.CollectionUtils.*;
</span><span class="cx">
</span><span class="cx"> public class ADAMHelperTest {
</span><span class="lines">@@ -31,7 +32,7 @@
</span><span class="cx"> @Test
</span><span class="cx"> public void nullPasswordIsNotEncoded() {
</span><span class="cx"> assertThat(helper.encodePassword(null)).isNull();
</span><del>- assertThat(helper.encodePassword(IdType.USER, null)).isNull();
</del><ins>+ assertThat(helper.encodePassword(IdType.USER, (byte[][]) \
null)).isNull(); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="lines">@@ -57,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> @Test
</span><span class="cx"> public void passwordSetIsCorrectlyEncoded() throws \
Exception { </span><del>- assertThat(helper.encodePassword(IdType.USER, \
asSet())).isNull(); </del><ins>+ assertThat(helper.encodePassword(IdType.USER, \
CollectionUtils.<String>asSet())).isNull(); </ins><span class="cx"> \
assertThat(helper.encodePassword(IdType.USER, asSet(PASSWORD))).isNotNull() \
</span><span class="cx"> \
.isEqualTo(QUOTED_PASSWORD.getBytes(ENCODING)); </span><span class="cx"> \
assertThat(helper.encodePassword(IdType.USER, asSet(PASSWORD, \
QUOTED_PASSWORD))).isNotNull() </span></span></pre>
</div>
</div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>
</body>
</html>
_______________________________________________
CommitOpenAM mailing list
CommitOpenAM@forgerock.org
https://lists.forgerock.org/mailman/listinfo/commitopenam
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic