[cpp-sp] branch main updated: Add missing constants, update some headers.
Scott Cantor
cantor.2 at osu.edu
Thu Jul 24 00:07:37 UTC 2025
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=8ca1bfbb56c198ff70f03931c84444a4141b390b
The following commit(s) were added to refs/heads/main by this push:
new 8ca1bfbb Add missing constants, update some headers.
8ca1bfbb is described below
commit 8ca1bfbb56c198ff70f03931c84444a4141b390b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 23 20:07:27 2025 -0400
Add missing constants, update some headers.
---
apache/mod_shib_24.cpp | 24 +++++++++--------------
iis7_shib/IIS7Request.cpp | 32 +++++++++++++-----------------
shibsp/RequestMapper.h | 28 +++++++++++++--------------
shibsp/impl/XMLRequestMapper.cpp | 42 ++++++++++++++++++++++------------------
4 files changed, 58 insertions(+), 68 deletions(-)
diff --git a/apache/mod_shib_24.cpp b/apache/mod_shib_24.cpp
index 4088b230..62b4451f 100644
--- a/apache/mod_shib_24.cpp
+++ b/apache/mod_shib_24.cpp
@@ -1,21 +1,15 @@
/**
- * Licensed to the University Corporation for Advanced Internet
- * Development, Inc. (UCAID) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * UCAID licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the
- * License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
/**
diff --git a/iis7_shib/IIS7Request.cpp b/iis7_shib/IIS7Request.cpp
index 28c988a1..3f25e285 100644
--- a/iis7_shib/IIS7Request.cpp
+++ b/iis7_shib/IIS7Request.cpp
@@ -1,22 +1,16 @@
/**
-* Licensed to the University Corporation for Advanced Internet
-* Development, Inc. (UCAID) under one or more contributor license
-* agreements. See the NOTICE file distributed with this work for
-* additional information regarding copyright ownership.
-*
-* UCAID licenses this file to you under the Apache License,
-* Version 2.0 (the "License"); you may not use this file except
-* in compliance with the License. You may obtain a copy of the
-* License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-* either express or implied. See the License for the specific
-* language governing permissions and limitations under the License.
-*/
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
#include "IIS7_shib.hpp"
@@ -65,7 +59,7 @@ IIS7Request::IIS7Request(IHttpContext *pHttpContext, IHttpEventProvider *pEventP
}
// Check for header/variable settings in RequestMap and only if absent fall back to Site info.
- const PropertySet* mapopedProperties = getRequestSettings().first;
+ const PropertySet* mappedProperties = getRequestSettings().first;
if (mappedProperties->hasProperty(RequestMapper::USE_HEADERS_PROP_NAME)) {
m_useHeaders = mappedProperties->getBool(
RequestMapper::USE_HEADERS_PROP_NAME, RequestMapper::USE_HEADERS_PROP_DEFAULT);
diff --git a/shibsp/RequestMapper.h b/shibsp/RequestMapper.h
index 51639840..01ba17fe 100644
--- a/shibsp/RequestMapper.h
+++ b/shibsp/RequestMapper.h
@@ -1,21 +1,15 @@
/**
- * Licensed to the University Corporation for Advanced Internet
- * Development, Inc. (UCAID) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for
- * additional information regarding copyright ownership.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * UCAID licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the
- * License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
/**
@@ -70,6 +64,8 @@ namespace shibsp {
static const char SESSION_COOKIE_NAME_PROP_NAME[];
static const char TARGET_PROP_NAME[];
static const char PRESERVE_POST_DATA_PROP_NAME[];
+ static const char USE_HEADERS_PROP_NAME[];
+ static const char USE_VARIABLES_PROP_NAME[];
static const char APPLICATION_ID_PROP_DEFAULT[];
static bool REQUIRE_SESSION_PROP_DEFAULT;
@@ -77,6 +73,8 @@ namespace shibsp {
static unsigned int TIMEOUT_PROP_DEFAULT;
static bool CONSISTENT_ADDRESS_PROP_DEFAULT;
static bool PRESERVE_POST_DATA_PROP_DEFAULT;
+ static bool USE_HEADERS_PROP_DEFAULT;
+ static bool USE_VARIABLES_PROP_DEFAULT;
/**
* Map request to settings.
diff --git a/shibsp/impl/XMLRequestMapper.cpp b/shibsp/impl/XMLRequestMapper.cpp
index 29681ed4..c9d76f03 100644
--- a/shibsp/impl/XMLRequestMapper.cpp
+++ b/shibsp/impl/XMLRequestMapper.cpp
@@ -167,28 +167,32 @@ void SHIBSP_API shibsp::registerRequestMappers()
conf.RequestMapperManager.registerFactory(NATIVE_REQUEST_MAPPER, XMLRequestMapperFactory);
}
-const char RequestMapper::APPLICATION_ID_PROP_NAME[] = "applicationId";
-const char RequestMapper::AUTH_TYPE_PROP_NAME[] = "authType";
-const char RequestMapper::REDIRECT_ERRORS_PROP_NAME[] = "redirectErrors";
-const char RequestMapper::REDIRECT_TO_SSL_PROP_NAME[] = "redirectToSSL";
-const char RequestMapper::REQUIRE_SESSION_PROP_NAME[] = "requireSession";
+const char RequestMapper::APPLICATION_ID_PROP_NAME[] = "applicationId";
+const char RequestMapper::AUTH_TYPE_PROP_NAME[] = "authType";
+const char RequestMapper::REDIRECT_ERRORS_PROP_NAME[] = "redirectErrors";
+const char RequestMapper::REDIRECT_TO_SSL_PROP_NAME[] = "redirectToSSL";
+const char RequestMapper::REQUIRE_SESSION_PROP_NAME[] = "requireSession";
const char RequestMapper::REQUIRE_LOGOUT_WITH_PROP_NAME[] = "requireLogoutWith";
-const char RequestMapper::HANDLER_CONFIG_ID_PROP_NAME[] = "handlerConfigId";
+const char RequestMapper::HANDLER_CONFIG_ID_PROP_NAME[] = "handlerConfigId";
const char RequestMapper::ATTRIBUTE_CONFIG_ID_PROP_NAME[] = "attributeConfigId";
-const char RequestMapper::SESSION_HOOK_PROP_NAME[] = "sessionHook";
-const char RequestMapper::LIFETIME_PROP_NAME[] = "lifetime";
-const char RequestMapper::TIMEOUT_PROP_NAME[] = "timeout";
-const char RequestMapper::CONSISTENT_ADDRESS_PROP_NAME[] = "consistentAddress";
-const char RequestMapper::COOKIE_MAXAGE_PROP_NAME[] = "cookieMaxAge";
+const char RequestMapper::SESSION_HOOK_PROP_NAME[] = "sessionHook";
+const char RequestMapper::LIFETIME_PROP_NAME[] = "lifetime";
+const char RequestMapper::TIMEOUT_PROP_NAME[] = "timeout";
+const char RequestMapper::CONSISTENT_ADDRESS_PROP_NAME[] = "consistentAddress";
+const char RequestMapper::COOKIE_MAXAGE_PROP_NAME[] = "cookieMaxAge";
const char RequestMapper::SESSION_COOKIE_NAME_PROP_NAME[] = "sessionCookieName";
-const char RequestMapper::TARGET_PROP_NAME[] = "target";
-const char RequestMapper::PRESERVE_POST_DATA_PROP_NAME[] = "preservePostData";
-
-const char RequestMapper::APPLICATION_ID_PROP_DEFAULT[] = "default";
-bool RequestMapper::REQUIRE_SESSION_PROP_DEFAULT = false;
-unsigned int RequestMapper::LIFETIME_PROP_DEFAULT = 3600 * 8;
-unsigned int RequestMapper::TIMEOUT_PROP_DEFAULT = 3600;
-bool RequestMapper::CONSISTENT_ADDRESS_PROP_DEFAULT = true;
+const char RequestMapper::TARGET_PROP_NAME[] = "target";
+const char RequestMapper::PRESERVE_POST_DATA_PROP_NAME[] = "preservePostData";
+const char RequestMapper::USE_HEADERS_PROP_NAME[] = "useHeaders";
+const char RequestMapper::USE_VARIABLES_PROP_NAME[] = "useVariables";
+
+const char RequestMapper::APPLICATION_ID_PROP_DEFAULT[] = "default";
+bool RequestMapper::REQUIRE_SESSION_PROP_DEFAULT = false;
+unsigned int RequestMapper::LIFETIME_PROP_DEFAULT = 3600 * 8;
+unsigned int RequestMapper::TIMEOUT_PROP_DEFAULT = 3600;
+bool RequestMapper::CONSISTENT_ADDRESS_PROP_DEFAULT = true;
+bool RequestMapper::USE_HEADERS_PROP_DEFAULT = false;
+bool RequestMapper::USE_VARIABLES_PROP_DEFAULT = true;
RequestMapper::RequestMapper()
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list