You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2007/08/14 17:21:53 UTC
svn commit: r565810 - in /geronimo/server/trunk:
modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/
modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/
modules/geronimo-openjpa/ modules/ge...
Author: kevan
Date: Tue Aug 14 08:21:52 2007
New Revision: 565810
URL: http://svn.apache.org/viewvc?view=rev&rev=565810
Log:
GERONIMO-3407 revert unintended changes
Removed:
geronimo/server/trunk/modules/geronimo-openjpa/
Modified:
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java
geronimo/server/trunk/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/UPCredentialLoginModule.java
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestLoginModule.java
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java?view=diff&rev=565810&r1=565809&r2=565810
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/CallerIdentityPasswordCredentialLoginModule.java Tue Aug 14 08:21:52 2007
@@ -81,13 +81,10 @@
resourcePrincipalName = ((NameCallback) callbacks[0]).getName();
userName = ((NameCallback) callbacks[0]).getName();
password = ((PasswordCallback) callbacks[1]).getPassword();
- return false;
+ return resourcePrincipalName != null && userName != null && password != null;
}
public boolean commit() throws LoginException {
- if (resourcePrincipalName == null || userName == null || password == null) {
- return false;
- }
subject.getPrincipals().add(new ResourcePrincipal(resourcePrincipalName));
PasswordCredential passwordCredential = new PasswordCredential(userName, password);
passwordCredential.setManagedConnectionFactory(managedConnectionFactory);
Modified: geronimo/server/trunk/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java?view=diff&rev=565810&r1=565809&r2=565810
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java Tue Aug 14 08:21:52 2007
@@ -112,10 +112,7 @@
if (password == null) {
throw new FailedLoginException();
}
- if (password.equals(new String(passwordCallback.getPassword()))) {
- return true;
- }
- throw new FailedLoginException();
+ return password.equals(new String(passwordCallback.getPassword()));
} catch (java.io.IOException e) {
throw new FailedLoginException();
} catch (UnsupportedCallbackException e) {
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/UPCredentialLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/UPCredentialLoginModule.java?view=diff&rev=565810&r1=565809&r2=565810
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/UPCredentialLoginModule.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/UPCredentialLoginModule.java Tue Aug 14 08:21:52 2007
@@ -72,7 +72,7 @@
String username = ((NameCallback) callbacks[0]).getName();
char[] password = ((PasswordCallback) callbacks[1]).getPassword();
- if (username == null || password == null) return false;
+ if (username == null || password == null) return true;
upCredential = new UsernamePasswordCredential(username, password);
Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestLoginModule.java?view=diff&rev=565810&r1=565809&r2=565810
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestLoginModule.java (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestLoginModule.java Tue Aug 14 08:21:52 2007
@@ -69,10 +69,7 @@
}
user = ((NameCallback)callbacks[0]).getName();
String password = new String(((PasswordCallback)callbacks[1]).getPassword());
- if (user.equals(password) && users.contains(user)) {
- return true;
- }
- throw new LoginException();
+ return user.equals(password) && users.contains(user);
}
public boolean commit() throws LoginException {