Author: alexoree
Date: Thu May 30 19:46:04 2013
New Revision: 1487989
URL: http://svn.apache.org/r1487989
Log:
Adding AES, 3DES Cryptors, tests. closing out JIRA JUDDI-618
Added:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AES128Cryptor.java
- copied, changed from r1487956,
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AES256Cryptor.java
- copied, changed from r1487956,
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AESCryptorAbstract.java
- copied, changed from r1487956,
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/TripleDESCrytor.java
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CrytorUtil.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/MD5XMLDocAuthenticator.java
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java
Copied:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AES128Cryptor.java
(from r1487956,
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java)
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AES128Cryptor.java?p2=juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AES128Cryptor.java&p1=juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java&r1=1487956&r2=1487989&rev=1487989&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AES128Cryptor.java
Thu May 30 19:46:04 2013
@@ -14,7 +14,6 @@
* limitations under the License.
*
*/
-
package org.apache.juddi.cryptor;
import java.security.InvalidAlgorithmParameterException;
@@ -26,84 +25,32 @@ import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
-import org.apache.commons.codec.binary.Base64;
-/**
- * @author Anou Manavalan
+/** AES 128 bit encryption
+ * @author Alex O'Ree
*/
-public class DefaultCryptor implements Cryptor
-{
- private PBEKeySpec pbeKeySpec = null;
- private PBEParameterSpec pbeParamSpec = null;
- private SecretKeyFactory keyFac = null;
- private SecretKey pbeKey = null;
-
- // Salt
- private byte[] salt = {
- (byte)0xc7, (byte)0x73, (byte)0x21, (byte)0x8c,
- (byte)0x7e, (byte)0xc8, (byte)0xee, (byte)0x99
- };
-
- // Iteration count
- private int count = 20;
-
- /**
- * Constructor for DefaultCryptor.
- */
- public DefaultCryptor()
- throws NoSuchAlgorithmException,InvalidKeySpecException
- {
- // Create PBE parameter set
- pbeParamSpec = new PBEParameterSpec(salt,count);
- pbeKeySpec = new PBEKeySpec("saagar".toCharArray());
- keyFac = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
- pbeKey = keyFac.generateSecret(pbeKeySpec);
- }
-
- /**
- * Encrypt the string
- */
- private byte[] crypt(int cipherMode,byte[] text)
- throws NoSuchPaddingException,
- NoSuchAlgorithmException,
- InvalidAlgorithmParameterException,
- InvalidKeyException,
- IllegalBlockSizeException,
- BadPaddingException
-
- {
- // Create PBE Cipher
- Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES");
-
- // Initialize PBE Cipher with key and parameters
- pbeCipher.init(cipherMode,pbeKey,pbeParamSpec);
-
- //byte[] text = str.getBytes();
-
- // Encrypt/Decrypt the string
- byte[] cryptext = pbeCipher.doFinal(text);
-
- return cryptext;
- }
-
- /**
- * Encrypt the string
- */
- public String encrypt(String str)
- throws NoSuchPaddingException,
- NoSuchAlgorithmException,
- InvalidAlgorithmParameterException,
- InvalidKeyException,
- IllegalBlockSizeException,
- BadPaddingException
- {
- byte[] encs = crypt(Cipher.ENCRYPT_MODE,str.getBytes());
- encs = Base64.encodeBase64(encs);
- return new String(encs);
- }
-}
\ No newline at end of file
+public class AES128Cryptor extends AESCryptorAbstract {
+
+ /**
+ * Constructor for DefaultCryptor.
+ */
+ public AES128Cryptor()
+ throws NoSuchAlgorithmException, InvalidKeySpecException,
NoSuchPaddingException, InvalidKeyException {
+ super();
+ }
+
+ @Override
+ protected String getKey()
+ {
+ return "ee4bd3eefe38c3d996a89589de5b9698";
+ }
+
+ @Override
+ public String encrypt(String str) throws NoSuchPaddingException,
NoSuchAlgorithmException, InvalidAlgorithmParameterException,
InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+ return super.encrypt(str);
+ }
+
+
+}
Copied:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AES256Cryptor.java
(from r1487956,
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java)
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AES256Cryptor.java?p2=juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AES256Cryptor.java&p1=juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java&r1=1487956&r2=1487989&rev=1487989&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AES256Cryptor.java
Thu May 30 19:46:04 2013
@@ -14,7 +14,6 @@
* limitations under the License.
*
*/
-
package org.apache.juddi.cryptor;
import java.security.InvalidAlgorithmParameterException;
@@ -26,84 +25,33 @@ import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
-import org.apache.commons.codec.binary.Base64;
-/**
- * @author Anou Manavalan
+/** AES 256 bit encryption.
+ * <h1> Requires Unlimited Strength Java Cryptographic Extensions</h1>
+ * @author Alex O'Ree
*/
-public class DefaultCryptor implements Cryptor
-{
- private PBEKeySpec pbeKeySpec = null;
- private PBEParameterSpec pbeParamSpec = null;
- private SecretKeyFactory keyFac = null;
- private SecretKey pbeKey = null;
-
- // Salt
- private byte[] salt = {
- (byte)0xc7, (byte)0x73, (byte)0x21, (byte)0x8c,
- (byte)0x7e, (byte)0xc8, (byte)0xee, (byte)0x99
- };
-
- // Iteration count
- private int count = 20;
-
- /**
- * Constructor for DefaultCryptor.
- */
- public DefaultCryptor()
- throws NoSuchAlgorithmException,InvalidKeySpecException
- {
- // Create PBE parameter set
- pbeParamSpec = new PBEParameterSpec(salt,count);
- pbeKeySpec = new PBEKeySpec("saagar".toCharArray());
- keyFac = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
- pbeKey = keyFac.generateSecret(pbeKeySpec);
- }
-
- /**
- * Encrypt the string
- */
- private byte[] crypt(int cipherMode,byte[] text)
- throws NoSuchPaddingException,
- NoSuchAlgorithmException,
- InvalidAlgorithmParameterException,
- InvalidKeyException,
- IllegalBlockSizeException,
- BadPaddingException
-
- {
- // Create PBE Cipher
- Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES");
-
- // Initialize PBE Cipher with key and parameters
- pbeCipher.init(cipherMode,pbeKey,pbeParamSpec);
-
- //byte[] text = str.getBytes();
-
- // Encrypt/Decrypt the string
- byte[] cryptext = pbeCipher.doFinal(text);
-
- return cryptext;
- }
-
- /**
- * Encrypt the string
- */
- public String encrypt(String str)
- throws NoSuchPaddingException,
- NoSuchAlgorithmException,
- InvalidAlgorithmParameterException,
- InvalidKeyException,
- IllegalBlockSizeException,
- BadPaddingException
- {
- byte[] encs = crypt(Cipher.ENCRYPT_MODE,str.getBytes());
- encs = Base64.encodeBase64(encs);
- return new String(encs);
- }
+public class AES256Cryptor extends AESCryptorAbstract {
+
+ /**
+ * Constructor for DefaultCryptor.
+ */
+ public AES256Cryptor()
+ throws NoSuchAlgorithmException, InvalidKeySpecException,
NoSuchPaddingException, InvalidKeyException {
+ super();
+ }
+
+ @Override
+ protected String getKey()
+ {
+ return
"ef057ce3abd9dd9a161a2888c9d7025f104a42eceda5947b083186e7190fcc46";
+ }
+
+ @Override
+ public String encrypt(String str) throws NoSuchPaddingException,
NoSuchAlgorithmException, InvalidAlgorithmParameterException,
InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+ return super.encrypt(str);
+ }
+
+
}
\ No newline at end of file
Copied:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AESCryptorAbstract.java
(from r1487956,
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java)
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AESCryptorAbstract.java?p2=juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AESCryptorAbstract.java&p1=juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java&r1=1487956&r2=1487989&rev=1487989&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/DefaultCryptor.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/AESCryptorAbstract.java
Thu May 30 19:46:04 2013
@@ -14,7 +14,6 @@
* limitations under the License.
*
*/
-
package org.apache.juddi.cryptor;
import java.security.InvalidAlgorithmParameterException;
@@ -26,84 +25,85 @@ import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.apache.commons.codec.binary.Base64;
+import javax.crypto.spec.SecretKeySpec;
/**
- * @author Anou Manavalan
+ * AES bit encryption
+ *
+ * @author Alex O'Ree
*/
-public class DefaultCryptor implements Cryptor
-{
- private PBEKeySpec pbeKeySpec = null;
- private PBEParameterSpec pbeParamSpec = null;
- private SecretKeyFactory keyFac = null;
- private SecretKey pbeKey = null;
-
- // Salt
- private byte[] salt = {
- (byte)0xc7, (byte)0x73, (byte)0x21, (byte)0x8c,
- (byte)0x7e, (byte)0xc8, (byte)0xee, (byte)0x99
- };
-
- // Iteration count
- private int count = 20;
-
- /**
- * Constructor for DefaultCryptor.
- */
- public DefaultCryptor()
- throws NoSuchAlgorithmException,InvalidKeySpecException
- {
- // Create PBE parameter set
- pbeParamSpec = new PBEParameterSpec(salt,count);
- pbeKeySpec = new PBEKeySpec("saagar".toCharArray());
- keyFac = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
- pbeKey = keyFac.generateSecret(pbeKeySpec);
- }
-
- /**
- * Encrypt the string
- */
- private byte[] crypt(int cipherMode,byte[] text)
- throws NoSuchPaddingException,
- NoSuchAlgorithmException,
- InvalidAlgorithmParameterException,
- InvalidKeyException,
- IllegalBlockSizeException,
- BadPaddingException
+public abstract class AESCryptorAbstract implements Cryptor {
- {
- // Create PBE Cipher
- Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES");
-
- // Initialize PBE Cipher with key and parameters
- pbeCipher.init(cipherMode,pbeKey,pbeParamSpec);
-
- //byte[] text = str.getBytes();
-
- // Encrypt/Decrypt the string
- byte[] cryptext = pbeCipher.doFinal(text);
-
- return cryptext;
- }
-
- /**
- * Encrypt the string
- */
- public String encrypt(String str)
- throws NoSuchPaddingException,
+ private static byte[] hexToBytes(String s) {
+ //return s.getBytes();
+ return hexToBytes(s.toCharArray());
+ }
+ private static final char[] kDigits = {'0', '1', '2', '3', '4', '5', '6',
'7', '8', '9', 'a',
+ 'b', 'c', 'd', 'e', 'f'};
+
+ private static byte[] hexToBytes(char[] hex) {
+ int length = hex.length / 2;
+ byte[] raw = new byte[length];
+ for (int i = 0; i < length; i++) {
+ int high = Character.digit(hex[i * 2], 16);
+ int low = Character.digit(hex[i * 2 + 1], 16);
+ int value = (high << 4) | low;
+ if (value > 127) {
+ value -= 256;
+ }
+ raw[i] = (byte) value;
+ }
+ return raw;
+ }
+
+ protected String getKey() {
+ return null;
+ }
+
+ /**
+ * Constructor for DefaultCryptor.
+ */
+ public AESCryptorAbstract()
+ throws NoSuchAlgorithmException, InvalidKeySpecException,
NoSuchPaddingException, InvalidKeyException {
+ byte[] raw =//skey.getEncoded();
+ hexToBytes(getKey()); //
+ SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+ // Instantiate the cipher
+ Cipher cipher = Cipher.getInstance("AES");
+ cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
+ }
+
+ /**
+ * Encrypt the string
+ */
+ public String encrypt(String cleartext)
+ throws NoSuchPaddingException,
NoSuchAlgorithmException,
InvalidAlgorithmParameterException,
InvalidKeyException,
IllegalBlockSizeException,
- BadPaddingException
- {
- byte[] encs = crypt(Cipher.ENCRYPT_MODE,str.getBytes());
- encs = Base64.encodeBase64(encs);
- return new String(encs);
- }
+ BadPaddingException {
+ byte[] raw = hexToBytes(getKey()); //
+ SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+ // Instantiate the cipher
+ Cipher cipher = Cipher.getInstance("AES");
+ cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
+ byte[] encrypted = cipher.doFinal(cleartext.getBytes());
+ return asHex(encrypted);
+ }
+
+ private static String asHex(byte buf[]) {
+ //return new String(buf);
+ StringBuilder strbuf = new StringBuilder(buf.length * 2);
+ int i;
+
+ for (i = 0; i < buf.length; i++) {
+ if (((int) buf[i] & 0xff) < 0x10) {
+ strbuf.append("0");
+ }
+ strbuf.append(Long.toString((int) buf[i] & 0xff, 16));
+ }
+
+ return strbuf.toString();
+ }
}
\ No newline at end of file
Added:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/TripleDESCrytor.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/TripleDESCrytor.java?rev=1487989&view=auto
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/TripleDESCrytor.java
(added)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/cryptor/TripleDESCrytor.java
Thu May 30 19:46:04 2013
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed 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.juddi.cryptor;
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.KeySpec;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.KeyGenerator;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESedeKeySpec;
+import org.apache.commons.codec.binary.Base64;
+
+/**
+ * Triple DES, 168 bit key
+ * @author Alex O'Ree
+ */
+public class TripleDESCrytor implements Cryptor {
+
+ private static final String UNICODE_FORMAT = "UTF8";
+ private static final String DESEDE_ENCRYPTION_SCHEME = "DESede";
+ private KeySpec ks;
+ private SecretKeyFactory skf;
+ private Cipher cipher;
+ byte[] arrayBytes;
+ private String myEncryptionKey;
+ private String myEncryptionScheme;
+ SecretKey key;
+
+ /**
+ *default constructor
+ * @throws Exception
+ */
+ public TripleDESCrytor() throws Exception {
+ myEncryptionKey = "rioTEBCe/RAHRs6tTyYxDqettnVbZA6z";
+ myEncryptionScheme = DESEDE_ENCRYPTION_SCHEME;
+ arrayBytes = myEncryptionKey.getBytes(UNICODE_FORMAT);
+ ks = new DESedeKeySpec(arrayBytes);
+ skf = SecretKeyFactory.getInstance(myEncryptionScheme);
+ cipher = Cipher.getInstance(myEncryptionScheme);
+ key = skf.generateSecret(ks);
+ }
+
+ @Override
+ public String encrypt(String clear) throws NoSuchPaddingException,
NoSuchAlgorithmException, InvalidAlgorithmParameterException,
InvalidKeyException, IllegalBlockSizeException, BadPaddingException {
+ String encryptedString = null;
+ try {
+ cipher.init(Cipher.ENCRYPT_MODE, key);
+ byte[] plainText = clear.getBytes(UNICODE_FORMAT);
+ byte[] encryptedText = cipher.doFinal(plainText);
+ encryptedString = new String(Base64.encodeBase64(encryptedText));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return encryptedString;
+ }
+
+ /**
+ * generates a new key
+ * @return
+ */
+ public static String GEN() {
+ KeyGenerator kgen;
+ try {
+ kgen = KeyGenerator.getInstance(DESEDE_ENCRYPTION_SCHEME);
+ kgen.init(168);
+ SecretKey skey = kgen.generateKey();
+ byte[] raw = skey.getEncoded();
+ return new String(Base64.encodeBase64(raw));
+ } catch (Exception ex) {
+ ex.printStackTrace();;
+ }
+ return null;
+ }
+}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CrytorUtil.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CrytorUtil.java?rev=1487989&r1=1487988&r2=1487989&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CrytorUtil.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/CrytorUtil.java
Thu May 30 19:46:04 2013
@@ -42,5 +42,10 @@ public class CrytorUtil {
System.out.println("Provided crypto providers:");
System.out.println("\torg.apache.juddi.cryptor.DefaultCryptor - uses
PBEWithMD5AndDES");
+ System.out.println("\torg.apache.juddi.cryptor.TripleDESCrytor - uses
TripleDES");
+ System.out.println("\torg.apache.juddi.cryptor.AES128Cryptor - uses
AES128");
+ System.out.println("\torg.apache.juddi.cryptor.AES256Cryptor - uses
AES256*");
+ System.out.println();
+ System.out.println("* Requires Unlimited Strength JCE *");
}
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/MD5XMLDocAuthenticator.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/MD5XMLDocAuthenticator.java?rev=1487989&r1=1487988&r2=1487989&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/MD5XMLDocAuthenticator.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/v3/auth/MD5XMLDocAuthenticator.java
Thu May 30 19:46:04 2013
@@ -72,8 +72,7 @@ public class MD5XMLDocAuthenticator exte
*/
private String hash(String str) throws FatalErrorException {
try {
- return DigestUtils.md5Hex(str) ;
- //return instance..encrypt(str);
+ return DigestUtils.md5Hex(str) ;
} catch (Exception e) {
logger.error("Exception caught hashing password", e);
throw new FatalErrorException(new ErrorMessage(
Modified:
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java?rev=1487989&r1=1487988&r2=1487989&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java
(original)
+++
juddi/trunk/juddi-core/src/test/java/org/apache/juddi/auth/AuthenticatorTest.java
Thu May 30 19:46:04 2013
@@ -24,8 +24,10 @@ import javax.xml.bind.Marshaller;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.api.impl.API_010_PublisherTest;
+import org.apache.juddi.cryptor.AES128Cryptor;
import org.apache.juddi.cryptor.Cryptor;
import org.apache.juddi.cryptor.CryptorFactory;
+import org.apache.juddi.cryptor.TripleDESCrytor;
import org.apache.juddi.v3.auth.Authenticator;
import org.apache.juddi.v3.auth.CryptedXMLDocAuthenticator;
import org.apache.juddi.v3.auth.JUDDIAuthenticator;
@@ -52,6 +54,7 @@ public class AuthenticatorTest
@Test
public void testDefaultAuthenticator()
{
+ System.out.println("testDefaultAuthenticator");
Authenticator auth = new JUDDIAuthenticator();
try {
API_010_PublisherTest api010 = new
API_010_PublisherTest();
@@ -69,6 +72,7 @@ public class AuthenticatorTest
@Test
public void testCreateJuddiUsers() throws Exception
{
+ System.out.println("testCreateJuddiUsers");
try {
JuddiUsers juddiUsers = new JuddiUsers();
juddiUsers.getUser().add(new
User("anou_mana","password"));
@@ -93,6 +97,7 @@ public class AuthenticatorTest
@Test
public void testXMLDocAuthenticator()
{
+ System.out.println("testXMLDocAuthenticator");
try {
Authenticator auth = new XMLDocAuthenticator();
auth.authenticate("anou_mana","password");
@@ -116,12 +121,14 @@ public class AuthenticatorTest
@Test(expected=UnknownUserException.class)
public void testBadXMLDocAuthenticator() throws Exception
{
+ System.out.println("testBadXMLDocAuthenticator");
Authenticator auth = new XMLDocAuthenticator();
auth.authenticate("anou_mana","badpass");
}
@Test
public void testCreateJuddiUsersEncrypted() throws Exception
{
+ System.out.println("testCreateJuddiUsersEncrypted");
try {
Cryptor cryptor = (Cryptor) CryptorFactory.getCryptor();
JuddiUsers juddiUsers = new JuddiUsers();
@@ -147,6 +154,7 @@ public class AuthenticatorTest
@Test
public void testCryptedXMLDocAuthenticator()
{
+ System.out.println("testCryptedXMLDocAuthenticator");
try {
Authenticator auth = new CryptedXMLDocAuthenticator();
auth.authenticate("anou_mana","password");
@@ -169,7 +177,9 @@ public class AuthenticatorTest
*/
@Test(expected=UnknownUserException.class)
public void testBadCryptedXMLDocAuthenticator() throws Exception
+
{
+ System.out.println("testBadCryptedXMLDocAuthenticator");
Authenticator auth = new CryptedXMLDocAuthenticator();
auth.authenticate("anou_mana","badpass");
}
@@ -178,8 +188,9 @@ public class AuthenticatorTest
@Test
public void testMD5XMLDocAuthenticator()
{
+ System.out.println("testMD5XMLDocAuthenticator");
try {
- Authenticator auth = new CryptedXMLDocAuthenticator();
+ Authenticator auth = new MD5XMLDocAuthenticator();
auth.authenticate("anou_mana","password");
auth.authenticate("bozo","clown");
auth.authenticate("sviens","password");
@@ -189,10 +200,44 @@ public class AuthenticatorTest
}
}
+
+
@Test(expected=UnknownUserException.class)
public void testBadMD5XMLDocAuthenticator() throws Exception
{
Authenticator auth = new MD5XMLDocAuthenticator();
auth.authenticate("anou_mana","badpass");
}
+
+
+ @Test
+ public void testAES128Cryptor()
+ {
+ System.out.println("testAES128Cryptor");
+ try {
+ Cryptor auth = new AES128Cryptor();
+ String encrypt = auth.encrypt("test");
+ Assert.assertNotNull(encrypt);
+ Assert.assertNotSame(encrypt, "test");
+ } catch (Exception e) {
+ logger.error(e.getMessage(),e);
+ Assert.fail("unexpected");
+ }
+ }
+
+
+ @Test
+ public void testTripleDESCryptor()
+ {
+ System.out.println("testTripleDESCryptor");
+ try {
+ Cryptor auth = new TripleDESCrytor();
+ String encrypt = auth.encrypt("test");
+ Assert.assertNotNull(encrypt);
+ Assert.assertNotSame(encrypt, "test");
+ } catch (Exception e) {
+ logger.error(e.getMessage(),e);
+ Assert.fail("unexpected");
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
