geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added a retry limit for dealing with communication exceptions.

Browse Source 
Updated the README to reflect the new mechanism info changes for
the Krb5 and Pwd authentication mechanisms.
This commit is contained in:
Juan Carlos Luciani
2007-03-21 22:15:35 +00:00
parent 0eda6a0830
commit 65a6c74d20
5 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
View File

@@ -42,7 +42,6 @@ import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
import org.bandit.ia.IAContext;
import org.bandit.util.config.Realm;
import org.apache.log4j.Logger;
@@ -716,7 +715,8 @@ public final class CasaIdentityToken implements IdentityToken
env.put(Realm.REALM_CONFIG_LOCATION, svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
env.put(Realm.REALM_SELECTOR, sourceName);
while (true)
int retries = 3;
while (retries != 0)
{
// Instantiate DirContext watching for an exception since it
// would be an indication that we should not retry the
@@ -801,6 +801,7 @@ public final class CasaIdentityToken implements IdentityToken
m_log.warn("initialize()- ServiceUnavailable exception caught looking up attributes, msg = " + e.getMessage());
// Retry the operation
retries --;
continue;
}

5
CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/Krb5Authenticate.java
View File

@@ -43,7 +43,6 @@ import org.ietf.jgss.GSSManager;
import org.ietf.jgss.GSSName;
import org.ietf.jgss.Oid;
import org.bandit.ia.IAContext;
import org.bandit.util.config.Realm;
import org.apache.log4j.Logger;
@@ -213,7 +212,8 @@ public final class Krb5Authenticate implements AuthMechanism, Serializable
env.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
env.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());
while (true)
int retries = 3;
while (retries != 0)
{
// Instantiate DirContext watching for an exception since it
// would be an indication that we should not retry the
@@ -305,6 +305,7 @@ public final class Krb5Authenticate implements AuthMechanism, Serializable
m_log.warn("invoke()- ServiceUnavailable exception caught looking up attributes, msg = " + e.getMessage());
// Retry the operation
retries --;
continue;
}

5
CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/PwdAuthenticate.java
View File

@@ -39,7 +39,6 @@ import javax.naming.directory.SearchControls;
import javax.naming.NamingException;
import javax.naming.ServiceUnavailableException;
import org.bandit.ia.IAContext;
import org.bandit.util.config.Realm;
import org.apache.log4j.Logger;
@@ -188,7 +187,8 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable
env.put(Realm.REALM_CONFIG_LOCATION, m_svcConfig.getSetting(SvcConfig.IdentityAbstractionConfigFile));
env.put(Realm.REALM_SELECTOR, authReqMsg.getRealm());
while (true)
int retries = 3;
while (retries != 0)
{
// Instantiate DirContext watching for an exception since it
// would be an indication that we should not retry the
@@ -300,6 +300,7 @@ public final class PwdAuthenticate implements AuthMechanism, Serializable
m_log.warn("invoke()- ServiceUnavailable exception caught looking up attributes, msg = " + e.getMessage());
// Retry the operation
retries --;
continue;
}

8
CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/RealmsInfo.java
View File

@@ -28,13 +28,11 @@ import org.bandit.util.config.gen.*;
import javax.naming.Context;
import javax.naming.NamingEnumeration;
import javax.naming.CommunicationException;
import javax.naming.ServiceUnavailableException;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
import javax.naming.directory.Attributes;
import org.bandit.ia.IAContext;
import org.bandit.util.config.Realm;
import org.apache.log4j.Logger;
@@ -137,7 +135,7 @@ public class RealmsInfo
else if (env[iii].getProp().equalsIgnoreCase("com.novell.casa.authtoksvc.directory_type"))
{
// We are dealing with a directory type, decode it and record the result.
String realmDirectoryType = env[iii].getValue();;
String realmDirectoryType = env[iii].getValue();
if (realmDirectoryType.equalsIgnoreCase("eDir"))
{
realmInfo.m_keyValueMap.put(RealmType, eDirectoryRealm);
@@ -184,7 +182,8 @@ public class RealmsInfo
env.put(Realm.REALM_CONFIG_LOCATION, realmConfigFilePath);
env.put(Realm.REALM_SELECTOR, realm.getId());
while (true)
int retries = 3;
while (retries != 0)
{
// Instantiate DirContext watching for an exception since it
// would be an indication that we should not retry the
@@ -224,6 +223,7 @@ public class RealmsInfo
m_log.warn("Constructor()- ServiceUnavailable exception caught looking up attributes, msg = " + e.getMessage());
// Retry the operation
retries --;
continue;
}
catch (Exception e)