-/*
- * 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.
*/
/**
#include "signature/SignableObject.h"
#include "signature/SignatureProfileValidator.h"
+#include <xmltooling/logging.h>
#include <xmltooling/signature/Signature.h>
#include <xercesc/util/XMLUniDefs.hpp>
using namespace opensaml;
using namespace xmlsignature;
+using namespace xmltooling::logging;
using namespace xmltooling;
using namespace std;
const SignableObject* signableObj=dynamic_cast<const SignableObject*>(sigObj.getParent());
if (!signableObj)
throw ValidationException("Signature is not a child of a signable SAML object.");
-
+
+ if (sig->getObjectLength() != 0) {
+ Category::getInstance(SAML_LOGCAT".SignatureProfileValidator").error("signature contained an embedded <Object> element");
+ throw ValidationException("Invalid signature profile for SAML object.");
+ }
+
+ sig->setIdByAttributeName(false);
+
bool valid=false;
DSIGReferenceList* refs=sig->getReferenceList();
if (refs && refs->getSize()==1) {
else if (tlist->item(i)->getTransformType()!=TRANSFORM_EXC_C14N &&
tlist->item(i)->getTransformType()!=TRANSFORM_C14N) {
valid=false;
+ Category::getInstance(SAML_LOGCAT".SignatureProfileValidator").error("signature contained an invalid transform");
break;
}
}
}
+
+ if (valid && URI && *URI) {
+ valid = false;
+ if (sigObj.getDOM() && signableObj->getDOM()) {
+ DOMElement* signedNode = sigObj.getDOM()->getOwnerDocument()->getElementById(ID);
+ if (signedNode && signedNode->isSameNode(signableObj->getDOM())) {
+ valid = true;
+ }
+ else {
+ Category::getInstance(SAML_LOGCAT".SignatureProfileValidator").error("signature reference does not match parent object node");
+ }
+ }
+ }
+ }
+ else {
+ Category::getInstance(SAML_LOGCAT".SignatureProfileValidator").error("signature reference does not match parent object ID");
}
}
}
+ else {
+ Category::getInstance(SAML_LOGCAT".SignatureProfileValidator").error("signature contained multiple or zero references");
+ }
if (!valid)
throw ValidationException("Invalid signature profile for SAML object.");