Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NoNewGlobals for ProxyProtocol::*::Magic #1791

Closed
wants to merge 2 commits into from
Closed

NoNewGlobals for ProxyProtocol::*::Magic #1791

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d5b493
NoNewGlobals for ProxyProtocol::*::Magic
kinkie Mar 20, 2024
da8320a
fixup: Removed formatting inconsistency
rousskov Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/proxyp/Parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@
namespace ProxyProtocol {
namespace One {
/// magic octet prefix for PROXY protocol version 1
static const SBuf Magic("PROXY", 5);
static const auto &
Magic()
{
static const auto magic = new SBuf("PROXY", 5);
return *magic;
}
/// extracts PROXY protocol v1 header from the given buffer
static Parsed Parse(const SBuf &buf);

Expand All @@ -41,7 +46,12 @@ static void ParseAddresses(Parser::Tokenizer &tok, Header::Pointer &header);

namespace Two {
/// magic octet prefix for PROXY protocol version 2
static const SBuf Magic("\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A", 12);
static const auto &
Magic()
{
static const auto magic = new SBuf("\x0D\x0A\x0D\x0A\x00\x0D\x0A\x51\x55\x49\x54\x0A", 12);
return *magic;
}
/// extracts PROXY protocol v2 header from the given buffer
static Parsed Parse(const SBuf &buf);

Expand Down Expand Up @@ -115,7 +125,7 @@ ProxyProtocol::One::Parse(const SBuf &buf)
Parser::Tokenizer tok(buf);

static const SBuf::size_type maxHeaderLength = 107; // including CRLF
static const auto maxInteriorLength = maxHeaderLength - Magic.length() - 2;
static const auto maxInteriorLength = maxHeaderLength - Magic().length() - 2;
static const auto interiorChars = CharacterSet::CR.complement().rename("non-CR");
SBuf interior;

Expand Down Expand Up @@ -244,8 +254,8 @@ ProxyProtocol::Parse(const SBuf &buf)
Parser::Tokenizer magicTok(buf);

const auto parser =
magicTok.skip(Two::Magic) ? &Two::Parse :
magicTok.skip(One::Magic) ? &One::Parse :
magicTok.skip(Two::Magic()) ? &Two::Parse :
magicTok.skip(One::Magic()) ? &One::Parse :
nullptr;

if (parser) {
Expand All @@ -254,7 +264,7 @@ ProxyProtocol::Parse(const SBuf &buf)
}

// detect and terminate other protocols
if (buf.length() >= Two::Magic.length()) {
if (buf.length() >= Two::Magic().length()) {
// PROXY/1.0 magic is shorter, so we know that
// the input does not start with any PROXY magic
throw TexcHere("PROXY protocol error: invalid magic");
Expand Down
Loading