summaryrefslogtreecommitdiff
path: root/lib/lib_rss.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2019-01-02 21:43:05 +0100
committerGravatar GitHub <noreply@github.com> 2019-01-02 21:43:05 +0100
commit945cf832ad2c20c10704282d03326d8495d0ca4b (patch)
tree00b83a1b046d5cfe498e871743c572b826840203 /lib/lib_rss.php
parenta6623b7b2fa3f026a0ea30e49b1a221f7a4a8e55 (diff)
HTTP authenfication fixes (#2204)
* Security fixes when HTTP user does not exist in FreshRSS * Accept HTTP header X-WebAuth-User for delegated HTTP Authentication (e.g. Træfik) * Document delegated HTTP authentication from https://github.com/FreshRSS/FreshRSS/pull/2202
Diffstat (limited to 'lib/lib_rss.php')
-rw-r--r--lib/lib_rss.php13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 333920c8c..168309563 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -364,9 +364,9 @@ function get_user_configuration($username) {
join_path(FRESHRSS_PATH, 'config-user.default.php'));
} catch (Minz_ConfigurationNamespaceException $e) {
// namespace already exists, do nothing.
- Minz_Log::warning($e->getMessage());
+ Minz_Log::warning($e->getMessage(), USERS_PATH . '/_/log.txt');
} catch (Minz_FileNotExistException $e) {
- Minz_Log::warning($e->getMessage());
+ Minz_Log::warning($e->getMessage(), USERS_PATH . '/_/log.txt');
return null;
}
@@ -375,14 +375,13 @@ function get_user_configuration($username) {
function httpAuthUser() {
- if (isset($_SERVER['REMOTE_USER'])) {
+ if (!empty($_SERVER['REMOTE_USER'])) {
return $_SERVER['REMOTE_USER'];
- }
-
- if (isset($_SERVER['REDIRECT_REMOTE_USER'])) {
+ } elseif (!empty($_SERVER['REDIRECT_REMOTE_USER'])) {
return $_SERVER['REDIRECT_REMOTE_USER'];
+ } elseif (!empty($_SERVER['HTTP_X_WEBAUTH_USER'])) {
+ return $_SERVER['HTTP_X_WEBAUTH_USER'];
}
-
return '';
}