From a57d67a213aab0c102880d473ce2657d37813bbe Mon Sep 17 00:00:00 2001 From: Ryan Ashcraft Date: Fri, 28 Jun 2024 15:57:38 -0400 Subject: [PATCH] #169 :green_heart: resolving IT reference to aiopskey --- .../src/main/resources/scripts/init_encrypt.py | 4 ++-- .../extensions-encryption-vault-java/README.md | 6 +++--- .../aissemble/data/encryption/VaultEncrypt.java | 4 ++-- .../test/resources/truststore/aiops-secure.jks | Bin 2169 -> 0 bytes .../resources/truststore/aissemble-secure.jks | Bin 0 -> 2173 bytes .../extensions-authzforce/README.md | 6 +++--- ...AiopsKeyStore.java => AissembleKeyStore.java} | 6 +++--- .../security/authorization/JsonWebTokenUtil.java | 2 +- .../security/config/SecurityConfiguration.java | 2 +- .../krausening/base/aiops-security.properties | 4 ++-- .../test/resources/truststore/aiops-secure.jks | Bin 2169 -> 0 bytes .../resources/truststore/aissemble-secure.jks | Bin 0 -> 2173 bytes .../templates/general-mlflow/auth.properties.vm | 2 +- .../v1_8_0/AiopsReferencePDPPythonMigration.java | 2 +- .../v1_8_0/AiopsReferencePythonMigration.java | 2 +- .../migration/aiops-security.properties | 4 ++-- .../tests/resources/config/base/auth.properties | 4 ++-- .../src/test/resources/config/auth.properties | 4 ++-- 18 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 extensions/extensions-encryption/extensions-encryption-vault-java/src/test/resources/truststore/aiops-secure.jks create mode 100644 extensions/extensions-encryption/extensions-encryption-vault-java/src/test/resources/truststore/aissemble-secure.jks rename extensions/extensions-security/extensions-authzforce/src/main/java/com/boozallen/aiops/security/authorization/{AiopsKeyStore.java => AissembleKeyStore.java} (97%) delete mode 100644 extensions/extensions-security/extensions-authzforce/src/test/resources/truststore/aiops-secure.jks create mode 100644 extensions/extensions-security/extensions-authzforce/src/test/resources/truststore/aissemble-secure.jks diff --git a/extensions/extensions-docker/aissemble-vault/src/main/resources/scripts/init_encrypt.py b/extensions/extensions-docker/aissemble-vault/src/main/resources/scripts/init_encrypt.py index ae1e0797c..c53af4a6e 100644 --- a/extensions/extensions-docker/aissemble-vault/src/main/resources/scripts/init_encrypt.py +++ b/extensions/extensions-docker/aissemble-vault/src/main/resources/scripts/init_encrypt.py @@ -42,11 +42,11 @@ # Enable the transit encryption service headers = {'X-Vault-Token': client.token} r = requests.post(VAULT_ADDR+ '/v1/sys/mounts/transit', data={'type':'transit'}, headers=headers) - client.secrets.transit.create_key('aiopskey', exportable=True, mount_point='transit') + client.secrets.transit.create_key('aissemblekey', exportable=True, mount_point='transit') # Create a policy for the transit service encrypt_policy = { - 'policy': 'path "transit/encrypt/aiopskey" { capabilities = [ "update" ]} path "transit/decrypt/aiopskey" { capabilities = [ "update" ]}' + 'policy': 'path "transit/encrypt/aissemblekey" { capabilities = [ "update" ]} path "transit/decrypt/aissemblekey" { capabilities = [ "update" ]}' } r = requests.post(VAULT_ADDR+ '/v1/sys/policies/acl/app-aiops', data=encrypt_policy, headers=headers) diff --git a/extensions/extensions-encryption/extensions-encryption-vault-java/README.md b/extensions/extensions-encryption/extensions-encryption-vault-java/README.md index 0377961f5..4e3c4a985 100644 --- a/extensions/extensions-encryption/extensions-encryption-vault-java/README.md +++ b/extensions/extensions-encryption/extensions-encryption-vault-java/README.md @@ -4,9 +4,9 @@ The following tasks will help you add authentication to your module. 1. Generate a jks key store with at least one public/private key pair. - Here is an example: - - ```openssl pkcs12 -export -in cacert.pem -inkey cakey.pem -out identity.p12 -name "aiopskey"``` - - ```keytool -importkeystore -destkeystore aiops-secure.jks -deststorepass password -srckeystore identity.p12 -srcstoretype PKCS12 -srcstorepass password``` - - ```keytool -import -file cacert.pem -keystore aiops-secure.jks -storepass password``` + - ```openssl pkcs12 -export -in cacert.pem -inkey cakey.pem -out identity.p12 -name "aissemblekey"``` + - ```keytool -importkeystore -destkeystore aissemble-secure.jks -deststorepass password -srckeystore identity.p12 -srcstoretype PKCS12 -srcstorepass password``` + - ```keytool -import -file cacert.pem -keystore aissemble-secure.jks -storepass password``` 1. Add the jks file to your environment and set the following krausening property to point to your keystore location - ```keystore.file.location=/path/to/my/keystore.jks``` 1. Use one of the authentication methods from com.boozallen.aiops.cookbook.authorization or create your own class that diff --git a/extensions/extensions-encryption/extensions-encryption-vault-java/src/main/java/com/boozallen/aissemble/data/encryption/VaultEncrypt.java b/extensions/extensions-encryption/extensions-encryption-vault-java/src/main/java/com/boozallen/aissemble/data/encryption/VaultEncrypt.java index 31184ad4b..81b232022 100644 --- a/extensions/extensions-encryption/extensions-encryption-vault-java/src/main/java/com/boozallen/aissemble/data/encryption/VaultEncrypt.java +++ b/extensions/extensions-encryption/extensions-encryption-vault-java/src/main/java/com/boozallen/aissemble/data/encryption/VaultEncrypt.java @@ -50,7 +50,7 @@ public String encryptValue(String valueToEncrypt) { // Base64 encoding is required by Vault String base64EncodedDataToEncrypt = base64Encode(valueToEncrypt); - LogicalResponse response = vault.logical().write("transit/encrypt/aiopskey", + LogicalResponse response = vault.logical().write("transit/encrypt/aissemblekey", Collections.singletonMap("plaintext", base64EncodedDataToEncrypt)); Map responses = response.getData(); @@ -81,7 +81,7 @@ public String decryptValue(String valueTodecrypt) { VaultUtil.checkSealStatusAndUnsealIfNecessary(vault); - LogicalResponse response = vault.logical().write("transit/decrypt/aiopskey", + LogicalResponse response = vault.logical().write("transit/decrypt/aissemble", Collections.singletonMap("ciphertext", valueTodecrypt)); Map responses = response.getData(); diff --git a/extensions/extensions-encryption/extensions-encryption-vault-java/src/test/resources/truststore/aiops-secure.jks b/extensions/extensions-encryption/extensions-encryption-vault-java/src/test/resources/truststore/aiops-secure.jks deleted file mode 100644 index b5b978efaa79d7442a98610386386c99a499411e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2169 zcmcJQ`#Tek7sq#VosCHw-IH740Z3CY$Fxs!y6lDTE>QcVb9 zxnv=hP;yUn(JQJNSg}zmjKO)-2GV;{UJ@34Z?YzN%a>LvGY5jy-AM;{=3tS=6>z2`?N{;FM z?#jBNp_PR*W@d*TL1hquUZ7MFcv;vzN)VCvCY<8UQa98XvDr;0I674ckbt(s2&-O* z5ey~C*9v0r^_NF-T=*jg!p}2~3Lb6X@LHeTTC`N#YLzT}SEsKTjsn1YIbO=FoXoXZ z_zEOVwEE^AIqt!h#nHl-;X3w-7LgS53zm)JNlB{*%YPn@G+vVo&J3U z`+|?Bd7^=Fj)1J250kW0B=pkjiES>O5!r7@8K00%if&BzClr9kIP#NGle^->G+#PZ zk~N;@m&G`uOCXJj=S-Mg-_mx|)w!|Vr&EVg9PJ6yJJnZOGty`voInZuJhb9h8-lzV zJk*G?Z?$^K`vdUw$oK}`;q!u}Jgx5*K{w=kX@raBx474)M&uW~S1N)u2n=p+S4uDn zqoTrBYJMEUBGWTM-L_HHHDakvnPrHn5*8M$)h)MjfH!ujI0?O8Q9kOAZ-$f%O`}?r zd!R>mv}z0&X8Pc!HWEhCJ`lujyWWYCHgW%9Ff{B3OdzAkdVY5ZrAPL@0vLWbsN!>K zve*>~$qLi@^2rERvNyBNiv%C&+o^f1dcfR5LAa2d<&1;k$IsAXp9w~XT8N;tK$X~5 z11>l4XwOMg_siPM)97LO{E$FLh18<#mR#!;6)`*KbkQac#!J=vmBu#l+MPMZ%HI|D z2FF^+hlu!oK-`lND5YD$#ukY3-d{%mshKbLmetgoD2e}ITO zvil{!6zmdfMO&(95(`h*_XM5%>++dWheF@kH$GCwH*hX(huF$SCHV!}2xE-8fES&a58n2*pZD)}VQ%N(@X?0v&A@{SyWRLPY==TPzeKAqplzM7MxQHvfRQ6v)K*9}xQk zQW(kKWs*{0XD4^;-vs?1$zo)F=fF}Df6lVzW(8&!3Z{+4;IVkD9!3|7JBxxH{Ea$) zjmlev+Fq^g zqG$~-Vt0RxVB$DMB9@B>^#$8*j`!Y@N%%U|y{FFTD*nGDZTtHCP(Ei&ul!b3wm>sW zl`IC0DBBssDLuLzjWgsXpAi2p7N=@%Gq?Bp>ghLK`{7i>;Epw_zGIdfaf#s;5Z=1$ z+jV>K;AQ0af{|;j1AMBp6*215HA7z<@sJj}Pgq8t@-aTXm3yqbR6sVAJLHsqq6G5G z_Nr+-WLxH|jf(kJn0Z3+N2vuMFyh_d`JJ~LE>>aeh|k=;?whu|^9!JpVV=qwk7N4p z5$g^6RtKOR>O^x_`^ugNKx&Ua2n+-O|LxG`8f-cQ1jwQL=foiXcQaOex|}t;KQh0BHSq}N4FWWQchS; z&?yQ%#qn|Z1KNYdx&jx@dFw)9K=ES-JjI#ekk8}f4i1dPj};`W393o6XsduOyXtXT z`v*IX?v&ueSB-+z(A(9h@rn5;A2*dooSbf1)r@IF2hF6POZ7IcPh0QZDvW8xiEe9# zM6mmH6HJ?fQ6$Uq1+Tl^sSfg`d48fCSYm!_Q6}S8_Cr|7MGf#uVuZaIleoPbtbRyg z-G7CU-E#R;WS>Z62X6+6zf-t0Nm7YrYerwG?9MUzX9r AssI20 diff --git a/extensions/extensions-encryption/extensions-encryption-vault-java/src/test/resources/truststore/aissemble-secure.jks b/extensions/extensions-encryption/extensions-encryption-vault-java/src/test/resources/truststore/aissemble-secure.jks new file mode 100644 index 0000000000000000000000000000000000000000..ac27523a90a590e9c9cc41864dc0fcc4f57bffd0 GIT binary patch literal 2173 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 AssI20 diff --git a/extensions/extensions-security/extensions-authzforce/src/test/resources/truststore/aissemble-secure.jks b/extensions/extensions-security/extensions-authzforce/src/test/resources/truststore/aissemble-secure.jks new file mode 100644 index 0000000000000000000000000000000000000000..263cbc79bcea5eeaef6d1d3253778869d66f33c9 GIT binary patch literal 2173 zcmcJQ`8yN}7sqF}j4g>MOP0uzp+<-y%N<*WkbQ=+*qPN2>?Jr2r6V3AqErHf&n2wP0#@#5DI`$A+y)499Gs->z zrAp_)&a>6ahH*g;71b42qIt+1Y1y~41fHw(8}hIgcQqiYIzy@@DV77`hQVt%jHv-%dw$~hXqW@e-jXry7< zw`lVHUfrh(4(_ZH<`o}9bVJ#0HC6{6o~UPPV6kgDvx0Tq^|jy0Uz>>DQ)cQWyGzJ9 zo@)9Q&7#&bBC9(l5k;=_QCf`2w_FMZ5loY#>nqvIs0u9*|0(sGGOf&~b6Ti92<#}V`1Q-h$60L93{vLw!dg~tb4IEqQcGci`^Oe^#o*(EO zq^8AXT=aWP+cNg1xJ7Qoal=Bp%T#oh=id3OxJAzX58ZEo^u4j5nm0D?Pey8)s=IzLi^p?wUj_+FaFz|l&7m^a#vffOZ@B1=F z;&1CAPCmiO4iPgMYzD$BC$(;-`Cq5&7b4Blj*Q)9Tl%2sDsyr3amy0Hss&byH90D# zVxa@FDRF$QTgdopM`H1g#iYJ3C2Ye+)ImE*7ET?YjlOfs@8zum*H|-$R%OGL*xDZ7 zd}7WGN}4&(F=&2db>7CW%QH8+<@3nO8CDyhNY-mnzR$Hj^$RIFlviifKq&I#9bHsA z;7+9BbAr;dcNPeY1T|#_Ov?F}Dxw%$W2C-F#+&S(c8Lk-UQ!riChiE1U0^z4Bq z3BqjBlVX!nw$x1~PYTK_PRBnPE8iUSxRYd$+{7~3V({&cOd-pP_$HBt${s@Cjigbf z=Bp@D|DbWN>;2YqO^SA$c1lH@0~oCq(0s%DlcQW~=7qlebXBiLnkTxLOo6* z5k>$2_#}b~)9{tp0Cf#LuJ6(|g%0)YVLsQxabrF}dzl3%%9 z)Z&p*tAolGbqy$WaqZFpKTl zOfd1w3&AWFh7jZ075=!16^vby9-A`{tiy>-b+;e*6vdfNT=?*-`0k}~hj^zb%U=!+ zSg@Ge7tN&3_%rOwA$#s5bQ(l1_xGI_-`YiOY0oA^=72!T$6;Uj`%S^s2p`O=OA(LI zotM@h!~a7LJFe51-2V{MVD@ff2;QZIu?@sl^_Bn=dZR&LAOQGJhxXTC-ytACO0$1f z01{2l+3;uU_)0Ak#=lB`wzrKLXFbSkF?gk3+WhV!v!SYZ!(Y;!X0oQ}T*JtfT?0Nz zQh*LjIs1i7UsNq1_r^GRBxd?GvP!5W3-yl!xV{&j?h>Ch;tV|Sg*e72w`h2XpT>Vo z+uW{ko6&S8a(rsWsGVPYbb2yljY;OQCp3?oNJvX($V7#xw<4tsE2^i_O9E2u`+HBthoq!PZsVlv-k>(E1J$|FUu|5%YPzT9;^di zO{ZW5N-;-zz*=Wyx1v|A^IwNg#=nDh8{*O0eMN@`Pn3$ij|zE*2rt2sTgcqutX9fA MDrKlm!m!urPr~KK^8f$< literal 0 HcmV?d00001 diff --git a/foundation/foundation-mda/src/main/resources/templates/general-mlflow/auth.properties.vm b/foundation/foundation-mda/src/main/resources/templates/general-mlflow/auth.properties.vm index 673fcea48..d0572327e 100644 --- a/foundation/foundation-mda/src/main/resources/templates/general-mlflow/auth.properties.vm +++ b/foundation/foundation-mda/src/main/resources/templates/general-mlflow/auth.properties.vm @@ -1,4 +1,4 @@ public_key_path = some/path/to/publicKey.pem -jks_path = some/path/to/truststore/aiops-secure.jks +jks_path = some/path/to/truststore/aissemble-secure.jks jks_password = somepassword key_alias = somekeyalias diff --git a/foundation/foundation-upgrade/src/main/java/com/boozallen/aissemble/upgrade/migration/v1_8_0/AiopsReferencePDPPythonMigration.java b/foundation/foundation-upgrade/src/main/java/com/boozallen/aissemble/upgrade/migration/v1_8_0/AiopsReferencePDPPythonMigration.java index 2a5b3506f..aaee8d859 100644 --- a/foundation/foundation-upgrade/src/main/java/com/boozallen/aissemble/upgrade/migration/v1_8_0/AiopsReferencePDPPythonMigration.java +++ b/foundation/foundation-upgrade/src/main/java/com/boozallen/aissemble/upgrade/migration/v1_8_0/AiopsReferencePDPPythonMigration.java @@ -34,7 +34,7 @@ public class AiopsReferencePDPPythonMigration extends AbstractAissembleMigration "aiops-security.properties", "aissemble-security.properties", "aiops.authority","aissemble.authority", "aiopskey","aissemblekey", - "/deployments/aiops-secure.jks","/deployments/aissemble-secure.jks" + "/deployments/aissemble-secure.jks","/deployments/aissemble-secure.jks" ); /** diff --git a/foundation/foundation-upgrade/src/main/java/com/boozallen/aissemble/upgrade/migration/v1_8_0/AiopsReferencePythonMigration.java b/foundation/foundation-upgrade/src/main/java/com/boozallen/aissemble/upgrade/migration/v1_8_0/AiopsReferencePythonMigration.java index 94a4144ca..469d28a41 100644 --- a/foundation/foundation-upgrade/src/main/java/com/boozallen/aissemble/upgrade/migration/v1_8_0/AiopsReferencePythonMigration.java +++ b/foundation/foundation-upgrade/src/main/java/com/boozallen/aissemble/upgrade/migration/v1_8_0/AiopsReferencePythonMigration.java @@ -33,7 +33,7 @@ public class AiopsReferencePythonMigration extends AbstractAissembleMigration { public static final Map AIOPS_REFERENCE_PYTHON_PACKAGE_MAP = Map.of( "aiops.authority", "aissemble.authority", "aiopskey" , "aissemblekey", - "/deployments/aiops-secure.jks" , "/deployments/aissemble-secure.jks", + "/deployments/aissemble-secure.jks" , "/deployments/aissemble-secure.jks", "policy-decision-point.aiops-security.properties.vm", "policy-decision-point.aissemble-security.properties.vm", "aiops_core_filestore.file_store_factory","aissemble_core_filestore.file_store_factory", "aiops_core_metadata.metadata_model", "aissemble_core_metadata.metadata_model", diff --git a/foundation/foundation-upgrade/src/test/resources/test-files/v1_8_0/AiopsReferencePDPPythonMigration/migration/aiops-security.properties b/foundation/foundation-upgrade/src/test/resources/test-files/v1_8_0/AiopsReferencePDPPythonMigration/migration/aiops-security.properties index 5b1c9b74d..60d15986f 100644 --- a/foundation/foundation-upgrade/src/test/resources/test-files/v1_8_0/AiopsReferencePDPPythonMigration/migration/aiops-security.properties +++ b/foundation/foundation-upgrade/src/test/resources/test-files/v1_8_0/AiopsReferencePDPPythonMigration/migration/aiops-security.properties @@ -14,7 +14,7 @@ # Generated from: templates/general-docker/policy-decision-point.aiops-security.properties.vm token.issuer=aiops.authority -private.key.alias=aiopskey -keystore.file.location=/deployments/aiops-secure.jks +private.key.alias=aissemblekey +keystore.file.location=/deployments/aissemble-secure.jks attribute.definition.location=/deployments/ pdp.configuration.location=/deployments/pdp.xml diff --git a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/config/base/auth.properties b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/config/base/auth.properties index 0f6c78519..f8afd80a3 100644 --- a/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/config/base/auth.properties +++ b/test/test-mda-models/aissemble-test-data-delivery-pyspark-model/tests/resources/config/base/auth.properties @@ -8,8 +8,8 @@ # #L% ### public_key_path = /keystore/publicKey.pem -jks_path = /keystore/aiops-secure.jks +jks_path = /keystore/aissemble-secure.jks jks_password = password -key_alias = aiopskey +key_alias = aissemblekey pdp_host_url = http://policy-decision-point:8080/api/pdp is_authorization_enabled = False diff --git a/test/test-mda-models/test-data-delivery-spark-model/src/test/resources/config/auth.properties b/test/test-mda-models/test-data-delivery-spark-model/src/test/resources/config/auth.properties index f733dd60c..4dd883292 100644 --- a/test/test-mda-models/test-data-delivery-spark-model/src/test/resources/config/auth.properties +++ b/test/test-mda-models/test-data-delivery-spark-model/src/test/resources/config/auth.properties @@ -8,8 +8,8 @@ # #L% ### public_key_path = /keystore/publicKey.pem -jks_path = /keystore/aiops-secure.jks +jks_path = /keystore/aissemble-secure.jks jks_password = password -key_alias = aiopskey +key_alias = aissemblekey pdp_host_url = http://policy-decision-point:8080/api/pdp is_authorization_enabled = False