[cpp-sp] branch main updated: Adjust some defaults.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=b81899b8b13fd1d7f3f85c4f9172936bbf2ceb0a

The following commit(s) were added to refs/heads/main by this push:
     new b81899b8 Adjust some defaults.
b81899b8 is described below

commit b81899b8b13fd1d7f3f85c4f9172936bbf2ceb0a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 13 15:16:30 2025 -0400

    Adjust some defaults.
---
 configs/agent.ini                                  | 14 ++++++------
 shibsp/impl/DefaultAgent.cpp                       | 25 +++++++++++-----------
 .../remoting/impl/AbstractHTTPRemotingService.cpp  |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/configs/agent.ini b/configs/agent.ini
index 23ab2071..75ab2071 100644
--- a/configs/agent.ini
+++ b/configs/agent.ini
@@ -1,5 +1,5 @@
 [global]
-agentID = sp.example.org
+agentID = localhost
 
 [logging]
 defaultLevel = INFO
@@ -11,12 +11,12 @@ defaultLevel = INFO
 
 
 [remoting]
-baseURL = https://localhost/idp/profile/sp/
-authMethod = basic
-authCachingCookie = __Host-JSESSIONID
-tlsCAFile = trustfile.pem
-secretSourceType = File
-secretFile = agent.pwd
+baseURL = http://localhost/idp/profile/sp/
+#authMethod = none
+#authCachingCookie = __Host-JSESSIONID
+#tlsCAFile = trustfile.pem
+#secretSourceType = File
+#secretFile = agent.pwd
 
 [session-cache]
 type = filesystem
diff --git a/shibsp/impl/DefaultAgent.cpp b/shibsp/impl/DefaultAgent.cpp
index 93f0f74e..665168b9 100644
--- a/shibsp/impl/DefaultAgent.cpp
+++ b/shibsp/impl/DefaultAgent.cpp
@@ -58,8 +58,6 @@ namespace {
 
         void init();
 
-        static const char AGENT_ID_PROP_NAME[];
-
         const char* getID() const {
             return m_id.c_str();
         }
@@ -143,28 +141,31 @@ namespace shibsp {
     }
 };
 
-const char DefaultAgent::AGENT_ID_PROP_NAME[] = "agentID";
-
 void DefaultAgent::init()
 {
-    // First load "global" property tree as this PropertySet.
+    static const char AGENT_ID_PROP_NAME[] = "agentID";
+    static const char ALLOWED_SCHEMES_PROP_NAME[] = "allowedSchemes";
+    static const char EXTRA_AUTH_TYPES_PROP_NAME[] = "extraAuthTypes";
+
+    static const char AGENT_ID_PROP_DEFAULT[] = "localhost";
+    static const char ALLOWED_SCHEMES_PROP_DEFAULT[] = "https http";
+
+        // First load "global" property tree as this PropertySet.
     const boost::optional<ptree&> global = m_pt.get_child_optional("global");
     if (global) {
         load(global.get());
-        m_id = getString(AGENT_ID_PROP_NAME, "");
+        m_id = getString(AGENT_ID_PROP_NAME, AGENT_ID_PROP_DEFAULT);
     }
 
     if (m_id.empty()) {
         throw ConfigurationException(string("No ") + AGENT_ID_PROP_NAME + " property in [global] section of configuration.");
     }
 
-    const char* prop = getString("allowedSchemes", "https http");
-    if (prop) {
-        HTTPResponse::getAllowedSchemes().clear();
-        split_to_container(HTTPResponse::getAllowedSchemes(), prop);
-    }
+    const char* prop = getString(ALLOWED_SCHEMES_PROP_NAME, ALLOWED_SCHEMES_PROP_DEFAULT);
+    HTTPResponse::getAllowedSchemes().clear();
+    split_to_container(HTTPResponse::getAllowedSchemes(), prop);
 
-    prop = getString("extraAuthTypes");
+    prop = getString(EXTRA_AUTH_TYPES_PROP_NAME);
     if (prop) {
         split_to_container(m_authTypes, prop);
         m_authTypes.insert("shibboleth");
diff --git a/shibsp/remoting/impl/AbstractHTTPRemotingService.cpp b/shibsp/remoting/impl/AbstractHTTPRemotingService.cpp
index b39524d8..4e6debca 100644
--- a/shibsp/remoting/impl/AbstractHTTPRemotingService.cpp
+++ b/shibsp/remoting/impl/AbstractHTTPRemotingService.cpp
@@ -48,7 +48,7 @@ const char AbstractHTTPRemotingService::REVOCATION_CHECK_PROP_NAME[] = "revocati
 
 const char AbstractHTTPRemotingService::SECRET_SOURCE_TYPE_PROP_DEFAULT[] = FILE_SECRET_SOURCE;
 const char AbstractHTTPRemotingService::BASE_URL_PROP_DEFAULT[] = "http://localhost/idp/profile/sp";
-const char AbstractHTTPRemotingService::AUTH_METHOD_PROP_DEFAULT[] = "basic";
+const char AbstractHTTPRemotingService::AUTH_METHOD_PROP_DEFAULT[] = "none";
 const char AbstractHTTPRemotingService::AUTH_CACHING_COOKIE_PROP_DEFAULT[] = "__Host-JSESSIONID";
 unsigned int AbstractHTTPRemotingService::CONNECT_TIMEOUT_PROP_DEFAULT = 3;
 unsigned int AbstractHTTPRemotingService::TIMEOUT_PROP_DEFAULT = 10;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.