You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2005/08/22 17:26:21 UTC
svn commit: r234507 -
/directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/
Author: erodriguez
Date: Mon Aug 22 08:26:13 2005
New Revision: 234507
URL: http://svn.apache.org/viewcvs?rev=234507&view=rev
Log:
Reformatting: imports, whitespace, line breaks, or code convention.
Modified:
directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ApplicationRequest.java
directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/AuthenticationReply.java
directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ErrorMessage.java
directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ErrorMessageModifier.java
directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KdcReply.java
directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KdcRequest.java
directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KerberosMessage.java
directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/MessageType.java
directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/TicketGrantReply.java
Modified: directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ApplicationRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ApplicationRequest.java?rev=234507&r1=234506&r2=234507&view=diff
==============================================================================
--- directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ApplicationRequest.java (original)
+++ directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ApplicationRequest.java Mon Aug 22 08:26:13 2005
@@ -16,67 +16,88 @@
*/
package org.apache.kerberos.messages;
-import org.apache.kerberos.messages.components.*;
-import org.apache.kerberos.messages.value.*;
+import org.apache.kerberos.messages.components.Authenticator;
+import org.apache.kerberos.messages.components.Ticket;
+import org.apache.kerberos.messages.value.ApOptions;
+import org.apache.kerberos.messages.value.EncryptedData;
-public class ApplicationRequest extends KerberosMessage {
+public class ApplicationRequest extends KerberosMessage
+{
+ private ApOptions apOptions;
+ private Ticket ticket;
+ private EncryptedData encPart;
+ private Authenticator authenticator;
- private ApOptions _apOptions;
- private Ticket _ticket;
- private EncryptedData _encPart;
- private Authenticator _authenticator;
-
- /**
- * Class constructors
- */
- public ApplicationRequest() {
- super(MessageType.KRB_AP_REQ);
- // used by ASN1 decoder
- }
-
- public ApplicationRequest(ApOptions apOptions, Ticket ticket, EncryptedData encPart) {
- super(MessageType.KRB_AP_REQ);
- _apOptions = apOptions;
- _ticket = ticket;
- _encPart = encPart;
- }
-
- public ApOptions getApOptions() {
- return _apOptions;
- }
- public Authenticator getAuthenticator() {
- return _authenticator;
- }
- public Ticket getTicket() {
- return _ticket;
- }
-
- // delegate ApOptions methods
- public boolean getOption(int option) {
- return _apOptions.get(option);
- }
- public void setOption(int option) {
- _apOptions.set(option);
- }
- public void clearOption(int option) {
- _apOptions.clear(option);
- }
-
- public EncryptedData getEncPart() {
- return _encPart;
- }
- public void setEncPart(EncryptedData data) {
- _encPart = data;
- }
-
- public void setApOptions(ApOptions options) {
- _apOptions = options;
- }
- public void setAuthenticator(Authenticator authenticator) {
- _authenticator = authenticator;
- }
- public void setTicket(Ticket ticket) {
- _ticket = ticket;
- }
-}
+ /**
+ * Class constructors
+ */
+ public ApplicationRequest()
+ {
+ super( MessageType.KRB_AP_REQ );
+ // used by ASN1 decoder
+ }
+
+ public ApplicationRequest( ApOptions apOptions, Ticket ticket, EncryptedData encPart )
+ {
+ super( MessageType.KRB_AP_REQ );
+ this.apOptions = apOptions;
+ this.ticket = ticket;
+ this.encPart = encPart;
+ }
+
+ public ApOptions getApOptions()
+ {
+ return apOptions;
+ }
+
+ public Authenticator getAuthenticator()
+ {
+ return authenticator;
+ }
+
+ public Ticket getTicket()
+ {
+ return ticket;
+ }
+
+ // delegate ApOptions methods
+ public boolean getOption( int option )
+ {
+ return apOptions.get( option );
+ }
+
+ public void setOption( int option )
+ {
+ apOptions.set( option );
+ }
+ public void clearOption( int option )
+ {
+ apOptions.clear( option );
+ }
+
+ public EncryptedData getEncPart()
+ {
+ return encPart;
+ }
+
+ public void setEncPart( EncryptedData data )
+ {
+ encPart = data;
+ }
+
+ public void setApOptions( ApOptions options )
+ {
+ apOptions = options;
+ }
+
+ public void setAuthenticator( Authenticator authenticator )
+ {
+ this.authenticator = authenticator;
+ }
+
+ public void setTicket( Ticket ticket )
+ {
+ this.ticket = ticket;
+ }
+}
Modified: directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/AuthenticationReply.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/AuthenticationReply.java?rev=234507&r1=234506&r2=234507&view=diff
==============================================================================
--- directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/AuthenticationReply.java (original)
+++ directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/AuthenticationReply.java Mon Aug 22 08:26:13 2005
@@ -16,23 +16,25 @@
*/
package org.apache.kerberos.messages;
-import org.apache.kerberos.messages.components.*;
-import org.apache.kerberos.messages.value.*;
+import javax.security.auth.kerberos.KerberosPrincipal;
-import javax.security.auth.kerberos.*;
+import org.apache.kerberos.messages.components.Ticket;
+import org.apache.kerberos.messages.value.EncryptedData;
+import org.apache.kerberos.messages.value.PreAuthenticationData;
-public class AuthenticationReply extends KdcReply {
-
- /**
- * Class constructors
- */
- public AuthenticationReply() {
- super(MessageType.KRB_AS_REP);
- }
-
- public AuthenticationReply(PreAuthenticationData[] paData, KerberosPrincipal clientPrincipal,
- Ticket ticket, EncryptedData encPart) {
- super(paData, clientPrincipal, ticket, encPart, MessageType.KRB_AS_REP);
- }
-}
+public class AuthenticationReply extends KdcReply
+{
+ /**
+ * Class constructors
+ */
+ public AuthenticationReply()
+ {
+ super( MessageType.KRB_AS_REP );
+ }
+ public AuthenticationReply( PreAuthenticationData[] paData, KerberosPrincipal clientPrincipal,
+ Ticket ticket, EncryptedData encPart )
+ {
+ super( paData, clientPrincipal, ticket, encPart, MessageType.KRB_AS_REP );
+ }
+}
Modified: directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ErrorMessage.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ErrorMessage.java?rev=234507&r1=234506&r2=234507&view=diff
==============================================================================
--- directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ErrorMessage.java (original)
+++ directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ErrorMessage.java Mon Aug 22 08:26:13 2005
@@ -14,14 +14,12 @@
* limitations under the License.
*
*/
-
package org.apache.kerberos.messages;
import javax.security.auth.kerberos.KerberosPrincipal;
import org.apache.kerberos.messages.value.KerberosTime;
-
public class ErrorMessage extends KerberosMessage
{
private KerberosTime clientTime; //optional
@@ -33,8 +31,7 @@
private KerberosPrincipal serverPrincipal;
private String explanatoryText; //optional
private byte[] explanatoryData; //optional
-
-
+
public ErrorMessage( KerberosTime clientTime, Integer clientMicroSecond, KerberosTime serverTime,
int serverMicroSecond, int errorCode, KerberosPrincipal clientPrincipal,
KerberosPrincipal serverPrincipal, String explanatoryText, byte[] explanatoryData )
@@ -51,51 +48,49 @@
this.explanatoryText = explanatoryText;
this.explanatoryData = explanatoryData;
}
-
-
+
public KerberosPrincipal getClientPrincipal()
- {
- return clientPrincipal;
- }
-
- public KerberosTime getClientTime()
- {
- return clientTime;
- }
-
- public Integer getClientMicroSecond()
- {
- return clientMicroSecond;
- }
-
- public byte[] getExplanatoryData()
- {
- return explanatoryData;
- }
-
- public int getErrorCode()
- {
- return errorCode;
- }
-
- public String getExplanatoryText()
- {
- return explanatoryText;
- }
-
- public KerberosPrincipal getServerPrincipal()
- {
- return serverPrincipal;
- }
-
- public KerberosTime getServerTime()
- {
- return serverTime;
- }
-
- public int getServerMicroSecond()
- {
- return serverMicroSecond;
- }
+ {
+ return clientPrincipal;
+ }
+
+ public KerberosTime getClientTime()
+ {
+ return clientTime;
+ }
+
+ public Integer getClientMicroSecond()
+ {
+ return clientMicroSecond;
+ }
+
+ public byte[] getExplanatoryData()
+ {
+ return explanatoryData;
+ }
+
+ public int getErrorCode()
+ {
+ return errorCode;
+ }
+
+ public String getExplanatoryText()
+ {
+ return explanatoryText;
+ }
+
+ public KerberosPrincipal getServerPrincipal()
+ {
+ return serverPrincipal;
+ }
+
+ public KerberosTime getServerTime()
+ {
+ return serverTime;
+ }
+
+ public int getServerMicroSecond()
+ {
+ return serverMicroSecond;
+ }
}
-
Modified: directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ErrorMessageModifier.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ErrorMessageModifier.java?rev=234507&r1=234506&r2=234507&view=diff
==============================================================================
--- directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ErrorMessageModifier.java (original)
+++ directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/ErrorMessageModifier.java Mon Aug 22 08:26:13 2005
@@ -14,14 +14,12 @@
* limitations under the License.
*
*/
-
package org.apache.kerberos.messages;
import javax.security.auth.kerberos.KerberosPrincipal;
import org.apache.kerberos.messages.value.KerberosTime;
-
public class ErrorMessageModifier
{
private KerberosTime clientTime; //optional
@@ -33,58 +31,55 @@
private KerberosPrincipal serverPrincipal;
private String explanatoryText; //optional
private byte[] explanatoryData; //optional
-
-
+
public ErrorMessage getErrorMessage()
- {
- return new ErrorMessage( clientTime, clientMicroSecond, serverTime, serverMicroSecond,
- errorCode, clientPrincipal, serverPrincipal, explanatoryText, explanatoryData );
- }
-
-
- public void setClientPrincipal( KerberosPrincipal principal )
- {
- this.clientPrincipal = principal;
- }
-
- public void setClientTime( KerberosTime time )
- {
- this.clientTime = time;
- }
-
- public void setClientMicroSecond( Integer clientMicroSecond )
- {
- this.clientMicroSecond = clientMicroSecond;
- }
-
- public void setExplanatoryData( byte[] data )
- {
- this.explanatoryData = data;
- }
-
- public void setErrorCode( int code )
- {
- this.errorCode = code;
- }
-
- public void setExplanatoryText( String text )
- {
- this.explanatoryText = text;
- }
-
- public void setServerPrincipal( KerberosPrincipal principal )
- {
- this.serverPrincipal = principal;
- }
-
- public void setServerTime( KerberosTime time )
- {
- this.serverTime = time;
- }
-
- public void setServerMicroSecond( int serverMicroSecond )
- {
- this.serverMicroSecond = serverMicroSecond;
- }
+ {
+ return new ErrorMessage( clientTime, clientMicroSecond, serverTime, serverMicroSecond,
+ errorCode, clientPrincipal, serverPrincipal, explanatoryText, explanatoryData );
+ }
+
+ public void setClientPrincipal( KerberosPrincipal principal )
+ {
+ this.clientPrincipal = principal;
+ }
+
+ public void setClientTime( KerberosTime time )
+ {
+ this.clientTime = time;
+ }
+
+ public void setClientMicroSecond( Integer clientMicroSecond )
+ {
+ this.clientMicroSecond = clientMicroSecond;
+ }
+
+ public void setExplanatoryData( byte[] data )
+ {
+ this.explanatoryData = data;
+ }
+
+ public void setErrorCode( int code )
+ {
+ this.errorCode = code;
+ }
+
+ public void setExplanatoryText( String text )
+ {
+ this.explanatoryText = text;
+ }
+
+ public void setServerPrincipal( KerberosPrincipal principal )
+ {
+ this.serverPrincipal = principal;
+ }
+
+ public void setServerTime( KerberosTime time )
+ {
+ this.serverTime = time;
+ }
+
+ public void setServerMicroSecond( int serverMicroSecond )
+ {
+ this.serverMicroSecond = serverMicroSecond;
+ }
}
-
Modified: directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KdcReply.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KdcReply.java?rev=234507&r1=234506&r2=234507&view=diff
==============================================================================
--- directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KdcReply.java (original)
+++ directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KdcReply.java Mon Aug 22 08:26:13 2005
@@ -16,139 +16,208 @@
*/
package org.apache.kerberos.messages;
-import org.apache.kerberos.messages.components.*;
-import org.apache.kerberos.messages.value.*;
+import javax.security.auth.kerberos.KerberosPrincipal;
-import javax.security.auth.kerberos.*;
+import org.apache.kerberos.messages.components.EncKdcRepPart;
+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.HostAddresses;
+import org.apache.kerberos.messages.value.KerberosTime;
+import org.apache.kerberos.messages.value.LastRequest;
+import org.apache.kerberos.messages.value.PreAuthenticationData;
+import org.apache.kerberos.messages.value.TicketFlags;
-public class KdcReply extends KerberosMessage {
-
- private PreAuthenticationData[] _paData; //optional
- private KerberosPrincipal _clientPrincipal;
- private Ticket _ticket;
+public class KdcReply extends KerberosMessage
+{
+ private PreAuthenticationData[] paData; //optional
+ private KerberosPrincipal clientPrincipal;
+ private Ticket ticket;
- private EncKdcRepPart _encKDCRepPart = new EncKdcRepPart();
- private EncryptedData _encPart;
+ private EncKdcRepPart encKDCRepPart = new EncKdcRepPart();
+ private EncryptedData encPart;
- public KdcReply(MessageType msgType) {
- super(msgType);
- }
-
- public KdcReply(PreAuthenticationData[] paData, KerberosPrincipal clientPrincipal,
- Ticket ticket, EncryptedData encPart, MessageType msgType) {
-
- this(msgType);
- _paData = paData;
- _clientPrincipal = clientPrincipal;
- _ticket = ticket;
- _encPart = encPart;
- }
-
- // getters
- public KerberosPrincipal getClientPrincipal() {
- return _clientPrincipal;
- }
- public String getClientRealm() {
- return _clientPrincipal.getRealm();
- }
- public EncryptedData getEncPart() {
- return _encPart;
- }
- public PreAuthenticationData[] getPaData() {
- return _paData;
- }
- public Ticket getTicket() {
- return _ticket;
- }
-
- // setters
- public void setClientPrincipal(KerberosPrincipal clientPrincipal) {
- _clientPrincipal = clientPrincipal;
- }
- public void setEncKDCRepPart(EncKdcRepPart repPart) {
- _encKDCRepPart = repPart;
- }
- public void setEncPart(EncryptedData part) {
- _encPart = part;
- }
- public void setPaData(PreAuthenticationData[] data) {
- _paData = data;
- }
- public void setTicket(Ticket ticket) {
- _ticket = ticket;
- }
-
- // EncKdcRepPart delegate getters
- public KerberosTime getAuthTime() {
- return _encKDCRepPart.getAuthTime();
- }
- public HostAddresses getClientAddresses() {
- return _encKDCRepPart.getClientAddresses();
- }
- public KerberosTime getEndTime() {
- return _encKDCRepPart.getEndTime();
- }
- public TicketFlags getFlags() {
- return _encKDCRepPart.getFlags();
- }
- public EncryptionKey getKey() {
- return _encKDCRepPart.getKey();
- }
- public KerberosTime getKeyExpiration() {
- return _encKDCRepPart.getKeyExpiration();
- }
- public LastRequest getLastRequest() {
- return _encKDCRepPart.getLastRequest();
- }
- public int getNonce() {
- return _encKDCRepPart.getNonce();
- }
- public KerberosTime getRenewTill() {
- return _encKDCRepPart.getRenewTill();
- }
- public KerberosPrincipal getServerPrincipal() {
- return _encKDCRepPart.getServerPrincipal();
- }
- public String getServerRealm() {
- return _encKDCRepPart.getServerRealm();
- }
- public KerberosTime getStartTime() {
- return _encKDCRepPart.getStartTime();
- }
-
- // EncKdcRepPart delegate setters
- public void setAuthTime(KerberosTime time) {
- _encKDCRepPart.setAuthTime(time);
- }
- public void setClientAddresses(HostAddresses addresses) {
- _encKDCRepPart.setClientAddresses(addresses);
- }
- public void setEndTime(KerberosTime time) {
- _encKDCRepPart.setEndTime(time);
- }
- public void setFlags(TicketFlags flags) {
- _encKDCRepPart.setFlags(flags);
- }
- public void setKey(EncryptionKey key) {
- _encKDCRepPart.setKey(key);
- }
- public void setKeyExpiration(KerberosTime expiration) {
- _encKDCRepPart.setKeyExpiration(expiration);
- }
- public void setLastRequest(LastRequest request) {
- _encKDCRepPart.setLastRequest(request);
- }
- public void setNonce(int nonce) {
- _encKDCRepPart.setNonce(nonce);
- }
- public void setRenewTill(KerberosTime till) {
- _encKDCRepPart.setRenewTill(till);
- }
- public void setServerPrincipal(KerberosPrincipal principal) {
- _encKDCRepPart.setServerPrincipal(principal);
- }
- public void setStartTime(KerberosTime time) {
- _encKDCRepPart.setStartTime(time);
- }
-}
+ public KdcReply( MessageType msgType )
+ {
+ super( msgType );
+ }
+
+ public KdcReply( PreAuthenticationData[] paData, KerberosPrincipal clientPrincipal,
+ Ticket ticket, EncryptedData encPart, MessageType msgType )
+ {
+ this( msgType );
+ this.paData = paData;
+ this.clientPrincipal = clientPrincipal;
+ this.ticket = ticket;
+ this.encPart = encPart;
+ }
+
+ // getters
+ public KerberosPrincipal getClientPrincipal()
+ {
+ return clientPrincipal;
+ }
+
+ public String getClientRealm()
+ {
+ return clientPrincipal.getRealm();
+ }
+
+ public EncryptedData getEncPart()
+ {
+ return encPart;
+ }
+
+ public PreAuthenticationData[] getPaData()
+ {
+ return paData;
+ }
+
+ public Ticket getTicket()
+ {
+ return ticket;
+ }
+
+ // setters
+ public void setClientPrincipal( KerberosPrincipal clientPrincipal )
+ {
+ this.clientPrincipal = clientPrincipal;
+ }
+
+ public void setEncKDCRepPart( EncKdcRepPart repPart )
+ {
+ encKDCRepPart = repPart;
+ }
+
+ public void setEncPart( EncryptedData part )
+ {
+ encPart = part;
+ }
+
+ public void setPaData( PreAuthenticationData[] data )
+ {
+ paData = data;
+ }
+
+ public void setTicket( Ticket ticket )
+ {
+ this.ticket = ticket;
+ }
+
+ // EncKdcRepPart delegate getters
+ public KerberosTime getAuthTime()
+ {
+ return encKDCRepPart.getAuthTime();
+ }
+
+ public HostAddresses getClientAddresses()
+ {
+ return encKDCRepPart.getClientAddresses();
+ }
+
+ public KerberosTime getEndTime()
+ {
+ return encKDCRepPart.getEndTime();
+ }
+ public TicketFlags getFlags()
+ {
+ return encKDCRepPart.getFlags();
+ }
+
+ public EncryptionKey getKey()
+ {
+ return encKDCRepPart.getKey();
+ }
+
+ public KerberosTime getKeyExpiration()
+ {
+ return encKDCRepPart.getKeyExpiration();
+ }
+
+ public LastRequest getLastRequest()
+ {
+ return encKDCRepPart.getLastRequest();
+ }
+
+ public int getNonce()
+ {
+ return encKDCRepPart.getNonce();
+ }
+
+ public KerberosTime getRenewTill()
+ {
+ return encKDCRepPart.getRenewTill();
+ }
+
+ public KerberosPrincipal getServerPrincipal()
+ {
+ return encKDCRepPart.getServerPrincipal();
+ }
+
+ public String getServerRealm()
+ {
+ return encKDCRepPart.getServerRealm();
+ }
+
+ public KerberosTime getStartTime()
+ {
+ return encKDCRepPart.getStartTime();
+ }
+
+ // EncKdcRepPart delegate setters
+ public void setAuthTime( KerberosTime time )
+ {
+ encKDCRepPart.setAuthTime( time );
+ }
+
+ public void setClientAddresses( HostAddresses addresses )
+ {
+ encKDCRepPart.setClientAddresses( addresses );
+ }
+
+ public void setEndTime( KerberosTime time )
+ {
+ encKDCRepPart.setEndTime( time );
+ }
+
+ public void setFlags( TicketFlags flags )
+ {
+ encKDCRepPart.setFlags( flags );
+ }
+
+ public void setKey( EncryptionKey key )
+ {
+ encKDCRepPart.setKey( key );
+ }
+
+ public void setKeyExpiration( KerberosTime expiration )
+ {
+ encKDCRepPart.setKeyExpiration( expiration );
+ }
+
+ public void setLastRequest( LastRequest request )
+ {
+ encKDCRepPart.setLastRequest( request );
+ }
+
+ public void setNonce( int nonce )
+ {
+ encKDCRepPart.setNonce( nonce );
+ }
+
+ public void setRenewTill( KerberosTime till )
+ {
+ encKDCRepPart.setRenewTill( till );
+ }
+
+ public void setServerPrincipal( KerberosPrincipal principal )
+ {
+ encKDCRepPart.setServerPrincipal( principal );
+ }
+
+ public void setStartTime( KerberosTime time )
+ {
+ encKDCRepPart.setStartTime( time );
+ }
+}
Modified: directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KdcRequest.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KdcRequest.java?rev=234507&r1=234506&r2=234507&view=diff
==============================================================================
--- directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KdcRequest.java (original)
+++ directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KdcRequest.java Mon Aug 22 08:26:13 2005
@@ -16,91 +16,109 @@
*/
package org.apache.kerberos.messages;
+import javax.security.auth.kerberos.KerberosPrincipal;
+
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.KerberosPrincipal;
+import org.apache.kerberos.messages.value.EncryptedData;
+import org.apache.kerberos.messages.value.HostAddresses;
+import org.apache.kerberos.messages.value.KdcOptions;
+import org.apache.kerberos.messages.value.KerberosTime;
+import org.apache.kerberos.messages.value.PreAuthenticationData;
+import org.apache.kerberos.messages.value.RequestBody;
public class KdcRequest extends KerberosMessage
{
- private PreAuthenticationData[] preAuthData; //optional
- private RequestBody requestBody;
-
- public KdcRequest(int pvno, MessageType messageType, PreAuthenticationData[] preAuthData, RequestBody requestBody)
- {
- super(pvno, messageType);
- this.preAuthData = preAuthData;
- this.requestBody = requestBody;
- }
-
- 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();
- }
-
- // 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)
+ private PreAuthenticationData[] preAuthData; //optional
+ private RequestBody requestBody;
+
+ public KdcRequest( int pvno, MessageType messageType, PreAuthenticationData[] preAuthData,
+ RequestBody requestBody )
{
- requestBody.getKdcOptions().clear(option);
- }
-}
+ super( pvno, messageType );
+ this.preAuthData = preAuthData;
+ this.requestBody = requestBody;
+ }
+
+ 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();
+ }
+
+ // 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 );
+ }
+}
Modified: directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KerberosMessage.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KerberosMessage.java?rev=234507&r1=234506&r2=234507&view=diff
==============================================================================
--- directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KerberosMessage.java (original)
+++ directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/KerberosMessage.java Mon Aug 22 08:26:13 2005
@@ -16,34 +16,42 @@
*/
package org.apache.kerberos.messages;
-public class KerberosMessage {
-
+public class KerberosMessage
+{
// Kerberos protocol version number
public static final int PVNO = 5;
+
+ private int protocolVersionNumber;
+ private MessageType messageType;
- private int _protocolVersionNumber;
- private MessageType _messageType;
-
- public KerberosMessage(MessageType type) {
- this(PVNO, type);
- }
-
- public KerberosMessage(int versionNumber, MessageType type) {
- _protocolVersionNumber = versionNumber;
- _messageType = type;
- }
-
- public MessageType getMessageType() {
- return _messageType;
- }
- public void setMessageType(MessageType type) {
- _messageType = type;
- }
- public int getProtocolVersionNumber() {
- return _protocolVersionNumber;
- }
- public void setProtocolVersionNumber(int versionNumber) {
- _protocolVersionNumber = versionNumber;
- }
-}
+ public KerberosMessage( MessageType type )
+ {
+ this( PVNO, type );
+ }
+ public KerberosMessage( int versionNumber, MessageType type )
+ {
+ protocolVersionNumber = versionNumber;
+ messageType = type;
+ }
+
+ public MessageType getMessageType()
+ {
+ return messageType;
+ }
+
+ public void setMessageType( MessageType type )
+ {
+ messageType = type;
+ }
+
+ public int getProtocolVersionNumber()
+ {
+ return protocolVersionNumber;
+ }
+
+ public void setProtocolVersionNumber( int versionNumber )
+ {
+ protocolVersionNumber = versionNumber;
+ }
+}
Modified: directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/MessageType.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/MessageType.java?rev=234507&r1=234506&r2=234507&view=diff
==============================================================================
--- directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/MessageType.java (original)
+++ directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/MessageType.java Mon Aug 22 08:26:13 2005
@@ -14,14 +14,12 @@
* limitations under the License.
*
*/
-
package org.apache.kerberos.messages;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-
public final class MessageType implements Comparable
{
/**
@@ -94,4 +92,3 @@
return ordinal;
}
}
-
Modified: directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/TicketGrantReply.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/TicketGrantReply.java?rev=234507&r1=234506&r2=234507&view=diff
==============================================================================
--- directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/TicketGrantReply.java (original)
+++ directory/shared/kerberos/branches/refactor-to-chain/common/src/java/org/apache/kerberos/messages/TicketGrantReply.java Mon Aug 22 08:26:13 2005
@@ -16,23 +16,25 @@
*/
package org.apache.kerberos.messages;
-import org.apache.kerberos.messages.components.*;
-import org.apache.kerberos.messages.value.*;
+import javax.security.auth.kerberos.KerberosPrincipal;
-import javax.security.auth.kerberos.*;
+import org.apache.kerberos.messages.components.Ticket;
+import org.apache.kerberos.messages.value.EncryptedData;
+import org.apache.kerberos.messages.value.PreAuthenticationData;
-public class TicketGrantReply extends KdcReply {
+public class TicketGrantReply extends KdcReply
+{
+ /**
+ * Class constructors
+ */
+ public TicketGrantReply()
+ {
+ super( MessageType.KRB_TGS_REP );
+ }
- /**
- * Class constructors
- */
- public TicketGrantReply() {
- super(MessageType.KRB_TGS_REP);
- }
-
- public TicketGrantReply(PreAuthenticationData[] pAData, KerberosPrincipal clientPrincipal,
- Ticket ticket, EncryptedData encPart) {
- super(pAData, clientPrincipal, ticket, encPart, MessageType.KRB_TGS_REP);
- }
+ public TicketGrantReply( PreAuthenticationData[] pAData, KerberosPrincipal clientPrincipal,
+ Ticket ticket, EncryptedData encPart )
+ {
+ super( pAData, clientPrincipal, ticket, encPart, MessageType.KRB_TGS_REP );
+ }
}
-