Honor HTTP header 'X-Real-IP' when available#6
Open
pini-gh wants to merge 1 commit into
Open
Conversation
Member
|
Clients can set the |
Author
|
It makes sense. Something like that? diff --git a/config/prod.exs b/config/prod.exs
index d2b0323..e116179 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -26,7 +26,8 @@ config :tmate, :websocket, Keyword.merge(websocket_ranch_opts,
cowboy_opts: %{
compress: true,
proxy_header: System.get_env("USE_PROXY_PROTOCOL") == "1"},
- base_url: System.get_env("WEBSOCKET_BASE_URL")
+ base_url: System.get_env("WEBSOCKET_BASE_URL"),
+ trust_x_real_ip: System.get_env("TRUST_X_REAL_IP") == "1"
)
config :tzdata, :autoupdate, :disabled
diff --git a/lib/tmate/ws_api/websocket.ex b/lib/tmate/ws_api/websocket.ex
index 2673f5d..f4c4d40 100644
--- a/lib/tmate/ws_api/websocket.ex
+++ b/lib/tmate/ws_api/websocket.ex
@@ -24,9 +24,10 @@ defmodule Tmate.WsApi.WebSocket do
{mode, session} ->
case Tmate.Session.ws_verify_auth(session) do
:ok ->
+ trust_x_real_ip = Application.get_env(:tmate, :websocket)[:trust_x_real_ip]
ip = case req do
%{proxy_header: %{src_address: ip}} -> ip
- %{headers: %{"x-real-ip" => ipstring}} ->
+ %{headers: %{"x-real-ip" => ipstring}} when trust_x_real_ip ->
{_, ip} = :inet.parse_address(ipstring |> to_charlist)
ip
%{peer: {ip, _port}} -> ip |
And because X-Real-IP can be spoofed, gate this feature with TRUST_X_REAL_IP environment variable. Fix tmate-io#5.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix #5.