gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

better handling of removed user default values

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@38162 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2014-11-05 15:31:19 +00:00
parent 50984de599
commit 80642b790c
3 changed files with 65 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2014-11-05 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSTLS.m: If a user default value is removed while running,
revert to the value from the environment or the hard coded fallback
rather than continuing to use the previous value from the defaults
system.
2014-11-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSThread.m: When handling perform in another thread, check

141
Source/GSTLS.m
View file

@ -174,63 +174,94 @@ static NSMutableDictionary *fileMap = nil;
+ (void) _defaultsChanged: (NSNotification*)n
{
NSString *str;
NSBundle *bundle;
NSUserDefaults *defs;
NSDictionary *env;
NSString *str;
str = [[NSUserDefaults standardUserDefaults] stringForKey: @"GSCipherList"];
bundle = [NSBundle bundleForClass: [NSObject class]];
defs = [NSUserDefaults standardUserDefaults];
env = [[NSProcessInfo processInfo] environment];
str = [defs stringForKey: @"GSCipherList"];
if (nil != str)
{
GSOnceMLog(@"GSCipherList is no longer used, please try GSTLSPriority");
}
str = [[NSUserDefaults standardUserDefaults] stringForKey: GSTLSPriority];
if (nil != str)
str = [defs stringForKey: GSTLSPriority];
if (0 == [str length])
{
ASSIGN(priority, str);
str = nil; // nil or empty string resets to default
}
ASSIGN(priority, str);
/* The GSTLSCAFile user default overrides the builtin value or the
* GS_TLS_CA_FILE environment variable.
*/
str = [[NSUserDefaults standardUserDefaults] stringForKey: GSTLSCAFile];
str = standardizedPath(str);
if (nil != str)
str = [defs stringForKey: GSTLSCAFile];
if (nil == str)
{
ASSIGN(caFile, str);
/* Let the GS_TLS_CA_FILE environment variable override the
* default certificate authority location.
*/
str = [env objectForKey: @"GS_TLS_CA_FILE"];
if (nil == str)
{
str = [bundle pathForResource: @"ca-certificates"
ofType: @"crt"
inDirectory: @"GSTLS"];
}
}
str = standardizedPath(str);
ASSIGN(caFile, str);
/* The GSTLSRevokeFile user default overrides the builtin value or the
* GS_TLS_REVOKE environment variable.
*/
str = [[NSUserDefaults standardUserDefaults] stringForKey: GSTLSRevokeFile];
str = [defs stringForKey: GSTLSRevokeFile];
if (nil == str)
{
/* Let the GS_TLS_REVOKE environment variable override the
* default revocation list location.
*/
str = [env objectForKey: @"GS_TLS_REVOKE"];
if (nil == str)
{
str = [bundle pathForResource: @"revoke"
ofType: @"crl"
inDirectory: @"GSTLS"];
}
}
str = standardizedPath(str);
if (nil != str)
{
ASSIGN(revokeFile, str);
}
ASSIGN(revokeFile, str);
str = [[NSUserDefaults standardUserDefaults]
stringForKey: @"GSTLSVerifyClient"];
if (nil != str)
str = [defs stringForKey: @"GSTLSVerifyClient"];
if (nil == str)
{
verifyClient = [str boolValue];
str = [env objectForKey: @"GS_TLS_VERIFY_C"];
}
verifyClient = [str boolValue];
str = [[NSUserDefaults standardUserDefaults]
stringForKey: @"GSTLSVerifyServer"];
if (nil != str)
{
verifyServer = [str boolValue];
str = [defs stringForKey: @"GSTLSVerifyServer"];
if (nil == str)
{
str = [env objectForKey: @"GS_TLS_VERIFY_S"];
}
verifyServer = [str boolValue];
str = [[NSUserDefaults standardUserDefaults] stringForKey: GSTLSDebug];
if (nil != str)
str = [defs stringForKey: GSTLSDebug];
if (nil == str)
{
globalDebug = [str intValue];
str = [env objectForKey: @"GS_TLS_DEBUG"];
}
globalDebug = [str intValue];
if (globalDebug < 0)
{
globalDebug = 0;
}
gnutls_global_set_log_level(globalDebug);
}
@ -261,69 +292,11 @@ static NSMutableDictionary *fileMap = nil;
if (beenHere == NO)
{
NSProcessInfo *pi;
NSBundle *bundle;
NSString *str;
beenHere = YES;
bundle = [NSBundle bundleForClass: [NSObject class]];
fileLock = [NSLock new];
fileMap = [NSMutableDictionary new];
/* Let the GS_TLS_CA_FILE environment variable override the
* default certificate authority location.
*/
pi = [NSProcessInfo processInfo];
str = [[pi environment] objectForKey: @"GS_TLS_CA_FILE"];
if (nil == str)
{
str = [bundle pathForResource: @"ca-certificates"
ofType: @"crt"
inDirectory: @"GSTLS"];
}
else
{
str = standardizedPath(str);
}
ASSIGN(caFile, str);
/* Let the GS_TLS_REVOKE environment variable override the
* default revocation list location.
*/
pi = [NSProcessInfo processInfo];
str = [[pi environment] objectForKey: @"GS_TLS_REVOKE"];
if (nil == str)
{
str = [bundle pathForResource: @"revoke"
ofType: @"crl"
inDirectory: @"GSTLS"];
}
else
{
str = standardizedPath(str);
}
ASSIGN(revokeFile, str);
str = [[pi environment] objectForKey: @"GS_TLS_VERIFY_C"];
if (nil != str)
{
verifyClient = [str boolValue];
}
str = [[pi environment] objectForKey: @"GS_TLS_VERIFY_S"];
if (nil != str)
{
verifyServer = [str boolValue];
}
str = [[pi environment] objectForKey: @"GS_TLS_DEBUG"];
if (nil != str)
{
globalDebug = [str intValue];
}
[[NSNotificationCenter defaultCenter]
addObserver: self
selector: @selector(_defaultsChanged:)

2
Source/NSPathUtilities.m
View file

@ -583,7 +583,7 @@ static void ExtractValuesFromConfig(NSDictionary *config)
}
[c removeObjectForKey: @"GNUSTEP_SYSTEM_DEFAULTS_FILE"];
/* If GNUSTEP_CREATE_DIRECTORIES is YES then we should ensure that the
/* If GNUSTEP_CREATE_LIBRARY_PATH is YES then we should ensure that the
* per-user directory and the Library subdirectory exist so resources
* can safely be stored in them.
*/