Replaced a few splits with parse_war_path

* src/platform/jboss/deployers/http_management.py src/platform/jboss/deployers/jmx_deploy.py src/platform/jboss/deployers/webconsole_deploy.py src/module/deploy_utils.py -- When parsing a given WAR file from an abspath, I wrote a small helper function, parse_war_path. Replaced a few missed instances of this in the code. * src/module/invoke_payload.py -- Committed a check for a raw URL to invoke. Temporary while this portion is reworked.
hatRiot · May 6, 2015 · 8930ee9 · 8930ee9
1 parent b26bfa1
commit 8930ee9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/src/module/deploy_utils.py b/src/module/deploy_utils.py
@@ -44,7 +44,7 @@ def _serve(war_file = None):
         kill(proc.pid, SIGINT)
 
     if war_file:
-        war_name = war_file.rsplit('/', 1)[1]
+        war_name = parse_war_path(war_file, True)
         # remove our copied file
         remove("%s/%s" % (state.serve_dir, war_name))
 

diff --git a/src/module/invoke_payload.py b/src/module/invoke_payload.py
@@ -10,6 +10,9 @@ def invoke(fingerengine, fingerprint, deployer):
     """
     """
 
+    if fingerengine.invoke_url:
+        return _invoke(fingerengine.invoke_url)
+
     if fingerengine.service in ["jboss", "tomcat", "weblogic", "glassfish"]:
         if fingerengine.service == 'glassfish' or\
            (fingerengine.service == 'jboss' and\

diff --git a/src/platform/jboss/deployers/http_management.py b/src/platform/jboss/deployers/http_management.py
@@ -18,7 +18,7 @@ def deploy(fingerengine, fingerprint):
 
     war_file = abspath(fingerengine.options.deploy)
     war_name = parse_war_path(war_file)
-    war_raw = war_file.rsplit('/', 1)[1]
+    war_raw = parse_war_path(war_file, True)
     utility.Msg("Preparing to deploy {0}...".format(war_file))
 
     base = "http://{0}:{1}/management".format(fingerengine.options.ip,

diff --git a/src/platform/jboss/deployers/jmx_deploy.py b/src/platform/jboss/deployers/jmx_deploy.py
@@ -1,6 +1,6 @@
 from src.platform.jboss.interfaces import JINTERFACES
 from src.platform.jboss.authenticate import checkAuth
-from src.module.deploy_utils import _serve, waitServe, killServe
+from src.module.deploy_utils import _serve, waitServe, killServe, parse_war_path
 from collections import OrderedDict
 from threading import Thread
 from requests import get, exceptions
@@ -18,7 +18,7 @@ def deploy(fingerengine, fingerprint):
     """
 
     war_file = abspath(fingerengine.options.deploy)
-    war_name = war_file.rsplit('/', 1)[1] 
+    war_name = parse_war_path(war_file, True)
 
     # start up the local HTTP server
     server_thread = Thread(target=_serve, args=(war_file,))

diff --git a/src/platform/jboss/deployers/webconsole_deploy.py b/src/platform/jboss/deployers/webconsole_deploy.py
@@ -1,5 +1,5 @@
 from src.platform.jboss.interfaces import JINTERFACES
-from src.module.deploy_utils import _serve, wc_invoke, waitServe,killServe
+from src.module.deploy_utils import _serve, wc_invoke, waitServe,killServe, parse_war_path
 from requests import get
 from threading import Thread
 from time import sleep
@@ -15,7 +15,7 @@ def deploy(fingerengine, fingerprint):
     """
 
     war_file = abspath(fingerengine.options.deploy)
-    war_name = war_file.rsplit('/', 1)[1]
+    war_name = parse_war_path(war_file, True)
 
     # start the local HTTP server
     server_thread = Thread(target=_serve, args=(war_file,))