From 68b2315d44b8df80d87b9fd050fe21aeea144c8f Mon Sep 17 00:00:00 2001 From: Instrumental Date: Tue, 1 May 2018 15:03:25 -0500 Subject: [PATCH] Update Certificate for all FQDNs Issue-ID: AAF-114 Change-Id: I0b73d55b471e0438bb4beb901a992be88e1e5f11 Signed-off-by: Instrumental --- .gitignore | 1 + .../java/org/onap/aaf/auth/cm/ca/X509andChain.java | 2 +- .../java/org/onap/aaf/auth/cm/cert/BCFactory.java | 2 +- .../org/onap/aaf/auth/cm/test/CertmanTest.java | 4 +-- .../src/main/java/org/onap/aaf/auth/cmd/Cmd.java | 2 +- auth/sample/local/org.osaaf.aaf.p12 | Bin 3920 -> 4140 bytes auth/sample/local/org.osaaf.aaf.props | 4 +-- .../onap/aaf/cadi/shiro/AAFAuthorizationInfo.java | 4 +-- conf/CA/manual.sh | 36 ++++++++++++++++++--- conf/CA/san.conf | 15 +++++++++ .../java/org/onap/aaf/misc/env/jaxb/JAXBmar.java | 2 +- .../java/org/onap/aaf/misc/env/jaxb/JAXBumar.java | 2 +- .../org/onap/aaf/misc/rosetta/test/JU_JSON.java | 4 +-- 13 files changed, 60 insertions(+), 18 deletions(-) create mode 100644 conf/CA/san.conf diff --git a/.gitignore b/.gitignore index f0ac2df4..5ca6890c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /target/ /temp/ .metadata/ +/cadisample/ diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java index 24416c92..46a6393a 100644 --- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java +++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java @@ -33,7 +33,7 @@ import org.onap.aaf.cadi.cm.Factory; * Have to put the Cert and resulting Trust Chain together. * Treating them separately has caused issues * - * @author jg1555 + * @author JonathanGathman * */ public class X509andChain { diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/BCFactory.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/BCFactory.java index 4fdac6a6..7f4590f3 100644 --- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/BCFactory.java +++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/cert/BCFactory.java @@ -48,7 +48,7 @@ import org.onap.aaf.misc.env.Trans; * Additional Factory mechanisms for CSRs, and BouncyCastle. The main Factory * utilizes only Java abstractions, and is useful in Client code. * - * @author jg1555 + * @author JonathanGathman * */ public class BCFactory extends Factory { diff --git a/auth/auth-certman/src/test/java/org/onap/aaf/auth/cm/test/CertmanTest.java b/auth/auth-certman/src/test/java/org/onap/aaf/auth/cm/test/CertmanTest.java index 3faa5bbf..7d3f25ca 100644 --- a/auth/auth-certman/src/test/java/org/onap/aaf/auth/cm/test/CertmanTest.java +++ b/auth/auth-certman/src/test/java/org/onap/aaf/auth/cm/test/CertmanTest.java @@ -120,8 +120,8 @@ public class CertmanTest { // @Override // public Void code(Rcli client) throws APIException, CadiException { // CertificateRequest cr = new CertificateRequest(); -// cr.setMechid("m12345@aaf.att.com"); -// cr.setSponsor("jg1555"); +// cr.setMechid("a12345@org.osaaf.org"); +// cr.setSponsor("something"); // cr.getFqdns().add("mithrilcsp.sbc.com"); // cr.getFqdns().add("zld01907.vci.att.com"); // cr.getFqdns().add("aaftest.test.att.com"); diff --git a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/Cmd.java b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/Cmd.java index 896cbb30..7f41650d 100644 --- a/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/Cmd.java +++ b/auth/auth-cmd/src/main/java/org/onap/aaf/auth/cmd/Cmd.java @@ -228,7 +228,7 @@ public abstract class Cmd { } else if(desc.startsWith("{")) { StringReader sr = new StringReader(desc); try { - // Note: 11-18-2013, JG1555. This rather convoluted Message Structure required by TSS Restful Specs, reflecting "Northbound" practices. + // Note: 11-18-2013, JonathanGathman. This rather convoluted Message Structure required by TSS Restful Specs, reflecting "Northbound" practices. Error err = getDF(Error.class).newData().in(TYPE.JSON).load(sr).asObject(); sb.append(" ["); sb.append(err.getMessageId()); diff --git a/auth/sample/local/org.osaaf.aaf.p12 b/auth/sample/local/org.osaaf.aaf.p12 index e4d33924874ad3312559ddba965f55e9dbc6079b..f40a7556dad00281f8cc75c49891b83c493bbbf2 100644 GIT binary patch delta 4076 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 delta 3860 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 WD68*H!UPDb -cadi_alias=aaf@aaf.osaaf.org +cadi_alias=aaf-authz@aaf.osaaf.org cadi_truststore=/opt/app/osaaf/local/org.osaaf.aaf.trust.p12 cadi_truststore_password=enc:5nzj6v3Rb0oZPV1zCxg8EJFfkFvWFGJflLB0i_FN0Np diff --git a/cadi/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java b/cadi/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java index 90935900..bfdc6bf1 100644 --- a/cadi/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java +++ b/cadi/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFAuthorizationInfo.java @@ -31,9 +31,9 @@ import org.onap.aaf.cadi.Access; import org.onap.aaf.cadi.Access.Level; /** - * We treate "roles" and "permissions" in a similar way for first pass. + * We treat "roles" and "permissions" in a similar way for first pass. * - * @author jg1555 + * @author JonathanGathman * */ public class AAFAuthorizationInfo implements AuthorizationInfo { diff --git a/conf/CA/manual.sh b/conf/CA/manual.sh index 7b75fbc9..00a23ec8 100644 --- a/conf/CA/manual.sh +++ b/conf/CA/manual.sh @@ -13,10 +13,30 @@ else FQDN=$1 NAME=$FQDN shift + + echo "Enter any SANS, delimited by spaces: " + read SANS +fi + +# Do SANs +if [ "$SANS" = "" ]; then + echo no SANS + if [ -e $NAME.san ]; then + rm $NAME.san + fi + else + echo some SANS + cp ../san.conf $NAME.san + NUM=1 + for D in $SANS; do + echo "DNS.$NUM = $D" >> $NAME.san + NUM=$((NUM+1)) + done fi + echo $SUBJECT -if [ -e $FQI.csr ]; then +if [ -e $NAME.csr ]; then SIGN_IT=true else if [ "$1" = "-local" ]; then @@ -46,13 +66,19 @@ fi if [ "$SIGN_IT" = "true" ]; then # Sign it - openssl ca -config ../openssl.conf -extensions server_cert -out $NAME.crt \ + if [ -e $NAME.san ]; then + openssl ca -config ../openssl.conf -extensions server_cert -out $NAME.crt \ -cert certs/ca.crt -keyfile private/ca.key \ -policy policy_loose \ -days 360 \ + -extfile $NAME.san \ -infiles $NAME.csr + else + openssl ca -config ../openssl.conf -extensions server_cert -out $NAME.crt \ + -cert certs/ca.crt -keyfile private/ca.key \ + -policy policy_loose \ + -days 360 \ + -infiles $NAME.csr + fi fi - - - diff --git a/conf/CA/san.conf b/conf/CA/san.conf new file mode 100644 index 00000000..de9f62f9 --- /dev/null +++ b/conf/CA/san.conf @@ -0,0 +1,15 @@ +# SAN Extension +# Copy, then add DNS.1 = name, etc +# +[ server_cert ] +# Extensions for server certificates (`man x509v3_config`). +basicConstraints = CA:FALSE +nsCertType = server, client +nsComment = "OpenSSL Generated Server Certificate" +subjectKeyIdentifier = hash +authorityKeyIdentifier = keyid,issuer:always +keyUsage = critical, digitalSignature, keyEncipherment, nonRepudiation +extendedKeyUsage = serverAuth, clientAuth +subjectAltName = @alt_names + +[ alt_names ] diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBmar.java b/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBmar.java index cca3e68c..127eb154 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBmar.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBmar.java @@ -25,7 +25,7 @@ * Created on: Apr 10, 2009 * Created by: Jonathan * - * Revamped to do away with ThreadLocal 5/27/2011, JG1555 + * Revamped to do away with ThreadLocal 5/27/2011, JonathanGathman * * (c) 2009 SBC Knowledge Ventures, L.P. All rights reserved. ******************************************************************* diff --git a/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBumar.java b/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBumar.java index 94e9ba80..74072aaf 100644 --- a/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBumar.java +++ b/misc/env/src/main/java/org/onap/aaf/misc/env/jaxb/JAXBumar.java @@ -25,7 +25,7 @@ * Created on: Apr 10, 2009 * Created by: Jonathan * - * Revamped to do away with ThreadLocal 5/27/2011, JG1555 + * Revamped to do away with ThreadLocal 5/27/2011, JonathanGathman * * (c) 2009 SBC Knowledge Ventures, L.P. All rights reserved. ******************************************************************* diff --git a/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/test/JU_JSON.java b/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/test/JU_JSON.java index 2a48edc4..080fc973 100644 --- a/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/test/JU_JSON.java +++ b/misc/rosetta/src/test/java/org/onap/aaf/misc/rosetta/test/JU_JSON.java @@ -58,9 +58,9 @@ public class JU_JSON { go(jin, jout, "{\"id\":\"Me,[}[eg[)(:x,\\\" Myself\",\"date\":1353094689100}"); // TODO: Clean out AT&T specific data - go(jin,jout, "{\"userid\":\"jg1555\",\"timestamp\":1353097388531,\"item\":[{\"tag\":\"color\",\"value\":\"Mauve\"},{\"tag\":\"shirtsize\",\"value\":\"Xtra Large\"}]}"); + go(jin,jout, "{\"userid\":\"xk3233\",\"timestamp\":1353097388531,\"item\":[{\"tag\":\"color\",\"value\":\"Mauve\"},{\"tag\":\"shirtsize\",\"value\":\"Xtra Large\"}]}"); //go() - //"jg15551353082669667"); + //"xk32331353082669667"); // 3/11/2015 Jonathan found a case with missing comma go(jin,jout, "{\"start\":\"2015-03-11T18:18:05.580-05:00\",\"end\":\"2015-09-11-05:00\",\"force\":\"false\",\"perm\":{\"type\":\"org.osaaf.myns.mytype\",\"instance\":\"myInstance\",\"action\":\"myAction\"}" -- 2.16.6