Author: dimuthul
Date: Fri Feb 29 02:26:51 2008
New Revision: 14349
Log:
Adding the card issuer log and token issuer logs.
Modified:
trunk/solutions/identity/modules/identity-provider/conf/log4j.properties
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/resources.properties
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderSimulator.java
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderTest.java
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilderSimulator.java
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilderTest.java
Modified:
trunk/solutions/identity/modules/identity-provider/conf/log4j.properties
==============================================================================
--- trunk/solutions/identity/modules/identity-provider/conf/log4j.properties
(original)
+++ trunk/solutions/identity/modules/identity-provider/conf/log4j.properties
Fri Feb 29 02:26:51 2008
@@ -25,6 +25,10 @@
log4j.rootLogger=INFO, WSO2WSAS_CONSOLE, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY,
WSO2WSAS_SYS_LOG
+log4j.logger.org.wso2.solutions.identity.card=DEBUG, CARDISSUER_LOGFILE
+log4j.logger.org.wso2.solutions.identity.token=DEBUG, TOKENISSUER_LOGFILE
+
+log4j.logger.org.wso2.solutions.identity.error=ERROR, WSO2WSAS_LOGFILE,
WSO2WSAS_MEMORY
log4j.logger.org.apache.axis2.wsdl.codegen.writer.PrettyPrinter=ERROR,
WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY
log4j.logger.org.apache.axis2.clustering=DEBUG, WSO2WSAS_CONSOLE,
WSO2WSAS_LOGFILE
log4j.logger.org.apache=ERROR, WSO2WSAS_LOGFILE, WSO2WSAS_MEMORY
@@ -59,6 +63,29 @@
log4j.appender.WSO2WSAS_MEMORY.layout.ConversionPattern=%5p [%d] %x %m%n
log4j.appender.WSO2WSAS_MEMORY.threshold=DEBUG
+
+# TOKENISSUER_LOGFILE is set to be a DailyRollingFileAppender using a
PatternLayout.
+log4j.appender.TOKENISSUER_LOGFILE=org.apache.log4j.DailyRollingFileAppender
+# Log file will be overridden by the configuration setting in the DB
+# This path should be relative to WSO2 WSAS Home
+log4j.appender.TOKENISSUER_LOGFILE.File=logs/token_issuer.log
+log4j.appender.TOKENISSUER_LOGFILE.Append=true
+log4j.appender.TOKENISSUER_LOGFILE.layout=org.apache.log4j.PatternLayout
+# ConversionPattern will be overridden by the configuration setting in the DB
+log4j.appender.TOKENISSUER_LOGFILE.layout.ConversionPattern=%5p [%d] %x %m%n
+log4j.appender.TOKENISSUER_LOGFILE.threshold=DEBUG
+
+# CARDISSUER_LOGFILE is set to be a DailyRollingFileAppender using a
PatternLayout.
+log4j.appender.CARDISSUER_LOGFILE=org.apache.log4j.DailyRollingFileAppender
+# Log file will be overridden by the configuration setting in the DB
+# This path should be relative to WSO2 WSAS Home
+log4j.appender.CARDISSUER_LOGFILE.File=logs/card_issuer.log
+log4j.appender.CARDISSUER_LOGFILE.Append=true
+log4j.appender.CARDISSUER_LOGFILE.layout=org.apache.log4j.PatternLayout
+# ConversionPattern will be overridden by the configuration setting in the DB
+log4j.appender.CARDISSUER_LOGFILE.layout.ConversionPattern=%5p [%d] %x %m%n
+log4j.appender.CARDISSUER_LOGFILE.threshold=DEBUG
+
# WSO2WSAS_LOGFILE is set to be a DailyRollingFileAppender using a
PatternLayout.
log4j.appender.WSO2WSAS_LOGFILE=org.apache.log4j.DailyRollingFileAppender
# Log file will be overridden by the configuration setting in the DB
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/IdentityProviderConstants.java
Fri Feb 29 02:26:51 2008
@@ -61,9 +61,9 @@
public final static String ATTR_NS_WORK_PHONE = IdentityConstants.NS
+ "/claims/otherphone";
-
+
public final static String ATTR_NS_NICKNAME = IdentityConstants.NS
- + "/claims/nickname";
+ + "/claims/nickname";
public final static String ATTR_NS_MOBILE_PHONE = IdentityConstants.NS
+ "/claims/mobile";
@@ -93,6 +93,12 @@
public final static String ISSUER_SELF = "Self";
+ public final static String CARD_ISSUSER_LOG =
+ "org.wso2.solutions.identity.card";
+
+ public final static String TOKEN_ISSUSER_LOG =
+ "org.wso2.solutions.identity.token";
+
/**
* Local names of the identity provider constants
*/
@@ -126,7 +132,7 @@
public final static String X509V3_AUTNENTICATE = "X509V3Authenticate";
public final static String IDENTITY = "Identity";
-
+
public final static String OPEN_ID_TOKEN = "OpenIDToken";
}
@@ -172,27 +178,26 @@
public final static String PARAM_NAME_EMAIL_PASSWORD = "email_password";
public final static String PARAM_NAME_EMAIL_VERIFICATION_EPR = "email_epr";
-
+
public final static String DEFAULT_IDENTITY_KEYSTORE_NAME = "wso2is.jks";
public final static String USER_TRUSTED_RP_KEYSTORE_NAME = "userRP.jks";
-
+
public final static String PARAM_NAME_ENABLE_OPENID_REGISTRATION =
"enableOpenIDReg";
-
+
/**
* Server Config data retrieval Strings.
*/
- public static class ServerConfig{
-
+ public static class ServerConfig {
+
public final static String USER_TRUSTED_RP_STORE_LOCATION =
"Security.UserTrustedRPStore.Location";
-
+
public final static String USER_TRUSTED_RP_STORE_PASSWORD =
"Security.UserTrustedRPStore.Password";
-
+
public final static String USER_TRUSTED_RP_STORE_TYPE =
"Security.UserTrustedRPStore.Type";
-
-
-
+
}
+
/**
* Sample related constants of the identity provider
*/
@@ -228,23 +233,22 @@
public final static String DRIVER =
"org.apache.derby.jdbc.EmbeddedDriver";
public final static String SQL_STATEMENTS_FILE_PATH =
"user.default.sql.properties";
-
}
/**
* OpenID related constants of the identity provider
*/
- public static class OpenId {
-
+ public static class OpenId {
+
public final static String PASSWORD = "password";
-
+
public static final String SERVICE_NAME_STS_OPENID = "sts-openid-ut";
-
- public static final String SERVICE_NAME_MEX_OPENID = "mex-openid-ut" ;
-
+
+ public static final String SERVICE_NAME_MEX_OPENID = "mex-openid-ut";
+
public static final String SERVICE_NAME_MEX_IC_OPENID =
"mex-openid-ic";
-
+
public static final String SERVICE_NAME_STS_IC_OPENID =
"sts-openid-ic";
}
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
Fri Feb 29 02:26:51 2008
@@ -70,6 +70,9 @@
private static Log log = LogFactory.getLog(CardIssuer.class);
+ private static Log cardIssuerLog = LogFactory
+ .getLog(IdentityProviderConstants.CARD_ISSUSER_LOG);
+
private static Messages messages = Messages
.getInstance(IdentityProviderConstants.RESOURCES);
@@ -77,15 +80,22 @@
// an InfoCard based on SAML token type.
private boolean isOpenIdInfoCard = false;
+ private boolean isCardLogDebug = false;
private static CardIssuerConfig issuerConfig = null;
public CardIssuer() throws IdentityProviderException {
issuerConfig = CardIssuerConfig.getInstance();
+ isCardLogDebug = cardIssuerLog.isDebugEnabled();
}
public Element issueCardForUsername(String username,
boolean requireAppliesTo) throws IdentityProviderException {
+ if (isCardLogDebug) {
+ cardIssuerLog.debug(messages.getMessage("startCardIssue",
+ new String[] { "usernameToken", username }));
+ }
+
UsernamePasswordCredential passCred = new UsernamePasswordCredential();
passCred.setUsername(username);
UserCredential cred = new UserCredential(passCred);
@@ -95,6 +105,12 @@
public Element issueCardForSelfIssuedCard(String ppid,
boolean requireAppliesTo) throws IdentityProviderException {
+
+ if (isCardLogDebug) {
+ cardIssuerLog.debug(messages.getMessage("startCardIssue",
+ new String[] { "selfIssuedCard", ppid }));
+ }
+
Element cardElement = null;
SelfIssuedCredential selfCred = new SelfIssuedCredential(ppid);
RegisteredInfoCardInfoAdmin registerAdmin = new
RegisteredInfoCardInfoAdmin();
@@ -139,18 +155,29 @@
Identity id = new Identity();
id.setCertificate((X509Certificate) store.getCertificate(alias));
-
+
InformationCard infoCard = getInfoCard(credential, id,
requireAppliesTo);
-
+
+ if (isCardLogDebug) {
+ cardIssuerLog.debug(messages.getMessage("cardElementGenerated",
+ new String[]
{infoCard.getInformationCardReference().getCardId()}));
+ }
+
storeCard(infoCard, primaryUserId);
Element elem = gen.signCard(infoCard);
+ if (isCardLogDebug) {
+
cardIssuerLog.debug(messages.getMessage("cardSignedSuccessfully",
+ new String[]
{infoCard.getInformationCardReference().getCardId()}));
+ }
+
String cardId = infoCard.getInformationCardReference().getCardId();
ReportAdmin.record(primaryUserId,
ActionDO.ACTION_USER_DOWNLOAD_CARD, "CardId=" + cardId);
+
return elem;
} catch (CardModelException e) {
throw new IdentityProviderException("cardModelError", e);
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/resources.properties
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/resources.properties
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/resources.properties
Fri Feb 29 02:26:51 2008
@@ -86,4 +86,13 @@
errorAccessActions = Error in accessing user actions from database
errorQuerryingOpenIDUserRP = Error reading OpenID user RPs from database
+#card Generation Log
+startCardIssue = Card requested by user. User gave {0} and identified by {1}
+cardElementGenerated = Card element generated. New card Id : {0}
+cardSignedSuccessfully = Successfully signed and issued card Id {0}
+#token Generation Log
+validInfoCard = Valid Token request by infocard {0}
+startSAMLTokenCreation = Start creation of SAML Token for InfoCard {0}
+finishSAMLTokenCreation = Successfully created SAML Token for InfoCard {0}
+RSTRCreationDone = Successfully created RSTR for InfoCard {0}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityTokenIssuer.java
Fri Feb 29 02:26:51 2008
@@ -66,9 +66,11 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.wso2.solutions.identity.IdentityConstants;
+import org.wso2.solutions.identity.IdentityProviderConstants;
import org.wso2.solutions.identity.IdentityProviderException;
import org.wso2.solutions.identity.admin.ParameterAdmin;
import org.wso2.solutions.identity.admin.ReportAdmin;
+import org.wso2.solutions.identity.i18n.Messages;
import org.wso2.solutions.identity.persistence.IPPersistenceManager;
import org.wso2.solutions.identity.persistence.dataobject.ActionDO;
import org.wso2.solutions.identity.persistence.dataobject.InfoCardDO;
@@ -108,6 +110,18 @@
public final static String ISSUER_SELF = IdentityConstants.NS
+ "/issuer/self";
+ private static Log tokenIssuerLog = LogFactory
+ .getLog(IdentityProviderConstants.TOKEN_ISSUSER_LOG);
+
+ private static Messages messages = Messages
+ .getInstance(IdentityProviderConstants.RESOURCES);
+
+ private boolean isTokenLogDebug = false;
+
+ public IdentityTokenIssuer() {
+ isTokenLogDebug = tokenIssuerLog.isDebugEnabled();
+ }
+
/**
* [EMAIL PROTECTED]
*/
@@ -148,6 +162,11 @@
}
+ if (isTokenLogDebug) {
+ tokenIssuerLog.debug(messages.getMessage("validInfoCard",
+ new String[] { ipData.getCardID() }));
+ }
+
return createResponse(data);
} catch (Exception e) {
@@ -216,13 +235,28 @@
+ (300 * 1000));
String assertionId = UUIDGenerator.getUUID();
+ if (isTokenLogDebug) {
+ tokenIssuerLog.debug(messages.getMessage(
+ "startSAMLTokenCreation", new String[] { ipData
+ .getCardID() }));
+ }
Element assertionNode = createSAMLAssertionAsDOM(ipData, rahasData,
notBefore, notAfter, assertionId);
+ if (isTokenLogDebug) {
+ tokenIssuerLog.debug(messages.getMessage(
+ "finishSAMLTokenCreation", new String[] { ipData
+ .getCardID() }));
+ }
+
OMElement rstrElem = createRSTR(rahasData, notBefore.toDate(),
notAfter.toDate(), env, doc, assertionNode, assertionId,
encryptedKey);
+ if (isTokenLogDebug) {
+ tokenIssuerLog.debug(messages.getMessage("RSTRCreationDone",
+ new String[] { ipData.getCardID() }));
+ }
if (log.isDebugEnabled()) {
log.debug("Response created");
log.debug("Response body : \n" + rstrElem.toString() + "\n\n");
@@ -250,7 +284,7 @@
}
throw new TrustException(TrustException.REQUEST_FAILED, e);
} finally {
- log.info("Response ready for : " + ipData.getCardID());
+ log.info("Response ready for : " + ipData.getCardID());
}
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderSimulator.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderSimulator.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderSimulator.java
Fri Feb 29 02:26:51 2008
@@ -20,6 +20,7 @@
*/
public class SAML1TokenBuilderSimulator extends SAML1TokenBuilder {
+
public void createStatement(IdentityProviderData ipData, RahasData
rahasData)
throws IdentityProviderException {
Modified:
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderTest.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderTest.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderTest.java
Fri Feb 29 02:26:51 2008
@@ -8,6 +8,7 @@
import org.joda.time.DateTime;
import org.opensaml.DefaultBootstrap;
import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
public class SAML1TokenBuilderTest
extends TestCase {
@@ -34,11 +35,11 @@
builder.marshellAndSign();
Element elemSAML = builder.getSAMLasDOM();
- // now we have to compare something.
- // let's compare
-
- // String val = DOM2Writer.nodeToString(elemSAML);
- // System.out.println(val);
+ NodeList list =
elemSAML.getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#";,
"Signature");
+ TestCase.assertNotNull(list);
+ TestCase.assertEquals(1, list.getLength());
+
+
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilderSimulator.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilderSimulator.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilderSimulator.java
Fri Feb 29 02:26:51 2008
@@ -40,6 +40,8 @@
attribute.getAttributeValues().add(stringValue);
attributeStmt.getAttributes().add(attribute);
+
+
}
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilderTest.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilderTest.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML2TokenBuilderTest.java
Fri Feb 29 02:26:51 2008
@@ -1,19 +1,24 @@
package org.wso2.solutions.identity.sts.saml;
+
+
+import junit.framework.TestCase;
+
import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.xml.security.Init;
import org.apache.xml.security.signature.XMLSignature;
import org.joda.time.DateTime;
import org.opensaml.DefaultBootstrap;
import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
-public class SAML2TokenBuilderTest {
+public class SAML2TokenBuilderTest extends TestCase{
static {
Init.init();
}
- public void testSAML1TokenCreation() throws Exception {
+ public void testSAML2TokenCreation() throws Exception {
DefaultBootstrap.bootstrap();
@@ -31,8 +36,8 @@
builder.marshellAndSign();
Element elemSAML = builder.getSAMLasDOM();
- // String val = DOM2Writer.nodeToString(elemSAML);
- // System.out.println(val);
-
+ NodeList list =
elemSAML.getElementsByTagNameNS("http://www.w3.org/2000/09/xmldsig#";,
"Signature");
+ TestCase.assertNotNull(list);
+ TestCase.assertEquals(1, list.getLength());
}
}
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
