summaryrefslogtreecommitdiff
path: root/config/initializers/hipchat_client_patch.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2019-04-21 12:03:26 +0200
committerOswaldo Ferreira <oswaldo@gitlab.com>2019-05-30 10:47:31 -0300
commita9bcddee4c2653cbf2254d893299393e3778e7df (patch)
tree0c81c5358bce244da7cf9f9f684234a7f4a2dfd0 /config/initializers/hipchat_client_patch.rb
parent88241108c4d9807e5c312b11c910b3072bc6f120 (diff)
downloadgitlab-ce-a9bcddee4c2653cbf2254d893299393e3778e7df.tar.gz
Protect Gitlab::HTTP against DNS rebinding attack
Gitlab::HTTP now resolves the hostname only once, verifies the IP is not blocked, and then uses the same IP to perform the actual request, while passing the original hostname in the `Host` header and SSL SNI field.
Diffstat (limited to 'config/initializers/hipchat_client_patch.rb')
-rw-r--r--config/initializers/hipchat_client_patch.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/hipchat_client_patch.rb b/config/initializers/hipchat_client_patch.rb
index 1879ecb15fb..51bd48af320 100644
--- a/config/initializers/hipchat_client_patch.rb
+++ b/config/initializers/hipchat_client_patch.rb
@@ -2,14 +2,14 @@
# This monkey patches the HTTParty used in https://github.com/hipchat/hipchat-rb.
module HipChat
class Client
- connection_adapter ::Gitlab::ProxyHTTPConnectionAdapter
+ connection_adapter ::Gitlab::HTTPConnectionAdapter
end
class Room
- connection_adapter ::Gitlab::ProxyHTTPConnectionAdapter
+ connection_adapter ::Gitlab::HTTPConnectionAdapter
end
class User
- connection_adapter ::Gitlab::ProxyHTTPConnectionAdapter
+ connection_adapter ::Gitlab::HTTPConnectionAdapter
end
end