From c73053bba0194231de9173c9e3b65155dcdea62a Mon Sep 17 00:00:00 2001 From: James Rigassio Date: Thu, 23 Jan 2020 17:42:00 -0800 Subject: [PATCH 1/2] modify create defaults for pass4symmkey change --- splunk/common-files/createdefaults.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/splunk/common-files/createdefaults.py b/splunk/common-files/createdefaults.py index fcf3da6b..48c5566e 100755 --- a/splunk/common-files/createdefaults.py +++ b/splunk/common-files/createdefaults.py @@ -25,7 +25,9 @@ splunk_hec_token = os.environ.get("SPLUNK_HEC_TOKEN", None) splunk_password = os.environ.get("SPLUNK_PASSWORD", None) splunk_idxc_secret = os.environ.get("SPLUNK_IDXC_SECRET", None) +splunk_idxc_pass4SymmKey = os.environ.get("SPLUNK_SHC_PASS4SYMMKEY", None) splunk_shc_secret = os.environ.get("SPLUNK_SHC_SECRET", None) +splunk_shc_pass4SymmKey = os.environ.get("SPLUNK_SHC_PASS4SYMMKEY", None) def random_generator(size=24): # Use System Random for @@ -43,8 +45,13 @@ def random_generator(size=24): os.environ["SPLUNK_PASSWORD"] = random_generator() if not splunk_idxc_secret: os.environ["SPLUNK_IDXC_SECRET"] = random_generator() +if not splunk_idxc_pass4SymmKey: + os.environ["SPLUNK_IDXC_SECRET"] = os.environ["SPLUNK_IDXC_SECRET"] if not splunk_shc_secret: os.environ["SPLUNK_SHC_SECRET"] = random_generator() +if not splunk_shc_pass4SymmKey: + os.environ["SPLUNK_SHC_PASS4SYMMKEY"] = os.environ["SPLUNK_SHC_SECRET"] + sys.argv.append("--write-to-stdout") import environ environ.main() From 73a7d3eb85f47883fe3fe66b6f6f81b8400b05a5 Mon Sep 17 00:00:00 2001 From: James Rigassio Date: Fri, 24 Jan 2020 11:59:46 -0800 Subject: [PATCH 2/2] addressing comment and change for variable deprecation --- splunk/common-files/createdefaults.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/splunk/common-files/createdefaults.py b/splunk/common-files/createdefaults.py index 48c5566e..944c83c7 100755 --- a/splunk/common-files/createdefaults.py +++ b/splunk/common-files/createdefaults.py @@ -25,7 +25,7 @@ splunk_hec_token = os.environ.get("SPLUNK_HEC_TOKEN", None) splunk_password = os.environ.get("SPLUNK_PASSWORD", None) splunk_idxc_secret = os.environ.get("SPLUNK_IDXC_SECRET", None) -splunk_idxc_pass4SymmKey = os.environ.get("SPLUNK_SHC_PASS4SYMMKEY", None) +splunk_idxc_pass4SymmKey = os.environ.get("SPLUNK_IDXC_PASS4SYMMKEY", None) splunk_shc_secret = os.environ.get("SPLUNK_SHC_SECRET", None) splunk_shc_pass4SymmKey = os.environ.get("SPLUNK_SHC_PASS4SYMMKEY", None) @@ -43,15 +43,18 @@ def random_generator(size=24): os.environ["SPLUNK_HEC_TOKEN"] = str(tempuuid) if not splunk_password: os.environ["SPLUNK_PASSWORD"] = random_generator() -if not splunk_idxc_secret: - os.environ["SPLUNK_IDXC_SECRET"] = random_generator() -if not splunk_idxc_pass4SymmKey: - os.environ["SPLUNK_IDXC_SECRET"] = os.environ["SPLUNK_IDXC_SECRET"] -if not splunk_shc_secret: - os.environ["SPLUNK_SHC_SECRET"] = random_generator() -if not splunk_shc_pass4SymmKey: - os.environ["SPLUNK_SHC_PASS4SYMMKEY"] = os.environ["SPLUNK_SHC_SECRET"] - +if splunk_idxc_pass4SymmKey: + os.environ["SPLUNK_IDXC_PASS4SYMMKEY"] = os.environ["SPLUNK_IDXC_SECRET"] = splunk_idxc_pass4SymmKey +elif splunk_idxc_secret: + os.environ["SPLUNK_IDXC_PASS4SYMMKEY"] = os.environ["SPLUNK_IDXC_SECRET"] = splunk_idxc_secret +else: + os.environ["SPLUNK_IDXC_PASS4SYMMKEY"] = os.environ["SPLUNK_IDXC_SECRET"] = random_generator() +if splunk_shc_secret: + os.environ["SPLUNK_SHC_PASS4SYMMKEY"] = os.environ["SPLUNK_SHC_SECRET"] = splunk_shc_pass4SymmKey +elif splunk_shc_pass4SymmKey: + os.environ["SPLUNK_SHC_PASS4SYMMKEY"] = os.environ["SPLUNK_SHC_SECRET"] = splunk_shc_secret +else: + os.environ["SPLUNK_SHC_PASS4SYMMKEY"] = os.environ["SPLUNK_SHC_SECRET"] = random_generator() sys.argv.append("--write-to-stdout") import environ environ.main()