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 2012/01/24 17:15:29 UTC
svn commit: r1235326 [9/28] - in /directory/apacheds/trunk:
jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
jdbm-partition...
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyUsage.java Tue Jan 24 16:15:05 2012
@@ -60,22 +60,26 @@ public final class KeyUsage implements C
/**
* TGS-REQ KDC-REQ-BODY AuthorizationData, encrypted with the TGS session key (Section 5.4.1)
*/
- public static final KeyUsage TGS_REQ_KDC_REQ_BODY_AUTHZ_DATA_ENC_WITH_TGS_SESS_KEY = new KeyUsage( 4, I18n.err( I18n.ERR_606 ) );
+ public static final KeyUsage TGS_REQ_KDC_REQ_BODY_AUTHZ_DATA_ENC_WITH_TGS_SESS_KEY = new KeyUsage( 4,
+ I18n.err( I18n.ERR_606 ) );
/**
* TGS-REQ KDC-REQ-BODY AuthorizationData, encrypted with the TGS authenticator subkey (Section 5.4.1)
*/
- public static final KeyUsage TGS_REQ_KDC_REQ_BODY_AUTHZ_DATA_ENC_WITH_AUTHNT_SUB_KEY = new KeyUsage( 5, I18n.err( I18n.ERR_607 ) );
+ public static final KeyUsage TGS_REQ_KDC_REQ_BODY_AUTHZ_DATA_ENC_WITH_AUTHNT_SUB_KEY = new KeyUsage( 5,
+ I18n.err( I18n.ERR_607 ) );
/**
* TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator cksum, keyed with the TGS session key (Section 5.5.1)
*/
- public static final KeyUsage TGS_REQ_PA_TGS_REQ_PADATA_AP_REQ_AUTHNT_CKSUM_TGS_SESS_KEY = new KeyUsage( 6, I18n.err( I18n.ERR_608 ) );
+ public static final KeyUsage TGS_REQ_PA_TGS_REQ_PADATA_AP_REQ_AUTHNT_CKSUM_TGS_SESS_KEY = new KeyUsage( 6,
+ I18n.err( I18n.ERR_608 ) );
/**
* TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator (includes TGS authenticator subkey), encrypted with the TGS session key (Section 5.5.1)
*/
- public static final KeyUsage TGS_REQ_PA_TGS_REQ_PADATA_AP_REQ_TGS_SESS_KEY = new KeyUsage( 7, I18n.err( I18n.ERR_609 ) );
+ public static final KeyUsage TGS_REQ_PA_TGS_REQ_PADATA_AP_REQ_TGS_SESS_KEY = new KeyUsage( 7,
+ I18n.err( I18n.ERR_609 ) );
/**
* TGS-REP encrypted part (includes application session key), encrypted with the TGS session key (Section 5.4.2)
@@ -111,8 +115,20 @@ public final class KeyUsage implements C
* These two lines are all that's necessary to export a List of VALUES.
*/
private static final KeyUsage[] values =
- { AS_REQ_PA_ENC_TIMESTAMP_WITH_CKEY, AS_OR_TGS_REP_TICKET_WITH_SRVKEY, AS_REP_ENC_PART_WITH_CKEY, TGS_REQ_KDC_REQ_BODY_AUTHZ_DATA_ENC_WITH_TGS_SESS_KEY, TGS_REQ_KDC_REQ_BODY_AUTHZ_DATA_ENC_WITH_AUTHNT_SUB_KEY, TGS_REQ_PA_TGS_REQ_PADATA_AP_REQ_AUTHNT_CKSUM_TGS_SESS_KEY, TGS_REQ_PA_TGS_REQ_PADATA_AP_REQ_TGS_SESS_KEY, TGS_REP_ENC_PART_TGS_SESS_KEY, TGS_REP_ENC_PART_TGS_AUTHNT_SUB_KEY, AP_REQ_AUTHNT_CKSUM_SESS_KEY, AP_REQ_AUTHNT_SESS_KEY,
- AP_REP_ENC_PART_SESS_KEY, KRB_PRIV_ENC_PART_CHOSEN_KEY };
+ {
+ AS_REQ_PA_ENC_TIMESTAMP_WITH_CKEY,
+ AS_OR_TGS_REP_TICKET_WITH_SRVKEY,
+ AS_REP_ENC_PART_WITH_CKEY,
+ TGS_REQ_KDC_REQ_BODY_AUTHZ_DATA_ENC_WITH_TGS_SESS_KEY,
+ TGS_REQ_KDC_REQ_BODY_AUTHZ_DATA_ENC_WITH_AUTHNT_SUB_KEY,
+ TGS_REQ_PA_TGS_REQ_PADATA_AP_REQ_AUTHNT_CKSUM_TGS_SESS_KEY,
+ TGS_REQ_PA_TGS_REQ_PADATA_AP_REQ_TGS_SESS_KEY,
+ TGS_REP_ENC_PART_TGS_SESS_KEY,
+ TGS_REP_ENC_PART_TGS_AUTHNT_SUB_KEY,
+ AP_REQ_AUTHNT_CKSUM_SESS_KEY,
+ AP_REQ_AUTHNT_SESS_KEY,
+ AP_REP_ENC_PART_SESS_KEY,
+ KRB_PRIV_ENC_PART_CHOSEN_KEY };
/**
* VALUES needs to be located here, otherwise illegal forward reference.
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactory.java Tue Jan 24 16:15:05 2012
@@ -112,7 +112,8 @@ public class RandomKeyFactory
if ( algorithm == null )
{
- throw new KerberosException( ErrorType.KDC_ERR_ETYPE_NOSUPP, I18n.err( I18n.ERR_616, encryptionType.getName() ) );
+ throw new KerberosException( ErrorType.KDC_ERR_ETYPE_NOSUPP, I18n.err( I18n.ERR_616,
+ encryptionType.getName() ) );
}
try
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/package-info.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/package-info.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/package-info.java Tue Jan 24 16:15:05 2012
@@ -25,3 +25,5 @@
*/
package org.apache.directory.server.kerberos.shared.crypto.encryption;
+
+
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCache.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCache.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCache.java Tue Jan 24 16:15:05 2012
@@ -59,7 +59,8 @@ public interface ReplayCache
*/
void save( KerberosPrincipal serverPrincipal, KerberosPrincipal clientPrincipal, KerberosTime clientTime,
int clientMicroSeconds );
-
+
+
/**
* removes all the elements present in the cache
*/
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCacheImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCacheImpl.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCacheImpl.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/ReplayCacheImpl.java Tue Jan 24 16:15:05 2012
@@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory;
*/
public class ReplayCacheImpl implements ReplayCache
{
-
+
private static final Logger LOG = LoggerFactory.getLogger( ReplayCacheImpl.class );
-
+
/** ehcache based storage to store the entries */
private Cache cache;
@@ -65,13 +65,13 @@ public class ReplayCacheImpl implements
/** The server principal */
private KerberosPrincipal serverPrincipal;
-
+
/** The client principal */
private KerberosPrincipal clientPrincipal;
-
+
/** The client time */
private KerberosTime clientTime;
-
+
/** The client micro seconds */
private int clientMicroSeconds;
@@ -249,8 +249,8 @@ public class ReplayCacheImpl implements
Element element = new Element( entry.createKey(), entry );
cache.put( element );
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/package-info.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/package-info.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/replay/package-info.java Tue Jan 24 16:15:05 2012
@@ -26,3 +26,5 @@
*/
package org.apache.directory.server.kerberos.shared.replay;
+
+
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/DirectoryPrincipalStore.java Tue Jan 24 16:15:05 2012
@@ -37,8 +37,8 @@ public class DirectoryPrincipalStore imp
/** The directory service backing store for this PrincipalStore. */
private final DirectoryService directoryService;
private final Dn searchBaseDn;
-
-
+
+
/**
* Creates a new instance of DirectoryPrincipalStore.
*
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosAttribute.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosAttribute.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosAttribute.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/KerberosAttribute.java Tue Jan 24 16:15:05 2012
@@ -31,30 +31,29 @@ public class KerberosAttribute
/** the krb5kdc schema principal name for a krb5KDCEntry */
public static final String KRB5_PRINCIPAL_NAME_AT = "krb5PrincipalName";
public static final String KRB5_PRINCIPAL_NAME_AT_OID = "1.3.6.1.4.1.5322.10.1.1";
-
+
/** the krb5kdc schema key for a krb5KDCEntry */
public static final String KRB5_KEY_AT = "krb5Key";
public static final String KRB5_KEY_AT_OID = "1.3.6.1.4.1.5322.10.1.10";
-
+
/** the krb5kdc schema key version identifier for a krb5KDCEntry */
public static final String KRB5_KEY_VERSION_NUMBER_AT = "krb5KeyVersionNumber";
public static final String KRB5_KEY_VERSION_NUMBER_AT_OID = "1.3.6.1.4.1.5322.10.1.2";
-
+
/** the disabled boolean LDAP attribute for a Kerberos account */
public static final String KRB5_ACCOUNT_DISABLED_AT = "krb5AccountDisabled";
public static final String KRB5_ACCOUNT_DISABLED_AT_OID = "1.3.6.1.4.1.5322.10.1.13";
-
+
/** the lockedout boolean LDAP attribute for a Kerberos account */
public static final String KRB5_ACCOUNT_LOCKEDOUT_AT = "krb5AccountLockedOut";
public static final String KRB5_ACCOUNT_LOCKEDOUT_AT_OID = "1.3.6.1.4.1.5322.10.1.14";
-
+
/** the expiration time attribute LDAP attribute for a Kerberos account */
public static final String KRB5_ACCOUNT_EXPIRATION_TIME_AT = "krb5AccountExpirationTime";
public static final String KRB5_ACCOUNT_EXPIRATION_TIME_AT_OID = "1.3.6.1.4.1.5322.10.1.15";
-
/** the Apache specific SAM type attribute */
public static final String APACHE_SAM_TYPE_AT = "apacheSamType";
public static final String APACHE_SAM_TYPE_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.9";
-
+
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/MultiBaseSearch.java Tue Jan 24 16:15:05 2012
@@ -57,7 +57,8 @@ class MultiBaseSearch implements Princip
this.directoryService = directoryService;
try
{
- catalog = new KerberosCatalog( ( Map<String, String> ) execute( directoryService.getSession(), new GetCatalog() ) );
+ catalog = new KerberosCatalog( ( Map<String, String> ) execute( directoryService.getSession(),
+ new GetCatalog() ) );
}
catch ( Exception e )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java Tue Jan 24 16:15:05 2012
@@ -20,7 +20,6 @@
package org.apache.directory.server.kerberos.shared.store;
-
import javax.security.auth.kerberos.KerberosPrincipal;
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java Tue Jan 24 16:15:05 2012
@@ -280,7 +280,8 @@ public class PrincipalStoreEntryModifier
* @throws LdapException
* @throws IOException
*/
- public Map<EncryptionType, EncryptionKey> reconstituteKeyMap( Attribute krb5key ) throws KerberosException, LdapException
+ public Map<EncryptionType, EncryptionKey> reconstituteKeyMap( Attribute krb5key ) throws KerberosException,
+ LdapException
{
Map<EncryptionType, EncryptionKey> map = new HashMap<EncryptionType, EncryptionKey>();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java Tue Jan 24 16:15:05 2012
@@ -20,7 +20,6 @@
package org.apache.directory.server.kerberos.shared.store;
-
import javax.security.auth.kerberos.KerberosPrincipal;
import org.apache.directory.server.core.api.CoreSession;
@@ -67,6 +66,6 @@ class SingleBaseSearch implements Princi
public String changePassword( KerberosPrincipal principal, String newPassword ) throws Exception
{
- return (String) new ChangePassword( principal, newPassword ).execute( session, searchBaseDn );
+ return ( String ) new ChangePassword( principal, newPassword ).execute( session, searchBaseDn );
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/TicketFactory.java Tue Jan 24 16:15:05 2012
@@ -111,7 +111,8 @@ public class TicketFactory
KerberosTime renewTill = new KerberosTime( now + ONE_WEEK );
encTicketPart.setRenewTill( renewTill );
- EncryptedData encryptedTicketPart = cipherTextHandler.seal( serverKey, encTicketPart, KeyUsage.AS_OR_TGS_REP_TICKET_WITH_SRVKEY );
+ EncryptedData encryptedTicketPart = cipherTextHandler.seal( serverKey, encTicketPart,
+ KeyUsage.AS_OR_TGS_REP_TICKET_WITH_SRVKEY );
Ticket ticket = new Ticket();
ticket.setTktVno( KerberosConstants.KERBEROS_V5 );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Tue Jan 24 16:15:05 2012
@@ -71,17 +71,20 @@ public class ChangePassword implements D
}
SchemaManager schemaManager = session.getDirectoryService().getSchemaManager();
-
+
Attribute newPasswordAttribute = new DefaultAttribute(
- schemaManager.lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT ), Strings.getBytesUtf8(newPassword) );
- Modification passwordMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, newPasswordAttribute );
-
- Attribute principalAttribute = new DefaultAttribute(
+ schemaManager.lookupAttributeTypeRegistry( SchemaConstants.USER_PASSWORD_AT ),
+ Strings.getBytesUtf8( newPassword ) );
+ Modification passwordMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
+ newPasswordAttribute );
+
+ Attribute principalAttribute = new DefaultAttribute(
schemaManager.lookupAttributeTypeRegistry( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT ), principal.getName() );
- Modification principalMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, principalAttribute );
-
+ Modification principalMod = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
+ principalAttribute );
+
//FIXME check if keyderivation is necessary
-
+
Entry entry = StoreUtils.findPrincipalEntry( session, searchBaseDn, principal.getName() );
session.modify( entry.getDn(), passwordMod, principalMod );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java Tue Jan 24 16:15:05 2012
@@ -121,7 +121,8 @@ public class GetPrincipal implements Dir
catch ( ParseException e )
{
throw new Exception( "Account expiration attribute "
- + KerberosAttribute.KRB5_ACCOUNT_EXPIRATION_TIME_AT + " contained an invalid value for generalizedTime: "
+ + KerberosAttribute.KRB5_ACCOUNT_EXPIRATION_TIME_AT
+ + " contained an invalid value for generalizedTime: "
+ val );
}
}
@@ -135,7 +136,7 @@ public class GetPrincipal implements Dir
if ( entry.get( KerberosAttribute.KRB5_KEY_AT ) != null )
{
Attribute krb5key = entry.get( KerberosAttribute.KRB5_KEY_AT );
-
+
try
{
Map<EncryptionType, EncryptionKey> keyMap = modifier.reconstituteKeyMap( krb5key );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/StoreUtils.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.kerberos.shared.store.operations;
+
import java.nio.ByteBuffer;
import org.apache.directory.server.core.api.CoreSession;
@@ -51,8 +52,8 @@ import org.slf4j.LoggerFactory;
public class StoreUtils
{
private static final Logger LOG = LoggerFactory.getLogger( StoreUtils.class );
-
-
+
+
/**
* Creates a Entry for a PrincipalStoreEntry, doing what a state
* factory does but for Entry instead of Attributes.
@@ -67,11 +68,11 @@ public class StoreUtils
throws Exception
{
Entry outAttrs = session.getDirectoryService().newEntry( dn );
-
+
// process the objectClass attribute
- outAttrs.add( SchemaConstants.OBJECT_CLASS_AT,
- SchemaConstants.TOP_OC, SchemaConstants.UID_OBJECT_AT,
- "uidObject", SchemaConstants.EXTENSIBLE_OBJECT_OC,
+ outAttrs.add( SchemaConstants.OBJECT_CLASS_AT,
+ SchemaConstants.TOP_OC, SchemaConstants.UID_OBJECT_AT,
+ "uidObject", SchemaConstants.EXTENSIBLE_OBJECT_OC,
SchemaConstants.PERSON_OC, SchemaConstants.ORGANIZATIONAL_PERSON_OC,
SchemaConstants.INET_ORG_PERSON_OC, SchemaConstants.KRB5_PRINCIPAL_OC,
"krb5KDCEntry" );
@@ -80,9 +81,9 @@ public class StoreUtils
outAttrs.add( KerberosAttribute.APACHE_SAM_TYPE_AT, "7" );
outAttrs.add( SchemaConstants.SN_AT, principalEntry.getUserId() );
outAttrs.add( SchemaConstants.CN_AT, principalEntry.getCommonName() );
-
+
EncryptionKey encryptionKey = principalEntry.getKeyMap().get( EncryptionType.DES_CBC_MD5 );
-
+
ByteBuffer buffer = ByteBuffer.allocate( encryptionKey.computeLength() );
outAttrs.add( KerberosAttribute.KRB5_KEY_AT, encryptionKey.encode( buffer ).array() );
@@ -93,8 +94,8 @@ public class StoreUtils
return outAttrs;
}
-
-
+
+
/**
* Constructs a filter expression tree for the filter used to search the
* directory.
@@ -110,7 +111,7 @@ public class StoreUtils
Value<String> value = new StringValue( type, principal );
return new EqualityNode<String>( KerberosAttribute.KRB5_PRINCIPAL_NAME_AT, value );
}
-
+
/**
* Finds the Entry associated with the Kerberos principal name.
@@ -125,24 +126,24 @@ public class StoreUtils
throws Exception
{
EntryFilteringCursor cursor = null;
-
+
try
{
SchemaManager schemaManager = session.getDirectoryService().getSchemaManager();
- cursor = session.search( searchBaseDn, SearchScope.SUBTREE,
+ cursor = session.search( searchBaseDn, SearchScope.SUBTREE,
getFilter( schemaManager, principal ), AliasDerefMode.DEREF_ALWAYS, null );
-
+
cursor.beforeFirst();
if ( cursor.next() )
{
Entry entry = cursor.get();
LOG.debug( "Found entry {} for kerberos principal name {}", entry, principal );
-
+
while ( cursor.next() )
{
LOG.error( I18n.err( I18n.ERR_149, principal, cursor.next() ) );
}
-
+
return entry;
}
else
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/package-info.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/package-info.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/package-info.java Tue Jan 24 16:15:05 2012
@@ -25,3 +25,5 @@
*/
package org.apache.directory.server.kerberos.shared.store.operations;
+
+
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/package-info.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/package-info.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/package-info.java Tue Jan 24 16:15:05 2012
@@ -26,3 +26,5 @@
*/
package org.apache.directory.server.kerberos.shared.store;
+
+
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosConstants.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosConstants.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosConstants.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos;
+
/**
* An cass to define Kerberos constants
*
@@ -38,7 +39,7 @@ public class KerberosConstants
public static final int TICKET_REALM_TAG = 0xA1;
public static final int TICKET_SNAME_TAG = 0xA2;
public static final int TICKET_ENC_PART_TAG = 0xA3;
-
+
/** Authenticator tags */
public static final int AUTHENTICATOR_TAG = 0x62;
public static final int AUTHENTICATOR_AUTHENTICATOR_VNO_TAG = 0xA0;
@@ -50,19 +51,19 @@ public class KerberosConstants
public static final int AUTHENTICATOR_SUBKEY_TAG = 0xA6;
public static final int AUTHENTICATOR_SEQ_NUMBER_TAG = 0xA7;
public static final int AUTHENTICATOR_AUTHORIZATION_DATA_TAG = 0xA8;
-
+
/** AS-REQ's tags */
public static final int AS_REQ_TAG = 0x6A;
-
+
/** AS-REP's tags */
public static final int AS_REP_TAG = 0x6B;
-
+
/** TGS-REQ's tags */
public static final int TGS_REQ_TAG = 0x6C;
-
+
/** TGS-REP's tags */
public static final int TGS_REP_TAG = 0x6D;
-
+
/** AP-REQ tags */
public static final int AP_REQ_TAG = 0x6E;
public static final int AP_REQ_PVNO_TAG = 0xA0;
@@ -70,13 +71,13 @@ public class KerberosConstants
public static final int AP_REQ_AP_OPTIONS_TAG = 0xA2;
public static final int AP_REQ_TICKET_TAG = 0xA3;
public static final int AP_REQ_AUTHENTICATOR_TAG = 0xA4;
-
+
/** AP-REP tags */
public static final int AP_REP_TAG = 0x6F;
public static final int AP_REP_PVNO_TAG = 0xA0;
public static final int AP_REP_MSG_TYPE_TAG = 0xA1;
public static final int AP_REP_ENC_PART_TAG = 0xA2;
-
+
/** KrbSafe tags */
public static final int KRB_SAFE_TAG = 0x74;
public static final int KRB_SAFE_PVNO_TAG = 0xA0;
@@ -92,17 +93,17 @@ public class KerberosConstants
/** EncAsRepPart's tags */
public static final int ENC_AS_REP_PART_TAG = 0x79;
-
+
/** EncTgsRepPart's tags */
public static final int ENC_TGS_REP_PART_TAG = 0x7A;
-
+
/** EncAPRepPart's tags */
public static final int ENC_AP_REP_PART_TAG = 0x7B;
public static final int ENC_AP_REP_PART_CTIME_TAG = 0xA0;
public static final int ENC_AP_REP_PART_CUSEC_TAG = 0xA1;
public static final int ENC_AP_REP_PART_SUB_KEY_TAG = 0xA2;
public static final int ENC_AP_REP_PART_SEQ_NUMBER_TAG = 0xA3;
-
+
/** EncKrbPrivPart */
public static final int ENC_KRB_PRIV_PART_TAG = 0x7C;
public static final int ENC_KRB_PRIV_PART_USER_DATA_TAG = 0xA0;
@@ -134,20 +135,20 @@ public class KerberosConstants
public static final int KRB_CRED_MSGTYPE_TAG = 0xA1;
public static final int KRB_CRED_TICKETS_TAG = 0xA2;
public static final int KRB_CRED_ENCPART_TAG = 0xA3;
-
+
//-------------------------------------------------------------------------
// Components
//-------------------------------------------------------------------------
/** AD-AND-OR */
public static final int AD_AND_OR_CONDITION_COUNT_TAG = 0xA0;
public static final int AD_AND_OR_ELEMENTS_TAG = 0xA1;
-
+
/** AD-KDCIssued */
public static final int AD_KDC_ISSUED_AD_CHECKSUM_TAG = 0xA0;
public static final int AD_KDC_ISSUED_I_REALM_TAG = 0xA1;
public static final int AD_KDC_ISSUED_I_SNAME_TAG = 0xA2;
public static final int AD_KDC_ISSUED_ELEMENTS_TAG = 0xA3;
-
+
/** AuthorizationData tags */
public static final int AUTHORIZATION_DATA_ADTYPE_TAG = 0xA0;
public static final int AUTHORIZATION_DATA_ADDATA_TAG = 0xA1;
@@ -155,7 +156,7 @@ public class KerberosConstants
/** Checksum tags */
public static final int CHECKSUM_TYPE_TAG = 0xA0;
public static final int CHECKSUM_CHECKSUM_TAG = 0xA1;
-
+
/** EncKdcRepPart tags */
public static final int ENC_KDC_REP_PART_KEY_TAG = 0xA0;
public static final int ENC_KDC_REP_PART_LAST_REQ_TAG = 0xA1;
@@ -169,7 +170,7 @@ public class KerberosConstants
public static final int ENC_KDC_REP_PART_SREALM_TAG = 0xA9;
public static final int ENC_KDC_REP_PART_SNAME_TAG = 0xAA;
public static final int ENC_KDC_REP_PART_CADDR_TAG = 0xAB;
-
+
/** EncKrbCredPart tags */
public static final int ENC_KRB_CRED_PART_TAG = 0x7D;
public static final int ENC_KRB_CRED_TICKET_INFO_TAG = 0xA0;
@@ -178,16 +179,16 @@ public class KerberosConstants
public static final int ENC_KRB_CRED_PART_USEC_TAG = 0xA3;
public static final int ENC_KRB_CRED_PART_SENDER_ADDRESS_TAG = 0xA4;
public static final int ENC_KRB_CRED_PART_RECIPIENT_ADDRESS_TAG = 0xA5;
-
+
/** Encrypteddata's tags */
public static final int ENCRYPTED_DATA_ETYPE_TAG = 0xA0;
public static final int ENCRYPTED_DATA_KVNO_TAG = 0xA1;
public static final int ENCRYPTED_DATA_CIPHER_TAG = 0xA2;
-
+
/** EncryptionKey tags */
public static final int ENCRYPTION_KEY_TYPE_TAG = 0xA0;
public static final int ENCRYPTION_KEY_VALUE_TAG = 0xA1;
-
+
/** EncTicketPart tags */
public static final int ENC_TICKET_PART_TAG = 0x63;
public static final int ENC_TICKET_PART_FLAGS_TAG = 0xA0;
@@ -205,16 +206,16 @@ public class KerberosConstants
/** ETYPE-INFO-ENTRY tags */
public static final int ETYPE_INFO_ENTRY_ETYPE_TAG = 0xA0;
public static final int ETYPE_INFO_ENTRY_SALT_TAG = 0xA1;
-
+
/** ETYPE-INFO2-ENTRY tags */
public static final int ETYPE_INFO2_ENTRY_ETYPE_TAG = 0xA0;
public static final int ETYPE_INFO2_ENTRY_SALT_TAG = 0xA1;
public static final int ETYPE_INFO2_ENTRY_S2KPARAMS_TAG = 0xA2;
-
+
/** HostAddress' tags */
public static final int HOST_ADDRESS_ADDR_TYPE_TAG = 0xA0;
public static final int HOST_ADDRESS_ADDRESS_TAG = 0xA1;
-
+
/** KrbCredInfo tags */
public static final int KRB_CRED_INFO_KEY_TAG = 0xA0;
public static final int KRB_CRED_INFO_PREALM_TAG = 0xA1;
@@ -236,7 +237,7 @@ public class KerberosConstants
public static final int KDC_REP_CNAME_TAG = 0xA4;
public static final int KDC_REP_TICKET_TAG = 0xA5;
public static final int KDC_REP_ENC_PART_TAG = 0xA6;
-
+
/** KRB-REQ's tags */
public static final int KDC_REQ_PVNO_TAG = 0xA1;
public static final int KDC_REQ_MSG_TYPE_TAG = 0xA2;
@@ -256,7 +257,7 @@ public class KerberosConstants
public static final int KDC_REQ_BODY_ADDRESSES_TAG = 0xA9;
public static final int KDC_REQ_BODY_ENC_AUTHZ_DATA_TAG = 0xAA;
public static final int KDC_REQ_BODY_ADDITIONAL_TICKETS_TAG = 0xAB;
-
+
/** KrbSafeBody tags */
public static final int KRB_SAFE_BODY_USER_DATA_TAG = 0xA0;
public static final int KRB_SAFE_BODY_TIMESTAMP_TAG = 0xA1;
@@ -284,7 +285,7 @@ public class KerberosConstants
/** TransitedEncoding tags */
public static final int TRANSITED_ENCODING_TR_TYPE_TAG = 0xA0;
public static final int TRANSITED_ENCODING_CONTENTS_TAG = 0xA1;
-
+
/** TypedData tags */
public static final int TYPED_DATA_TDTYPE_TAG = 0xA0;
public static final int TYPED_DATA_TDDATA_TAG = 0xA1;
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosMessageType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosMessageType.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosMessageType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosMessageType.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos;
+
/**
* An enum listing all the Kerberos V5 messages :
*
@@ -40,27 +41,28 @@ package org.apache.directory.shared.kerb
*/
public enum KerberosMessageType
{
- TICKET( 1, "ticket" ),
- AUTHENTICATOR( 2, "Authenticator" ),
- ENC_TICKET_PART( 3, "EncTicketPart" ),
- AS_REQ( 10, "initial authentication request" ),
- AS_REP( 11, "initial authentication response"),
- TGS_REQ( 12, "request for authentication based on TGT" ),
- TGS_REP( 13, "response to authentication based on TGT" ),
- AP_REQ( 14, "application request" ),
- AP_REP( 15, "application response" ),
- KRB_SAFE( 20, "safe (checksummed) application message" ),
- KRB_PRIV( 21, "private (encrypted) application message" ),
- KRB_CRED( 22, "private (encrypted) message to forward credentials" ),
- ENC_AS_REP_PART( 25, "encrypted authentication reply part" ),
- ENC_TGS_REP_PART( 26, "encrypted TGT reply part" ),
- ENC_AP_REP_PART( 27, "encrypted application reply part" ),
- ENC_PRIV_PART( 28, "encrypted private message part" ),
- KRB_ERROR( 30, "error response" );
-
+ TICKET(1, "ticket"),
+ AUTHENTICATOR(2, "Authenticator"),
+ ENC_TICKET_PART(3, "EncTicketPart"),
+ AS_REQ(10, "initial authentication request"),
+ AS_REP(11, "initial authentication response"),
+ TGS_REQ(12, "request for authentication based on TGT"),
+ TGS_REP(13, "response to authentication based on TGT"),
+ AP_REQ(14, "application request"),
+ AP_REP(15, "application response"),
+ KRB_SAFE(20, "safe (checksummed) application message"),
+ KRB_PRIV(21, "private (encrypted) application message"),
+ KRB_CRED(22, "private (encrypted) message to forward credentials"),
+ ENC_AS_REP_PART(25, "encrypted authentication reply part"),
+ ENC_TGS_REP_PART(26, "encrypted TGT reply part"),
+ ENC_AP_REP_PART(27, "encrypted application reply part"),
+ ENC_PRIV_PART(28, "encrypted private message part"),
+ KRB_ERROR(30, "error response");
+
private int value;
private String message;
-
+
+
/**
* Creates a new instance of KerberosMessageType.
*/
@@ -70,7 +72,7 @@ public enum KerberosMessageType
this.message = message;
}
-
+
/**
* Get the int value for this element
*
@@ -80,8 +82,8 @@ public enum KerberosMessageType
{
return value;
}
-
-
+
+
/**
* Get the message associated with this element
*
@@ -91,8 +93,8 @@ public enum KerberosMessageType
{
return message;
}
-
-
+
+
/**
* Get the instance of a KerberosMessageType from an int value
*
@@ -103,22 +105,38 @@ public enum KerberosMessageType
{
switch ( value )
{
- case 1 : return TICKET;
- case 2 : return AUTHENTICATOR;
- case 3 : return ENC_TICKET_PART;
- case 10 : return AS_REQ;
- case 11 : return AS_REP;
- case 12 : return TGS_REQ;
- case 13 : return TGS_REP;
- case 14 : return AP_REQ;
- case 15 : return AP_REP;
- case 20 : return KRB_SAFE;
- case 21 : return KRB_PRIV;
- case 22 : return KRB_CRED;
- case 27 : return ENC_AP_REP_PART;
- case 28 : return ENC_PRIV_PART;
- case 30 : return KRB_ERROR;
- default : return null;
+ case 1:
+ return TICKET;
+ case 2:
+ return AUTHENTICATOR;
+ case 3:
+ return ENC_TICKET_PART;
+ case 10:
+ return AS_REQ;
+ case 11:
+ return AS_REP;
+ case 12:
+ return TGS_REQ;
+ case 13:
+ return TGS_REP;
+ case 14:
+ return AP_REQ;
+ case 15:
+ return AP_REP;
+ case 20:
+ return KRB_SAFE;
+ case 21:
+ return KRB_PRIV;
+ case 22:
+ return KRB_CRED;
+ case 27:
+ return ENC_AP_REP_PART;
+ case 28:
+ return ENC_PRIV_PART;
+ case 30:
+ return KRB_ERROR;
+ default:
+ return null;
}
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosTime.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosTime.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosTime.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosTime.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos;
+
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -31,6 +32,7 @@ import java.util.TimeZone;
import org.apache.directory.shared.util.DateUtils;
import org.apache.directory.shared.util.Strings;
+
/**
* An specialization of the ASN.1 GeneralTime. The Kerberos time contains date and
* time up to the seconds, but with no fractional seconds. It's also always
@@ -44,13 +46,13 @@ public class KerberosTime implements Com
/** The UTC timeZone */
private static final TimeZone UTC = TimeZone.getTimeZone( "UTC" );
-
+
/** The KerberosTime as a String*/
private String date;
-
+
/** The kerberosTime, as a long */
private long kerberosTime;
-
+
/** Constant for the {@link KerberosTime} "infinity." */
public static final KerberosTime INFINITY = new KerberosTime( Long.MAX_VALUE );
@@ -63,17 +65,17 @@ public class KerberosTime implements Com
/** The number of milliseconds in a week. */
public static final int WEEK = MINUTE * 10080;
-
+
/**
* Creates a new instance of a KerberosTime object
*/
public KerberosTime()
{
- kerberosTime = (System.currentTimeMillis()/1000L)*1000L; // drop the ms
+ kerberosTime = ( System.currentTimeMillis() / 1000L ) * 1000L; // drop the ms
convertInternal( kerberosTime );
}
-
+
/**
* Creates a new instance of a KerberosTime object
*
@@ -90,8 +92,8 @@ public class KerberosTime implements Com
throw new IllegalArgumentException( "Bad time : " + date );
}
}
-
-
+
+
/**
* Creates a new instance of a KerberosTime object
*/
@@ -99,7 +101,7 @@ public class KerberosTime implements Com
{
convertInternal( date );
}
-
+
/**
* Creates a new instance of KerberosTime.
@@ -108,11 +110,11 @@ public class KerberosTime implements Com
*/
public KerberosTime( Date time )
{
- kerberosTime = (time.getTime()/1000L)*1000L; // drop the ms
+ kerberosTime = ( time.getTime() / 1000L ) * 1000L; // drop the ms
convertInternal( kerberosTime );
}
-
+
/**
* converts the given milliseconds time to seconds and
* also formats the time to the generalized form
@@ -123,15 +125,15 @@ public class KerberosTime implements Com
{
Calendar calendar = Calendar.getInstance( UTC );
calendar.setTimeInMillis( date );
-
+
synchronized ( DateUtils.DATE_FORMAT )
{
this.date = DateUtils.DATE_FORMAT.format( calendar.getTime() );
}
-
- kerberosTime = (calendar.getTimeInMillis()/1000L)*1000L; // drop the ms
+
+ kerberosTime = ( calendar.getTimeInMillis() / 1000L ) * 1000L; // drop the ms
}
-
+
/**
* Returns the {@link KerberosTime} as a long.
@@ -165,16 +167,16 @@ public class KerberosTime implements Com
public static KerberosTime getTime( String zuluTime ) throws ParseException
{
Date date = null;
-
+
synchronized ( DateUtils.DATE_FORMAT )
{
date = DateUtils.DATE_FORMAT.parse( zuluTime );
}
-
+
return new KerberosTime( date );
}
-
+
/**
* Sets the date if it's a valid KerberosTime
* @param date The date to store
@@ -185,20 +187,20 @@ public class KerberosTime implements Com
{
kerberosTime = DateUtils.DATE_FORMAT.parse( date ).getTime();
}
-
+
convertInternal( kerberosTime );
}
-
-
+
+
/**
* @return The date as a byte[]
*/
public byte[] getBytes()
{
- return Strings.getBytesUtf8(date);
+ return Strings.getBytesUtf8( date );
}
-
-
+
+
/**
* @return The stored date
*/
@@ -211,7 +213,7 @@ public class KerberosTime implements Com
@Override
public int hashCode()
{
- return (int)kerberosTime;
+ return ( int ) kerberosTime;
}
@@ -222,18 +224,18 @@ public class KerberosTime implements Com
{
return true;
}
-
+
if ( obj == null )
{
return true;
}
-
+
KerberosTime other = ( KerberosTime ) obj;
-
+
return kerberosTime == other.kerberosTime;
}
-
-
+
+
/**
* Returns whether this {@link KerberosTime} is within the given clockskew.
*
@@ -244,11 +246,11 @@ public class KerberosTime implements Com
{
// The KerberosTime does not have milliseconds
long delta = Math.abs( kerberosTime - System.currentTimeMillis() );
-
+
return delta < clockSkew;
}
-
-
+
+
/**
* compares current kerberos time with the given kerberos time
* @param that the kerberos time against which the current kerberos time is compared
@@ -281,8 +283,8 @@ public class KerberosTime implements Com
return EQUAL;
}
-
-
+
+
/**
* checks if the current kerberos time is less or equal than the given kerberos time
* @param ktime the kerberos time against which the current kerberos time needs to be compared
@@ -292,8 +294,8 @@ public class KerberosTime implements Com
{
return kerberosTime <= ktime.kerberosTime;
}
-
-
+
+
/**
* checks if the current kerberos time is greater than the given kerberos time
* @param ktime the kerberos time against which the currnet kerberos time needs to be compared
@@ -303,8 +305,8 @@ public class KerberosTime implements Com
{
return kerberosTime > ktime.kerberosTime;
}
-
-
+
+
/**
* Returns whether this {@link KerberosTime} is zero.
*
@@ -314,8 +316,8 @@ public class KerberosTime implements Com
{
return kerberosTime == 0;
}
-
-
+
+
/**
* Write a serialized version of this instance.
*/
@@ -323,27 +325,27 @@ public class KerberosTime implements Com
{
out.writeUTF( date );
}
-
-
+
+
/**
* Read a KerberosTime from a stream
*/
private void readObject( ObjectInputStream in ) throws IOException, ClassNotFoundException
{
String date = in.readUTF();
-
+
try
{
setDate( date );
}
catch ( ParseException pe )
{
- kerberosTime = (System.currentTimeMillis()/1000L)*1000L; // drop the ms
+ kerberosTime = ( System.currentTimeMillis() / 1000L ) * 1000L; // drop the ms
convertInternal( kerberosTime );
}
}
-
-
+
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosUtils.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosUtils.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/KerberosUtils.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos;
+
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
@@ -31,6 +32,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.util.Strings;
+
/**
* An utility class for Kerberos.
*
@@ -43,7 +45,8 @@ public class KerberosUtils
/** An empty list of principal names */
public static final List<String> EMPTY_PRINCIPAL_NAME = new ArrayList<String>();
-
+
+
/**
* Parse a KerberosPrincipal instance and return the names. The Principal name
* is described in RFC 1964 : <br/>
@@ -96,18 +99,19 @@ public class KerberosUtils
{
return EMPTY_PRINCIPAL_NAME;
}
-
+
String names = principal.getName();
-
- if ( Strings.isEmpty(names) )
+
+ if ( Strings.isEmpty( names ) )
{
// Empty name...
return EMPTY_PRINCIPAL_NAME;
}
-
+
return getNames( names );
}
+
/**
* Parse a PrincipalName and return the names.
*/
@@ -117,33 +121,33 @@ public class KerberosUtils
{
return EMPTY_PRINCIPAL_NAME;
}
-
+
List<String> nameComponents = new ArrayList<String>();
-
+
// Start the parsing. Another State Machine :)
char[] chars = principalNames.toCharArray();
-
+
boolean escaped = false;
boolean done = false;
int start = 0;
int pos = 0;
-
+
for ( int i = 0; i < chars.length; i++ )
{
pos = i;
-
+
switch ( chars[i] )
{
- case '\\' :
+ case '\\':
escaped = !escaped;
break;
-
- case '/' :
+
+ case '/':
if ( escaped )
{
escaped = false;
}
- else
+ else
{
// We have a new name component
if ( i - start > 0 )
@@ -157,10 +161,10 @@ public class KerberosUtils
throw new ParseException( I18n.err( I18n.ERR_628 ), i );
}
}
-
+
break;
-
- case '@' :
+
+ case '@':
if ( escaped )
{
escaped = false;
@@ -182,27 +186,27 @@ public class KerberosUtils
throw new ParseException( I18n.err( I18n.ERR_628 ), i );
}
}
-
+
break;
-
- default :
+
+ default:
}
-
+
if ( done )
{
break;
}
- }
-
+ }
+
if ( escaped )
{
throw new ParseException( I18n.err( I18n.ERR_629 ), pos );
}
-
+
return nameComponents;
}
-
-
+
+
/**
* Constructs a KerberosPrincipal from a PrincipalName and an
* optional realm
@@ -214,13 +218,13 @@ public class KerberosUtils
*/
public static KerberosPrincipal getKerberosPrincipal( PrincipalName principal, String realm )
{
- String name = principal.getNameString();
-
- if ( !Strings.isEmpty(realm) )
+ String name = principal.getNameString();
+
+ if ( !Strings.isEmpty( realm ) )
{
name += '@' + realm;
}
-
+
return new KerberosPrincipal( name, principal.getNameType().getValue() );
}
@@ -233,9 +237,10 @@ public class KerberosUtils
* @param configuredTypes The configured encryption types
* @return The first matching encryption type.
*/
- public static EncryptionType getBestEncryptionType( Set<EncryptionType> requestedTypes, Set<EncryptionType> configuredTypes )
+ public static EncryptionType getBestEncryptionType( Set<EncryptionType> requestedTypes,
+ Set<EncryptionType> configuredTypes )
{
- for ( EncryptionType encryptionType:requestedTypes )
+ for ( EncryptionType encryptionType : requestedTypes )
{
if ( configuredTypes.contains( encryptionType ) )
{
@@ -245,8 +250,8 @@ public class KerberosUtils
return null;
}
-
-
+
+
/**
* Build a list of encryptionTypes
*
@@ -258,7 +263,7 @@ public class KerberosUtils
StringBuilder sb = new StringBuilder();
boolean isFirst = true;
- for ( EncryptionType etype:encryptionTypes )
+ for ( EncryptionType etype : encryptionTypes )
{
if ( isFirst )
{
@@ -268,21 +273,21 @@ public class KerberosUtils
{
sb.append( ", " );
}
-
+
sb.append( etype );
}
return sb.toString();
}
-
-
+
+
public static boolean isKerberosString( byte[] value )
{
if ( value == null )
{
return false;
}
-
+
for ( byte b : value )
{
if ( ( b < 0x20 ) || ( b > 0x7E ) )
@@ -290,11 +295,10 @@ public class KerberosUtils
return false;
}
}
-
+
return true;
}
-
/**
* Verifies an AuthHeader using guidelines from RFC 1510 section A.10., "KRB_AP_REQ verification."
*
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartContainer.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartContainer.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.codec.EncKdcRepPart;
+
import java.nio.ByteBuffer;
import org.apache.directory.shared.asn1.ber.AbstractContainer;
@@ -34,7 +35,8 @@ public class EncKdcRepPartContainer exte
{
/** An EncKdcRepPart container */
private EncKdcRepPart encKdcRepPart;
-
+
+
/**
* Creates a new EncKdcRepPartContainer object.
* @param stream The stream containing the data to decode
@@ -56,7 +58,7 @@ public class EncKdcRepPartContainer exte
return encKdcRepPart;
}
-
+
/**
* Set a EncKdcRepPart Object into the container. It will be completed by the
* KerberosDecoder.
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartGrammar.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartGrammar.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartGrammar.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartGrammar.java Tue Jan 24 16:15:05 2012
@@ -131,7 +131,8 @@ public final class EncKdcRepPartGrammar
// EncKDCRepPart ::= SEQUENCE {
// ...
// nonce [2] UInt32,
- super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_NONCE_TAG_STATE.ordinal()][UniversalTag.INTEGER.getValue()] =
+ super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_NONCE_TAG_STATE.ordinal()][UniversalTag.INTEGER
+ .getValue()] =
new GrammarTransition<EncKdcRepPartContainer>(
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_NONCE_TAG_STATE,
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_NONCE_STATE,
@@ -170,7 +171,8 @@ public final class EncKdcRepPartGrammar
// EncKDCRepPart ::= SEQUENCE {
// ...
// key-expiration [3] KerberosTime OPTIONAL,
- super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_KEY_EXPIRATION_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME.getValue()] =
+ super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_KEY_EXPIRATION_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME
+ .getValue()] =
new GrammarTransition<EncKdcRepPartContainer>(
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_KEY_EXPIRATION_TAG_STATE,
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_KEY_EXPIRATION_STATE,
@@ -196,7 +198,8 @@ public final class EncKdcRepPartGrammar
// EncKDCRepPart ::= SEQUENCE {
// ...
// flags [4] TicketFlags,
- super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_FLAGS_TAG_STATE.ordinal()][UniversalTag.BIT_STRING.getValue()] =
+ super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_FLAGS_TAG_STATE.ordinal()][UniversalTag.BIT_STRING
+ .getValue()] =
new GrammarTransition<EncKdcRepPartContainer>(
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_FLAGS_TAG_STATE,
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_FLAGS_STATE,
@@ -222,7 +225,8 @@ public final class EncKdcRepPartGrammar
// EncKDCRepPart ::= SEQUENCE {
// ...
// authtime [5] KerberosTime,
- super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_AUTH_TIME_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME.getValue()] =
+ super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_AUTH_TIME_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME
+ .getValue()] =
new GrammarTransition<EncKdcRepPartContainer>(
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_AUTH_TIME_TAG_STATE,
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_AUTH_TIME_STATE,
@@ -261,7 +265,8 @@ public final class EncKdcRepPartGrammar
// EncKDCRepPart ::= SEQUENCE {
// ...
// starttime [6] KerberosTime OPTIONAL,
- super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_START_TIME_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME.getValue()] =
+ super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_START_TIME_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME
+ .getValue()] =
new GrammarTransition<EncKdcRepPartContainer>(
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_START_TIME_TAG_STATE,
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_START_TIME_STATE,
@@ -287,7 +292,8 @@ public final class EncKdcRepPartGrammar
// EncKDCRepPart ::= SEQUENCE {
// ...
// endtime [7] KerberosTime,
- super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_END_TIME_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME.getValue()] =
+ super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_END_TIME_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME
+ .getValue()] =
new GrammarTransition<EncKdcRepPartContainer>(
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_END_TIME_TAG_STATE,
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_END_TIME_STATE,
@@ -326,7 +332,8 @@ public final class EncKdcRepPartGrammar
// EncKDCRepPart ::= SEQUENCE {
// ...
// renew-till [8] KerberosTime OPTIONAL,
- super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_RENEW_TILL_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME.getValue()] =
+ super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_RENEW_TILL_TAG_STATE.ordinal()][UniversalTag.GENERALIZED_TIME
+ .getValue()] =
new GrammarTransition<EncKdcRepPartContainer>(
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_RENEW_TILL_TAG_STATE,
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_RENEW_TILL_STATE,
@@ -352,7 +359,8 @@ public final class EncKdcRepPartGrammar
// EncKDCRepPart ::= SEQUENCE {
// ...
// srealm [9] Realm,
- super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_SREALM_TAG_STATE.ordinal()][UniversalTag.GENERAL_STRING.getValue()] =
+ super.transitions[EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_SREALM_TAG_STATE.ordinal()][UniversalTag.GENERAL_STRING
+ .getValue()] =
new GrammarTransition<EncKdcRepPartContainer>(
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_SREALM_TAG_STATE,
EncKdcRepPartStatesEnum.ENC_KDC_REP_PART_SREALM_STATE,
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartStatesEnum.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/EncKdcRepPart/EncKdcRepPartStatesEnum.java Tue Jan 24 16:15:05 2012
@@ -33,47 +33,46 @@ import org.apache.directory.shared.asn1.
public enum EncKdcRepPartStatesEnum implements States
{
// Start
- START_STATE, // 0
+ START_STATE, // 0
// ----- EncKdcRepPart component --------------------------------------
- ENC_KDC_REP_PART_SEQ_TAG_STATE, // 1
+ ENC_KDC_REP_PART_SEQ_TAG_STATE, // 1
- ENC_KDC_REP_PART_KEY_TAG_STATE, // 2
+ ENC_KDC_REP_PART_KEY_TAG_STATE, // 2
- ENC_KDC_REP_PART_LAST_REQ_TAG_STATE, // 3
+ ENC_KDC_REP_PART_LAST_REQ_TAG_STATE, // 3
- ENC_KDC_REP_PART_NONCE_TAG_STATE, // 4
- ENC_KDC_REP_PART_NONCE_STATE, // 5
+ ENC_KDC_REP_PART_NONCE_TAG_STATE, // 4
+ ENC_KDC_REP_PART_NONCE_STATE, // 5
- ENC_KDC_REP_PART_KEY_EXPIRATION_TAG_STATE, // 6
- ENC_KDC_REP_PART_KEY_EXPIRATION_STATE, // 7
+ ENC_KDC_REP_PART_KEY_EXPIRATION_TAG_STATE, // 6
+ ENC_KDC_REP_PART_KEY_EXPIRATION_STATE, // 7
- ENC_KDC_REP_PART_FLAGS_TAG_STATE, // 8
- ENC_KDC_REP_PART_FLAGS_STATE, // 9
+ ENC_KDC_REP_PART_FLAGS_TAG_STATE, // 8
+ ENC_KDC_REP_PART_FLAGS_STATE, // 9
- ENC_KDC_REP_PART_AUTH_TIME_TAG_STATE, // 10
- ENC_KDC_REP_PART_AUTH_TIME_STATE, // 11
+ ENC_KDC_REP_PART_AUTH_TIME_TAG_STATE, // 10
+ ENC_KDC_REP_PART_AUTH_TIME_STATE, // 11
- ENC_KDC_REP_PART_START_TIME_TAG_STATE, // 12
- ENC_KDC_REP_PART_START_TIME_STATE, // 13
+ ENC_KDC_REP_PART_START_TIME_TAG_STATE, // 12
+ ENC_KDC_REP_PART_START_TIME_STATE, // 13
- ENC_KDC_REP_PART_END_TIME_TAG_STATE, // 14
- ENC_KDC_REP_PART_END_TIME_STATE, // 15
+ ENC_KDC_REP_PART_END_TIME_TAG_STATE, // 14
+ ENC_KDC_REP_PART_END_TIME_STATE, // 15
- ENC_KDC_REP_PART_RENEW_TILL_TAG_STATE, // 16
- ENC_KDC_REP_PART_RENEW_TILL_STATE, // 17
+ ENC_KDC_REP_PART_RENEW_TILL_TAG_STATE, // 16
+ ENC_KDC_REP_PART_RENEW_TILL_STATE, // 17
- ENC_KDC_REP_PART_SREALM_TAG_STATE, // 18
- ENC_KDC_REP_PART_SREALM_STATE, // 19
+ ENC_KDC_REP_PART_SREALM_TAG_STATE, // 18
+ ENC_KDC_REP_PART_SREALM_STATE, // 19
- ENC_KDC_REP_PART_SNAME_TAG_STATE, // 20
+ ENC_KDC_REP_PART_SNAME_TAG_STATE, // 20
- ENC_KDC_REP_PART_CADDR_TAG_STATE, // 21
+ ENC_KDC_REP_PART_CADDR_TAG_STATE, // 21
// End
- LAST_ENC_KDC_REP_PART_STATE; // 22
-
+ LAST_ENC_KDC_REP_PART_STATE; // 22
/**
* Get the grammar name
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageContainer.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageContainer.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.codec;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.PrincipalName;
import org.apache.directory.shared.kerberos.messages.KerberosMessage;
@@ -36,16 +37,17 @@ public class KerberosMessageContainer ex
{
/** The internal kerberos message */
private KerberosMessage message;
-
+
/** A PrincipalName container */
private PrincipalName principalName;
-
+
/** A flag used when the protocol used to transfer the PDU is TCP */
private boolean isTCP;
-
+
/** When the connection is using a TCP protocol, the PDU length */
private int tcpLength = -1;
+
/**
* Creates a new KerberosMessageContainer object. We will store ten grammars,
* it's enough ...
@@ -67,7 +69,7 @@ public class KerberosMessageContainer ex
return message;
}
-
+
/**
* Set a Message Object into the container. It will be completed by the
* KerberosDecoder.
@@ -85,7 +87,7 @@ public class KerberosMessageContainer ex
*/
public Ticket getTicket()
{
- return (Ticket)message;
+ return ( Ticket ) message;
}
@@ -97,7 +99,7 @@ public class KerberosMessageContainer ex
return principalName;
}
-
+
/**
* Set a PrincipalName Object into the container. It will be completed by the
* KerberosDecoder.
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageGrammar.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageGrammar.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageGrammar.java Tue Jan 24 16:15:05 2012
@@ -71,7 +71,7 @@ public final class KerberosMessageGramma
public void action( KerberosMessageContainer kerberosMessageContainer ) throws DecoderException
{
ByteBuffer stream = kerberosMessageContainer.getStream();
-
+
try
{
stream.reset();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageStatesEnum.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosMessageStatesEnum.java Tue Jan 24 16:15:05 2012
@@ -49,21 +49,20 @@ public enum KerberosMessageStatesEnum im
// ----- Kerberos message --------------------------------------------
- AS_REQ_STATE, // 0x6A
- AS_REP_TAG_STATE, // 0x6B
- TGS_REQ_TAG_STATE, // 0x6C
- TGS_REP_TAG_STATE, // 0x6D
- AP_REQ_TAG_STATE, // 0x6E
- AP_REP_TAG_STATE, // 0x6F
- KRB_SAFE_STATE, // 0x74
- KRB_PRIV_STATE, // 0x75
- KRB_CRED_STATE, // 0x76
- KRB_ERROR_STATE, // 0x7E
+ AS_REQ_STATE, // 0x6A
+ AS_REP_TAG_STATE, // 0x6B
+ TGS_REQ_TAG_STATE, // 0x6C
+ TGS_REP_TAG_STATE, // 0x6D
+ AP_REQ_TAG_STATE, // 0x6E
+ AP_REP_TAG_STATE, // 0x6F
+ KRB_SAFE_STATE, // 0x74
+ KRB_PRIV_STATE, // 0x75
+ KRB_CRED_STATE, // 0x76
+ KRB_ERROR_STATE, // 0x7E
// End
LAST_KERBEROS_MESSAGE_STATE;
-
/**
* Get the grammar name
*
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddress.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddress.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadHostAddress.java Tue Jan 24 16:15:05 2012
@@ -57,6 +57,7 @@ public abstract class AbstractReadHostAd
protected abstract void setAddress( HostAddress hostAddress, E container );
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java Tue Jan 24 16:15:05 2012
@@ -83,7 +83,7 @@ public abstract class AbstractReadKerber
// The value is the KerberosTime
Value value = tlv.getValue();
- String date = Strings.utf8ToString(value.getData());
+ String date = Strings.utf8ToString( value.getData() );
try
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java Tue Jan 24 16:15:05 2012
@@ -49,6 +49,7 @@ public abstract class AbstractReadMsgTyp
/** The msgType to decode */
private KerberosMessageType msgType = null;
+
/**
* Instantiates a new StoreMsgType action.
*/
@@ -99,7 +100,7 @@ public abstract class AbstractReadMsgTyp
return;
}
- String message = I18n.err( I18n.ERR_04070, Strings.dumpBytes(value.getData()) );
+ String message = I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ) );
LOG.error( message );
// This will generate a PROTOCOL_ERROR
@@ -111,20 +112,20 @@ public abstract class AbstractReadMsgTyp
if ( container instanceof KdcReqContainer )
{
- if ( ((KdcReqContainer)container).getKdcReq().getMessageType() == messageType )
+ if ( ( ( KdcReqContainer ) container ).getKdcReq().getMessageType() == messageType )
{
return;
}
}
else if ( container instanceof KdcRepContainer )
{
- if ( ((KdcRepContainer)container).getKdcRep().getMessageType() == messageType )
+ if ( ( ( KdcRepContainer ) container ).getKdcRep().getMessageType() == messageType )
{
return;
}
}
- String message = I18n.err( I18n.ERR_04070, Strings.dumpBytes(value.getData()) );
+ String message = I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ) );
LOG.error( message );
// This will generate a PROTOCOL_ERROR
@@ -133,7 +134,7 @@ public abstract class AbstractReadMsgTyp
}
catch ( IntegerDecoderException ide )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes(value.getData()), ide
+ LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), ide
.getLocalizedMessage() ) );
// This will generate a PROTOCOL_ERROR
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java Tue Jan 24 16:15:05 2012
@@ -87,11 +87,11 @@ public abstract class AbstractReadPvno<E
try
{
- int pvno = IntegerDecoder.parse(value);
+ int pvno = IntegerDecoder.parse( value );
if ( pvno != 5 )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes(value.getData()), "The PVNO should be 5" ) );
+ LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), "The PVNO should be 5" ) );
// This will generate a PROTOCOL_ERROR
throw new DecoderException( "The PVNO should be 5" );
@@ -106,7 +106,7 @@ public abstract class AbstractReadPvno<E
}
catch ( IntegerDecoderException ide )
{
- LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes(value.getData()), ide
+ LOG.error( I18n.err( I18n.ERR_04070, Strings.dumpBytes( value.getData() ), ide
.getLocalizedMessage() ) );
// This will generate a PROTOCOL_ERROR
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java Tue Jan 24 16:15:05 2012
@@ -62,6 +62,7 @@ public abstract class AbstractReadRealm<
*/
protected abstract void setRealm( String realm, E container );
+
/**
* {@inheritDoc}
*/
@@ -80,7 +81,7 @@ public abstract class AbstractReadRealm<
// The value is the realm
Value value = tlv.getValue();
- String realm = Strings.utf8ToString(value.getData());
+ String realm = Strings.utf8ToString( value.getData() );
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrContainer.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrContainer.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.codec.adAndOr;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.AdAndOr;
@@ -33,6 +34,7 @@ public class AdAndOrContainer extends Ab
/** An AD-AND-OR container */
private AdAndOr adAndOr = new AdAndOr();
+
/**
* Creates a new AdAndOrContainer object.
*/
@@ -53,7 +55,7 @@ public class AdAndOrContainer extends Ab
return adAndOr;
}
-
+
/**
* Set an AdAndOr Object into the container. It will be completed by the
* KerberosDecoder.
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrGrammar.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrGrammar.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrGrammar.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrGrammar.java Tue Jan 24 16:15:05 2012
@@ -55,7 +55,7 @@ public final class AdAndOrGrammar extend
/**
* Creates a new AdAndOrGrammar object.
*/
- @SuppressWarnings( "unchecked" )
+ @SuppressWarnings("unchecked")
private AdAndOrGrammar()
{
setName( AdAndOrGrammar.class.getName() );
@@ -94,7 +94,8 @@ public final class AdAndOrGrammar extend
// --------------------------------------------------------------------------------------------
// AD-AND-OR ::= SEQUENCE {
// condition-count [0] Int32,
- super.transitions[AdAndOrStatesEnum.AD_AND_OR_CONDITION_COUNT_TAG_STATE.ordinal()][UniversalTag.INTEGER.getValue()] =
+ super.transitions[AdAndOrStatesEnum.AD_AND_OR_CONDITION_COUNT_TAG_STATE.ordinal()][UniversalTag.INTEGER
+ .getValue()] =
new GrammarTransition<AdAndOrContainer>(
AdAndOrStatesEnum.AD_AND_OR_CONDITION_COUNT_TAG_STATE,
AdAndOrStatesEnum.AD_AND_OR_CONDITION_COUNT_STATE,
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrStatesEnum.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adAndOr/AdAndOrStatesEnum.java Tue Jan 24 16:15:05 2012
@@ -33,19 +33,18 @@ import org.apache.directory.shared.asn1.
public enum AdAndOrStatesEnum implements States
{
// Start
- START_STATE, // 0
+ START_STATE, // 0
// ----- AD-AND-OR message --------------------------------------
- AD_AND_OR_STATE, // 1
+ AD_AND_OR_STATE, // 1
- AD_AND_OR_CONDITION_COUNT_TAG_STATE, // 2
- AD_AND_OR_CONDITION_COUNT_STATE, // 3
+ AD_AND_OR_CONDITION_COUNT_TAG_STATE, // 2
+ AD_AND_OR_CONDITION_COUNT_STATE, // 3
- AD_AND_OR_ELEMENTS_TAG_STATE, // 4
+ AD_AND_OR_ELEMENTS_TAG_STATE, // 4
// End
- LAST_AD_AND_OR_STATE; // 5
-
+ LAST_AD_AND_OR_STATE; // 5
/**
* Get the grammar name
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adIfRelevant/AdIfRelevantContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adIfRelevant/AdIfRelevantContainer.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adIfRelevant/AdIfRelevantContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adIfRelevant/AdIfRelevantContainer.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.codec.adIfRelevant;
+
import org.apache.directory.shared.kerberos.codec.authorizationData.AuthorizationDataContainer;
import org.apache.directory.shared.kerberos.components.AdIfRelevant;
@@ -36,7 +37,7 @@ public class AdIfRelevantContainer exten
public AdIfRelevantContainer()
{
super();
-
+
setAuthorizationData( new AdIfRelevant() );
}
@@ -46,6 +47,6 @@ public class AdIfRelevantContainer exten
*/
public AdIfRelevant getAdIfRelevant()
{
- return (AdIfRelevant)getAuthorizationData();
+ return ( AdIfRelevant ) getAuthorizationData();
}
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKDCIssuedGrammar.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKDCIssuedGrammar.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKDCIssuedGrammar.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKDCIssuedGrammar.java Tue Jan 24 16:15:05 2012
@@ -107,7 +107,8 @@ public final class AdKDCIssuedGrammar ex
KerberosConstants.AD_KDC_ISSUED_ELEMENTS_TAG,
new StoreElements() );
- super.transitions[AdKDCIssuedStatesEnum.AD_KDC_ISSUED_I_REALM_TAG_STATE.ordinal()][UniversalTag.GENERAL_STRING.getValue()] =
+ super.transitions[AdKDCIssuedStatesEnum.AD_KDC_ISSUED_I_REALM_TAG_STATE.ordinal()][UniversalTag.GENERAL_STRING
+ .getValue()] =
new GrammarTransition<AdKdcIssuedContainer>(
AdKDCIssuedStatesEnum.AD_KDC_ISSUED_I_REALM_TAG_STATE,
AdKDCIssuedStatesEnum.AD_KDC_ISSUED_I_REALM_STATE,
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKDCIssuedStatesEnum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKDCIssuedStatesEnum.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKDCIssuedStatesEnum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKDCIssuedStatesEnum.java Tue Jan 24 16:15:05 2012
@@ -33,23 +33,22 @@ import org.apache.directory.shared.asn1.
public enum AdKDCIssuedStatesEnum implements States
{
// Start
- START_STATE, // 0
+ START_STATE, // 0
// ----- AdKDCIssued message --------------------------------------
- AD_KDC_ISSUED_SEQ_STATE, // 1
+ AD_KDC_ISSUED_SEQ_STATE, // 1
- AD_KDC_ISSUED_AD_CHECKSUM_TAG_STATE, // 2
+ AD_KDC_ISSUED_AD_CHECKSUM_TAG_STATE, // 2
- AD_KDC_ISSUED_I_REALM_TAG_STATE, // 3
- AD_KDC_ISSUED_I_REALM_STATE, // 4
+ AD_KDC_ISSUED_I_REALM_TAG_STATE, // 3
+ AD_KDC_ISSUED_I_REALM_STATE, // 4
- AD_KDC_ISSUED_I_SNAME_TAG_STATE, // 5
+ AD_KDC_ISSUED_I_SNAME_TAG_STATE, // 5
- AD_KDC_ISSUED_ELEMENTS_TAG_STATE, // 6
+ AD_KDC_ISSUED_ELEMENTS_TAG_STATE, // 6
// End
- LAST_AD_KDC_ISSUED_STATE; // 7
-
+ LAST_AD_KDC_ISSUED_STATE; // 7
/**
* Get the grammar name
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKdcIssuedContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKdcIssuedContainer.java?rev=1235326&r1=1235325&r2=1235326&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKdcIssuedContainer.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/adKdcIssued/AdKdcIssuedContainer.java Tue Jan 24 16:15:05 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.shared.kerberos.codec.adKdcIssued;
+
import org.apache.directory.shared.asn1.ber.AbstractContainer;
import org.apache.directory.shared.kerberos.components.AdKdcIssued;
@@ -33,6 +34,7 @@ public class AdKdcIssuedContainer extend
/** An AdKdcIssued container */
private AdKdcIssued adKdcIssued = new AdKdcIssued();
+
/**
* Creates a new AdKdcIssuedContainer object.
*/
@@ -53,7 +55,7 @@ public class AdKdcIssuedContainer extend
return adKdcIssued;
}
-
+
/**
* Set an AdKdcIssued Object into the container. It will be completed by the
* KerberosDecoder.