Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add feature to allow route string in class SAPRouterNativeProxy #33

Merged
merged 1 commit into from
Feb 25, 2021
Merged

Add feature to allow route string in class SAPRouterNativeProxy #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions examples/router_portfw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from pysap.SAPRouter import (SAPRouter, SAPRouteException,
SAPRouterNativeProxy,
SAPRouterNativeRouterHandler,
SAPRouterRouteHop,
ROUTER_TALK_MODE_NI_RAW_IO, ROUTER_TALK_MODE_NI_MSG_IO)


Expand Down Expand Up @@ -71,11 +72,23 @@ def parse_options():
target.add_argument("--talk-mode", dest="talk_mode", default="raw",
help="Talk mode to use when requesting the route (raw or ni) [%(default)s]")

target.add_argument("--route-string", dest="target_route_string",
help="Route String for connecting through a SAP Router")
misc = parser.add_argument_group("Misc options")
misc.add_argument("-v", "--verbose", dest="verbose", action="store_true", help="Verbose output")

options = parser.parse_args()

if options.target_route_string and ( options.remote_host or options.target_host):
print("[!] Route String specified, Remote and Target host ignored")
route = SAPRouterRouteHop.from_string(options.target_route_string)
options.remote_host = route[0].hostname
options.remote_port = 3299
if route[0].port and route[0].port.isdigit(): options.remote_port = int(route[0].port)
options.target_host = route[-1].hostname
options.target_port = 3299
if route[-1].port and route[-1].port.isdigit(): options.target_port = int(route[-1].port)
del route
if not options.remote_host:
parser.error("Remote host is required")
if not options.target_host:
Expand Down Expand Up @@ -108,6 +121,8 @@ def main():
options.remote_port,
options.talk_mode))

if options.target_route_string:
logging.info("[*] using Route String %s" % (options.target_route_string))
options.talk_mode = {"raw": ROUTER_TALK_MODE_NI_RAW_IO, "ni": ROUTER_TALK_MODE_NI_MSG_IO}[options.talk_mode]

proxy = SAPRouterNativeProxy(options.local_host, options.local_port,
Expand Down
17 changes: 10 additions & 7 deletions pysap/SAPRouter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ class SAPRouterRouteHop(PacketNoPadded):
]

regex = re.compile(r"""
(/[hH]/(?P<hostname>[\w\.]+) # Hostname, FQDN or IP addresss
(/[sS]/(?P<port>[\w]+))? # Optional port/service
(/[hH]/(?P<hostname>[\w\.\-]+) # Hostname, FQDN or IP addresss
(/[sS]/(?P<port>[\w]+))? # Optional port/service
(/[pwPW]/(?P<password>[\w.]+))? # Optional password
)
""", re.VERBOSE)
Expand Down Expand Up @@ -822,11 +822,14 @@ def route(self):
keep_alive=self.keep_alive)

# Build the Route request packet
router_string = [SAPRouterRouteHop(hostname=remote_address,
port=remote_port),
SAPRouterRouteHop(hostname=self.target_address,
port=self.target_port,
password=self.target_pass)]
if self.options.target_route_string is None:
router_string = [SAPRouterRouteHop(hostname=remote_address,
port=remote_port),
SAPRouterRouteHop(hostname=self.target_address,
port=self.target_port,
password=self.target_pass)]
else:
router_string = SAPRouterRouteHop.from_string(self.options.target_route_string)
router_string_lens = list(map(len, list(map(str, router_string))))
p = SAPRouter(type=SAPRouter.SAPROUTER_ROUTE,
route_entries=len(router_string),
Expand Down