Skip to content
This repository was archived by the owner on May 14, 2021. It is now read-only.

Add support for silo identifier for multi-tenant login #49

Open
gschneider-r7 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for silo identifier for multi-tenant login #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c602278
Add support for silo identifier for multi-tenant login
gschneider-r7 Jan 11, 2018
57dc223
Fix some silo_id params
gschneider-r7 Jan 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions nexpose/nexpose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,10 @@ def request_and_create_objects_from_xml(requestor, xpath, object_creator):
return create_objects_from_xml(requestor().iterfind(xpath), object_creator.__call__)


def BuildLoginRequest(username, password):
def BuildLoginRequest(username, password, silo_id=None):
attributes = {'user-id': username, 'password': password}
if silo_id:
attributes['silo-id'] = silo_id
login_request = create_element("LoginRequest", attributes)
return login_request

Expand Down Expand Up @@ -293,10 +295,10 @@ def GetSecurityConsoleStatus(self):


class NexposeSession_APIv1d1(NexposeSessionBase):
def __init__(self, host, port, username, password):
def __init__(self, host, port, username, password, silo_id=None):
NexposeSessionBase.__init__(self, host, port)
self._URI_APIv1d1 = BuildURI_APIv1d1(host, port)
self._login_request = BuildLoginRequest(username, password)
self._login_request = BuildLoginRequest(username, password, silo_id)
self._session_id = None

#
Expand Down Expand Up @@ -729,8 +731,8 @@ def RequestSendLog(self, xml_transport, keyid=0):


class NexposeSession_APIv1d2(NexposeSession_APIv1d1):
def __init__(self, host, port, username, password):
NexposeSession_APIv1d1.__init__(self, host, port, username, password)
def __init__(self, host, port, username, password, silo_id=None):
NexposeSession_APIv1d1.__init__(self, host, port, username, password, silo_id)
self._URI_APIv1d2 = BuildURI_APIv1d2(host, port)

#
Expand Down Expand Up @@ -1166,17 +1168,17 @@ def RequestVulnerabilityExceptionUpdateExpirationDate(self):

class NexposeSession(NexposeSession_APIv1d2):
@staticmethod
def CreateAndOpen(host, port, username, password):
session = NexposeSession.Create(host, port, username, password)
def CreateAndOpen(host, port, username, password, silo_id=None):
session = NexposeSession.Create(host, port, username, password, silo_id)
session.Open()
return session

@staticmethod
def Create(host, port, username, password):
return NexposeSession(host, port, username, password)
def Create(host, port, username, password, silo_id=None):
return NexposeSession(host, port, username, password, silo_id)

def __init__(self, host, port, username, password):
NexposeSession_APIv1d2.__init__(self, host, port, username, password)
def __init__(self, host, port, username, password, silo_id=None):
NexposeSession_APIv1d2.__init__(self, host, port, username, password, silo_id)
self.session_username = username

#
Expand Down