mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS xmlsec13 (1.3.28); FILE MERGED

Browse Source 
2005/10/31 13:37:47 jl 1.3.28.2: RESYNC: (1.3-1.4); FILE MERGED
2005/10/25 08:19:19 jl 1.3.28.1: #54495# #54047# extra verification of certificates, better errorhandling
This commit is contained in:
Rüdiger Timm
2005-11-11 08:19:25 +00:00
parent 0e2341d732
commit 57cde025da
1 changed files with 136 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

268
xmlsecurity/source/xmlsec/errorcallback.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: errorcallback.cxx,v $ * $RCSfile: errorcallback.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: rt $ $Date: 2005-09-09 17:25:54 $ * last change: $Author: rt $ $Date: 2005-11-11 09:19:25 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -45,111 +45,111 @@
using namespace ::com::sun::star::xml::crypto; using namespace ::com::sun::star::xml::crypto;
::com::sun::star::uno::Reference< XXMLSecurityTemplate > g_xErrorRecorder; // ::com::sun::star::uno::Reference< XXMLSecurityTemplate > g_xErrorRecorder;
bool g_bErrorRecorded; // bool g_bErrorRecorded;
SecurityOperationStatus getOperationStatus(int reason) // SecurityOperationStatus getOperationStatus(int reason)
{ // {
switch (reason) // switch (reason)
{ // {
case XMLSEC_ERRORS_R_XMLSEC_FAILED: // case XMLSEC_ERRORS_R_XMLSEC_FAILED:
return SecurityOperationStatus_ENGINE_FAILED; // return SecurityOperationStatus_ENGINE_FAILED;
case XMLSEC_ERRORS_R_MALLOC_FAILED: // case XMLSEC_ERRORS_R_MALLOC_FAILED:
return SecurityOperationStatus_MALLOC_FAILED; // return SecurityOperationStatus_MALLOC_FAILED;
case XMLSEC_ERRORS_R_STRDUP_FAILED: // case XMLSEC_ERRORS_R_STRDUP_FAILED:
return SecurityOperationStatus_STRDUP_FAILED; // return SecurityOperationStatus_STRDUP_FAILED;
case XMLSEC_ERRORS_R_CRYPTO_FAILED: // case XMLSEC_ERRORS_R_CRYPTO_FAILED:
return SecurityOperationStatus_CRYPTO_FAILED; // return SecurityOperationStatus_CRYPTO_FAILED;
case XMLSEC_ERRORS_R_XML_FAILED: // case XMLSEC_ERRORS_R_XML_FAILED:
return SecurityOperationStatus_XML_FAILED; // return SecurityOperationStatus_XML_FAILED;
case XMLSEC_ERRORS_R_XSLT_FAILED: // case XMLSEC_ERRORS_R_XSLT_FAILED:
return SecurityOperationStatus_XSLT_FAILED; // return SecurityOperationStatus_XSLT_FAILED;
case XMLSEC_ERRORS_R_IO_FAILED: // case XMLSEC_ERRORS_R_IO_FAILED:
return SecurityOperationStatus_IO_FAILED; // return SecurityOperationStatus_IO_FAILED;
case XMLSEC_ERRORS_R_DISABLED: // case XMLSEC_ERRORS_R_DISABLED:
return SecurityOperationStatus_DISABLED; // return SecurityOperationStatus_DISABLED;
case XMLSEC_ERRORS_R_NOT_IMPLEMENTED: // case XMLSEC_ERRORS_R_NOT_IMPLEMENTED:
return SecurityOperationStatus_NOT_IMPLEMENTED; // return SecurityOperationStatus_NOT_IMPLEMENTED;
case XMLSEC_ERRORS_R_INVALID_SIZE: // case XMLSEC_ERRORS_R_INVALID_SIZE:
return SecurityOperationStatus_INVALID_SIZE; // return SecurityOperationStatus_INVALID_SIZE;
case XMLSEC_ERRORS_R_INVALID_DATA: // case XMLSEC_ERRORS_R_INVALID_DATA:
return SecurityOperationStatus_INVALID_DATA; // return SecurityOperationStatus_INVALID_DATA;
case XMLSEC_ERRORS_R_INVALID_RESULT: // case XMLSEC_ERRORS_R_INVALID_RESULT:
return SecurityOperationStatus_INVALID_RESULT; // return SecurityOperationStatus_INVALID_RESULT;
case XMLSEC_ERRORS_R_INVALID_TYPE: // case XMLSEC_ERRORS_R_INVALID_TYPE:
return SecurityOperationStatus_INVALID_TYPE; // return SecurityOperationStatus_INVALID_TYPE;
case XMLSEC_ERRORS_R_INVALID_OPERATION: // case XMLSEC_ERRORS_R_INVALID_OPERATION:
return SecurityOperationStatus_INVALID_OPERATION; // return SecurityOperationStatus_INVALID_OPERATION;
case XMLSEC_ERRORS_R_INVALID_STATUS: // case XMLSEC_ERRORS_R_INVALID_STATUS:
return SecurityOperationStatus_INVALID_STATUS; // return SecurityOperationStatus_INVALID_STATUS;
case XMLSEC_ERRORS_R_INVALID_FORMAT: // case XMLSEC_ERRORS_R_INVALID_FORMAT:
return SecurityOperationStatus_INVALID_FORMAT; // return SecurityOperationStatus_INVALID_FORMAT;
case XMLSEC_ERRORS_R_DATA_NOT_MATCH: // case XMLSEC_ERRORS_R_DATA_NOT_MATCH:
return SecurityOperationStatus_DATA_NOT_MATCH; // return SecurityOperationStatus_DATA_NOT_MATCH;
case XMLSEC_ERRORS_R_INVALID_NODE: // case XMLSEC_ERRORS_R_INVALID_NODE:
return SecurityOperationStatus_INVALID_NODE; // return SecurityOperationStatus_INVALID_NODE;
case XMLSEC_ERRORS_R_INVALID_NODE_CONTENT: // case XMLSEC_ERRORS_R_INVALID_NODE_CONTENT:
return SecurityOperationStatus_INVALID_NODE_CONTENT; // return SecurityOperationStatus_INVALID_NODE_CONTENT;
case XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE: // case XMLSEC_ERRORS_R_INVALID_NODE_ATTRIBUTE:
return SecurityOperationStatus_INVALID_NODE_ATTRIBUTE; // return SecurityOperationStatus_INVALID_NODE_ATTRIBUTE;
case XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE: // case XMLSEC_ERRORS_R_MISSING_NODE_ATTRIBUTE:
return SecurityOperationStatus_MISSING_NODE_ATTRIBUTE; // return SecurityOperationStatus_MISSING_NODE_ATTRIBUTE;
case XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT: // case XMLSEC_ERRORS_R_NODE_ALREADY_PRESENT:
return SecurityOperationStatus_NODE_ALREADY_PRESENT; // return SecurityOperationStatus_NODE_ALREADY_PRESENT;
case XMLSEC_ERRORS_R_UNEXPECTED_NODE: // case XMLSEC_ERRORS_R_UNEXPECTED_NODE:
return SecurityOperationStatus_UNEXPECTED_NODE; // return SecurityOperationStatus_UNEXPECTED_NODE;
case XMLSEC_ERRORS_R_NODE_NOT_FOUND: // case XMLSEC_ERRORS_R_NODE_NOT_FOUND:
return SecurityOperationStatus_NODE_NOT_FOUND; // return SecurityOperationStatus_NODE_NOT_FOUND;
case XMLSEC_ERRORS_R_INVALID_TRANSFORM: // case XMLSEC_ERRORS_R_INVALID_TRANSFORM:
return SecurityOperationStatus_INVALID_TRANSFORM; // return SecurityOperationStatus_INVALID_TRANSFORM;
case XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY: // case XMLSEC_ERRORS_R_INVALID_TRANSFORM_KEY:
return SecurityOperationStatus_INVALID_TRANSFORM_KEY; // return SecurityOperationStatus_INVALID_TRANSFORM_KEY;
case XMLSEC_ERRORS_R_INVALID_URI_TYPE: // case XMLSEC_ERRORS_R_INVALID_URI_TYPE:
return SecurityOperationStatus_INVALID_URI_TYPE; // return SecurityOperationStatus_INVALID_URI_TYPE;
case XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED: // case XMLSEC_ERRORS_R_TRANSFORM_SAME_DOCUMENT_REQUIRED:
return SecurityOperationStatus_TRANSFORM_SAME_DOCUMENT_REQUIRED; // return SecurityOperationStatus_TRANSFORM_SAME_DOCUMENT_REQUIRED;
case XMLSEC_ERRORS_R_TRANSFORM_DISABLED: // case XMLSEC_ERRORS_R_TRANSFORM_DISABLED:
return SecurityOperationStatus_TRANSFORM_DISABLED; // return SecurityOperationStatus_TRANSFORM_DISABLED;
case XMLSEC_ERRORS_R_INVALID_KEY_DATA: // case XMLSEC_ERRORS_R_INVALID_KEY_DATA:
return SecurityOperationStatus_INVALID_KEY_DATA; // return SecurityOperationStatus_INVALID_KEY_DATA;
case XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND: // case XMLSEC_ERRORS_R_KEY_DATA_NOT_FOUND:
return SecurityOperationStatus_KEY_DATA_NOT_FOUND; // return SecurityOperationStatus_KEY_DATA_NOT_FOUND;
case XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST: // case XMLSEC_ERRORS_R_KEY_DATA_ALREADY_EXIST:
return SecurityOperationStatus_KEY_DATA_ALREADY_EXIST; // return SecurityOperationStatus_KEY_DATA_ALREADY_EXIST;
case XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE: // case XMLSEC_ERRORS_R_INVALID_KEY_DATA_SIZE:
return SecurityOperationStatus_INVALID_KEY_DATA_SIZE; // return SecurityOperationStatus_INVALID_KEY_DATA_SIZE;
case XMLSEC_ERRORS_R_KEY_NOT_FOUND: // case XMLSEC_ERRORS_R_KEY_NOT_FOUND:
return SecurityOperationStatus_KEY_NOT_FOUND; // return SecurityOperationStatus_KEY_NOT_FOUND;
case XMLSEC_ERRORS_R_KEYDATA_DISABLED: // case XMLSEC_ERRORS_R_KEYDATA_DISABLED:
return SecurityOperationStatus_KEYDATA_DISABLED; // return SecurityOperationStatus_KEYDATA_DISABLED;
case XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL: // case XMLSEC_ERRORS_R_MAX_RETRIEVALS_LEVEL:
return SecurityOperationStatus_MAX_RETRIEVALS_LEVEL; // return SecurityOperationStatus_MAX_RETRIEVALS_LEVEL;
case XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH: // case XMLSEC_ERRORS_R_MAX_RETRIEVAL_TYPE_MISMATCH:
return SecurityOperationStatus_MAX_RETRIEVAL_TYPE_MISMATCH; // return SecurityOperationStatus_MAX_RETRIEVAL_TYPE_MISMATCH;
case XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL: // case XMLSEC_ERRORS_R_MAX_ENCKEY_LEVEL:
return SecurityOperationStatus_MAX_ENCKEY_LEVEL; // return SecurityOperationStatus_MAX_ENCKEY_LEVEL;
case XMLSEC_ERRORS_R_CERT_VERIFY_FAILED: // case XMLSEC_ERRORS_R_CERT_VERIFY_FAILED:
return SecurityOperationStatus_CERT_VERIFY_FAILED; // return SecurityOperationStatus_CERT_VERIFY_FAILED;
case XMLSEC_ERRORS_R_CERT_NOT_FOUND: // case XMLSEC_ERRORS_R_CERT_NOT_FOUND:
return SecurityOperationStatus_CERT_NOT_FOUND; // return SecurityOperationStatus_CERT_NOT_FOUND;
case XMLSEC_ERRORS_R_CERT_REVOKED: // case XMLSEC_ERRORS_R_CERT_REVOKED:
return SecurityOperationStatus_CERT_REVOKED; // return SecurityOperationStatus_CERT_REVOKED;
case XMLSEC_ERRORS_R_CERT_ISSUER_FAILED: // case XMLSEC_ERRORS_R_CERT_ISSUER_FAILED:
return SecurityOperationStatus_CERT_ISSUER_FAILED; // return SecurityOperationStatus_CERT_ISSUER_FAILED;
case XMLSEC_ERRORS_R_CERT_NOT_YET_VALID: // case XMLSEC_ERRORS_R_CERT_NOT_YET_VALID:
return SecurityOperationStatus_CERT_NOT_YET_VALID; // return SecurityOperationStatus_CERT_NOT_YET_VALID;
case XMLSEC_ERRORS_R_CERT_HAS_EXPIRED: // case XMLSEC_ERRORS_R_CERT_HAS_EXPIRED:
return SecurityOperationStatus_CERT_HAS_EXPIRED; // return SecurityOperationStatus_CERT_HAS_EXPIRED;
case XMLSEC_ERRORS_R_DSIG_NO_REFERENCES: // case XMLSEC_ERRORS_R_DSIG_NO_REFERENCES:
return SecurityOperationStatus_DSIG_NO_REFERENCES; // return SecurityOperationStatus_DSIG_NO_REFERENCES;
case XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE: // case XMLSEC_ERRORS_R_DSIG_INVALID_REFERENCE:
return SecurityOperationStatus_DSIG_INVALID_REFERENCE; // return SecurityOperationStatus_DSIG_INVALID_REFERENCE;
case XMLSEC_ERRORS_R_ASSERTION: // case XMLSEC_ERRORS_R_ASSERTION:
return SecurityOperationStatus_ASSERTION; // return SecurityOperationStatus_ASSERTION;
default: // default:
return SecurityOperationStatus_RUNTIMEERROR_FAILED; // return SecurityOperationStatus_RUNTIMEERROR_FAILED;
} // }
} // }
void errorCallback(const char *file, void errorCallback(const char *file,
int line, int line,
@@ -159,42 +159,46 @@ void errorCallback(const char *file,
int reason, int reason,
const char *msg) const char *msg)
{ {
if (g_xErrorRecorder.is() && !g_bErrorRecorded) //ToDo write log message
{ // if (g_xErrorRecorder.is() && !g_bErrorRecorded)
g_xErrorRecorder->setStatus(getOperationStatus(reason)); // {
// g_xErrorRecorder->setStatus(getOperationStatus(reason));
if ( reason != XMLSEC_ERRORS_R_ASSERTION && reason!=XMLSEC_ERRORS_R_XMLSEC_FAILED) // if ( reason != XMLSEC_ERRORS_R_ASSERTION && reason!=XMLSEC_ERRORS_R_XMLSEC_FAILED)
{ // {
g_bErrorRecorded = true; // g_bErrorRecorded = true;
} // }
} // }
} }
void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >& xTemplate) // void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >& xTemplate)
// {
// g_xErrorRecorder = xTemplate;
// g_xErrorRecorder->setStatus(SecurityOperationStatus_OPERATION_SUCCEEDED);
// g_bErrorRecorded = false;
// xmlSecErrorsSetCallback(errorCallback);
// }
//void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& xTemplate)
void setErrorRecorder()
{ {
g_xErrorRecorder = xTemplate; // ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >
g_xErrorRecorder->setStatus(SecurityOperationStatus_OPERATION_SUCCEEDED); // xSecurityTemplate(xTemplate, ::com::sun::star::uno::UNO_QUERY);
g_bErrorRecorded = false; // setErrorRecorder( xSecurityTemplate );
xmlSecErrorsSetCallback(errorCallback); xmlSecErrorsSetCallback(errorCallback);
} }
void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& xTemplate) // void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& xTemplate)
{ // {
::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate > // ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >
xSecurityTemplate(xTemplate, ::com::sun::star::uno::UNO_QUERY); // xSecurityTemplate(xTemplate, ::com::sun::star::uno::UNO_QUERY);
setErrorRecorder( xSecurityTemplate ); // setErrorRecorder( xSecurityTemplate );
} // }
void setErrorRecorder(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& xTemplate)
{
::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityTemplate >
xSecurityTemplate(xTemplate, ::com::sun::star::uno::UNO_QUERY);
setErrorRecorder( xSecurityTemplate );
}
void clearErrorRecorder() void clearErrorRecorder()
{ {
xmlSecErrorsSetCallback(NULL); xmlSecErrorsSetCallback(NULL);
g_xErrorRecorder = NULL; // g_xErrorRecorder = NULL;
} }