Added set_extra_headers() to WebSocketServer

[rohanrhu]

Hi, I'm resending PR to master branch with changes.

[rohanrhu]

Please merge this PR. I'm still using my revision on my server because I need sending CORS headers for my game to connect my server from itch.io.

[Faless]

See comments (const usage and p_ parameters prefix).
Looks overall good but needs a rebase 👍 .

[Faless]

because I need sending CORS headers for my game to connect my server from itch.io.

While the PR scope is okay, I strongly advise (STRONGLY!) to put an HTTP proxy in front of it to manage both the extra headers and requests sanitization, e.g. with nginx

[rohanrhu]

because I need sending CORS headers for my game to connect my server from itch.io.

While the PR scope is okay, I strongly advise (STRONGLY!) to put an HTTP proxy in front of it to manage both the extra headers and requests sanitization, e.g. with nginx

You mean using proxy for just sending additional headers? We can just send CORS headers when it is neccessary, why would we need to use a proxy?

[rohanrhu]

Should I resolve conflicts or you do that?

[Faless]

Should I resolve conflicts or you do that?

I can't resolve the conflicts on your branch, please rebase and squash the commits, see here for instructions:
https://docs.godotengine.org/en/stable/community/contributing/pr_workflow.html#the-interactive-rebase

[rohanrhu]

Should I resolve conflicts or you do that?

I can't resolve the conflicts on your branch, please rebase and squash the commits, see here for instructions: https://docs.godotengine.org/en/stable/community/contributing/pr_workflow.html#the-interactive-rebase

Thank you @Faless I will resolve conflicts soon.

[Faless]

We can just send CORS headers when it is neccessary, why would we need to use a proxy?

As a bare minimum (it can offer more than that):

• Access/Error logging
• Requests filtering

I.e. a basic form of protection against the dozens of malicious requests (port scanners/exploit checkers/etc) you'll receive every day and that will otherwise end up being consumed by godot (most likely at a higher cost, and resulting in more errors in the godot log unrelated to the actual game).

[rohanrhu]

Hiiiii @Faless I resolved conflicts with latest revision.

[Faless]

Good job 👍
See review comment on adding the override keyword to set_extra_headers when overriding.
The commits also needs to be squashed together https://docs.godotengine.org/en/latest/community/contributing/pr_workflow.html#the-interactive-rebase

[rohanrhu]

Hiiii @Faless I squashed it into one commit.

[Faless]

CI is failing: https://github.com/godotengine/godot/runs/5964150172?check_suite_focus=true .
I think you just need to re-update the class reference (godot --doctool ) and re-squash.

[rohanrhu]

CI is failing: https://github.com/godotengine/godot/runs/5964150172?check_suite_focus=true . I think you just need to re-update the class reference (godot --doctool ) and re-squash.

Meow.. I did it.

[Faless]

I think CI will fail again, the doctool seem to not have worked properly 😿 .
Can you please try applying this patch?

diff --git a/modules/websocket/doc_classes/WebSocketServer.xml b/modules/websocket/doc_classes/WebSocketServer.xml
index ef3279aac4..46b0274de3 100644
--- a/modules/websocket/doc_classes/WebSocketServer.xml
+++ b/modules/websocket/doc_classes/WebSocketServer.xml
@@ -60,6 +60,13 @@
 				If [code]false[/code] is passed instead (default), you must call [PacketPeer] functions ([code]put_packet[/code], [code]get_packet[/code], etc.), on the [WebSocketPeer] returned via [code]get_peer(id)[/code] to communicate with the peer with given [code]id[/code] (e.g. [code]get_peer(id).get_available_packet_count[/code]).
 			</description>
 		</method>
+		<method name="set_extra_headers">
+			<return type="void" />
+			<argument index="0" name="headers" type="PackedStringArray" default="PackedStringArray()" />
+			<description>
+				Sets additional headers to be sent to clients during the HTTP handshake.
+			</description>
+		</method>
 		<method name="stop">
 			<return type="void" />
 			<description>

[rohanrhu]

I think CI will fail again, the doctool seem to not have worked properly 😿 . Can you please try applying this patch?

Done. I'm on Windows btw maybe about it?

[Faless]

Thanks! 🐈 🏆

[akien-mga]

Cherry-picked for 3.5.