password: syntax did not work if using a dynamic/REST based restore, now supported

Author: gjanders

README.md

@@ -260,6 +260,9 @@ To do this you will need to install Version Control For SplunkCloud on your Splu
 [SplunkVersionControlCloud github](https://github.com/gjanders/SplunkVersionControlCloud)
 
 ## Release Notes 
+### 1.1.3
+password: syntax did not work if using a dynamic/REST based restore, now supported
+
 ### 1.1.2
 Found a bug that stops this running on Splunk 8 / python 3
 

SplunkVersionControl.tgz

@@ -17,6 +17,7 @@
 
 sys.path.append(os.path.join(os.path.dirname(__file__), "..", "bin"))
 from splunkversioncontrol_restore_class import SplunkVersionControlRestore
+from splunkversioncontrol_utility import get_password
 
 splunkLogsDir = os.environ['SPLUNK_HOME'] + "/var/log/splunk"
 #Setup the logging
@@ -123,6 +124,8 @@ def handle_POST(self):
                 return
             destUsername = json_dict['destUsername']
             destPassword = json_dict['destPassword']
+            if destPassword.find("password:") == 0:
+                destPassword = get_password(destPassword[9:], self.request['systemAuth'], logger)
         else:
             if not 'destURL' in json_dict:
                 logger.error("Missing one of destURL from the splunk version control restore stanza, invalid configuration")

bin/splunkversioncontrol_rest_restore.py

@@ -39,7 +39,13 @@ def runOSProcess(command, logger, timeout=10, shell=False):
 def get_password(password, session_key, logger):
     #TODO move this into shared function to obtain passwords:
     context = os.path.dirname(os.path.dirname(__file__))
-    
+
+    if context.find("/bin/") != -1 or context.find("\\bin\\") != -1:
+        if context.find("/bin/") != -1:
+            context = context[:context.find("/bin/")]
+        else:
+            context = context[:context.find("\\bin\\")]
+
     if platform.system() == "Windows":
         start = context.rfind("\\")
     else:
@@ -52,6 +58,9 @@ def get_password(password, session_key, logger):
     res = requests.get(url, headers=headers, verify=False)
     dict = json.loads(res.text)
     clear_password = False
+    if not 'entry' in dict:
+        logger.warn("dict=%s did not contain the entries expected on url=%s while looking for password=%s" % (dict, url, password))
+        raise Exception('Error while finding password')
     for entry in dict['entry']:
         logger.debug("found=%s looking for :%s:" % (entry['name'], password))
         if entry['name'].find(":" + password + ":") != -1:
@@ -66,6 +75,9 @@ def get_password(password, session_key, logger):
     logger.debug("Trying url=%s with session_key to obtain name=%s" % (url, password))
     res = requests.get(url, headers=headers, verify=False)
     dict = json.loads(res.text)
+    if not 'entry' in dict:
+        logger.warn("dict=%s did not contain the entries expected on url=%s while looking for password=%s" % (dict, url, password))
+        raise Exception('Error while finding password')
     for entry in dict['entry']:
         logger.debug("found=%s looking for :%s:" % (entry['name'], password))
         if entry['name'].find(":" + password + ":") != -1:

bin/splunkversioncontrol_utility.py

@@ -12,7 +12,7 @@ label = SplunkVersionControl
 [launcher]
 author = Gareth Anderson
 description = Version Control software for Splunk instances (backup/restore from git)
-version = 1.1.2
+version = 1.1.3
 
 [package]
 id = SplunkVersionControl