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