diff options
author | Richard Walters <rwalters@digitalstirling.com> | 2018-06-30 23:35:15 -0700 |
---|---|---|
committer | Richard Walters <rwalters@digitalstirling.com> | 2018-06-30 23:35:15 -0700 |
commit | b57bf0b772c5cfef789363b9951f737d9e92a28a (patch) | |
tree | 369f2d034a9ae4862674d73ced46a9df3714a65e /src/Uri.cpp | |
parent | 6f389efe5808c83f86a4c71861c50e6e941fc5bb (diff) |
Add code to check that scheme, if present, is legal
Diffstat (limited to 'src/Uri.cpp')
-rw-r--r-- | src/Uri.cpp | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/src/Uri.cpp b/src/Uri.cpp index 8bc2f4a..da1b9f8 100644 --- a/src/Uri.cpp +++ b/src/Uri.cpp @@ -6,7 +6,9 @@ * © 2018 by Richard Walters */ +#include <functional> #include <inttypes.h> +#include <memory> #include <string> #include <Uri/Uri.hpp> #include <vector> @@ -51,6 +53,83 @@ namespace { return true; } + /** + * This function takes a given "stillPassing" strategy + * and invokes it on the sequence of characters in the given + * string, to check if the string passes or not. + * + * @param[in] candidate + * This is the string to test. + * + * @param[in] stillPassing + * This is the strategy to invoke in order to test the string. + * + * @return + * An indication of whether or not the given candidate string + * passes the test is returned. + */ + bool FailsMatch( + const std::string& candidate, + std::function< bool(char, bool) > stillPassing + ) { + for (const auto c: candidate) { + if (!stillPassing(c, false)) { + return true; + } + } + return !stillPassing(' ', true); + } + + /** + * This function returns a strategy function that + * may be used with the FailsMatch function to test a scheme + * to make sure it is legal according to the standard. + * + * @return + * A strategy function that may be used with the + * FailsMatch function to test a scheme to make sure + * it is legal according to the standard is returned. + */ + std::function< bool(char, bool) > LegalSchemeCheckStrategy() { + auto isFirstCharacter = std::make_shared< bool >(true); + return [isFirstCharacter](char c, bool end){ + if (end) { + return !*isFirstCharacter; + } else { + bool check; + if (*isFirstCharacter) { + check = ( + ( + (c >= 'a') + && (c <= 'z') + ) || ( + (c >= 'A') + && (c <= 'Z') + ) + ); + } else { + check = ( + ( + (c >= 'a') + && (c <= 'z') + ) || ( + (c >= 'A') + && (c <= 'Z') + ) || ( + (c >= '0') + && (c <= '9') + ) + || (c == '+') + || (c == '-') + || (c == '.') + ); + } + *isFirstCharacter = false; + return check; + } + }; + } + } namespace Uri { @@ -200,6 +279,15 @@ namespace Uri { rest = uriString; } else { impl_->scheme = uriString.substr(0, schemeEnd); + bool isFirstCharacter = true; + if ( + FailsMatch( + impl_->scheme, + LegalSchemeCheckStrategy() + ) + ) { + return false; + } rest = uriString.substr(schemeEnd + 1); } |