#include "squid.h"
#include "base/Packable.h"
#include "Debug.h"
+#include "http/one/ResponseParser.h"
#include "http/StatusLine.h"
+#include "parser/forward.h"
+#include "parser/Tokenizer.h"
+
+#include <algorithm>
void
Http::StatusLine::init()
if (packedStatus == Http::scNone) {
static unsigned int reports = 0;
if (++reports <= 100)
- debugs(57, DBG_IMPORTANT, "BUG: Generated response lacks status code");
+ debugs(57, DBG_IMPORTANT, "BUG: the internalized response lacks status-code");
packedStatus = Http::scInternalServerError;
packedReason = Http::StatusCodeString(packedStatus); // ignore custom reason_ (if any)
}
p->appendf(Http1StatusLineFormat, version.major, version.minor, packedStatus, packedReason);
}
-/*
- * Parse character string.
- * XXX: Note 'end' currently unused, so NULL-termination assumed.
- */
bool
-Http::StatusLine::parse(const String &protoPrefix, const char *start, const char * /*end*/)
+Http::StatusLine::parse(const String &protoPrefix, const char *start, const char *end)
{
status_ = Http::scInvalidHeader; /* Squid header parsing error */
if (!(start = strchr(start, ' ')))
return false;
- // XXX: should we be using xstrtoui() or xatoui() ?
- status_ = static_cast<Http::StatusCode>(atoi(++start));
+ ++start; // skip SP between HTTP-version and status-code
+
+ assert(start <= end);
+ const auto stdStatusAreaLength = 4; // status-code length plus SP
+ const auto unparsedLength = end - start;
+ const auto statusAreaLength = std::min<size_t>(stdStatusAreaLength, unparsedLength);
+
+ static SBuf statusBuf;
+ statusBuf.assign(start, statusAreaLength);
+ Parser::Tokenizer tok(statusBuf);
+ try {
+ One::ResponseParser::ParseResponseStatus(tok, status_);
+ } catch (const Parser::InsufficientInput &) {
+ debugs(57, 7, "need more; have " << unparsedLength);
+ return false;
+ } catch (...) {
+ debugs(57, 3, "cannot parse status-code area: " << CurrentException);
+ return false;
+ }
// XXX check if the given 'reason' is the default status string, if not save to reason_
#include "http/ProtocolVersion.h"
#include "parser/Tokenizer.h"
#include "profiler/Profiler.h"
+#include "sbuf/Stream.h"
#include "SquidConfig.h"
const SBuf Http::One::ResponseParser::IcyMagic("ICY ");
// NP: we found the protocol version and consumed it already.
// just need the status code and reason phrase
int
-Http::One::ResponseParser::parseResponseStatusAndReason(Tokenizer &tok, const CharacterSet &WspDelim)
+Http::One::ResponseParser::parseResponseStatusAndReason(Tokenizer &tok)
{
- if (!completedStatus_) {
- debugs(74, 9, "seek status-code in: " << tok.remaining().substr(0,10) << "...");
- /* RFC 7230 section 3.1.2 - status code is 3 DIGIT octets.
- * There is no limit on what those octets may be.
- * 000 through 999 are all valid.
- */
- int64_t statusValue;
- if (tok.int64(statusValue, 10, false, 3) && tok.skipOne(WspDelim)) {
-
- debugs(74, 6, "found int64 status-code=" << statusValue);
- statusCode_ = static_cast<Http::StatusCode>(statusValue);
-
+ try {
+ if (!completedStatus_) {
+ debugs(74, 9, "seek status-code in: " << tok.remaining().substr(0,10) << "...");
+ ParseResponseStatus(tok, statusCode_);
buf_ = tok.remaining(); // resume checkpoint
completedStatus_ = true;
-
- } else if (tok.atEnd()) {
- debugs(74, 6, "Parser needs more data");
- return 0; // need more to be sure we have it all
-
- } else {
- debugs(74, 6, "invalid status-line. invalid code.");
- return -1; // invalid status, a single SP terminator required
}
// NOTE: any whitespace after the single SP is part of the reason phrase.
- }
-
- /* RFC 7230 says we SHOULD ignore the reason phrase content
- * but it has a definite valid vs invalid character set.
- * We interpret the SHOULD as ignoring absence and syntax, but
- * producing an error if it contains an invalid octet.
- */
- debugs(74, 9, "seek reason-phrase in: " << tok.remaining().substr(0,50) << "...");
+ /* RFC 7230 says we SHOULD ignore the reason phrase content
+ * but it has a definite valid vs invalid character set.
+ * We interpret the SHOULD as ignoring absence and syntax, but
+ * producing an error if it contains an invalid octet.
+ */
- // if we got here we are still looking for reason-phrase bytes
- static const CharacterSet phraseChars = CharacterSet::WSP + CharacterSet::VCHAR + CharacterSet::OBSTEXT;
- (void)tok.prefix(reasonPhrase_, phraseChars); // optional, no error if missing
- try {
+ debugs(74, 9, "seek reason-phrase in: " << tok.remaining().substr(0,50) << "...");
+ // if we got here we are still looking for reason-phrase bytes
+ static const CharacterSet phraseChars = CharacterSet::WSP + CharacterSet::VCHAR + CharacterSet::OBSTEXT;
+ (void)tok.prefix(reasonPhrase_, phraseChars); // optional, no error if missing
skipLineTerminator(tok);
buf_ = tok.remaining(); // resume checkpoint
debugs(74, DBG_DATA, Raw("leftovers", buf_.rawContent(), buf_.length()));
return -1;
}
+void
+Http::One::ResponseParser::ParseResponseStatus(Tokenizer &tok, StatusCode &code)
+{
+ int64_t statusValue;
+ if (tok.int64(statusValue, 10, false, 3) && tok.skipOne(Parser::DelimiterCharacters())) {
+ debugs(74, 6, "raw status-code=" << statusValue);
+ code = static_cast<StatusCode>(statusValue); // may be invalid
+
+ // RFC 7230 Section 3.1.2 says status-code is exactly three DIGITs
+ if (code <= 99)
+ throw TextException(ToSBuf("status-code too short: ", code), Here());
+
+ // Codes with a non-standard first digit (a.k.a. response class) are
+ // considered semantically invalid per the following HTTP WG discussion:
+ // https://lists.w3.org/Archives/Public/ietf-http-wg/2010AprJun/0354.html
+ if (code >= 600)
+ throw TextException(ToSBuf("status-code from an invalid response class: ", code), Here());
+ } else if (tok.atEnd()) {
+ throw InsufficientInput();
+ } else {
+ throw TextException("syntactically invalid status-code area", Here());
+ }
+}
+
/**
* Attempt to parse the method field out of an HTTP message status-line.
*
{
Tokenizer tok(buf_);
- const CharacterSet &WspDelim = DelimiterCharacters();
-
if (msgProtocol_.protocol != AnyP::PROTO_NONE) {
debugs(74, 6, "continue incremental parse for " << msgProtocol_);
debugs(74, DBG_DATA, "parse remaining buf={length=" << tok.remaining().length() << ", data='" << tok.remaining() << "'}");
// we already found the magic, but not the full line. keep going.
- return parseResponseStatusAndReason(tok, WspDelim);
+ return parseResponseStatusAndReason(tok);
} else if (tok.skip(Http1magic)) {
debugs(74, 6, "found prefix magic " << Http1magic);
// magic contains major version, still need to find minor DIGIT
int64_t verMinor;
+ const auto &WspDelim = DelimiterCharacters();
if (tok.int64(verMinor, 10, false, 1) && tok.skipOne(WspDelim)) {
msgProtocol_.protocol = AnyP::PROTO_HTTP;
msgProtocol_.major = 1;
debugs(74, DBG_DATA, "parse remaining buf={length=" << tok.remaining().length() << ", data='" << tok.remaining() << "'}");
buf_ = tok.remaining(); // resume checkpoint
- return parseResponseStatusAndReason(tok, WspDelim);
+ return parseResponseStatusAndReason(tok);
} else if (tok.atEnd())
return 0; // need more to be sure we have it all
// NP: ICY has no /major.minor details
debugs(74, DBG_DATA, "parse remaining buf={length=" << tok.remaining().length() << ", data='" << tok.remaining() << "'}");
buf_ = tok.remaining(); // resume checkpoint
- return parseResponseStatusAndReason(tok, WspDelim);
+ return parseResponseStatusAndReason(tok);
} else if (buf_.length() < Http1magic.length() && Http1magic.startsWith(buf_)) {
debugs(74, 7, Raw("valid HTTP/1 prefix", buf_.rawContent(), buf_.length()));
return 0;
projects / thirdparty / squid.git / commitdiff
