[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-openam-commit
Subject: [CommitOpenAM] [14899] branches/sts_newton/openam/openam-sts: changes from CR-7765
From: noreply () forgerock ! org
Date: 2015-07-30 20:22:37
Message-ID: 20150730202238.0140A3F8E4 () 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>[14899] branches/sts_newton/openam/openam-sts: changes from CR-7765</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=14899">14899</a></dd> \
<dt>Author</dt> <dd>dhogan</dd> <dt>Date</dt> <dd>2015-07-30 21:22:37 +0100 (Thu, 30 \
Jul 2015)</dd> </dl>
<h3>Log Message</h3>
<pre>changes from CR-7765</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessts_newtonopenamopenamstsopenamclientstssrcmainjavaorgforgerocko \
penamstsuserinvocationSTSIssuedTokenStatejava">branches/sts_newton/openam/openam-sts/o \
penam-client-sts/src/main/java/org/forgerock/openam/sts/user/invocation/STSIssuedTokenState.java</a></li>
<li><a href="#branchessts_newtonopenamopenamstsopenamtokenservicestssrcmainjavaorgfor \
gerockopenamststokengenerationCTSTokenPersistencejava">branches/sts_newton/openam/open \
am-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/CTSTokenPersistence.java</a></li>
<li><a href="#branchessts_newtonopenamopenamstsopenamtokenservicestssrcmainjavaorgfor \
gerockopenamststokengenerationserviceTokenGenerationServicejava">branches/sts_newton/o \
penam/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/service/TokenGenerationService.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessts_newtonopenamopenamstsopenamclientstssrcmainjavaorgforgerockopenamstsuserinvocationSTSIssuedTokenStatejava"></a>
<div class="modfile"><h4>Modified: \
branches/sts_newton/openam/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/user/invocation/STSIssuedTokenState.java \
(14898 => 14899)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/sts_newton/openam/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/user/invocation/STSIssuedTokenState.java 2015-07-30 \
17:28:56 UTC (rev 14898)
+++ branches/sts_newton/openam/openam-sts/openam-client-sts/src/main/java/org/forgerock/openam/sts/user/invocation/STSIssuedTokenState.java 2015-07-30 \
20:22:37 UTC (rev 14899) </span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> The following two strings aid in creating the \
_queryFilter param to search for STS issued tokens when performing </span><span \
class="cx"> a resource-less GET on the TokenService endpoint. </span><span \
class="cx"> */ </span><del>- public static final String STS_ID_LDAP_ATTRIBUTE \
= "coreTokenString01";
- public static final String STS_USER_ID_LDAP_ATTRIBUTE = \
"coreTokenUserId"; </del><ins>+ public static final String \
STS_ID_QUERY_ATTRIBUTE = "sts_id"; + public static final String \
STS_TOKEN_PRINCIPAL_QUERY_ATTRIBUTE = "token_principal"; </ins><span \
class="cx"> public static class STSIssuedTokenStateBuilder { </span><span \
class="cx"> private String tokenId; </span><span class="cx"> private \
String stsId; </span></span></pre></div>
<a id="branchessts_newtonopenamopenamstsopenamtokenservicestssrcmainjavaorgforgerockopenamststokengenerationCTSTokenPersistencejava"></a>
<div class="modfile"><h4>Modified: \
branches/sts_newton/openam/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/CTSTokenPersistence.java \
(14898 => 14899)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/sts_newton/openam/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/CTSTokenPersistence.java 2015-07-30 \
17:28:56 UTC (rev 14898)
+++ branches/sts_newton/openam/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/CTSTokenPersistence.java 2015-07-30 \
20:22:37 UTC (rev 14899) </span><span class="lines">@@ -61,5 +61,12 @@
</span><span class="cx"> */
</span><span class="cx"> void deleteToken(String tokenId) throws \
CTSTokenPersistenceException; </span><span class="cx">
</span><ins>+ /**
+ * Returns a list of STSIssuedTokenState instances corresponding to the \
sts-issued tokens specified by the QueryFilter. + * These queries are currently \
limited to a specific sts id, and an optional subject asserted by the token. + * \
@param queryFilter the QueryFilter referencing the CoreTokenFields which will guide \
the CTS search + * @return the non-null, possibly-empty list returned by the \
query. + * @throws CTSTokenPersistenceException if the query could not be \
successfully performed. + */
</ins><span class="cx"> List<STSIssuedTokenState> \
listTokens(QueryFilter<CoreTokenField> queryFilter) throws \
CTSTokenPersistenceException; </span><span class="cx"> }
</span></span></pre></div>
<a id="branchessts_newtonopenamopenamstsopenamtokenservicestssrcmainjavaorgforgerockopenamststokengenerationserviceTokenGenerationServicejava"></a>
<div class="modfile"><h4>Modified: \
branches/sts_newton/openam/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/service/TokenGenerationService.java \
(14898 => 14899)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/sts_newton/openam/openam-sts/openam-token-service-sts/src/main/java/org/forgerock/openam/sts/tokengeneration/service/TokenGenerationService.java 2015-07-30 \
17:28:56 UTC (rev 14898)
+++ branches/sts_newton/openam/openam-sts/openam-token-service-sts/src/main/java/org/f \
orgerock/openam/sts/tokengeneration/service/TokenGenerationService.java 2015-07-30 \
20:22:37 UTC (rev 14899) </span><span class="lines">@@ -295,9 +295,9 @@
</span><span class="cx"> @Override
</span><span class="cx"> public \
org.forgerock.util.query.QueryFilter<CoreTokenField> visitEqualsFilter(Void \
aVoid, JsonPointer field, Object valueAssertion) { </span><span class="cx"> \
final String fieldString = field.toString().substring(1); </span><del>- \
if (CTSTokenPersistence.CTS_TOKEN_FIELD_STS_ID.toString().equals(fieldString)) { \
</del><ins>+ if \
(STSIssuedTokenState.STS_ID_QUERY_ATTRIBUTE.equals(fieldString)) { </ins><span \
class="cx"> return \
org.forgerock.util.query.QueryFilter.equalTo(CTSTokenPersistence.CTS_TOKEN_FIELD_STS_ID, \
valueAssertion); </span><del>- } else if \
(CoreTokenField.USER_ID.toString().equals(fieldString)) { </del><ins>+ \
} else if (STSIssuedTokenState.STS_TOKEN_PRINCIPAL_QUERY_ATTRIBUTE.equals(fieldString)) \
{ </ins><span class="cx"> return \
org.forgerock.util.query.QueryFilter.equalTo(CoreTokenField.USER_ID, valueAssertion); \
</span><span class="cx"> } else { </span><span class="cx"> \
throw new IllegalArgumentException("Querying TokenService on field " + \
fieldString + </span><span class="lines">@@ -379,8 +379,9 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> private static String getUsageString() {
</span><del>- return "Url must have a query param of format: \
_queryFilter=/coreTokenString01+eq+\"sts_instance_id\" or \
" +
- "_queryFilter=/coreTokenString01+eq+\"sts_instance_id\"+and+/coreTokenUserId+eq+\"user_id\"";
</del><ins>+ return "Url must have a query param of format: \
_queryFilter=/" + STSIssuedTokenState.STS_ID_QUERY_ATTRIBUTE + + \
"+eq+\"sts_instance_id\" or _queryFilter=/" + \
STSIssuedTokenState.STS_ID_QUERY_ATTRIBUTE + + \
"+eq+\"sts_instance_id\"+and+/" + \
STSIssuedTokenState.STS_TOKEN_PRINCIPAL_QUERY_ATTRIBUTE + \
"+eq+\"token_principal_id\""; </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @Override
</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