From 69a6484257033cac41c7c25dee8aa7d590467c88 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 1 Aug 2017 17:17:32 +0200 Subject: baseurl is expected to be the host name and protocol without path Signed-off-by: Lukas Reschke --- lib/SAMLSettings.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/SAMLSettings.php') diff --git a/lib/SAMLSettings.php b/lib/SAMLSettings.php index 2d30ff9e..380f2d70 100644 --- a/lib/SAMLSettings.php +++ b/lib/SAMLSettings.php @@ -23,6 +23,7 @@ namespace OCA\User_SAML; use OCP\AppFramework\Http; use OCP\IConfig; +use OCP\IRequest; use OCP\IURLGenerator; class SAMLSettings { @@ -30,22 +31,27 @@ class SAMLSettings { private $urlGenerator; /** @var IConfig */ private $config; + /** @var IRequest */ + private $request; /** * @param IURLGenerator $urlGenerator * @param IConfig $config + * @param IRequest $request */ public function __construct(IURLGenerator $urlGenerator, - IConfig $config) { + IConfig $config, + IRequest $request) { $this->urlGenerator = $urlGenerator; $this->config = $config; + $this->request = $request; } public function getOneLoginSettingsArray() { $settings = [ 'strict' => true, 'debug' => $this->config->getSystemValue('debug', false), - 'baseurl' => $this->urlGenerator->getAbsoluteURL('/'), + 'baseurl' => $this->request->getServerProtocol() . '://' . $this->request->getServerHost(), 'security' => [ 'nameIdEncrypted' => ($this->config->getAppValue('user_saml', 'security-nameIdEncrypted', '0') === '1') ? true : false, 'authnRequestsSigned' => ($this->config->getAppValue('user_saml', 'security-authnRequestsSigned', '0') === '1') ? true : false, -- cgit v1.2.3