Author: david.lloyd(a)jboss.com
Date: 2008-02-21 10:15:06 -0500 (Thu, 21 Feb 2008)
New Revision: 3462
Modified:
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java
remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpSaslServerFactoryImpl.java
Log:
Default the client to SRP if no mechanism is selected.
Modified:
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java
===================================================================
---
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-02-21
05:25:03 UTC (rev 3461)
+++
remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-02-21
15:15:06 UTC (rev 3462)
@@ -11,6 +11,7 @@
import java.util.Enumeration;
import java.util.LinkedHashSet;
import java.util.HashSet;
+import java.util.Collections;
import java.util.concurrent.Executor;
import org.apache.mina.common.AttributeKey;
import org.apache.mina.common.IdleStatus;
@@ -181,15 +182,7 @@
if (list != null) {
return list.toArray(new String[list.size()]);
}
- final Set<String> mechanisms = new LinkedHashSet<String>();
- final Enumeration<javax.security.sasl.SaslClientFactory> e =
Sasl.getSaslClientFactories();
- while (e.hasMoreElements()) {
- final javax.security.sasl.SaslClientFactory clientFactory = e.nextElement();
- for (String name : clientFactory.getMechanismNames(saslProps)) {
- mechanisms.add(name);
- }
- }
- return mechanisms.toArray(new String[mechanisms.size()]);
+ return new String[] { "SRP" };
}
private Map<String, ?> getSaslProperties(final AttributeMap attributeMap) {
@@ -746,7 +739,7 @@
try {
saslClientFilter.handleSaslChallenge(ioSession, bytes);
} catch (SaslException ex) {
- log.debug("Failed to handle challenge from server;
reset and try again");
+ log.debug("Failed to handle challenge from server
(%s). Sending new auth request.", ex.getMessage());
// todo - retry counter - JBREM-907
sendAuthRequest();
}
Modified:
remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpSaslServerFactoryImpl.java
===================================================================
---
remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpSaslServerFactoryImpl.java 2008-02-21
05:25:03 UTC (rev 3461)
+++
remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpSaslServerFactoryImpl.java 2008-02-21
15:15:06 UTC (rev 3462)
@@ -16,6 +16,6 @@
}
public String[] getMechanismNames(Map<String, ?> props) {
- return new String[0];
+ return new String[] { "SRP" };
}
}