You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dj...@apache.org on 2007/08/11 00:57:48 UTC
svn commit: r564794 [2/2] - in /directory/sandbox/djencks/triplesec-jacc2:
jaas/src/main/java/org/apache/directory/triplesec/jaas/
main/src/main/java/org/apache/directory/triplesec/ otp/
otp/src/main/java/org/apache/ otp/src/main/java/org/apache/direct...
Added: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java?view=auto&rev=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java (added)
+++ directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java Fri Aug 10 15:57:44 2007
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.triplesec.profile;
+
+
+/**
+ * The interface for a Safehaus account profile.
+ *
+ * @author <a href="mailto:akarasulu@safehaus.org">Alex Karasulu</a>
+ * @version $Rev$
+ */
+public interface Profile
+{
+ /**
+ * Check to see if this profile is disabled.
+ *
+ * @return true if the profile is disabled, false if it is not
+ */
+ boolean isDisabled();
+
+ /**
+ * Gets the label associated with this Profile.
+ *
+ * @return the label that identifies this Profile
+ */
+ String getLabel();
+
+
+ /**
+ * Gets the shared secret key used to generate the HOTP value.
+ *
+ * @return the shared secret key between client and server
+ */
+ byte[] getSecret();
+
+
+ /**
+ * The moving factor (counter) used to generate an OTP.
+ *
+ * @return the OTP moving factor (counter)
+ */
+ long getFactor();
+
+
+ /**
+ * Gets additional account information about this Profile.
+ *
+ * @return additional account information
+ */
+ String getInfo();
+}
Propchange: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/Profile.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ProfileUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ProfileUtils.java?view=auto&rev=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ProfileUtils.java (added)
+++ directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ProfileUtils.java Fri Aug 10 15:57:44 2007
@@ -0,0 +1,198 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.triplesec.profile;
+
+
+import java.io.*;
+
+
+/**
+ * Utility functions dealing with account Profiles.
+ *
+ * @author <a href="mailto:akarasulu@safehaus.org">Alex Karasulu</a>
+ * @version $Rev$
+ */
+public class ProfileUtils
+{
+
+
+ /**
+ * Generates the serialized representation of a Profile.
+ *
+ * @param profile the Profile to serialize using the record format
+ * @return the serialized Profile
+ */
+ public static byte[] serialize( Profile profile ) throws IOException
+ {
+ ByteArrayOutputStream arrayOut = null;
+
+ DataOutputStream dataOut = null;
+
+ try
+ {
+ arrayOut = new ByteArrayOutputStream();
+
+ dataOut = new DataOutputStream( arrayOut );
+
+ /*
+ * We write the members in the following order:
+ *
+ * 1). the label value
+ * 2). moving factor
+ * 3). additional account information if any at all
+ * 4). the shared secret
+ */
+
+ dataOut.writeUTF( profile.getLabel() );
+
+ dataOut.writeLong( profile.getFactor() );
+
+ if ( profile.getInfo() == null )
+ {
+ dataOut.writeUTF( "" );
+ }
+ else
+ {
+ dataOut.writeUTF( profile.getInfo() );
+ }
+
+ dataOut.write( profile.getSecret() );
+
+ dataOut.flush();
+ }
+ finally
+ {
+ if ( dataOut != null )
+ {
+ dataOut.close();
+ }
+
+ if ( arrayOut != null )
+ {
+ arrayOut.close();
+ }
+ }
+
+ return arrayOut.toByteArray();
+ }
+
+
+ /**
+ * Creates a Profile by resusitating a serialized profile from a record
+ * format.
+ *
+ * @param rec the serialized Profile record
+ * @throws IOException if there are problems resusitating the fields
+ */
+ public static final Profile create( byte[] rec ) throws IOException
+ {
+ BaseProfileModifier modifier = new BaseProfileModifier();
+
+ ByteArrayInputStream arrayIn = null;
+
+ DataInputStream dataIn = null;
+
+ try
+ {
+ arrayIn = new ByteArrayInputStream( rec );
+
+ dataIn = new DataInputStream( arrayIn );
+
+ /*
+ * We read the members in the following order which is in the same
+ * order we write them:
+ *
+ * 1). the label value
+ * 2). moving factor
+ * 3). additional account information if any at all
+ * 4). the shared secret
+ */
+
+ modifier.setLabel( dataIn.readUTF() );
+
+ modifier.setFactor( dataIn.readLong() );
+
+ modifier.setInfo( dataIn.readUTF() );
+
+ byte[] buf = new byte[100];
+ int ammount = dataIn.read( buf );
+ byte[] resized = new byte[ammount];
+ System.arraycopy( buf, 0, resized, 0, ammount );
+ modifier.setSecret( resized );
+ }
+ finally
+ {
+ if ( arrayIn != null )
+ {
+ arrayIn.close();
+ }
+
+ if ( dataIn != null )
+ {
+ dataIn.close();
+ }
+ }
+
+ return modifier.getProfile();
+ }
+
+
+ /**
+ * Gets the label of a Profile from the raw record without creating a
+ * Profile object. This is a very efficient method to use while filtering
+ * trying to match for specific Profiles by label.
+ *
+ * @param rec the raw serialized Profile
+ * @return the Profile record's label field
+ * @throws java.io.IOException if there is a problem accessing the serialized data
+ */
+ public static final String getLabel( byte[] rec ) throws IOException
+ {
+ ByteArrayInputStream arrayIn = null;
+
+ DataInputStream dataIn = null;
+
+ String label = null;
+
+
+ try
+ {
+ arrayIn = new ByteArrayInputStream( rec );
+
+ dataIn = new DataInputStream( arrayIn );
+
+ label = dataIn.readUTF();
+ }
+ finally
+ {
+ if ( dataIn != null )
+ {
+ dataIn.close();
+ }
+
+ if ( arrayIn != null )
+ {
+ arrayIn.close();
+ }
+ }
+
+ return label;
+ }
+}
Propchange: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ProfileUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ProfileUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ProfileUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java?view=auto&rev=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java (added)
+++ directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java Fri Aug 10 15:57:44 2007
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.triplesec.profile;
+
+
+/**
+ * A HOTP validation server needs more parameters for a Profile which are
+ * modelled within this interface which extends the Profile interface.
+ *
+ * @author <a href="mailto:akarasulu@safehaus.org">Alex Karasulu</a>
+ * @version $Rev$
+ */
+public interface ServerProfile extends Profile
+{
+ /**
+ * Gets the unique user id associated with this profile.
+ *
+ * @return the unique user id associated with this profile
+ */
+ String getUserId();
+
+
+ /**
+ * Gets the authentication realm associated with this Profile.
+ *
+ * @return the authentication realm associated with this Profile
+ */
+ String getRealm();
+
+
+ /**
+ * Gets the number of successful consecutive resync operations that have
+ * passed. This count is set to a negative number to denote that no resynch
+ * is in progress. When users are undergoing the resynch process they may
+ * be asked to type in their password a certain number of times
+ * consecutively. Each time the user succeeds this counter is incremented.
+ * When the user has successfully completed the resynch operation the
+ * counter is set to a negative value. If the user fails during resynch
+ * the counter is set to 0.
+ *
+ * @return the number of successful resynch passes until now
+ */
+ int getResynchCount();
+
+ /**
+ * Gets the number of authentication failures within an epoch. The number
+ * of authentication failures are tracked here within time periods
+ * determined by the server. If the user exceeds some threshold the account
+ * is automatically locked to prevent brute force attacks.
+ *
+ * @return the number of authentication failures within an epoch
+ */
+ int getFailuresInEpoch();
+
+ /**
+ * Checks to see if this profile is active.
+ */
+ boolean isActive();
+
+ /**
+ * Gets the profile's activation key.
+ */
+ String getActivationKey();
+
+ /**
+ * Get's the safehausTokenPin value for this account.
+ */
+ String getTokenPin();
+
+ /**
+ * Get's the static password for this account.
+ */
+ byte[] getPassword();
+
+
+ String getNotifyBy();
+}
Propchange: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: directory/sandbox/djencks/triplesec-jacc2/profile/src/main/java/org/apache/directory/triplesec/profile/ServerProfile.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: directory/sandbox/djencks/triplesec-jacc2/testdata/src/main/java/org/apache/directory/triplesec/profile/ProfileTestData.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/testdata/src/main/java/org/apache/directory/triplesec/profile/ProfileTestData.java?view=auto&rev=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/testdata/src/main/java/org/apache/directory/triplesec/profile/ProfileTestData.java (added)
+++ directory/sandbox/djencks/triplesec-jacc2/testdata/src/main/java/org/apache/directory/triplesec/profile/ProfileTestData.java Fri Aug 10 15:57:44 2007
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.triplesec.profile;
+
+
+/**
+ * Some pre-fab test profiles for use in various tests, demos and applications.
+ *
+ * @author <a href="mailto:akarasulu@safehaus.org">Alex Karasulu</a>
+ * @version $Rev$
+ */
+public class ProfileTestData
+{
+ /** bogus test account profile */
+ private static final ServerProfile BANK_ONE = new BaseServerProfile( "bankone",
+ "EXAMPLE.COM", "BankOne",
+ 18237017371834L, new byte[] { 'a','s','d','f',
+ 'a','d','s','f',
+ 'a','d','f','a',
+ 'd','f','a','f',
+ 's','f','d','f'}, "1234",
+ new byte[] { 's', 'e', 'c', 'r', 'e', 't' }
+ );
+
+ /** bogus test account profile */
+ private static final ServerProfile CITI_401K = new BaseServerProfile( "citi401k",
+ "EXAMPLE.COM", "Citi401k",
+ 27934524L, new byte[] { 'x','a','x','1',
+ 'a','x','s','d',
+ 'f','g','c','f',
+ 'g','4','a','3',
+ 'f','f','y','*'}, "1234",
+ new byte[] { 's', 'e', 'c', 'r', 'e', 't' }
+ );
+
+ /** bogus test account profile */
+ private static final ServerProfile APACHE = new BaseServerProfile( "apache",
+ "EXAMPLE.COM", "Apache",
+ 513417813624832L, new byte[] { 'S','s','5','(',
+ '.','d','-','s',
+ 'K','z','f','s',
+ 'd','z','d','a',
+ 's','z','?','f'}, "1234",
+ new byte[] { 's', 'e', 'c', 'r', 'e', 't' }
+ );
+
+ /** bogus test account profile */
+ private static final ServerProfile CODEHAUS = new BaseServerProfile( "codehaus",
+ "EXAMPLE.COM", "Codehaus",
+ 123984713378815745L, new byte[] { '5','x','g','>',
+ 'a','v','s','.',
+ 'x','Q','4','a',
+ 'd','z',',','m',
+ 'z','$','=','%'}, "1234",
+ new byte[] { 's', 'e', 'c', 'r', 'e', 't' }
+ );
+
+ /** bogus test account profile */
+ private static final ServerProfile OFFICE = new BaseServerProfile( "officew2k",
+ "EXAMPLE.COM", "OfficeW2K",
+ 999372763L, new byte[] { 'g','$','7','x',
+ 'a','c','s','j',
+ 'a','m','f','O',
+ 'd','@','a','(',
+ 's','-','d','.'}, "1234",
+ new byte[] { 's', 'e', 'c', 'r', 'e', 't' }
+ );
+
+ /** bogus test account profile */
+ public static final ServerProfile[] PROFILES = new ServerProfile[]
+ {
+ BANK_ONE, CITI_401K, APACHE, CODEHAUS, OFFICE
+ };
+}
Propchange: directory/sandbox/djencks/triplesec-jacc2/testdata/src/main/java/org/apache/directory/triplesec/profile/ProfileTestData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/sandbox/djencks/triplesec-jacc2/testdata/src/main/java/org/apache/directory/triplesec/profile/ProfileTestData.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: directory/sandbox/djencks/triplesec-jacc2/testdata/src/main/java/org/apache/directory/triplesec/profile/ProfileTestData.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: directory/sandbox/djencks/triplesec-jacc2/utils-hauskeys/src/test/java/org/apache/directory/triplesec/utils/hauskeys/HauskeysMidletBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/utils-hauskeys/src/test/java/org/apache/directory/triplesec/utils/hauskeys/HauskeysMidletBuilderTest.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/utils-hauskeys/src/test/java/org/apache/directory/triplesec/utils/hauskeys/HauskeysMidletBuilderTest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/utils-hauskeys/src/test/java/org/apache/directory/triplesec/utils/hauskeys/HauskeysMidletBuilderTest.java Fri Aug 10 15:57:44 2007
@@ -22,8 +22,8 @@
import java.io.File;
-import org.apache.directory.otp.HotpAttributes;
-import org.apache.directory.otp.HotpAttributesCipher;
+import org.apache.directory.triplesec.otp.HotpAttributes;
+import org.apache.directory.triplesec.otp.HotpAttributesCipher;
import org.apache.directory.triplesec.profile.ProfileTestData;
import org.apache.directory.triplesec.profile.ServerProfile;
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountDisabledException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountDisabledException.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountDisabledException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountDisabledException.java Fri Aug 10 15:57:44 2007
@@ -20,7 +20,7 @@
package org.apache.directory.triplesec.verifier.hotp;
-import org.apache.directory.otp.HotpErrorConstants;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
/**
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountInactiveException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountInactiveException.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountInactiveException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountInactiveException.java Fri Aug 10 15:57:44 2007
@@ -20,7 +20,7 @@
package org.apache.directory.triplesec.verifier.hotp;
-import org.apache.directory.otp.HotpErrorConstants;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
/**
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountLockedOutException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountLockedOutException.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountLockedOutException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/AccountLockedOutException.java Fri Aug 10 15:57:44 2007
@@ -20,7 +20,7 @@
package org.apache.directory.triplesec.verifier.hotp;
-import org.apache.directory.otp.HotpErrorConstants;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
/**
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/DefaultHotpSamVerifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/DefaultHotpSamVerifier.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/DefaultHotpSamVerifier.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/DefaultHotpSamVerifier.java Fri Aug 10 15:57:44 2007
@@ -29,8 +29,8 @@
import org.apache.directory.server.kerberos.sam.KeyIntegrityChecker;
import org.apache.directory.server.kerberos.sam.SamException;
-import org.apache.directory.otp.Hotp;
-import org.apache.directory.otp.ResynchParameters;
+import org.apache.directory.triplesec.otp.Hotp;
+import org.apache.directory.triplesec.otp.ResynchParameters;
import org.apache.directory.triplesec.store.ServerProfileStore;
import org.apache.directory.triplesec.store.DefaultServerProfileStore;
import org.apache.directory.triplesec.profile.ServerProfile;
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpException.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpException.java Fri Aug 10 15:57:44 2007
@@ -23,7 +23,7 @@
import org.apache.directory.server.kerberos.shared.messages.value.SamType;
import org.apache.directory.server.kerberos.sam.SamException;
-import org.apache.directory.otp.HotpErrorConstants;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
/**
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpMonitor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpMonitor.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpMonitor.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpMonitor.java Fri Aug 10 15:57:44 2007
@@ -22,7 +22,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.otp.ResynchParameters;
+import org.apache.directory.triplesec.otp.ResynchParameters;
import org.apache.directory.triplesec.profile.ServerProfile;
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpMonitorAdapter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpMonitorAdapter.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpMonitorAdapter.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/HotpMonitorAdapter.java Fri Aug 10 15:57:44 2007
@@ -22,7 +22,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.otp.ResynchParameters;
+import org.apache.directory.triplesec.otp.ResynchParameters;
import org.apache.directory.triplesec.profile.ServerProfile;
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/PreauthFailedException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/PreauthFailedException.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/PreauthFailedException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/PreauthFailedException.java Fri Aug 10 15:57:44 2007
@@ -20,8 +20,7 @@
package org.apache.directory.triplesec.verifier.hotp;
-import org.apache.directory.otp.HotpErrorConstants;
-import org.apache.directory.triplesec.verifier.hotp.HotpException;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
/**
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/ResynchInProgressException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/ResynchInProgressException.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/ResynchInProgressException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/ResynchInProgressException.java Fri Aug 10 15:57:44 2007
@@ -20,8 +20,7 @@
package org.apache.directory.triplesec.verifier.hotp;
-import org.apache.directory.otp.HotpErrorConstants;
-import org.apache.directory.triplesec.verifier.hotp.HotpException;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
/**
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/ResynchStartingException.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/ResynchStartingException.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/ResynchStartingException.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/main/java/org/apache/directory/triplesec/verifier/hotp/ResynchStartingException.java Fri Aug 10 15:57:44 2007
@@ -20,8 +20,7 @@
package org.apache.directory.triplesec.verifier.hotp;
-import org.apache.directory.otp.HotpErrorConstants;
-import org.apache.directory.triplesec.verifier.hotp.HotpException;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
/**
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/GenerateHotp.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/GenerateHotp.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/GenerateHotp.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/GenerateHotp.java Fri Aug 10 15:57:44 2007
@@ -34,8 +34,8 @@
import org.apache.directory.triplesec.store.schema.SafehausSchema;
import org.apache.directory.triplesec.profile.ServerProfile;
import org.apache.directory.triplesec.profile.BaseServerProfileModifier;
-import org.apache.directory.otp.Hotp;
-import org.apache.directory.otp.Base64;
+import org.apache.directory.triplesec.otp.Hotp;
+import org.apache.directory.triplesec.otp.Base64;
import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.configuration.Configuration;
Modified: directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/HotpSamVerifierITest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/HotpSamVerifierITest.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/HotpSamVerifierITest.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/verifier/src/test/java/org/apache/directory/triplesec/verifier/hotp/HotpSamVerifierITest.java Fri Aug 10 15:57:44 2007
@@ -65,9 +65,9 @@
import org.apache.directory.server.schema.bootstrap.Schema;
import org.apache.directory.server.schema.registries.DefaultRegistries;
import org.apache.directory.server.schema.registries.DefaultOidRegistry;
-import org.apache.directory.otp.Hotp;
-import org.apache.directory.otp.HotpErrorConstants;
-import org.apache.directory.otp.ResynchParameters;
+import org.apache.directory.triplesec.otp.Hotp;
+import org.apache.directory.triplesec.otp.HotpErrorConstants;
+import org.apache.directory.triplesec.otp.ResynchParameters;
import org.apache.directory.triplesec.profile.ServerProfile;
import org.apache.directory.triplesec.store.DefaultServerProfileStore;
import org.apache.directory.triplesec.store.ServerProfileStore;
Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivateAccountFilter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivateAccountFilter.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivateAccountFilter.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivateAccountFilter.java Fri Aug 10 15:57:44 2007
@@ -39,8 +39,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.directory.otp.HotpAttributes;
-import org.apache.directory.otp.HotpAttributesCipher;
+import org.apache.directory.triplesec.otp.HotpAttributes;
+import org.apache.directory.triplesec.otp.HotpAttributesCipher;
import org.apache.directory.triplesec.configuration.ActivationConfiguration;
import org.apache.directory.triplesec.configuration.SmsConfiguration;
import org.apache.directory.triplesec.configuration.SmtpConfiguration;
Modified: directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java?view=diff&rev=564794&r1=564793&r2=564794
==============================================================================
--- directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java (original)
+++ directory/sandbox/djencks/triplesec-jacc2/webapp-activation/src/main/java/org/apache/directory/triplesec/activation/ActivationUtils.java Fri Aug 10 15:57:44 2007
@@ -38,8 +38,8 @@
import org.apache.tools.ant.taskdefs.ManifestException;
import org.apache.tools.ant.taskdefs.Mkdir;
-import org.apache.directory.otp.HotpAttributes;
-import org.apache.directory.otp.HotpAttributesCipher;
+import org.apache.directory.triplesec.otp.HotpAttributes;
+import org.apache.directory.triplesec.otp.HotpAttributesCipher;
import org.apache.directory.triplesec.utils.hauskeys.HauskeysMidletBuilder;
import org.slf4j.Logger;