diff options
author | Francois Andriot <[email protected]> | 2013-06-01 18:08:42 +0200 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2013-06-01 18:08:42 +0200 |
commit | a67a48107f8996a6c753fdd02d15e234dbd17ceb (patch) | |
tree | c7bb3ad6be54591f3441dfc9197c39e1763c430d /tdeioslave | |
parent | 930498ce8ad0305d1c0a32a7a383d0b909dc96c5 (diff) | |
download | tdelibs-a67a48107f8996a6c753fdd02d15e234dbd17ceb.tar.gz tdelibs-a67a48107f8996a6c753fdd02d15e234dbd17ceb.zip |
Fix security issue when displaying certificate informations (CVE-2011-3365)
Diffstat (limited to 'tdeioslave')
-rw-r--r-- | tdeioslave/http/http.cc | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/tdeioslave/http/http.cc b/tdeioslave/http/http.cc index a492221d5..fd7c0bfb5 100644 --- a/tdeioslave/http/http.cc +++ b/tdeioslave/http/http.cc @@ -184,6 +184,27 @@ static TQString sanitizeCustomHTTPHeader(const TQString& _header) return sanitizedHeaders.stripWhiteSpace(); } +static TQString htmlEscape(const TQString &plain) +{ + TQString rich; + rich.reserve(uint(plain.length() * 1.1)); + for (uint i = 0; i < plain.length(); ++i) { + if (plain.at(i) == '<') { + rich += "<"; + } else if (plain.at(i) == '>') { + rich += ">"; + } else if (plain.at(i) == '&') { + rich += "&"; + } else if (plain.at(i) == '"') { + rich += """; + } else { + rich += plain.at(i); + } + } + rich.squeeze(); + return rich; +} + #define NO_SIZE ((TDEIO::filesize_t) -1) @@ -5186,7 +5207,7 @@ void HTTPProtocol::promptInfo( AuthInfo& info ) info.verifyPath = false; info.digestInfo = m_strAuthorization; info.commentLabel = i18n( "Site:" ); - info.comment = i18n("<b>%1</b> at <b>%2</b>").arg( m_strRealm ).arg( m_request.hostname ); + info.comment = i18n("<b>%1</b> at <b>%2</b>").arg( htmlEscape(m_strRealm) ).arg( m_request.hostname ); } } else if ( m_responseCode == 407 ) @@ -5203,7 +5224,7 @@ void HTTPProtocol::promptInfo( AuthInfo& info ) info.verifyPath = false; info.digestInfo = m_strProxyAuthorization; info.commentLabel = i18n( "Proxy:" ); - info.comment = i18n("<b>%1</b> at <b>%2</b>").arg( m_strProxyRealm ).arg( m_proxyURL.host() ); + info.comment = i18n("<b>%1</b> at <b>%2</b>").arg( htmlEscape(m_strProxyRealm) ).arg( m_proxyURL.host() ); } } } |