You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/12/05 23:07:43 UTC
svn commit: r1042466 - in
/directory/apacheds/branches/apacheds-kerberos-codec-2.0:
kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/
protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/
proto...
Author: elecharny
Date: Sun Dec 5 22:07:43 2010
New Revision: 1042466
URL: http://svn.apache.org/viewvc?rev=1042466&view=rev
Log:
Removed the ApplicationRequest class, replaced by ApReq
Removed:
directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/ApplicationRequest.java
Modified:
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java?rev=1042466&r1=1042465&r2=1042466&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java Sun Dec 5 22:07:43 2010
@@ -20,8 +20,8 @@
package org.apache.directory.server.changepw.messages;
-import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
+import org.apache.directory.shared.kerberos.messages.ApReq;
/**
@@ -29,7 +29,7 @@ import org.apache.directory.server.kerbe
*/
public class ChangePasswordRequest extends AbstractPasswordMessage
{
- private ApplicationRequest authHeader;
+ private ApReq authHeader;
private PrivateMessage privateMessage;
@@ -40,7 +40,7 @@ public class ChangePasswordRequest exten
* @param authHeader
* @param privateMessage
*/
- public ChangePasswordRequest( short versionNumber, ApplicationRequest authHeader, PrivateMessage privateMessage )
+ public ChangePasswordRequest( short versionNumber, ApReq authHeader, PrivateMessage privateMessage )
{
super( versionNumber );
@@ -50,11 +50,11 @@ public class ChangePasswordRequest exten
/**
- * Returns the {@link ApplicationRequest}.
+ * Returns the {@link ApReq}.
*
- * @return The {@link ApplicationRequest}.
+ * @return The {@link ApReq}.
*/
- public ApplicationRequest getAuthHeader()
+ public ApReq getAuthHeader()
{
return authHeader;
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java?rev=1042466&r1=1042465&r2=1042466&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java Sun Dec 5 22:07:43 2010
@@ -20,8 +20,8 @@
package org.apache.directory.server.changepw.messages;
-import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
+import org.apache.directory.shared.kerberos.messages.ApReq;
/**
@@ -29,7 +29,7 @@ import org.apache.directory.server.kerbe
*/
public class ChangePasswordRequestModifier extends AbstractPasswordMessageModifier
{
- private ApplicationRequest authHeader;
+ private ApReq authHeader;
private PrivateMessage privateMessage;
@@ -49,7 +49,7 @@ public class ChangePasswordRequestModifi
*
* @param authHeader
*/
- public void setAuthHeader( ApplicationRequest authHeader )
+ public void setAuthHeader( ApReq authHeader )
{
this.authHeader = authHeader;
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java?rev=1042466&r1=1042465&r2=1042466&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java Sun Dec 5 22:07:43 2010
@@ -25,10 +25,9 @@ import java.net.InetAddress;
import org.apache.directory.server.changepw.ChangePasswordServer;
import org.apache.directory.server.changepw.messages.AbstractPasswordMessage;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
-import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
-import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
+import org.apache.directory.shared.kerberos.messages.ApReq;
import org.apache.directory.shared.kerberos.messages.Authenticator;
import org.apache.directory.shared.kerberos.messages.Ticket;
@@ -46,7 +45,7 @@ public class ChangePasswordContext
private AbstractPasswordMessage reply;
private InetAddress clientAddress;
- private ApplicationRequest authHeader;
+ private ApReq authHeader;
private Ticket ticket;
private Authenticator authenticator;
private PrincipalStoreEntry serverEntry;
@@ -183,7 +182,7 @@ public class ChangePasswordContext
/**
* @return Returns the authHeader.
*/
- public ApplicationRequest getAuthHeader()
+ public ApReq getAuthHeader()
{
return authHeader;
}
@@ -192,7 +191,7 @@ public class ChangePasswordContext
/**
* @param authHeader The authHeader to set.
*/
- public void setAuthHeader( ApplicationRequest authHeader )
+ public void setAuthHeader( ApReq authHeader )
{
this.authHeader = authHeader;
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java?rev=1042466&r1=1042465&r2=1042466&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordService.java Sun Dec 5 22:07:43 2010
@@ -40,7 +40,6 @@ import org.apache.directory.server.i18n.
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
-import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply;
import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
@@ -53,6 +52,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.EncryptionKey;
import org.apache.directory.shared.kerberos.components.HostAddress;
import org.apache.directory.shared.kerberos.components.HostAddresses;
+import org.apache.directory.shared.kerberos.messages.ApReq;
import org.apache.directory.shared.kerberos.messages.Authenticator;
import org.apache.directory.shared.kerberos.messages.EncApRepPart;
import org.apache.directory.shared.kerberos.messages.Ticket;
@@ -166,7 +166,7 @@ public class ChangePasswordService
throw new ChangePasswordException( ErrorType.KRB5_KPASSWD_AUTHERROR );
}
- ApplicationRequest authHeader = request.getAuthHeader();
+ ApReq authHeader = request.getAuthHeader();
Ticket ticket = authHeader.getTicket();
changepwContext.setAuthHeader( authHeader );
@@ -200,7 +200,7 @@ public class ChangePasswordService
private static void verifyServiceTicketAuthHeader( ChangePasswordContext changepwContext ) throws KerberosException
{
- ApplicationRequest authHeader = changepwContext.getAuthHeader();
+ ApReq authHeader = changepwContext.getAuthHeader();
Ticket ticket = changepwContext.getTicket();
EncryptionType encryptionType = ticket.getEncPart().getEType();
@@ -287,7 +287,7 @@ public class ChangePasswordService
try
{
PrincipalStore store = changepwContext.getStore();
- ApplicationRequest authHeader = changepwContext.getAuthHeader();
+ ApReq authHeader = changepwContext.getAuthHeader();
Ticket ticket = changepwContext.getTicket();
ReplayCache replayCache = changepwContext.getConfig().getReplayCache();
long clockSkew = changepwContext.getConfig().getAllowableClockSkew();
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java?rev=1042466&r1=1042465&r2=1042466&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java Sun Dec 5 22:07:43 2010
@@ -43,7 +43,6 @@ import org.apache.directory.server.kerbe
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
import org.apache.directory.server.kerberos.shared.crypto.encryption.RandomKeyFactory;
import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
-import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.server.kerberos.shared.store.TicketFactory;
@@ -57,6 +56,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.EncryptionKey;
import org.apache.directory.shared.kerberos.components.HostAddress;
import org.apache.directory.shared.kerberos.components.PrincipalName;
+import org.apache.directory.shared.kerberos.messages.ApReq;
import org.apache.directory.shared.kerberos.messages.Authenticator;
import org.apache.directory.shared.kerberos.messages.KrbError;
import org.apache.directory.shared.kerberos.messages.Ticket;
@@ -173,7 +173,7 @@ public class ChangepwProtocolHandlerTest
EncryptedData encryptedAuthenticator = cipherTextHandler.seal( serviceTicket.getEncTicketPart().getKey(), authenticator
, KeyUsage.NUMBER11 );
- ApplicationRequest apReq = new ApplicationRequest( apOptions, serviceTicket, encryptedAuthenticator );
+ ApReq apReq = new ApReq( apOptions, serviceTicket, encryptedAuthenticator );
String newPassword = "secretsecret";
@@ -249,7 +249,7 @@ public class ChangepwProtocolHandlerTest
EncryptedData encryptedAuthenticator = cipherTextHandler.seal( serverKey, authenticator,
KeyUsage.NUMBER11 );
- ApplicationRequest apReq = new ApplicationRequest( apOptions, serviceTicket, encryptedAuthenticator );
+ ApReq apReq = new ApReq( apOptions, serviceTicket, encryptedAuthenticator );
String newPassword = "secretsecret";