Update CM to us Local Intermediate Certs
[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / cm / PlaceArtifactInKeystore.java
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
deleted file mode 100644 (file)
index 2b498d4..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * ============LICENSE_START====================================================
- * org.onap.aaf
- * ===========================================================================
- * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
- * ===========================================================================
- * 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.
- * ============LICENSE_END====================================================
- *
- */
-
-package org.onap.aaf.cadi.cm;
-
-import java.io.File;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.onap.aaf.cadi.CadiException;
-import org.onap.aaf.cadi.Symm;
-import org.onap.aaf.cadi.config.Config;
-import org.onap.aaf.cadi.util.Chmod;
-import org.onap.aaf.misc.env.Trans;
-
-import certman.v1_0.Artifacts.Artifact;
-import certman.v1_0.CertInfo;
-
-public class PlaceArtifactInKeystore extends ArtifactDir {
-       private String kst;
-
-       public PlaceArtifactInKeystore(String kst) {
-               this.kst = kst;
-       }
-
-       @Override
-       public boolean _place(Trans trans, CertInfo certInfo, Artifact arti) throws CadiException {
-               File fks = new File(dir,arti.getNs()+'.'+kst);
-               try {
-                       KeyStore jks = KeyStore.getInstance(kst);
-                       if(fks.exists()) {
-                               fks.delete();
-                       }       
-
-                       // Get the Cert(s)... Might include Trust store
-                       Collection<? extends Certificate> certColl = Factory.toX509Certificate(certInfo.getCerts());
-                       // find where the trusts end in 1.0 API
-               
-                       X509Certificate x509;
-                       List<X509Certificate> certList = new ArrayList<X509Certificate>();
-                       Certificate[] trustChain = null;
-                       Certificate[] trustCAs;
-                       for(Certificate c : certColl) {
-                               x509 = (X509Certificate)c;
-                               if(trustChain==null && x509.getSubjectDN().equals(x509.getIssuerDN())) {
-                                       trustChain = new Certificate[certList.size()];
-                                       certList.toArray(trustChain);
-                                       certList.clear(); // reuse
-                               }
-                               certList.add(x509);
-                       }
-                       
-                       // remainder should be Trust CAs
-                       trustCAs = new Certificate[certList.size()];
-                       certList.toArray(trustCAs);
-
-                       // Properties, etc
-                       // Add CADI Keyfile Entry to Properties
-                       addProperty(Config.CADI_KEYFILE,arti.getDir()+'/'+arti.getNs() + ".keyfile");
-                       // Set Keystore Password
-                       addProperty(Config.CADI_KEYSTORE,fks.getAbsolutePath());
-                       String keystorePass = Symm.randomGen(CmAgent.PASS_SIZE);
-                       addEncProperty(Config.CADI_KEYSTORE_PASSWORD,keystorePass);
-                       char[] keystorePassArray = keystorePass.toCharArray();
-                       jks.load(null,keystorePassArray); // load in
-                       
-                       // Add Private Key/Cert Entry for App
-                       // Note: Java SSL security classes, while having a separate key from keystore,
-                       // is documented to not actually work. 
-                       // java.security.UnrecoverableKeyException: Cannot recover key
-                       // You can create a custom Key Manager to make it work, but Practicality  
-                       // dictates that you live with the default, meaning, they are the same
-                       String keyPass = keystorePass; //Symm.randomGen(CmAgent.PASS_SIZE);
-                       PrivateKey pk = Factory.toPrivateKey(trans, certInfo.getPrivatekey());
-                       addEncProperty(Config.CADI_KEY_PASSWORD, keyPass);
-                       addProperty(Config.CADI_ALIAS, arti.getMechid());
-//                     Set<Attribute> attribs = new HashSet<Attribute>();
-//                     if(kst.equals("pkcs12")) {
-//                             // Friendly Name
-//                             attribs.add(new PKCS12Attribute("1.2.840.113549.1.9.20", arti.getNs()));
-//                     } 
-//                     
-                       KeyStore.ProtectionParameter protParam = 
-                                       new KeyStore.PasswordProtection(keyPass.toCharArray());
-                       
-                       KeyStore.PrivateKeyEntry pkEntry = 
-                               new KeyStore.PrivateKeyEntry(pk, trustChain);
-                       jks.setEntry(arti.getMechid(), 
-                                       pkEntry, protParam);
-
-                       // Write out
-                       write(fks,Chmod.to400,jks,keystorePassArray);
-                       
-                       // Change out to TrustStore
-                       fks = new File(dir,arti.getNs()+".trust."+kst);
-                       jks = KeyStore.getInstance(kst);
-                       
-                       // Set Truststore Password
-                       addProperty(Config.CADI_TRUSTSTORE,fks.getAbsolutePath());
-                       String trustStorePass = Symm.randomGen(CmAgent.PASS_SIZE);
-                       addEncProperty(Config.CADI_TRUSTSTORE_PASSWORD,trustStorePass);
-                       char[] truststorePassArray = trustStorePass.toCharArray();
-                       jks.load(null,truststorePassArray); // load in
-                       
-                       // Add Trusted Certificates, but PKCS12 doesn't support
-                       for(int i=0; i<trustCAs.length;++i) {
-                               jks.setCertificateEntry("ca_" + arti.getCa() + '_' + i, trustCAs[i]);
-                       }
-                       // Write out
-                       write(fks,Chmod.to644,jks,truststorePassArray);
-                       return true;
-               } catch (Exception e) {
-                       throw new CadiException(e);
-               }
-       }
-
-}