Skip to content

Commit

Permalink
Fixed JBoss 7.0+ invoker
Browse files Browse the repository at this point in the history
* .gitignore
  -- Fixed pyc
* src/module/invoke_payload.py
  -- JBoss 7.0+ deploys over port 9990 by default, but the
  application is actually served by default on port 8080
* src/platform/jboss/undeployer.py
  -- Fixed parsing off the extension
  • Loading branch information
hatRiot committed Sep 12, 2014
1 parent a080046 commit b94214f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
**/*.pyc
*.py[cod]
4 changes: 3 additions & 1 deletion src/module/invoke_payload.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ def invoke(fingerengine, fingerprint, deployer):
"""

if fingerengine.service in ["jboss", "tomcat", "weblogic", "glassfish"]:
if fingerengine.service == 'glassfish':
if fingerengine.service == 'glassfish' or\
(fingerengine.service == 'jboss' and\
fingerprint.version in ['7.0', '7.1', '8.0', '8.1']):
# different port; if this has changed from default, we may need
# to iterate through fingerprints to find the correct one...
fingerprint.port = 8080
Expand Down
3 changes: 2 additions & 1 deletion src/platform/jboss/undeployer.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from src.platform.jboss.authenticate import checkAuth
from src.platform.jboss.interfaces import JINTERFACES
from src.module.deploy_utils import parse_war_path
from collections import OrderedDict
from log import LOG
from re import findall
Expand Down Expand Up @@ -77,7 +78,7 @@ def manage_undeploy(fingerengine, fingerprint):
"""

context = fingerengine.options.undeploy
context = context if not '/' in context else context[1:]
context = parse_war_path(context)

url = 'http://{0}:{1}/management'.format(fingerengine.options.ip,
fingerprint.port)
Expand Down

0 comments on commit b94214f

Please sign in to comment.