From 25d8f64bedc3867f8eab7cd74166cc22edb91527 Mon Sep 17 00:00:00 2001
From: Jeff Storck <jtswork@gmail.com>
Date: Wed, 3 Apr 2019 01:06:04 -0400
Subject: [PATCH] NIFI-6178: Implemented capability to add IP SANs to certs
 Regenerated test certs for nifi-livy-processors and nifi-standard-processors
 to fix some broken SSL tests in those modules

This closes #3416.
---
 .../src/test/resources/keystore.jks           | Bin 3088 -> 3095 bytes
 .../src/test/resources/truststore.jks         | Bin 911 -> 911 bytes
 .../src/test/resources/keystore.jks           | Bin 3088 -> 3095 bytes
 .../src/test/resources/truststore.jks         | Bin 911 -> 911 bytes
 .../nifi/toolkit/tls/util/TlsHelper.java      |   3 ++-
 .../nifi/toolkit/tls/util/TlsHelperTest.java  |   5 ++++-
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/keystore.jks b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/keystore.jks
index 246fe888efbb981188c9dcca109b5d2c52f2b435..5f3cbe3a785e57214b925ea65bd18bab0e5c3944 100644
GIT binary patch
delta 2701
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

delta 2681
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
F{sS!?;Y9!d

diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/truststore.jks b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/truststore.jks
index 87f4be1cb74419252a6dd4a8cb8ed6063e7ade2f..d26ec92e443fcdc62c5d59f4ae20615ff05e0a1a 100644
GIT binary patch
delta 676
zcmV;V0$cr$2agAk9wlkuYB<CI1z0XMFgXAK15Gf314%G~0x_Ti0s#U73IS>0YB(~H
zLp>QeFf=eSGBYzbGcj5h4Kgw?G%ztTGcz|ck(o$;q^CBZ2EZ+HYAV6B_np?7FBG~R
zH!(49@nG~PT}6<8e&}TowcEH>B}(D5`+9l-@8xr#d`X6pDqh)C@T@Aa+}!S!>I~oE
z=ORr|RGt+R7+YBnV|d#fK)#)TbQ)>JTF@*fQ1sl?16jeAter8lf$3C16=liFStgXR
zO|;Q}zrV<4$5e-fSr3S8lA(U7LLx@!eswg}c8+(PBriIF4&Ba8?%Xj%<%hqG%}YcF
zmoo=~{otTM(qD?6s{5yE{dlIPz5=vjRFLGHFn3iEOy(9JX+7QFg~@}KW^Pm2@Zr!6
z6a;!bmtAk8+CggENHdDys(7nz6OkJr@>=`?36YcG0Wvkt(5?}jkL{i|R+V{51v8~d
zyj&eH9|i+e9U}x7FcyFm&d{zAoR96EHdd8+N(D2eNxWPglSl$He=DxhQklBc820eg
zR!d8Lq2|G@&dhB)i?_LC^Y!aK=|3rqGIcEqyeht-F1Bed;jsF|jmHR(<|a|#P}5;T
zlQ2<i;~ypf??kwczyxR6JVi{hRtYP-&C~ms9b}K4rK@P=G=h#eIX@#i^W`0$YrDdG
znOE#oFX(wyMXRY7f7E(K<DjkH1WWtY>;9n5a03B<p|`>1#>E29ljw}F>l)AgZ4}0T
z^7X1vb=`)%Ku{g83Q||3%3;>2TNdS|7_}8bIc3gVf$ZU3(#y6II@ru)fwk?b0fU-C
z+nJv*52vz{TVNo$XZ3ovo&}e?p?dpP+w!)2FAdV=cGBQ}7OzMqw}(uUl03zo`6<CU
KjH2UWU~j@^<3IHP

delta 676
zcmV;V0$cr$2agAk9wlY{hY<b%1z0XMFgXAK15Gf314%G~0x_Ti0s#U73IS#PhYt~v
zLp>QdFgY?YF*z_cH8ENj4Kgt>IWjOYIWRUgk(o$;i-s|ed_M4aKJJqi35^9D(qaee
zrD!3b-alWHf{wmH?%qH{I>hkqVIo?dGTJF>QgB1uQ1q2jvbvFbuGbGCze$!DAvmWN
znVK;yorKCpwWm!E7nXN6sVR`C`74rDf+et9AcF9CKc*2ytk_u0+XP!yViAr!1m|?X
zch^9Fp=a~O9XGBZ3o)y;w<2yI5ifl#8X<Zuc!G=}0*zp#4+H@dpuJvd6DfW;!JcI-
zU4C)jJ6e9Bc(6&06dUewF2)GVm6`LPn*ltq`#j8O%d6K^jEGd%mPW)0(CH=OF-n8q
z^U~97Wk|izlN;%nj+dsOZv1z(J!qC31JED>RW+000Wvid&oGmVzL+h%)GczgPprJL
z2GPkd9|i+e9U}x7FcyFm6wfe|i@umGywojnwNI?Pu?Eq}lSl$He_!f#l?v&F0K%^i
zN2yY4rdlW2R#f;0#lQVVitt_QBzSkJzHF4&o72TddCAxOun(wj6ZCdx1HLzsa$SLI
z1^@f5IWD+*H39-dOm%XQPlOy_;@evQ<n{U0(0zoE9>^!FOtVD>&0HMNRMZeH(YL%D
zk{LhSr{ik)rAY20e~!-|z3{b7@2(#eExlOZgy^_u^0A=h0Gte<42l)!TU{F`yI3C8
zgc}cI6#K<kgupzy$14I!+|IFF69@VvysVuy@Ddsv51aJ`^qfJNV?H<kYax%C&7rJ;
zw0c)?fYs#782!?MeNpx_I(`u3Sgs^dte}#luTTlN8A)BG7W!4IQ6e;Bq83EQ^*&BU
K<LYOTRn~mG8ZM{+

diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/keystore.jks b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/keystore.jks
index 246fe888efbb981188c9dcca109b5d2c52f2b435..5f3cbe3a785e57214b925ea65bd18bab0e5c3944 100644
GIT binary patch
delta 2701
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

delta 2681
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
F{sS!?;Y9!d

diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/truststore.jks b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/truststore.jks
index 87f4be1cb74419252a6dd4a8cb8ed6063e7ade2f..d26ec92e443fcdc62c5d59f4ae20615ff05e0a1a 100644
GIT binary patch
delta 676
zcmV;V0$cr$2agAk9wlkuYB<CI1z0XMFgXAK15Gf314%G~0x_Ti0s#U73IS>0YB(~H
zLp>QeFf=eSGBYzbGcj5h4Kgw?G%ztTGcz|ck(o$;q^CBZ2EZ+HYAV6B_np?7FBG~R
zH!(49@nG~PT}6<8e&}TowcEH>B}(D5`+9l-@8xr#d`X6pDqh)C@T@Aa+}!S!>I~oE
z=ORr|RGt+R7+YBnV|d#fK)#)TbQ)>JTF@*fQ1sl?16jeAter8lf$3C16=liFStgXR
zO|;Q}zrV<4$5e-fSr3S8lA(U7LLx@!eswg}c8+(PBriIF4&Ba8?%Xj%<%hqG%}YcF
zmoo=~{otTM(qD?6s{5yE{dlIPz5=vjRFLGHFn3iEOy(9JX+7QFg~@}KW^Pm2@Zr!6
z6a;!bmtAk8+CggENHdDys(7nz6OkJr@>=`?36YcG0Wvkt(5?}jkL{i|R+V{51v8~d
zyj&eH9|i+e9U}x7FcyFm&d{zAoR96EHdd8+N(D2eNxWPglSl$He=DxhQklBc820eg
zR!d8Lq2|G@&dhB)i?_LC^Y!aK=|3rqGIcEqyeht-F1Bed;jsF|jmHR(<|a|#P}5;T
zlQ2<i;~ypf??kwczyxR6JVi{hRtYP-&C~ms9b}K4rK@P=G=h#eIX@#i^W`0$YrDdG
znOE#oFX(wyMXRY7f7E(K<DjkH1WWtY>;9n5a03B<p|`>1#>E29ljw}F>l)AgZ4}0T
z^7X1vb=`)%Ku{g83Q||3%3;>2TNdS|7_}8bIc3gVf$ZU3(#y6II@ru)fwk?b0fU-C
z+nJv*52vz{TVNo$XZ3ovo&}e?p?dpP+w!)2FAdV=cGBQ}7OzMqw}(uUl03zo`6<CU
KjH2UWU~j@^<3IHP

delta 676
zcmV;V0$cr$2agAk9wlY{hY<b%1z0XMFgXAK15Gf314%G~0x_Ti0s#U73IS#PhYt~v
zLp>QdFgY?YF*z_cH8ENj4Kgt>IWjOYIWRUgk(o$;i-s|ed_M4aKJJqi35^9D(qaee
zrD!3b-alWHf{wmH?%qH{I>hkqVIo?dGTJF>QgB1uQ1q2jvbvFbuGbGCze$!DAvmWN
znVK;yorKCpwWm!E7nXN6sVR`C`74rDf+et9AcF9CKc*2ytk_u0+XP!yViAr!1m|?X
zch^9Fp=a~O9XGBZ3o)y;w<2yI5ifl#8X<Zuc!G=}0*zp#4+H@dpuJvd6DfW;!JcI-
zU4C)jJ6e9Bc(6&06dUewF2)GVm6`LPn*ltq`#j8O%d6K^jEGd%mPW)0(CH=OF-n8q
z^U~97Wk|izlN;%nj+dsOZv1z(J!qC31JED>RW+000Wvid&oGmVzL+h%)GczgPprJL
z2GPkd9|i+e9U}x7FcyFm6wfe|i@umGywojnwNI?Pu?Eq}lSl$He_!f#l?v&F0K%^i
zN2yY4rdlW2R#f;0#lQVVitt_QBzSkJzHF4&o72TddCAxOun(wj6ZCdx1HLzsa$SLI
z1^@f5IWD+*H39-dOm%XQPlOy_;@evQ<n{U0(0zoE9>^!FOtVD>&0HMNRMZeH(YL%D
zk{LhSr{ik)rAY20e~!-|z3{b7@2(#eExlOZgy^_u^0A=h0Gte<42l)!TU{F`yI3C8
zgc}cI6#K<kgupzy$14I!+|IFF69@VvysVuy@Ddsv51aJ`^qfJNV?H<kYax%C&7rJ;
zw0c)?fYs#782!?MeNpx_I(`u3Sgs^dte}#luTTlN8A)BG7W!4IQ6e;Bq83EQ^*&BU
K<LYOTRn~mG8ZM{+

diff --git a/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/util/TlsHelper.java b/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/util/TlsHelper.java
index 3d6d5c596b..3ce389723d 100644
--- a/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/util/TlsHelper.java
+++ b/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/util/TlsHelper.java
@@ -49,6 +49,7 @@ import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 import org.bouncycastle.pkcs.PKCS10CertificationRequest;
 import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest;
 import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
+import org.bouncycastle.util.IPAddress;
 import org.bouncycastle.util.io.pem.PemWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -366,7 +367,7 @@ public class TlsHelper {
 
         if (StringUtils.isNotBlank(domainAlternativeNames)) {
             for (String alternativeName : domainAlternativeNames.split(",")) {
-                namesList.add(new GeneralName(GeneralName.dNSName, alternativeName));
+                namesList.add(new GeneralName(IPAddress.isValid(alternativeName) ? GeneralName.iPAddress : GeneralName.dNSName, alternativeName));
             }
         }
 
diff --git a/nifi-toolkit/nifi-toolkit-tls/src/test/java/org/apache/nifi/toolkit/tls/util/TlsHelperTest.java b/nifi-toolkit/nifi-toolkit-tls/src/test/java/org/apache/nifi/toolkit/tls/util/TlsHelperTest.java
index 5ed4e919d9..490a3b7621 100644
--- a/nifi-toolkit/nifi-toolkit-tls/src/test/java/org/apache/nifi/toolkit/tls/util/TlsHelperTest.java
+++ b/nifi-toolkit/nifi-toolkit-tls/src/test/java/org/apache/nifi/toolkit/tls/util/TlsHelperTest.java
@@ -34,6 +34,7 @@ import org.bouncycastle.openssl.PEMParser;
 import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
 import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest;
+import org.bouncycastle.util.IPAddress;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -373,7 +374,9 @@ public class TlsHelperTest {
 
         List<String> extractedSans = extractSanFromCsr(csrWithSan);
         assert extractedSans.size() == SAN_COUNT + 1;
-        List<String> formattedSans = SAN_ENTRIES.stream().map(s -> "DNS: " + s).collect(Collectors.toList());
+        List<String> formattedSans = SAN_ENTRIES.stream()
+                .map(s -> (IPAddress.isValid(s) ? "IP Address: " + new GeneralName(GeneralName.iPAddress, s).getName() : "DNS: " + s))
+                .collect(Collectors.toList());
         assert extractedSans.containsAll(formattedSans);
 
         // We check that the SANs also contain the CN