LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for bug #2237

pull/12/head
Ludovic Marcotte 2013-06-19 15:45:40 -04:00
parent 871115e349
commit 1734b387a3
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SoObjects/SOGo/SOGoProxyAuthenticator.m
View File

@ -1,8 +1,6 @@
/* SOGoProxyAuthenticator.h - this file is part of SOGo
*
* Copyright (C) 2009-2011 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Copyright (C) 2009-2013 Inverse inc.
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -32,6 +30,7 @@
#import <NGExtensions/NSObject+Logs.h>
#import "SOGoPermissions.h"
#import "SOGoSystemDefaults.h"
#import "SOGoUser.h"
#import "SOGoProxyAuthenticator.h"
@ -60,10 +59,17 @@
{
NSString *remoteUser;
/* If such a header is not provided by the proxy, SOPE will attempt to
deduce it from the "Authorization" header. */
remoteUser = [[context request] headerForKey: @"x-webobjects-remote-user"];
if ([[SOGoSystemDefaults sharedSystemDefaults] trustProxyAuthentication])
{
remoteUser = @"anonymous";
}
else
{
/* If such a header is not provided by the proxy, SOPE will attempt to
deduce it from the "Authorization" header. */
remoteUser = [[context request] headerForKey: @"x-webobjects-remote-user"];
}
return remoteUser;
}

4
SoObjects/SOGo/SOGoPublicBaseFolder.m
View File

@ -1,8 +1,6 @@
/* SOGoPublicBaseFolder.m - this file is part of SOGo
*
* Copyright (C) 2010 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Copyright (C) 2010-2013 Inverse inc.
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by