Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Neilj/fix trailing slashes #4560

Closed
neilisfragile wants to merge 1 commit into from
Closed

Neilj/fix trailing slashes #4560

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
2 changes: 1 addition & 1 deletion synapse/federation/transport/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def send_transaction(self, transaction, json_data_callback=None):
# generated by the json_data_callback.
json_data = transaction.get_dict()

path = _create_v1_path("/send/%s/", transaction.transaction_id)
path = _create_v1_path("/send/%s", transaction.transaction_id)

response = yield self.client.put_json(
transaction.destination,
Expand Down
8 changes: 4 additions & 4 deletions synapse/federation/transport/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,15 +366,15 @@ def on_PUT(self, origin, content, query, transaction_id):


class FederationEventServlet(BaseFederationServlet):
PATH = "/event/(?P<event_id>[^/]*)/"
PATH = "/event/(?P<event_id>[^/]*)"

# This is when someone asks for a data item for a given server data_id pair.
def on_GET(self, origin, content, query, event_id):
return self.handler.on_pdu_request(origin, event_id)


class FederationStateServlet(BaseFederationServlet):
PATH = "/state/(?P<context>[^/]*)/"
PATH = "/state/(?P<context>[^/]*)"

# This is when someone asks for all data for a given context.
def on_GET(self, origin, content, query, context):
Expand All @@ -386,7 +386,7 @@ def on_GET(self, origin, content, query, context):


class FederationStateIdsServlet(BaseFederationServlet):
PATH = "/state_ids/(?P<room_id>[^/]*)/"
PATH = "/state_ids/(?P<room_id>[^/]*)"

def on_GET(self, origin, content, query, room_id):
return self.handler.on_state_ids_request(
Expand All @@ -397,7 +397,7 @@ def on_GET(self, origin, content, query, room_id):


class FederationBackfillServlet(BaseFederationServlet):
PATH = "/backfill/(?P<context>[^/]*)/"
PATH = "/backfill/(?P<context>[^/]*)"

def on_GET(self, origin, content, query, context):
versions = [x.decode('ascii') for x in query[b"v"]]
Expand Down
2 changes: 1 addition & 1 deletion synapse/rest/client/v2_alpha/groups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class GroupCategoriesServlet(RestServlet):
"""Get all group categories
"""
PATTERNS = client_v2_patterns(
"/groups/(?P<group_id>[^/]*)/categories/$"
"/groups/(?P<group_id>[^/]*)/categories$"
Copy link
Copy Markdown
Member

@ara4n ara4n Feb 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be /? to make the slash optional?

Copy link
Copy Markdown
Member

@ara4n ara4n Feb 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(similarly the others, to stop us from choking on folks who include /)

)

def __init__(self, hs):
Expand Down