Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion splunklib/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ class Endpoint(object):
"""
def __init__(self, service, path):
self.service = service
self.path = path if path.endswith('/') else path + '/'
self.path = path

def get(self, path_segment="", owner=None, app=None, sharing=None, **query):
"""Performs a GET operation on the path segment relative to this endpoint.
Expand Down Expand Up @@ -782,6 +782,8 @@ def get(self, path_segment="", owner=None, app=None, sharing=None, **query):
if path_segment.startswith('/'):
path = path_segment
else:
if not self.path.endswith('/') and path_segment != "":
self.path = self.path + '/'
path = self.service._abspath(self.path + path_segment, owner=owner,
app=app, sharing=sharing)
# ^-- This was "%s%s" % (self.path, path_segment).
Expand Down Expand Up @@ -842,6 +844,8 @@ def post(self, path_segment="", owner=None, app=None, sharing=None, **query):
if path_segment.startswith('/'):
path = path_segment
else:
if not self.path.endswith('/') and path_segment != "":
self.path = self.path + '/'
path = self.service._abspath(self.path + path_segment, owner=owner, app=app, sharing=sharing)
return self.service.post(path, owner=owner, app=app, sharing=sharing, **query)

Expand Down
10 changes: 10 additions & 0 deletions tests/test_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ def _create_unauthenticated_service(self):
'scheme': self.opts.kwargs['scheme']
})

#To check the HEC event endpoint using Endpoint instance
def test_hec_event(self):
import json
service_hec = client.connect(host='localhost', scheme='https', port=8088,
token="11111111-1111-1111-1111-1111111111113")
event_collector_endpoint = client.Endpoint(service_hec, "/services/collector/event")
msg = {"index": "main", "event": "Hello World"}
response = event_collector_endpoint.post("", body=json.dumps(msg))
self.assertEqual(response.status,200)


class TestCookieAuthentication(unittest.TestCase):
def setUp(self):
Expand Down