You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2010/11/26 10:41:26 UTC
svn commit: r1039284 - in
/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec:
apRep/actions/StoreEncPart.java ticket/actions/StoreEncPart.java
Author: kayyagari
Date: Fri Nov 26 09:41:26 2010
New Revision: 1039284
URL: http://svn.apache.org/viewvc?rev=1039284&view=rev
Log:
o extended AbstractReadEncryptedPart
Modified:
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/actions/StoreEncPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/StoreEncPart.java
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/actions/StoreEncPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/actions/StoreEncPart.java?rev=1039284&r1=1039283&r2=1039284&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/actions/StoreEncPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/apRep/actions/StoreEncPart.java Fri Nov 26 09:41:26 2010
@@ -21,19 +21,9 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.ber.Asn1Container;
-import org.apache.directory.shared.asn1.ber.Asn1Decoder;
-import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
-import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
+import org.apache.directory.shared.kerberos.codec.actions.AbstractReadEncryptedPart;
import org.apache.directory.shared.kerberos.codec.apRep.ApRepContainer;
-import org.apache.directory.shared.kerberos.codec.encryptedData.EncryptedDataContainer;
import org.apache.directory.shared.kerberos.components.EncryptedData;
-import org.apache.directory.shared.kerberos.messages.ApRep;
-import org.apache.directory.shared.ldap.util.StringTools;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -41,72 +31,26 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StoreEncPart extends GrammarAction
+public class StoreEncPart extends AbstractReadEncryptedPart
{
- /** The logger */
- private static final Logger LOG = LoggerFactory.getLogger( KerberosMessageGrammar.class );
-
- /** Speedup for logs */
- private static final boolean IS_DEBUG = LOG.isDebugEnabled();
-
/**
* Instantiates a new StoreEncPart action.
*/
public StoreEncPart()
{
- super( "EncPart" );
+ super( "AP-REP enc-part" );
}
/**
* {@inheritDoc}
*/
- public void action( Asn1Container container ) throws DecoderException
+ @Override
+ protected void setEncryptedData( EncryptedData encryptedData, Asn1Container container )
{
ApRepContainer apRepContainer = ( ApRepContainer ) container;
-
- TLV tlv = apRepContainer.getCurrentTLV();
-
- // The Length should not be null
- if ( tlv.getLength() == 0 )
- {
- LOG.error( I18n.err( I18n.ERR_04066 ) );
-
- // This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
- }
-
- // Now, let's decode the EncPart
- Asn1Decoder encryptedDataDecoder = new Asn1Decoder();
-
- EncryptedDataContainer encryptedDataContainer = new EncryptedDataContainer();
- encryptedDataContainer.setStream( container.getStream() );
-
- // Decode the EncPart PDU
- try
- {
- encryptedDataDecoder.decode( container.getStream(), encryptedDataContainer );
- }
- catch ( DecoderException de )
- {
- throw de;
- }
-
- EncryptedData encryptedData = encryptedDataContainer.getEncryptedData();
- ApRep apRep = apRepContainer.getApRep();
- apRep.setEncPart( encryptedData );
-
- if ( IS_DEBUG )
- {
- LOG.debug( "EncPart : {}", StringTools.dumpBytes( encryptedData.getCipher() ) );
- }
-
- // Update the TLV
- tlv.setExpectedLength( tlv.getExpectedLength() - tlv.getLength() );
-
- // Update the parent
- container.updateParent();
+ apRepContainer.getApRep().setEncPart( encryptedData );
container.setGrammarEndAllowed( true );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/StoreEncPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/StoreEncPart.java?rev=1039284&r1=1039283&r2=1039284&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/StoreEncPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/ticket/actions/StoreEncPart.java Fri Nov 26 09:41:26 2010
@@ -21,18 +21,9 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.ber.Asn1Container;
-import org.apache.directory.shared.asn1.ber.Asn1Decoder;
-import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
-import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.codec.DecoderException;
-import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.kerberos.codec.KerberosMessageGrammar;
-import org.apache.directory.shared.kerberos.codec.encryptedData.EncryptedDataContainer;
+import org.apache.directory.shared.kerberos.codec.actions.AbstractReadEncryptedPart;
import org.apache.directory.shared.kerberos.codec.ticket.TicketContainer;
import org.apache.directory.shared.kerberos.components.EncryptedData;
-import org.apache.directory.shared.kerberos.messages.Ticket;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -40,14 +31,8 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class StoreEncPart extends GrammarAction
+public class StoreEncPart extends AbstractReadEncryptedPart
{
- /** The logger */
- private static final Logger LOG = LoggerFactory.getLogger( KerberosMessageGrammar.class );
-
- /** Speedup for logs */
- private static final boolean IS_DEBUG = LOG.isDebugEnabled();
-
/**
* Instantiates a new TicketEncPart action.
@@ -61,51 +46,11 @@ public class StoreEncPart extends Gramma
/**
* {@inheritDoc}
*/
- public void action( Asn1Container container ) throws DecoderException
+ @Override
+ protected void setEncryptedData( EncryptedData encryptedData, Asn1Container container )
{
TicketContainer ticketContainer = ( TicketContainer ) container;
-
- TLV tlv = ticketContainer.getCurrentTLV();
-
- // The Length should not be null
- if ( tlv.getLength() == 0 )
- {
- LOG.error( I18n.err( I18n.ERR_04066 ) );
-
- // This will generate a PROTOCOL_ERROR
- throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
- }
-
- // Now, let's decode the PrincipalName
- Asn1Decoder encryptedDataDecoder = new Asn1Decoder();
-
- EncryptedDataContainer encryptedDataContainer = new EncryptedDataContainer();
- encryptedDataContainer.setStream( container.getStream() );
-
- // Decode the Ticket PDU
- try
- {
- encryptedDataDecoder.decode( container.getStream(), encryptedDataContainer );
- }
- catch ( DecoderException de )
- {
- throw de;
- }
-
- EncryptedData encryptedData = encryptedDataContainer.getEncryptedData();
- Ticket ticket = ticketContainer.getTicket();
- ticket.setEncPart( encryptedData );
-
- if ( IS_DEBUG )
- {
- LOG.debug( "EncryptedData : " + encryptedData );
- }
-
- // Update the TLV
- tlv.setExpectedLength( tlv.getExpectedLength() - tlv.getLength() );
-
- // Update the parent
- container.updateParent();
+ ticketContainer.getTicket().setEncPart( encryptedData );
container.setGrammarEndAllowed( true );
}