Boost changes

[shibboleth/cpp-sp.git] / shibsp / attribute / filtering / impl / ChainingAttributeFilter.cpp

diff --git a/shibsp/attribute/filtering/impl/ChainingAttributeFilter.cpp b/shibsp/attribute/filtering/impl/ChainingAttributeFilter.cpp
index ee4201e..5f4649b 100644 (file)
--- a/shibsp/attribute/filtering/impl/ChainingAttributeFilter.cpp
+++ b/shibsp/attribute/filtering/impl/ChainingAttributeFilter.cpp
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2010 Internet2
- * 
- * 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
+/**
+ * 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.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ * 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.
  */
 
 /**
@@ -21,14 +25,17 @@
  */
 
 #include "internal.h"
+#include "exceptions.h"
 #include "attribute/filtering/AttributeFilter.h"
 #include "attribute/filtering/FilteringContext.h"
 
+#include <boost/ptr_container/ptr_vector.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xmltooling/util/XMLHelper.h>
 
 using namespace shibsp;
 using namespace xmltooling;
+using namespace boost;
 using namespace std;
 
 namespace shibsp {
@@ -37,9 +44,7 @@ namespace shibsp {
     {
     public:
         ChainingAttributeFilter(const DOMElement* e);
-        virtual ~ChainingAttributeFilter() {
-            for_each(m_filters.begin(), m_filters.end(), xmltooling::cleanup<AttributeFilter>());
-        }
+        virtual ~ChainingAttributeFilter() {}
         
         Lockable* lock() {
             return this;
@@ -48,14 +53,14 @@ namespace shibsp {
         }
         
         void filterAttributes(const FilteringContext& context, vector<Attribute*>& attributes) const {
-            for (vector<AttributeFilter*>::const_iterator i=m_filters.begin(); i!=m_filters.end(); ++i) {
-                Locker locker(*i);
-                (*i)->filterAttributes(context, attributes);
+            for (ptr_vector<AttributeFilter>::iterator i = m_filters.begin(); i != m_filters.end(); ++i) {
+                Locker locker(&(*i));
+                i->filterAttributes(context, attributes);
             }
         }
 
     private:
-        vector<AttributeFilter*> m_filters;
+        mutable ptr_vector<AttributeFilter> m_filters;
     };
 
     static const XMLCh _AttributeFilter[] = UNICODE_LITERAL_15(A,t,t,r,i,b,u,t,e,F,i,l,t,e,r);
@@ -69,25 +74,17 @@ namespace shibsp {
 
 ChainingAttributeFilter::ChainingAttributeFilter(const DOMElement* e)
 {
-    SPConfig& conf = SPConfig::getConfig();
-
     // Load up the chain of handlers.
     e = XMLHelper::getFirstChildElement(e, _AttributeFilter);
     while (e) {
         string t(XMLHelper::getAttrString(e, nullptr, _type));
         if (!t.empty()) {
-            try {
-                Category::getInstance(SHIBSP_LOGCAT".AttributeFilter.Chaining").info(
-                    "building AttributeFilter of type (%s)...", t.c_str()
-                    );
-                m_filters.push_back(conf.AttributeFilterManager.newPlugin(t.c_str(), e));
-            }
-            catch (exception& ex) {
-                Category::getInstance(SHIBSP_LOGCAT".AttributeFilter.Chaining").error(
-                    "caught exception processing embedded AttributeFilter element: %s", ex.what()
-                    );
-            }
+            Category::getInstance(SHIBSP_LOGCAT".AttributeFilter.Chaining").info("building AttributeFilter of type (%s)...", t.c_str());
+            auto_ptr<AttributeFilter> np(SPConfig::getConfig().AttributeFilterManager.newPlugin(t.c_str(), e));
+            m_filters.push_back(np);
         }
         e = XMLHelper::getNextSiblingElement(e, _AttributeFilter);
     }
+    if (m_filters.empty())
+        throw ConfigurationException("Chaining AttributeFilter plugin requires at least one child plugin.");
 }