Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions bookmarks/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,16 @@
if LD_AUTH_PROXY_LOGOUT_URL:
LOGOUT_REDIRECT_URL = LD_AUTH_PROXY_LOGOUT_URL

LD_USE_X_FORWARDED_HOST = os.getenv("LD_USE_X_FORWARDED_HOST", False) in (
True,
"True",
"true",
"1",
)

if LD_USE_X_FORWARDED_HOST:
USE_X_FORWARDED_HOST = LD_USE_X_FORWARDED_HOST

# CSRF trusted origins
trusted_origins = os.getenv("LD_CSRF_TRUSTED_ORIGINS", "")
if trusted_origins:
Expand Down
8 changes: 4 additions & 4 deletions bookmarks/tests/test_settings_integrations_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,18 +134,18 @@ def test_should_display_feed_urls(self):

token = FeedToken.objects.first()
self.assertInHTML(
f'<a target="_blank" href="http://testserver/feeds/{token.key}/all">All bookmarks</a>',
f'<a target="_blank" href="/feeds/{token.key}/all">All bookmarks</a>',
html,
)
self.assertInHTML(
f'<a target="_blank" href="http://testserver/feeds/{token.key}/unread">Unread bookmarks</a>',
f'<a target="_blank" href="/feeds/{token.key}/unread">Unread bookmarks</a>',
html,
)
self.assertInHTML(
f'<a target="_blank" href="http://testserver/feeds/{token.key}/shared">Shared bookmarks</a>',
f'<a target="_blank" href="/feeds/{token.key}/shared">Shared bookmarks</a>',
html,
)
self.assertInHTML(
'<a target="_blank" href="http://testserver/feeds/shared">Public shared bookmarks</a>',
'<a target="_blank" href="/feeds/shared">Public shared bookmarks</a>',
html,
)
17 changes: 5 additions & 12 deletions bookmarks/views/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,18 +178,11 @@ def integrations(request):
)

feed_token = FeedToken.objects.get_or_create(user=request.user)[0]
all_feed_url = request.build_absolute_uri(
reverse("linkding:feeds.all", args=[feed_token.key])
)
unread_feed_url = request.build_absolute_uri(
reverse("linkding:feeds.unread", args=[feed_token.key])
)
shared_feed_url = request.build_absolute_uri(
reverse("linkding:feeds.shared", args=[feed_token.key])
)
public_shared_feed_url = request.build_absolute_uri(
reverse("linkding:feeds.public_shared")
)

all_feed_url = reverse("linkding:feeds.all", args=[feed_token.key])
unread_feed_url = reverse("linkding:feeds.unread", args=[feed_token.key])
shared_feed_url = reverse("linkding:feeds.shared", args=[feed_token.key])
public_shared_feed_url = reverse("linkding:feeds.public_shared")

return render(
request,
Expand Down
8 changes: 8 additions & 0 deletions docs/src/content/docs/options.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,14 @@ Multiple origins can be specified by separating them with a comma (`,`).

This setting is adopted from the Django framework used by linkding, more information on the setting is available in the [Django documentation](https://docs.djangoproject.com/en/4.0/ref/settings/#std-setting-CSRF_TRUSTED_ORIGINS).

### `LD_USE_X_FORWARDED_HOST`

Values: `true` or `false` | Default = `false`

If enabled the server will trust the `X-Forwarded-Host` header over the `Host` header to determine the hostname of the server. This should only be enabled if a proxy which sets this header is in use.

This setting is adopted from the Django framework used by linkding, more information on the setting is available in the [Django documentation](https://docs.djangoproject.com/en/6.0/ref/settings/#std-setting-USE_X_FORWARDED_HOST)

### `LD_LOG_X_FORWARDED_FOR`

Values: `true` or `false` | Default = `false`
Expand Down