Author: erodriguez
Date: Tue Nov 9 01:33:08 2004
New Revision: 57009
Modified:
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/KdcRequest.java
Log:
Refactored KdcRequest in preparation for pre-authentication implementation.
Removed a pre-auth setter which will never be used.
Modified:
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/KdcRequest.java
==============================================================================
---
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/KdcRequest.java
(original)
+++
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/messages/KdcRequest.java
Tue Nov 9 01:33:08 2004
@@ -16,80 +16,91 @@
*/
package org.apache.kerberos.messages;
-import org.apache.kerberos.crypto.encryption.*;
-import org.apache.kerberos.messages.components.*;
+import org.apache.kerberos.crypto.encryption.EncryptionType;
+import org.apache.kerberos.messages.components.Ticket;
import org.apache.kerberos.messages.value.*;
-import javax.security.auth.kerberos.*;
+import javax.security.auth.kerberos.KerberosPrincipal;
-public class KdcRequest extends KerberosMessage {
-
- private PreAuthenticationData[] _preAuthData; //optional
- private RequestBody _requestBody;
+public class KdcRequest extends KerberosMessage
+{
+ private PreAuthenticationData[] preAuthData; //optional
+ private RequestBody requestBody;
- /**
- * Class constructor
- */
- public KdcRequest(int pvno, MessageType msgType,
PreAuthenticationData[] paData, RequestBody reqBody) {
- super(pvno, msgType);
- _preAuthData = paData;
- _requestBody = reqBody;
+ public KdcRequest(int pvno, MessageType messageType,
PreAuthenticationData[] preAuthData, RequestBody requestBody)
+ {
+ super(pvno, messageType);
+ this.preAuthData = preAuthData;
+ this.requestBody = requestBody;
}
- public PreAuthenticationData[] getPaData() {
- return _preAuthData;
- }
- public void setPaData(PreAuthenticationData[] paData) {
- _preAuthData = paData;
+ public PreAuthenticationData[] getPreAuthData()
+ {
+ return preAuthData;
}
-
+
// RequestBody delegate methods
- public Ticket[] getAdditionalTickets() {
- return _requestBody.getAdditionalTickets();
- }
- public HostAddresses getAddresses() {
- return _requestBody.getAddresses();
- }
- public KerberosPrincipal getClientPrincipal() {
- return _requestBody.getClientPrincipal();
- }
- public String getRealm() {
- return _requestBody.getServerPrincipal().getRealm();
- }
- public EncryptedData getEncAuthorizationData() {
- return _requestBody.getEncAuthorizationData();
- }
- public EncryptionType[] getEType() {
- return _requestBody.getEType();
- }
- public KerberosTime getFrom() {
- return _requestBody.getFrom();
- }
- public KdcOptions getKdcOptions() {
- return _requestBody.getKdcOptions();
- }
- public int getNonce() {
- return _requestBody.getNonce();
- }
- public KerberosTime getRtime() {
- return _requestBody.getRtime();
- }
- public KerberosPrincipal getServerPrincipal() {
- return _requestBody.getServerPrincipal();
- }
- public KerberosTime getTill() {
- return _requestBody.getTill();
+ public Ticket[] getAdditionalTickets()
+ {
+ return requestBody.getAdditionalTickets();
+ }
+ public HostAddresses getAddresses()
+ {
+ return requestBody.getAddresses();
+ }
+ public KerberosPrincipal getClientPrincipal()
+ {
+ return requestBody.getClientPrincipal();
+ }
+ public String getRealm()
+ {
+ return requestBody.getServerPrincipal().getRealm();
+ }
+ public EncryptedData getEncAuthorizationData()
+ {
+ return requestBody.getEncAuthorizationData();
+ }
+ public EncryptionType[] getEType()
+ {
+ return requestBody.getEType();
+ }
+ public KerberosTime getFrom()
+ {
+ return requestBody.getFrom();
+ }
+ public KdcOptions getKdcOptions()
+ {
+ return requestBody.getKdcOptions();
+ }
+ public int getNonce()
+ {
+ return requestBody.getNonce();
+ }
+ public KerberosTime getRtime()
+ {
+ return requestBody.getRtime();
+ }
+ public KerberosPrincipal getServerPrincipal()
+ {
+ return requestBody.getServerPrincipal();
+ }
+ public KerberosTime getTill()
+ {
+ return requestBody.getTill();
}
// RequestBody KdcOptions delegate accesors
- public boolean getOption(int option) {
- return _requestBody.getKdcOptions().get(option);
- }
- public void setOption(int option) {
- _requestBody.getKdcOptions().set(option);
- }
- public void clearOption(int option) {
- _requestBody.getKdcOptions().clear(option);
+ public boolean getOption(int option)
+ {
+ return requestBody.getKdcOptions().get(option);
+ }
+ public void setOption(int option)
+ {
+ requestBody.getKdcOptions().set(option);
+ }
+ public void clearOption(int option)
+ {
+ requestBody.getKdcOptions().clear(option);
}
}
