[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-openam-commit
Subject: [CommitOpenAM] [13634] trunk/openam/openam-federation/openam-federation-library/src/main/
From: noreply () forgerock ! org
Date: 2015-04-29 9:00:27
Message-ID: 20150429090027.DDF2E3F86E () 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>[13634] trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2: \
OPENAM-5614 CR-6759 Resolve deserialization issues when using SAML SFO</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=13634">13634</a></dd> \
<dt>Author</dt> <dd>peter.major</dd> <dt>Date</dt> <dd>2015-04-29 10:00:27 +0100 \
(Wed, 29 Apr 2015)</dd> </dl>
<h3>Log Message</h3>
<pre><a href="https://bugster.forgerock.org/jira/browse/OPENAM-5614">OPENAM-5614</a> \
CR-6759 Resolve deserialization issues when using SAML SFO</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkopenamopenamfederationopenamfederationlibrarysrcmainjavacomsunident \
itysaml2assertionNameIDjava">trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/NameID.java</a></li>
<li><a href="#trunkopenamopenamfederationopenamfederationlibrarysrcmainjavacomsuniden \
titysaml2profileAuthnRequestInfoCopyjava">trunk/openam/openam-federation/openam-federa \
tion-library/src/main/java/com/sun/identity/saml2/profile/AuthnRequestInfoCopy.java</a></li>
<li><a href="#trunkopenamopenamfederationopenamfederationlibrarysrcmainjavacomsuniden \
titysaml2profileIDPSessionCopyjava">trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSessionCopy.java</a></li>
<li><a href="#trunkopenamopenamfederationopenamfederationlibrarysrcmainjavacomsuniden \
titysaml2profileNameIDandSPpairjava">trunk/openam/openam-federation/openam-federation- \
library/src/main/java/com/sun/identity/saml2/profile/NameIDandSPpair.java</a></li> \
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkopenamopenamfederationopenamfederationlibrarysrcmainjavacomsunidentitysaml2assertionNameIDjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/NameID.java \
(13633 => 13634)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/NameID.java 2015-04-29 \
08:58:46 UTC (rev 13633)
+++ trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/assertion/NameID.java 2015-04-29 \
09:00:27 UTC (rev 13634) </span><span class="lines">@@ -24,14 +24,15 @@
</span><span class="cx"> *
</span><span class="cx"> * $Id: NameID.java,v 1.2 2008/06/25 05:47:41 qcheng Exp $
</span><span class="cx"> *
</span><ins>+ * Portions Copyrighted 2015 ForgeRock AS.
</ins><span class="cx"> */
</span><del>-
-
</del><span class="cx"> package com.sun.identity.saml2.assertion;
</span><span class="cx">
</span><span class="cx"> import java.security.Key;
</span><span class="cx">
</span><ins>+import com.sun.identity.saml2.assertion.impl.NameIDImpl;
</ins><span class="cx"> import com.sun.identity.saml2.common.SAML2Exception;
</span><ins>+import org.codehaus.jackson.annotate.JsonTypeInfo;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * The <code>NameID</code> is used in various \
SAML assertion constructs </span><span class="lines">@@ -40,6 +41,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @supported.all.api
</span><span class="cx"> */
</span><ins>+@JsonTypeInfo(include = JsonTypeInfo.As.PROPERTY, use = \
JsonTypeInfo.Id.CLASS, defaultImpl = NameIDImpl.class) </ins><span class="cx"> public \
interface NameID extends NameIDType { </span><span class="cx"> /**
</span><span class="cx"> * Returns an <code>EncryptedID</code> \
object. </span></span></pre></div>
<a id="trunkopenamopenamfederationopenamfederationlibrarysrcmainjavacomsunidentitysaml2profileAuthnRequestInfoCopyjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AuthnRequestInfoCopy.java \
(13633 => 13634)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AuthnRequestInfoCopy.java 2015-04-29 \
08:58:46 UTC (rev 13633)
+++ trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/AuthnRequestInfoCopy.java 2015-04-29 \
09:00:27 UTC (rev 13634) </span><span class="lines">@@ -1,27 +1,18 @@
</span><del>-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
</del><ins>+/*
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in \
compliance with the + * License.
</ins><span class="cx"> *
</span><del>- * Copyright © 2011-2013 ForgeRock AS. All rights reserved.
</del><ins>+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the \
License for the + * specific language governing permission and limitations under the \
License. </ins><span class="cx"> *
</span><del>- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
</del><ins>+ * When distributing Covered Software, include this CDDL Header Notice in \
each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add \
the following below the CDDL + * Header, with the fields enclosed by brackets [] \
replaced by your own identifying + * information: "Portions copyright [year] \
[name of copyright owner]". </ins><span class="cx"> *
</span><del>- * You can obtain a copy of the License at
- * http://forgerock.org/license/CDDLv1.0.html
- * See the License for the specific language governing
- * permission and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at http://forgerock.org/license/CDDLv1.0.html
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
</del><ins>+ * Copyright 2011-2015 ForgeRock AS.
</ins><span class="cx"> */
</span><del>-
</del><span class="cx"> package com.sun.identity.saml2.profile;
</span><span class="cx">
</span><span class="cx"> import com.sun.identity.saml2.common.SAML2Exception;
</span><span class="lines">@@ -48,7 +39,13 @@
</span><span class="cx"> private String relayState;
</span><span class="cx"> private String spEntityID;
</span><span class="cx"> private String idpEntityID;
</span><del>-
</del><ins>+
+ /**
+ * Default constructor for deserialization.
+ */
+ public AuthnRequestInfoCopy() {
+ }
+
</ins><span class="cx"> public AuthnRequestInfoCopy(AuthnRequestInfo info) throws \
SAML2Exception { </span><span class="cx">
</span><span class="cx"> this.realm = info.getRealm();
</span></span></pre></div>
<a id="trunkopenamopenamfederationopenamfederationlibrarysrcmainjavacomsunidentitysaml2profileIDPSessionCopyjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSessionCopy.java \
(13633 => 13634)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSessionCopy.java 2015-04-29 \
08:58:46 UTC (rev 13633)
+++ trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/IDPSessionCopy.java 2015-04-29 \
09:00:27 UTC (rev 13634) </span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-/**
</del><ins>+/*
</ins><span class="cx"> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
</span><span class="cx"> *
</span><span class="cx"> * Copyright (c) 2008 Sun Microsystems Inc. All Rights \
Reserved </span><span class="lines">@@ -24,11 +24,8 @@
</span><span class="cx"> *
</span><span class="cx"> * $Id: IDPSessionCopy.java,v 1.3 2009/05/06 19:48:34 \
madan_ranganath Exp $ </span><span class="cx"> *
</span><ins>+ * Portions copyright 2013-2015 ForgeRock AS.
</ins><span class="cx"> */
</span><del>-
-/**
- * Portions copyright 2013 ForgeRock AS
- */
</del><span class="cx"> package com.sun.identity.saml2.profile;
</span><span class="cx">
</span><span class="cx"> import com.sun.identity.plugin.session.SessionException;
</span><span class="lines">@@ -60,6 +57,12 @@
</span><span class="cx"> private String metaAlias = null;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Default constructor for deserialization.
+ */
+ public IDPSessionCopy() {
+ }
+
+ /**
</ins><span class="cx"> * Constructor for a \
<code>IDPSessionCopy</code> </span><span class="cx"> *
</span><span class="cx"> * @param ssoToken the <code>SSO \
Token</code> corresponding </span><span class="lines">@@ -69,7 +72,7 @@
</span><span class="cx"> this.ssoTokenID = ssoToken;
</span><span class="cx"> nameIDandSPpairs = new \
ArrayList<NameIDandSPpair>(); </span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> public IDPSessionCopy(IDPSession idpSession) {
</span><span class="cx"> try {
</span><span class="cx"> SessionProvider sessionProvider = \
SessionManager.getProvider(); </span></span></pre></div>
<a id="trunkopenamopenamfederationopenamfederationlibrarysrcmainjavacomsunidentitysaml2profileNameIDandSPpairjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/NameIDandSPpair.java \
(13633 => 13634)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/NameIDandSPpair.java 2015-04-29 \
08:58:46 UTC (rev 13633)
+++ trunk/openam/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/profile/NameIDandSPpair.java 2015-04-29 \
09:00:27 UTC (rev 13634) </span><span class="lines">@@ -24,32 +24,35 @@
</span><span class="cx"> *
</span><span class="cx"> * $Id: NameIDandSPpair.java,v 1.3 2008/06/25 05:47:54 \
qcheng Exp $ </span><span class="cx"> *
</span><ins>+ * Portions Copyrighted 2013-2015 ForgeRock AS.
</ins><span class="cx"> */
</span><del>-
-/**
- * Portions Copyrighted 2013 ForgeRock AS
- */
</del><span class="cx"> package com.sun.identity.saml2.profile;
</span><span class="cx">
</span><span class="cx"> import com.sun.identity.saml2.assertion.NameID;
</span><span class="cx"> import java.io.Serializable;
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * This class represents a pair of \
<code>NameID</code> and its </span><span class="cx"> * corresponding \
<code>SPEntityID</code>. </span><span class="cx"> */
</span><del>-
</del><span class="cx"> public class NameIDandSPpair implements Serializable {
</span><span class="cx">
</span><span class="cx"> private NameID nameID = null;
</span><span class="cx"> private String spEntityID = null;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Default constructor for deserialization.
+ */
+ public NameIDandSPpair() {
+ }
+
+ /**
</ins><span class="cx"> * Constructor for a \
<code>NameIDandSPpair</code>. </span><span class="cx"> *
</span><span class="cx"> * @param nameID the <code>NameID</code> \
object </span><span class="cx"> * @param spEntityID the \
<code>SPEntityID</code> </span><span class="cx"> */
</span><del>- public NameIDandSPpair( NameID nameID, String spEntityID) {
</del><ins>+ public NameIDandSPpair(NameID nameID, String spEntityID) {
</ins><span class="cx"> this.nameID = nameID;
</span><span class="cx"> this.spEntityID = spEntityID;
</span><span class="cx"> }
</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