X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2Fexceptions.cpp;h=6ff78ca3f2aed7033d273436d541ecc0bf3eda5f;hb=4e08add2d98d246f1a5bd97305dd7da8ed761d5b;hp=3b37262cc37e5e7b3da7236a82e99781a96a2563;hpb=d73e59e9834ff2447334d7a5e576cc4a2cb219f9;p=shibboleth%2Fcpp-xmltooling.git diff --git a/xmltooling/exceptions.cpp b/xmltooling/exceptions.cpp index 3b37262..6ff78ca 100644 --- a/xmltooling/exceptions.cpp +++ b/xmltooling/exceptions.cpp @@ -1,17 +1,21 @@ -/* - * Copyright 2001-2007 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. */ /** @@ -28,10 +32,14 @@ #include "util/XMLHelper.h" #include +#include #include +#include #include using namespace xmltooling; +using namespace xercesc; +using namespace boost; using namespace std; using xmlconstants::XMLTOOLING_NS; @@ -99,89 +107,46 @@ void XMLToolingException::setMessage(const char* msg) m_processedmsg.erase(); } -inline const char* get_digit_character() -{ - static const char s_characters[19] = - { - '9' - , '8' - , '7' - , '6' - , '5' - , '4' - , '3' - , '2' - , '1' - , '0' - , '1' - , '2' - , '3' - , '4' - , '5' - , '6' - , '7' - , '8' - , '9' - }; - static const char *s_mid = s_characters + 9; - - return s_mid; -} - -inline const char* unsigned_integer_to_string(char* buf, size_t cchBuf, int i) -{ - char* psz=buf + cchBuf - 1; // Set psz to last char - *psz = 0; // Set terminating null - - do { - unsigned int lsd = i % 10; // Get least significant - // digit - - i /= 10; // Prepare for next most - // significant digit - - --psz; // Move back - - *psz = get_digit_character()[lsd]; // Place the digit - - } while(i!=0 && psz>buf); - - return psz; -} - void XMLToolingException::addProperties(const params& p) { m_processedmsg.erase(); - int i=m_params.size()+1; - char buf[20]; + map::size_type i = m_params.size() + 1; const vector& v=p.get(); - for (vector::const_iterator ci=v.begin(); ci!=v.end(); ci++) { - m_params[unsigned_integer_to_string(buf,sizeof(buf),i++)] = *ci; + for (vector::const_iterator ci = v.begin(); ci != v.end(); ++ci) { + try { + m_params[lexical_cast(i++)] = *ci; + } + catch (bad_lexical_cast&) { + } } } void XMLToolingException::addProperties(const namedparams& p) { m_processedmsg.erase(); - const vector& v=p.get(); - for (vector::const_iterator ci=v.begin(); ci!=v.end(); ci++) { + const vector& v = p.get(); + for (vector::const_iterator ci = v.begin(); ci != v.end(); ++ci) { m_params.erase(*ci); m_params[*ci] = *(ci+1); - ci++; // advance past name to value, then loop will advance it again + ++ci; // advance past name to value, then loop will advance it again } } const char* XMLToolingException::getProperty(unsigned int index) const { - char buf[20]; - map::const_iterator i=m_params.find(unsigned_integer_to_string(buf,sizeof(buf),index)); - return (i==m_params.end()) ? NULL : i->second.c_str(); + try { + map::const_iterator i = m_params.find(lexical_cast(index)); + return (i==m_params.end()) ? nullptr : i->second.c_str(); + } + catch (bad_lexical_cast&) { + return nullptr; + } } const char* XMLToolingException::getProperty(const char* name) const { - map::const_iterator i=m_params.find(name); - return (i==m_params.end()) ? NULL : i->second.c_str(); + map::const_iterator i = m_params.find(name); + return (i==m_params.end()) ? nullptr : i->second.c_str(); } const char* XMLToolingException::getMessage() const @@ -217,35 +182,64 @@ const char* XMLToolingException::getMessage() const return m_processedmsg.c_str(); } +void xml_encode(string& s, const char* pre, const char* start, const char* post) +{ + s += pre; + size_t pos; + while (start && *start) { + pos = strcspn(start, "\"<>&"); + if (pos > 0) { + s.append(start, pos); + start += pos; + } + else { + switch (*start) { + case '\'': s += "'"; break; + case '<': s += "<"; break; + case '>': s += ">"; break; + case '&': s += "&"; break; + default: s += *start; + } + start++; + } + } + s += post; +} + string XMLToolingException::toString() const { - string xml=string(""; + string xml=string(""; const char* msg=getMessage(); if (msg) - xml=xml + "" + msg + ""; - for (map::const_iterator i=m_params.begin(); i!=m_params.end(); i++) - xml=xml + "first + "\">" + i->second + ""; + xml_encode(xml, "", msg, ""); + const URLEncoder* encoder = XMLToolingConfig::getConfig().getURLEncoder(); + for (map::const_iterator i = m_params.begin(); i != m_params.end(); ++i) { + xml_encode(xml, "", encoder->encode(i->second.c_str()).c_str(), ""); + } xml+=""; return xml; } string XMLToolingException::toQueryString() const { + string q; const URLEncoder* enc = XMLToolingConfig::getConfig().getURLEncoder(); - string q("type="); - q = q + enc->encode(getClassName()) + "&message=" + enc->encode(what()); - for (map::const_iterator i=m_params.begin(); i!=m_params.end(); i++) - q = q + '&' + i->first + '=' + enc->encode(i->second.c_str()); + for (map::const_iterator i = m_params.begin(); i != m_params.end(); ++i) { + if (!q.empty()) + q += '&'; + q = q + i->first + '=' + enc->encode(i->second.c_str()); + } return q; } XMLToolingException* XMLToolingException::fromStream(std::istream& in) { - static const XMLCh exception[] = { chLatin_e, chLatin_x, chLatin_c, chLatin_e, chLatin_p, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull }; - static const XMLCh message[] = { chLatin_m, chLatin_e, chLatin_s, chLatin_s, chLatin_a, chLatin_g, chLatin_e, chNull }; - static const XMLCh name[] = { chLatin_n, chLatin_a, chLatin_m, chLatin_e, chNull }; - static const XMLCh param[] = { chLatin_p, chLatin_a, chLatin_r, chLatin_a, chLatin_m, chNull }; - static const XMLCh type[] = { chLatin_t, chLatin_y, chLatin_p, chLatin_e, chNull }; + static const XMLCh exception[] = UNICODE_LITERAL_9(e,x,c,e,p,t,i,o,n); + static const XMLCh message[] = UNICODE_LITERAL_7(m,e,s,s,a,g,e); + static const XMLCh name[] = UNICODE_LITERAL_4(n,a,m,e); + static const XMLCh param[] = UNICODE_LITERAL_5(p,a,r,a,m); + static const XMLCh type[] = UNICODE_LITERAL_4(t,y,p,e); DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in); @@ -256,7 +250,7 @@ XMLToolingException* XMLToolingException::fromStream(std::istream& in) throw XMLToolingException("Invalid root element on serialized exception."); } - auto_ptr_char classname(root->getAttributeNS(NULL,type)); + auto_ptr_char classname(root->getAttributeNS(nullptr,type)); auto_ptr excep(XMLToolingException::getInstance(classname.get())); DOMElement* child=XMLHelper::getFirstChildElement(root,XMLTOOLING_NS,message); @@ -265,14 +259,17 @@ XMLToolingException* XMLToolingException::fromStream(std::istream& in) excep->setMessage(m.get()); } + const URLEncoder* encoder = XMLToolingConfig::getConfig().getURLEncoder(); child=XMLHelper::getFirstChildElement(root,XMLTOOLING_NS,param); while (child && child->hasChildNodes()) { - auto_ptr_char n(child->getAttributeNS(NULL,name)); - char* v=toUTF8(child->getFirstChild()->getNodeValue()); - if (n.get() && v) - excep->addProperty(n.get(), v); - XMLString::release(&v); - child=XMLHelper::getNextSiblingElement(root,XMLTOOLING_NS,param); + auto_ptr_char n(child->getAttributeNS(nullptr,name)); + char* encoded = XMLString::transcode(child->getFirstChild()->getNodeValue()); + if (n.get() && encoded) { + encoder->decode(encoded); + excep->addProperty(n.get(), encoded); + } + XMLString::release(&encoded); + child=XMLHelper::getNextSiblingElement(child,XMLTOOLING_NS,param); } doc->release();