From 695fc5fff9ec0fb5f0d4ffd1d5d07342d565e9fe Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 2 Nov 2012 15:30:13 -0400
Subject: [PATCH] added methods for supporting SAML2 configuration

---
 SoObjects/SOGo/SOGoSystemDefaults.h |  7 +++++++
 SoObjects/SOGo/SOGoSystemDefaults.m | 31 +++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
index 8f17eb39c..24d211350 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.h
+++ b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -76,6 +76,13 @@
 - (NSString *) CASServiceURL;
 - (BOOL) CASLogoutEnabled;
 
+- (NSString *) SAML2PrivateKeyLocation;
+- (NSString *) SAML2CertificateLocation;
+- (NSString *) SAML2IdpMetadataLocation;
+- (NSString *) SAML2IdpPublicKeyLocation;
+- (NSString *) SAML2IdpCertificateLocation;
+- (BOOL) SAML2LogoutEnabled;
+
 - (BOOL) enablePublicAccess;
 
 @end
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index df1ed413f..67101044f 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -425,6 +425,37 @@ _injectConfigurationFromFile (NSUserDefaults *ud,
   return [self boolForKey: @"SOGoCASLogoutEnabled"];
 }
 
+/* SAML2 support */
+- (NSString *) SAML2PrivateKeyLocation
+{
+  return [self stringForKey: @"SOGoSAML2PrivateKeyLocation"];
+}
+
+- (NSString *) SAML2CertificateLocation;
+{
+  return [self stringForKey: @"SOGoSAML2CertificateLocation"];
+}
+
+- (NSString *) SAML2IdpMetadataLocation
+{
+  return [self stringForKey: @"SOGoSAML2IdpMetadataLocation"];
+}
+
+- (NSString *) SAML2IdpPublicKeyLocation
+{
+  return [self stringForKey: @"SOGoSAML2IdpPublicKeyLocation"];
+}
+
+- (NSString *) SAML2IdpCertificateLocation
+{
+  return [self stringForKey: @"SOGoSAML2IdpCertificateLocation"];
+}
+
+- (BOOL) SAML2LogoutEnabled
+{
+  return [self boolForKey: @"SOGoSAML2LogoutEnabled"];
+}
+
 - (BOOL) enablePublicAccess
 {
   return [self boolForKey: @"SOGoEnablePublicAccess"];