diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-05 19:50:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-05 19:50:43 +0200 |
| commit | 3c9c1d909476896b16ba750090f042e7824b50b2 (patch) | |
| tree | bdddf72f0cce5b1b309bb61fc60a7f0bf77d8bb1 /storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp | |
| parent | b81ed9944fd93513b18c48f8fc84d9aeec8615a5 (diff) | |
| parent | 506f285043535af5d81fd098dfd28166930704e5 (diff) | |
Merge pull request #23934 from vespa-engine/vekterli/factor-out-xml-string-escapingv8.48.22
Factor out XML string escaping and use for internal legacy status pages [run-systemtest]
Diffstat (limited to 'storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp')
| -rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp index 63fec9f037f..62be96447a4 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp @@ -23,6 +23,7 @@ #include <vespa/vespalib/util/cpu_usage.h> #include <vespa/vespalib/util/idestructorcallback.h> #include <vespa/vespalib/util/sequencedtaskexecutor.h> +#include <vespa/vespalib/util/string_escape.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/config/subscription/configuri.h> #include <vespa/config/helper/configfetcher.hpp> @@ -887,16 +888,17 @@ void FileStorManager::onFlush(bool downwards) void FileStorManager::reportHtmlStatus(std::ostream& out, const framework::HttpUrlPath& path) const { - bool showStatus = !path.hasAttribute("thread"); - bool verbose = path.hasAttribute("verbose"); + using vespalib::xml_attribute_escaped; - // Print menu + bool showStatus = !path.hasAttribute("thread"); + bool verbose = path.hasAttribute("verbose"); + // Print menu out << "<font size=\"-1\">[ <a href=\"/\">Back to top</a>" << " | <a href=\"?" << (verbose ? "verbose" : "") << "\">Main filestor manager status page</a>" << " | <a href=\"?" << (verbose ? "notverbose" : "verbose"); if (!showStatus) { - out << "&thread=" << path.get("thread", std::string("")); + out << "&thread=" << xml_attribute_escaped(path.get("thread", std::string(""))); } out << "\">" << (verbose ? "Less verbose" : "More verbose") << "</a>\n" << " ]</font><br><br>\n"; |