Author: erodriguez Date: Fri Jan 14 08:38:45 2005 New Revision: 125182 URL: http://svn.apache.org/viewcvs?view=rev&rev=125182 Log: Refactoring and cleanup. Added: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ - copied from r125171, incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/service/ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/service/ChangePasswordServiceImpl.java Removed: incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/ Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordDispatcher.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordErrorService.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordException.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordService.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordDataDecoder.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordErrorEncoder.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordReplyEncoder.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordRequestDecoder.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/AbstractPasswordMessage.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/AbstractPasswordMessageModifier.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordError.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordErrorModifier.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordReply.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordReplyModifier.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordRequest.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordRequestModifier.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/EmbeddedEveStore.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/LdapPasswordStore.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStore.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStoreEntry.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStoreEntryModifier.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/value/ChangePasswordData.java incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/value/ChangePasswordDataModifier.java
Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordDispatcher.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordDispatcher.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/ChangePasswordDispatcher.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordDispatcher.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/ChangePasswordDispatcher.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordDispatcher.java Fri Jan 14 08:38:45 2005 @@ -14,21 +14,16 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw; -import org.apache.kerberos.changepw.io.ChangePasswordErrorEncoder; -import org.apache.kerberos.changepw.io.ChangePasswordReplyEncoder; -import org.apache.kerberos.changepw.io.ChangePasswordRequestDecoder; -import org.apache.kerberos.changepw.messages.ChangePasswordError; -import org.apache.kerberos.changepw.messages.ChangePasswordReply; -import org.apache.kerberos.changepw.messages.ChangePasswordRequest; -import org.apache.kerberos.changepw.store.PasswordStore; +package org.apache.changepw; + +import java.io.IOException; + import org.apache.kerberos.kdc.KdcConfiguration; import org.apache.kerberos.kdc.KerberosException; import org.apache.kerberos.kdc.store.BootstrapStore; import org.apache.kerberos.kdc.store.PrincipalStore; -import java.io.IOException; public class ChangePasswordDispatcher { Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordErrorService.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordErrorService.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/ChangePasswordErrorService.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordErrorService.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/ChangePasswordErrorService.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordErrorService.java Fri Jan 14 08:38:45 2005 @@ -14,12 +14,13 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw; +package org.apache.changepw; -import org.apache.kerberos.changepw.messages.*; -import org.apache.kerberos.kdc.*; -import org.apache.kerberos.messages.*; -import org.apache.kerberos.messages.value.*; +import org.apache.kerberos.kdc.KdcConfiguration; +import org.apache.kerberos.kdc.KerberosException; +import org.apache.kerberos.messages.ErrorMessage; +import org.apache.kerberos.messages.ErrorMessageModifier; +import org.apache.kerberos.messages.value.KerberosTime; public class ChangePasswordErrorService { Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordException.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordException.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/ChangePasswordException.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordException.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/ChangePasswordException.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordException.java Fri Jan 14 08:38:45 2005 @@ -14,31 +14,33 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw; -import org.apache.kerberos.kdc.*; +package org.apache.changepw; -public class ChangePasswordException extends KerberosException { +import org.apache.kerberos.kdc.KerberosException; - public static final ChangePasswordException KRB5_KPASSWD_MALFORMED = new ChangePasswordException(1, - "Request failed due to being malformed."); - public static final ChangePasswordException KRB5_KPASSWD_HARDERROR = new ChangePasswordException(2, - "Request failed due to a hard error in processing the request."); - public static final ChangePasswordException KRB5_KPASSWD_AUTHERROR = new ChangePasswordException(3, - "Request failed due to an error in authentication processing."); - public static final ChangePasswordException KRB5_KPASSWD_SOFTERROR = new ChangePasswordException(4, - "Request failed due to a soft error in processing the request."); - public static final ChangePasswordException KRB5_KPASSWD_ACCESSDENIED = new ChangePasswordException(5, - "Requestor not authorized."); - public static final ChangePasswordException KRB5_KPASSWD_BAD_VERSION = new ChangePasswordException(6, - "Protocol version unsupported."); - public static final ChangePasswordException KRB5_KPASSWD_INITIAL_FLAG_NEEDED = new ChangePasswordException(7, - "Initial flag required."); - public static final ChangePasswordException KRB5_KPASSWD_UNKNOWN_ERROR = new ChangePasswordException(8, - "Request failed for an unknown reason."); +public class ChangePasswordException extends KerberosException +{ + public static final ChangePasswordException KRB5_KPASSWD_MALFORMED = new ChangePasswordException( 1, + "Request failed due to being malformed." ); + public static final ChangePasswordException KRB5_KPASSWD_HARDERROR = new ChangePasswordException( 2, + "Request failed due to a hard error in processing the request." ); + public static final ChangePasswordException KRB5_KPASSWD_AUTHERROR = new ChangePasswordException( 3, + "Request failed due to an error in authentication processing." ); + public static final ChangePasswordException KRB5_KPASSWD_SOFTERROR = new ChangePasswordException( 4, + "Request failed due to a soft error in processing the request." ); + public static final ChangePasswordException KRB5_KPASSWD_ACCESSDENIED = new ChangePasswordException( 5, + "Requestor not authorized." ); + public static final ChangePasswordException KRB5_KPASSWD_BAD_VERSION = new ChangePasswordException( 6, + "Protocol version unsupported." ); + public static final ChangePasswordException KRB5_KPASSWD_INITIAL_FLAG_NEEDED = new ChangePasswordException( 7, + "Initial flag required." ); + public static final ChangePasswordException KRB5_KPASSWD_UNKNOWN_ERROR = new ChangePasswordException( 8, + "Request failed for an unknown reason." ); - protected ChangePasswordException(int ordinal, String name) { - super(ordinal, name); + protected ChangePasswordException(int ordinal, String name) + { + super( ordinal, name ); } } Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordService.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordService.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/ChangePasswordService.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordService.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/ChangePasswordService.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordService.java Fri Jan 14 08:38:45 2005 @@ -14,15 +14,15 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw; -import org.apache.kerberos.changepw.io.ChangePasswordDataDecoder; -import org.apache.kerberos.changepw.messages.ChangePasswordReply; -import org.apache.kerberos.changepw.messages.ChangePasswordReplyModifier; -import org.apache.kerberos.changepw.messages.ChangePasswordRequest; -import org.apache.kerberos.changepw.store.PasswordStore; -import org.apache.kerberos.changepw.value.ChangePasswordData; -import org.apache.kerberos.changepw.value.ChangePasswordDataModifier; +package org.apache.changepw; + +import java.io.IOException; +import java.net.InetAddress; + +import javax.security.auth.kerberos.KerberosKey; +import javax.security.auth.kerberos.KerberosPrincipal; + import org.apache.kerberos.crypto.encryption.EncryptionEngine; import org.apache.kerberos.io.decoder.EncKrbPrivPartDecoder; import org.apache.kerberos.io.encoder.EncApRepPartEncoder; @@ -34,15 +34,15 @@ import org.apache.kerberos.messages.ApplicationRequest; import org.apache.kerberos.messages.application.ApplicationReply; import org.apache.kerberos.messages.application.PrivateMessage; -import org.apache.kerberos.messages.components.*; +import org.apache.kerberos.messages.components.Authenticator; +import org.apache.kerberos.messages.components.EncApRepPart; +import org.apache.kerberos.messages.components.EncApRepPartModifier; +import org.apache.kerberos.messages.components.EncKrbPrivPart; +import org.apache.kerberos.messages.components.EncKrbPrivPartModifier; +import org.apache.kerberos.messages.components.Ticket; import org.apache.kerberos.messages.value.EncryptedData; import org.apache.kerberos.messages.value.EncryptionKey; import org.apache.kerberos.messages.value.HostAddress; - -import javax.security.auth.kerberos.KerberosKey; -import javax.security.auth.kerberos.KerberosPrincipal; -import java.io.IOException; -import java.net.InetAddress; /** * Kerberos Change Password and Set Password Protocols (RFC 3244) Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordDataDecoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordDataDecoder.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/io/ChangePasswordDataDecoder.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordDataDecoder.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/io/ChangePasswordDataDecoder.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordDataDecoder.java Fri Jan 14 08:38:45 2005 @@ -14,14 +14,19 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.io; +package org.apache.changepw.io; -import org.apache.kerberos.changepw.value.*; -import org.apache.kerberos.io.decoder.*; -import org.bouncycastle.asn1.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Enumeration; -import java.io.*; -import java.util.*; +import org.apache.kerberos.io.decoder.KerberosMessageDecoder; +import org.bouncycastle.asn1.ASN1InputStream; +import org.bouncycastle.asn1.DERGeneralString; +import org.bouncycastle.asn1.DERObject; +import org.bouncycastle.asn1.DEROctetString; +import org.bouncycastle.asn1.DERSequence; +import org.bouncycastle.asn1.DERTaggedObject; public class ChangePasswordDataDecoder extends KerberosMessageDecoder { Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordErrorEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordErrorEncoder.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/io/ChangePasswordErrorEncoder.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordErrorEncoder.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/io/ChangePasswordErrorEncoder.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordErrorEncoder.java Fri Jan 14 08:38:45 2005 @@ -14,14 +14,13 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.io; +package org.apache.changepw.io; -import org.apache.kerberos.changepw.messages.*; -import org.apache.kerberos.io.encoder.*; -import org.apache.kerberos.messages.*; +import java.io.IOException; +import java.nio.ByteBuffer; -import java.io.*; -import java.nio.*; +import org.apache.kerberos.io.encoder.ErrorMessageEncoder; +import org.apache.kerberos.messages.ErrorMessage; public class ChangePasswordErrorEncoder { Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordReplyEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordReplyEncoder.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/io/ChangePasswordReplyEncoder.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordReplyEncoder.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/io/ChangePasswordReplyEncoder.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordReplyEncoder.java Fri Jan 14 08:38:45 2005 @@ -14,14 +14,15 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.io; +package org.apache.changepw.io; -import org.apache.kerberos.changepw.messages.*; -import org.apache.kerberos.io.encoder.*; -import org.apache.kerberos.messages.application.*; +import java.io.IOException; +import java.nio.ByteBuffer; -import java.io.*; -import java.nio.*; +import org.apache.kerberos.io.encoder.ApplicationReplyEncoder; +import org.apache.kerberos.io.encoder.PrivateMessageEncoder; +import org.apache.kerberos.messages.application.ApplicationReply; +import org.apache.kerberos.messages.application.PrivateMessage; public class ChangePasswordReplyEncoder { Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordRequestDecoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordRequestDecoder.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/io/ChangePasswordRequestDecoder.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordRequestDecoder.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/io/ChangePasswordRequestDecoder.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/io/ChangePasswordRequestDecoder.java Fri Jan 14 08:38:45 2005 @@ -14,15 +14,16 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.io; +package org.apache.changepw.io; -import org.apache.kerberos.changepw.messages.*; -import org.apache.kerberos.io.decoder.*; -import org.apache.kerberos.messages.*; -import org.apache.kerberos.messages.application.*; +import java.io.IOException; +import java.nio.ByteBuffer; -import java.io.*; -import java.nio.*; +import org.apache.kerberos.io.decoder.ApplicationRequestDecoder; +import org.apache.kerberos.io.decoder.KerberosMessageDecoder; +import org.apache.kerberos.io.decoder.PrivateMessageDecoder; +import org.apache.kerberos.messages.ApplicationRequest; +import org.apache.kerberos.messages.application.PrivateMessage; public class ChangePasswordRequestDecoder extends KerberosMessageDecoder { Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/AbstractPasswordMessage.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/AbstractPasswordMessage.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/AbstractPasswordMessage.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/AbstractPasswordMessage.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/AbstractPasswordMessage.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/AbstractPasswordMessage.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.messages; +package org.apache.changepw.messages; abstract public class AbstractPasswordMessage { Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/AbstractPasswordMessageModifier.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/AbstractPasswordMessageModifier.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/AbstractPasswordMessageModifier.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/AbstractPasswordMessageModifier.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/AbstractPasswordMessageModifier.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/AbstractPasswordMessageModifier.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.messages; +package org.apache.changepw.messages; abstract public class AbstractPasswordMessageModifier { Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordError.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordError.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordError.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordError.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordError.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordError.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.messages; +package org.apache.changepw.messages; import org.apache.kerberos.messages.*; Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordErrorModifier.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordErrorModifier.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordErrorModifier.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordErrorModifier.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordErrorModifier.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordErrorModifier.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.messages; +package org.apache.changepw.messages; import org.apache.kerberos.messages.*; Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordReply.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordReply.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordReply.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordReply.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordReply.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordReply.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.messages; +package org.apache.changepw.messages; import org.apache.kerberos.messages.application.*; Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordReplyModifier.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordReplyModifier.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordReplyModifier.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordReplyModifier.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordReplyModifier.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordReplyModifier.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.messages; +package org.apache.changepw.messages; import org.apache.kerberos.messages.application.*; Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordRequest.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordRequest.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordRequest.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordRequest.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordRequest.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordRequest.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.messages; +package org.apache.changepw.messages; import org.apache.kerberos.messages.*; import org.apache.kerberos.messages.application.*; Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordRequestModifier.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordRequestModifier.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordRequestModifier.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordRequestModifier.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/messages/ChangePasswordRequestModifier.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/messages/ChangePasswordRequestModifier.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.messages; +package org.apache.changepw.messages; import org.apache.kerberos.messages.*; import org.apache.kerberos.messages.application.*; Added: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/service/ChangePasswordServiceImpl.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/service/ChangePasswordServiceImpl.java?view=auto&rev=125182 ============================================================================== --- (empty file) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/service/ChangePasswordServiceImpl.java Fri Jan 14 08:38:45 2005 @@ -0,0 +1,25 @@ +/* + * Copyright 2005 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.changepw.service; + + +public class ChangePasswordServiceImpl implements ChangePasswordService +{ + +} + Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/EmbeddedEveStore.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/EmbeddedEveStore.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/store/EmbeddedEveStore.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/EmbeddedEveStore.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/store/EmbeddedEveStore.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/EmbeddedEveStore.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,8 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.store; + +package org.apache.changepw.store; import java.io.File; Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/LdapPasswordStore.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/LdapPasswordStore.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/store/LdapPasswordStore.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/LdapPasswordStore.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/store/LdapPasswordStore.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/LdapPasswordStore.java Fri Jan 14 08:38:45 2005 @@ -14,26 +14,34 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.store; -import org.apache.kerberos.kdc.KdcConfiguration; -import org.apache.kerberos.kdc.jaas.KdcLoginConfiguration; -import org.apache.kerberos.kdc.store.BootstrapStore; -import org.apache.kerberos.messages.value.EncryptionKey; +package org.apache.changepw.store; + +import java.security.PrivilegedAction; import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import javax.naming.directory.*; +import javax.naming.directory.Attributes; +import javax.naming.directory.BasicAttribute; +import javax.naming.directory.BasicAttributes; +import javax.naming.directory.DirContext; +import javax.naming.directory.InitialDirContext; +import javax.naming.directory.ModificationItem; +import javax.naming.directory.SearchResult; import javax.security.auth.Subject; import javax.security.auth.kerberos.KerberosKey; import javax.security.auth.kerberos.KerberosPrincipal; import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import java.security.PrivilegedAction; -public class LdapPasswordStore implements PasswordStore { - +import org.apache.kerberos.kdc.KdcConfiguration; +import org.apache.kerberos.kdc.jaas.KdcLoginConfiguration; +import org.apache.kerberos.kdc.store.BootstrapStore; +import org.apache.kerberos.messages.value.EncryptionKey; + +public class LdapPasswordStore implements PasswordStore +{ public static final String PRINCIPAL_NAME = "krb5PrincipalName"; public static final String KEY_VERSION_NUMBER = "krb5KeyVersionNumber"; public static final String MAX_LIFE = "krb5MaxLife"; @@ -51,13 +59,14 @@ private BootstrapStore _bootstrap; private Subject _subject; - public LdapPasswordStore(KdcConfiguration config, BootstrapStore bootstrap) { + public LdapPasswordStore( KdcConfiguration config, BootstrapStore bootstrap ) + { _config = config; _bootstrap = bootstrap; } - public void init() { - + public void init() + { _subject = new Subject(); KerberosPrincipal principal = _config.getChangepwPrincipal(); @@ -69,43 +78,50 @@ _subject.getPrincipals().add(principal); _subject.getPrivateCredentials().add(key); - Configuration.setConfiguration(new KdcLoginConfiguration()); + Configuration.setConfiguration( new KdcLoginConfiguration() ); LoginContext lc = null; - try { - lc = new LoginContext(LdapPasswordStore.class.getName(), _subject); + try + { + lc = new LoginContext( LdapPasswordStore.class.getName(), _subject ); lc.login(); - } catch (LoginException le) { - System.err.println("Authentication attempt failed" + le); + } + catch (LoginException le) + { + System.err.println( "Authentication attempt failed" + le ); } } - public String changePassword(KerberosPrincipal principal, byte[] newKey) { + public String changePassword(KerberosPrincipal principal, byte[] newKey) + { return (String)Subject.doAs(_subject, new JaasLdapLookupAction(_config, principal, newKey)); } } -class JaasLdapLookupAction implements PrivilegedAction { - +class JaasLdapLookupAction implements PrivilegedAction +{ private KdcConfiguration _config; private KerberosPrincipal _principal; private byte[] _newKey; private String _name; - public JaasLdapLookupAction(KdcConfiguration config, KerberosPrincipal principal, byte[] newKey) { + public JaasLdapLookupAction(KdcConfiguration config, KerberosPrincipal principal, byte[] newKey) + { _config = config; _principal = principal; _newKey = newKey; } - public Object run() { + public Object run() + { performJndiOperation(); return _name; } - private void performJndiOperation() { - - try { + private void performJndiOperation() + { + try + { DirContext ctx = new InitialDirContext(_config.getProperties()); search(ctx); @@ -116,14 +132,16 @@ ctx.modifyAttributes(_name, mods); ctx.close(); - } catch (NamingException e) { + } + catch (NamingException e) + { _name = null; e.printStackTrace(); } } - private void search(DirContext ctx) throws NamingException { - + private void search(DirContext ctx) throws NamingException + { String[] attrIDs = {LdapPasswordStore.PRINCIPAL_NAME, LdapPasswordStore.KEY_VERSION_NUMBER, LdapPasswordStore.ENCRYPTION_TYPE, LdapPasswordStore.KEY}; @@ -136,9 +154,11 @@ // Search for objects that have those matching attributes NamingEnumeration answer = ctx.search("", matchAttrs, attrIDs); - if (answer.hasMore()) { + if (answer.hasMore()) + { SearchResult sr = (SearchResult) answer.next(); - if (sr != null) { + if (sr != null) + { _name = sr.getName(); } } Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStore.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStore.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/store/PasswordStore.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStore.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/store/PasswordStore.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStore.java Fri Jan 14 08:38:45 2005 @@ -14,12 +14,14 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.store; -import javax.security.auth.kerberos.*; +package org.apache.changepw.store; -public interface PasswordStore { +import javax.security.auth.kerberos.KerberosPrincipal; + +public interface PasswordStore +{ public void init(); - public String changePassword(KerberosPrincipal principal, byte[] key); + public String changePassword( KerberosPrincipal principal, byte[] key ); } Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStoreEntry.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStoreEntry.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/store/PasswordStoreEntry.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStoreEntry.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/store/PasswordStoreEntry.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStoreEntry.java Fri Jan 14 08:38:45 2005 @@ -14,15 +14,17 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.store; -import org.apache.kerberos.crypto.encryption.*; -import org.apache.kerberos.messages.value.*; +package org.apache.changepw.store; -import javax.security.auth.kerberos.*; +import javax.security.auth.kerberos.KerberosPrincipal; -public class PasswordStoreEntry { - +import org.apache.kerberos.crypto.encryption.EncryptionType; +import org.apache.kerberos.messages.value.EncryptionKey; +import org.apache.kerberos.messages.value.KerberosTime; + +public class PasswordStoreEntry +{ // 'Principal' private String _commonName; private KerberosPrincipal _principal; @@ -41,8 +43,8 @@ PasswordStoreEntry(String commonName, KerberosPrincipal principal, int keyVersionNumber, KerberosTime validStart, KerberosTime validEnd, KerberosTime passwordEnd, int maxLife, int maxRenew, int kdcFlags, - int keyType, byte[] key, String realmName) { - + int keyType, byte[] key, String realmName) + { _commonName = commonName; _principal = principal; _validStart = validStart; @@ -56,34 +58,53 @@ _key = new EncryptionKey(EncryptionType.getTypeByOrdinal(keyType), key, keyVersionNumber); } - public String getCommonName() { + public String getCommonName() + { return _commonName; } - public EncryptionKey getEncryptionKey() { + + public EncryptionKey getEncryptionKey() + { return _key; } - public int getKDCFlags() { + + public int getKDCFlags() + { return _kdcFlags; } - public int getMaxLife() { + + public int getMaxLife() + { return _maxLife; } - public int getMaxRenew() { + + public int getMaxRenew() + { return _maxRenew; } - public KerberosTime getPasswordEnd() { + + public KerberosTime getPasswordEnd() + { return _passwordEnd; } - public KerberosPrincipal getPrincipal() { + + public KerberosPrincipal getPrincipal() + { return _principal; } - public String getRealmName() { + + public String getRealmName() + { return _realmName; } - public KerberosTime getValidEnd() { + + public KerberosTime getValidEnd() + { return _validEnd; } - public KerberosTime getValidStart() { + + public KerberosTime getValidStart() + { return _validStart; } } Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStoreEntryModifier.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStoreEntryModifier.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/store/PasswordStoreEntryModifier.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStoreEntryModifier.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/store/PasswordStoreEntryModifier.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/store/PasswordStoreEntryModifier.java Fri Jan 14 08:38:45 2005 @@ -14,14 +14,15 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.store; -import org.apache.kerberos.messages.value.*; +package org.apache.changepw.store; -import javax.security.auth.kerberos.*; +import javax.security.auth.kerberos.KerberosPrincipal; -public class PasswordStoreEntryModifier { - +import org.apache.kerberos.messages.value.KerberosTime; + +public class PasswordStoreEntryModifier +{ // 'Principal' private String _commonName; private KerberosPrincipal _principal; @@ -40,46 +41,70 @@ private String _realmName; - public PasswordStoreEntry getEntry() { + public PasswordStoreEntry getEntry() + { return new PasswordStoreEntry(_commonName, _principal, _keyVersionNumber, _validStart, _validEnd, _passwordEnd, _maxLife, _maxRenew, _kdcFlags, _encryptionType, _key, _realmName); } - public void setCommonName(String commonName) { + public void setCommonName(String commonName) + { _commonName = commonName; } - public void setEncryptionType(int encryptionType) { + + public void setEncryptionType(int encryptionType) + { _encryptionType = encryptionType; } - public void setKDCFlags(int kdcFlags) { + + public void setKDCFlags(int kdcFlags) + { _kdcFlags = kdcFlags; } - public void setKey(byte[] key) { + + public void setKey(byte[] key) + { _key = key; } - public void setKeyVersionNumber(int keyVersionNumber) { + + public void setKeyVersionNumber(int keyVersionNumber) + { _keyVersionNumber = keyVersionNumber; } - public void setMaxLife(int maxLife) { + + public void setMaxLife(int maxLife) + { _maxLife = maxLife; } - public void setMaxRenew(int maxRenew) { + + public void setMaxRenew(int maxRenew) + { _maxRenew = maxRenew; } - public void setPasswordEnd(KerberosTime passwordEnd) { + + public void setPasswordEnd(KerberosTime passwordEnd) + { _passwordEnd = passwordEnd; } - public void setPrincipal(KerberosPrincipal principal) { + + public void setPrincipal(KerberosPrincipal principal) + { _principal = principal; } - public void setRealmName(String realmName) { + + public void setRealmName(String realmName) + { _realmName = realmName; } - public void setValidEnd(KerberosTime validEnd) { + + public void setValidEnd(KerberosTime validEnd) + { _validEnd = validEnd; } - public void setValidStart(KerberosTime validStart) { + + public void setValidStart(KerberosTime validStart) + { _validStart = validStart; } } Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/value/ChangePasswordData.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/value/ChangePasswordData.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/value/ChangePasswordData.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/value/ChangePasswordData.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/value/ChangePasswordData.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/value/ChangePasswordData.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.value; +package org.apache.changepw.value; import org.apache.kerberos.messages.value.*; Modified: incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/value/ChangePasswordDataModifier.java Url: http://svn.apache.org/viewcvs/incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/value/ChangePasswordDataModifier.java?view=diff&rev=125182&p1=incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/value/ChangePasswordDataModifier.java&r1=125171&p2=incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/value/ChangePasswordDataModifier.java&r2=125182 ============================================================================== --- incubator/directory/changepw/trunk/core/src/java/org/apache/kerberos/changepw/value/ChangePasswordDataModifier.java (original) +++ incubator/directory/changepw/trunk/core/src/java/org/apache/changepw/value/ChangePasswordDataModifier.java Fri Jan 14 08:38:45 2005 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.kerberos.changepw.value; +package org.apache.changepw.value; import org.apache.kerberos.messages.value.*;
