Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
290f5b2c
Commit
290f5b2c
authored
May 17, 2019
by
kaniini
Browse files
config: make sending the user agent configurable, disable sending the user agent in tests
parent
d3b8cd34
Changes
3
Show whitespace changes
Inline
Side-by-side
config/config.exs
View file @
290f5b2c
...
...
@@ -192,6 +192,7 @@
# Configures http settings, upstream proxy etc.
config
:pleroma
,
:http
,
proxy_url:
nil
,
send_user_agent:
true
,
adapter:
[
ssl_options:
[
# We don't support TLS v1.3 yet
...
...
config/test.exs
View file @
290f5b2c
...
...
@@ -63,6 +63,8 @@
config
:pleroma
,
:http_security
,
report_uri:
"https://endpoint.com"
config
:pleroma
,
:http
,
send_user_agent:
false
rum_enabled
=
System
.
get_env
(
"RUM_ENABLED"
)
==
"true"
config
:pleroma
,
:database
,
rum_enabled:
rum_enabled
IO
.
puts
(
"RUM enabled:
#{
rum_enabled
}
"
)
...
...
lib/pleroma/http/request_builder.ex
View file @
290f5b2c
...
...
@@ -46,7 +46,13 @@ def url(request, u) do
"""
@spec
headers
(
map
(),
list
(
tuple
))
::
map
()
def
headers
(
request
,
header_list
)
do
header_list
=
header_list
++
[{
"User-Agent"
,
Pleroma
.
Application
.
user_agent
()}]
header_list
=
if
Pleroma
.
Config
.
get
([
:http
,
:send_user_agent
])
do
header_list
++
[{
"User-Agent"
,
Pleroma
.
Application
.
user_agent
()}]
else
header_list
end
Map
.
put_new
(
request
,
:headers
,
header_list
)
end
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment