Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 097 - Fix https download link showing as http text behind nginx reverse proxy #100

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Issue 097 - Fix https download link showing as http text behind nginx reverse proxy #100

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aa6ffc4
Merge branch 'develop' for release v5.1.2
epoupon Feb 4, 2023
833a0a6
Merge branch 'develop' for release v6.0.0
epoupon Jun 13, 2023
a4a3b23
Merge branch 'develop'
epoupon Jul 2, 2023
4b8d1a2
Merge branch 'develop' for release v6.1.0
epoupon Jul 20, 2023
f0524ce
Issue 97 - download link
andymarden Jan 31, 2024
f2a2fef
Issue 97 - download link
andymarden Jan 31, 2024
5cacdac
Issue 97 - download link
andymarden Jan 31, 2024
be89609
Merge branch 'andy' of https://gitea.mardenfamily.org/andy/fileshelte…
andymarden Jan 31, 2024
629dee7
Issue 97 - comments
andymarden Jan 31, 2024
4bf66e9
Issue 97 - generalised fallback if no rev proxy
andymarden Feb 2, 2024
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
18 changes: 17 additions & 1 deletion src/fileshelter/ui/ShareUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,28 @@

namespace UserInterface::ShareUtils
{

static
std::string
getScheme()
{
// Necessary because the scheme in envonment does not pay attention to X-Forwarded_Proto by default
//and we have to use that beause you cannot get the full URL out of wLink as text
const std::string xForwardedProto = wApp->environment().headerValue("X-Forwarded-Proto");
if (!xForwardedProto.empty())
{
return xForwardedProto; // will be 'http' or 'https'
}

// Fallback if header is not set
return wApp->environment().urlScheme();
}

static
std::string
computeURL(const std::string& internalPath)
{
return wApp->environment().urlScheme() + "://" + wApp->environment().hostName() + (wApp->environment().deploymentPath() == "/" ? "" : wApp->environment().deploymentPath()) + internalPath;
return getScheme() + "://" + wApp->environment().hostName() + (wApp->environment().deploymentPath() == "/" ? "" : wApp->environment().deploymentPath()) + internalPath;
}

std::unique_ptr<Wt::WAnchor>
Expand Down