Author: ammulder Date: Tue Nov 16 15:00:59 2004 New Revision: 76050 Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DecouplingCallbackHandler.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginCoordinator.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleConfiguration.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginService.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginServiceMBean.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleConfiguration.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlag.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlagEditor.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginUtils.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java Log: Add license, javadoc, versions, etc. Turn off the timeout tests in LoginSQLTest since they're now handled in a separate timeout test.
Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DecouplingCallbackHandler.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DecouplingCallbackHandler.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/DecouplingCallbackHandler.java Tue Nov 16 15:00:59 2004 @@ -1,3 +1,19 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.geronimo.security.jaas; import javax.security.auth.callback.CallbackHandler; @@ -12,6 +28,8 @@ * the module wants and prompt the user in advance, and then turn around * and pass those values to the login module, instead of actually prompting * the user at the mercy of the login module. + * + * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ */ public class DecouplingCallbackHandler implements CallbackHandler { private Callback[] source; @@ -35,11 +53,20 @@ } } + + /** + * While we're exploring, we'll discover new callbacks that the server + * login module wants. While not exploring, we'll actually set + * values for the server callbacks. + */ public void setExploring() { exploring = true; source = null; } + /** + * Indicates that the exploring phase is over. + */ public Callback[] finalizeCallbackList() { exploring = false; return source; Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginCoordinator.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginCoordinator.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginCoordinator.java Tue Nov 16 15:00:59 2004 @@ -1,3 +1,19 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.geronimo.security.jaas; import org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingClient; @@ -23,7 +39,7 @@ * case the client/server distinction is somewhat less important, and the * communication is optimized by avoiding network traffic. * - * @version $Revision: 1.0$ + * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ */ public class JaasLoginCoordinator implements LoginModule { public final static String OPTION_HOST = "host"; Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleConfiguration.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleConfiguration.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleConfiguration.java Tue Nov 16 15:00:59 2004 @@ -1,3 +1,19 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.geronimo.security.jaas; import org.apache.geronimo.common.GeronimoSecurityException; @@ -11,7 +27,7 @@ * flag, options, and the Geronimo extension for whether it should run on * the client side or server side. * - * @version $Revision: 1.0$ + * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ */ public class JaasLoginModuleConfiguration implements Serializable { private boolean serverSide; Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginService.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginService.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginService.java Tue Nov 16 15:00:59 2004 @@ -1,3 +1,19 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.geronimo.security.jaas; import org.apache.geronimo.gbean.*; @@ -31,7 +47,7 @@ * this service, or use a LoginModule implementation that interacts with this * service. * - * @version $Revision: 1.0$ + * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ */ public class JaasLoginService implements GBeanLifecycle, JaasLoginServiceMBean { public static final ObjectName OBJECT_NAME = JMXUtil.getObjectName("geronimo.security:type=JaasLoginService"); Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginServiceMBean.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginServiceMBean.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginServiceMBean.java Tue Nov 16 15:00:59 2004 @@ -1,3 +1,19 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.geronimo.security.jaas; import org.apache.geronimo.common.GeronimoSecurityException; @@ -9,9 +25,10 @@ import java.util.Collection; /** - * + * Interface used to connect to the JaasLoginService via remoting, etc. This + * may no longer be necessary? * - * @version $Revision: 1.0$ + * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ */ public interface JaasLoginServiceMBean { /** Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/JaasSecurityContext.java Tue Nov 16 15:00:59 2004 @@ -1,3 +1,19 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.geronimo.security.jaas; import org.apache.geronimo.security.RealmPrincipal; @@ -11,7 +27,7 @@ * Tracks security information about a single user. This is used before, * during, and after the login. * - * @version $Revision: 1.0$ + * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ */ public class JaasSecurityContext { private String realmName; Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleConfiguration.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleConfiguration.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleConfiguration.java Tue Nov 16 15:00:59 2004 @@ -1,11 +1,27 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.geronimo.security.jaas; import javax.security.auth.spi.LoginModule; /** + * Helper class that stores a login module with its associated control flag. * - * - * @version $Revision 1.0 $ + * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ */ public class LoginModuleConfiguration { private LoginModule module; Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlag.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlag.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlag.java Tue Nov 16 15:00:59 2004 @@ -23,6 +23,7 @@ /** + * A wrapper for the JAAS login module control flag that is Serializable. * * @version $Rev$ $Date$ */ Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlagEditor.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlagEditor.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleControlFlagEditor.java Tue Nov 16 15:00:59 2004 @@ -22,6 +22,8 @@ /** + * A property editor for login module flags. This is used by GBeans when flags + * are specified in config files. * * @version $Rev$ $Date$ */ Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginUtils.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginUtils.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/jaas/LoginUtils.java Tue Nov 16 15:00:59 2004 @@ -1,11 +1,28 @@ +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.geronimo.security.jaas; import javax.security.auth.login.LoginException; /** + * Helper class the computes the login result across a number of separate + * login modules. * - * - * @version $Revision 1.0 $ + * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ */ public class LoginUtils { public static boolean computeLogin(LoginModuleConfiguration[] modules) throws LoginException { Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java Tue Nov 16 15:00:59 2004 @@ -29,6 +29,8 @@ /** + * A client-side utility that connects to a remote login service. + * * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ */ public class JaasLoginServiceRemotingClient { Modified: geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java ============================================================================== --- geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java (original) +++ geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingServer.java Tue Nov 16 15:00:59 2004 @@ -38,6 +38,10 @@ /** + * A server-side utility that exposes a JaasLoginService to remote clients. + * It prevents clients from connecting to arbitrary server-side MBeans through + * this listener -- only the JaasLoginService is exposed. + * * @version $Rev: 56022 $ $Date: 2004-10-30 01:16:18 -0400 (Sat, 30 Oct 2004) $ */ public class JaasLoginServiceRemotingServer implements GBeanLifecycle, JMXTarget { Modified: geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java ============================================================================== --- geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java (original) +++ geronimo/trunk/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java Tue Nov 16 15:00:59 2004 @@ -127,7 +127,7 @@ context.logout(); } - +/* public void testLogoutTimeout() throws Exception { assertEquals(new Integer(State.RUNNING_INDEX), kernel.getAttribute(sqlRealm, "state")); @@ -188,11 +188,9 @@ context.login(); context.logout(); - /** - * Waiting this long should cause the login module w/ an artificially - * low age limit to expire. The next call to login should automatically - * create a new one. - */ + // Waiting this long should cause the login module w/ an artificially + // low age limit to expire. The next call to login should automatically + // create a new one. Thread.sleep(4 * 1000); context.login(); @@ -208,4 +206,5 @@ context.logout(); } + */ }
