Author: anil.saldhana(a)jboss.com Date: 2009-08-31 12:35:00 -0400 (Mon, 31 Aug 2009) New Revision: 754 Removed: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert/KeyStoreUtil.java Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/KeystoreUtilUnitTestCase.java identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/RedirectBindingSignatureUtilTestCase.java Log: JBID-181: remove the redundant KeyStoreUtil from Bindings Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-08-29 17:10:40 UTC (rev 753) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-08-31 16:35:00 UTC (rev 754) @@ -44,9 +44,9 @@ import org.jboss.identity.federation.web.interfaces.TrustKeyConfigurationException; import org.jboss.identity.federation.web.interfaces.TrustKeyManager; import org.jboss.identity.federation.web.interfaces.TrustKeyProcessingException; +import org.jboss.identity.federation.api.util.KeyStoreUtil; import org.jboss.identity.federation.bindings.util.ValveUtil; import org.jboss.identity.federation.bindings.util.cert.EncryptionKeyUtil; -import org.jboss.identity.federation.bindings.util.cert.KeyStoreUtil; /** * KeyStore based Trust Key Manager Deleted: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert/KeyStoreUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert/KeyStoreUtil.java 2009-08-29 17:10:40 UTC (rev 753) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert/KeyStoreUtil.java 2009-08-31 16:35:00 UTC (rev 754) @@ -1,181 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.identity.federation.bindings.util.cert; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.security.GeneralSecurityException; -import java.security.Key; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.cert.Certificate; - -/** - * Utility to handle Java Keystore - * @author Anil.Saldhana(a)redhat.com - * @since Jan 12, 2009 - */ -public class KeyStoreUtil -{ - /** - * Get the KeyStore - * @param keyStoreFile - * @param storePass - * @return - * @throws GeneralSecurityException - * @throws IOException - */ - public static KeyStore getKeyStore(File keyStoreFile, char[] storePass) throws GeneralSecurityException, IOException - { - FileInputStream fis = new FileInputStream(keyStoreFile); - return getKeyStore(fis,storePass); - } - - /** - * Get the Keystore given the url to the keystore file as a string - * @param fileURL - * @param storePass - * @return - * @throws GeneralSecurityException - * @throws IOException - */ - public static KeyStore getKeyStore(String fileURL, char[] storePass) throws GeneralSecurityException, IOException - { - if(fileURL == null) - throw new IllegalArgumentException("fileURL is null"); - - File file = new File(fileURL); - FileInputStream fis = new FileInputStream(file); - return getKeyStore(fis,storePass); - } - - /** - * Get the Keystore given the URL to the keystore - * @param url - * @param storePass - * @return - * @throws GeneralSecurityException - * @throws IOException - */ - public static KeyStore getKeyStore(URL url, char[] storePass) throws GeneralSecurityException, IOException - { - if(url == null) - throw new IllegalArgumentException("url is null"); - - return getKeyStore(url.openStream(), storePass); - } - - /** - * Get the Key Store - * <b>Note:</b> This method wants the InputStream to be not null. - * @param ksStream - * @param storePass - * @return - * @throws GeneralSecurityException - * @throws IOException - * @throws IllegalArgumentException if ksStream is null - */ - public static KeyStore getKeyStore(InputStream ksStream, char[] storePass) throws GeneralSecurityException, IOException - { - if(ksStream == null) - throw new IllegalArgumentException("InputStream for the KeyStore is null"); - KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); - ks.load(ksStream, storePass); - return ks; - } - - /** - * Generate a Key Pair - * @param algo (RSA, DSA etc) - * @return - * @throws GeneralSecurityException - */ - public static KeyPair generateKeyPair(String algo) throws GeneralSecurityException - { - KeyPairGenerator kpg = KeyPairGenerator.getInstance(algo); - return kpg.genKeyPair(); - } - - /** - * Get the Public Key from the keystore - * @param ks - * @param alias - * @param password - * @return - * @throws GeneralSecurityException - */ - public static PublicKey getPublicKey(KeyStore ks, String alias, char[] password) throws KeyStoreException, NoSuchAlgorithmException, GeneralSecurityException - { - PublicKey publicKey = null; - - // Get private key - Key key = ks.getKey(alias, password); - if (key instanceof PrivateKey) - { - // Get certificate of public key - Certificate cert = ks.getCertificate(alias); - - // Get public key - publicKey = cert.getPublicKey(); - } - // if alias is a certificate alias, get the public key from the certificate. - if(publicKey == null) - { - Certificate cert = ks.getCertificate(alias); - if(cert != null) - publicKey = cert.getPublicKey(); - } - return publicKey; - } - - /** - * Add a certificate to the KeyStore - * @param keystoreFile - * @param storePass - * @param alias - * @param cert - * @throws GeneralSecurityException - * @throws IOException - */ - public static void addCertificate(File keystoreFile, char[] storePass, String alias, Certificate cert) - throws GeneralSecurityException, IOException - { - KeyStore keystore = getKeyStore(keystoreFile, storePass); - - // Add the certificate - keystore.setCertificateEntry(alias, cert); - - // Save the new keystore contents - FileOutputStream out = new FileOutputStream(keystoreFile); - keystore.store(out, storePass); - out.close(); - } -} \ No newline at end of file Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/KeystoreUtilUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/KeystoreUtilUnitTestCase.java 2009-08-29 17:10:40 UTC (rev 753) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/KeystoreUtilUnitTestCase.java 2009-08-31 16:35:00 UTC (rev 754) @@ -28,8 +28,8 @@ import java.util.Enumeration; import junit.framework.TestCase; - -import org.jboss.identity.federation.bindings.util.cert.KeyStoreUtil; + +import org.jboss.identity.federation.api.util.KeyStoreUtil; import org.jboss.identity.federation.core.saml.v2.util.SignatureUtil; /** Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/RedirectBindingSignatureUtilTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/RedirectBindingSignatureUtilTestCase.java 2009-08-29 17:10:40 UTC (rev 753) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/RedirectBindingSignatureUtilTestCase.java 2009-08-31 16:35:00 UTC (rev 754) @@ -28,8 +28,8 @@ import junit.framework.TestCase; import org.jboss.identity.federation.api.saml.v2.common.IDGenerator; -import org.jboss.identity.federation.web.util.RedirectBindingSignatureUtil; -import org.jboss.identity.federation.bindings.util.cert.KeyStoreUtil; +import org.jboss.identity.federation.api.util.KeyStoreUtil; +import org.jboss.identity.federation.web.util.RedirectBindingSignatureUtil; import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLAuthnRequestFactory; import org.jboss.identity.federation.core.saml.v2.util.SignatureUtil; import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;