diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-02-25 13:24:39 +0000 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-02-25 13:24:39 +0000 |
| commit | 695f43a1edd757a79281d62a8696fa2cd02e8548 (patch) | |
| tree | aaa428371471e64a9046dc3b555412d8fe47c703 /lib | |
| parent | f5b62267325415b307cf2d47b69d11d4337536e4 (diff) | |
| parent | 165afb004b68d0429c6e65e296a4508308929f26 (diff) | |
| download | nextcloud-server-695f43a1edd757a79281d62a8696fa2cd02e8548.tar.gz nextcloud-server-695f43a1edd757a79281d62a8696fa2cd02e8548.zip | |
Merge pull request #10735 from owncloud/use_remote_addr
Use getRemoteAddress which supports reverse proxies
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/user/manager.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index 33858dfd9dd..c965b22edbc 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -181,10 +181,7 @@ class Manager extends PublicEmitter implements IUserManager { } } - $remoteAddr = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : ''; - $forwardedFor = isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : ''; - - \OC::$server->getLogger()->warning('Login failed: \''. $loginname .'\' (Remote IP: \''. $remoteAddr .'\', X-Forwarded-For: \''. $forwardedFor .'\')', array('app' => 'core')); + \OC::$server->getLogger()->warning('Login failed: \''. $loginname .'\' (Remote IP: \''. \OC::$server->getRequest()->getRemoteAddress(). ')', ['app' => 'core']); return false; } |