Rename MANDATORY_HEX to MANDATORY_ALPHA_HEX

This commit is contained in:
Ai Lin Chia
2016-04-19 10:55:46 +02:00
parent bf57e59590
commit d09ed9f7f2
3 changed files with 7 additions and 7 deletions

@ -547,8 +547,8 @@ static void stripParameters( char *s, int32_t *len ) {
// 81cfba6ed9b66a8ad0df43c2f3d259bd
{
std::vector<UrlComponent*> queryMatches = urlParser.matchQueryParam( UrlComponent::Matcher( "s" ) );
urlParser.removeQueryParam( queryMatches, UrlComponent::Validator( 40, 40, false, ALLOW_HEX, MANDATORY_HEX ) );
urlParser.removeQueryParam( queryMatches, UrlComponent::Validator( 32, 32, false, ALLOW_HEX, MANDATORY_HEX ) );
urlParser.removeQueryParam( queryMatches, UrlComponent::Validator( 40, 40, false, ALLOW_HEX, MANDATORY_ALPHA_HEX ) );
urlParser.removeQueryParam( queryMatches, UrlComponent::Validator( 32, 32, false, ALLOW_HEX, MANDATORY_ALPHA_HEX ) );
}
// session_id
@ -578,8 +578,8 @@ static void stripParameters( char *s, int32_t *len ) {
{
std::vector<UrlComponent*> queryMatches = urlParser.matchQueryParam( UrlComponent::Matcher( "sessid", MATCH_PARTIAL ) );
urlParser.removeQueryParam( queryMatches, UrlComponent::Validator( 52, 52, false, ( ALLOW_ALPHA | ALLOW_DIGIT ), ( MANDATORY_ALPHA | MANDATORY_DIGIT ) ) );
urlParser.removeQueryParam( queryMatches, UrlComponent::Validator( 40, 40, false, ALLOW_HEX, MANDATORY_HEX ) );
urlParser.removeQueryParam( queryMatches, UrlComponent::Validator( 32, 32, false, ALLOW_HEX, MANDATORY_HEX ) );
urlParser.removeQueryParam( queryMatches, UrlComponent::Validator( 40, 40, false, ALLOW_HEX, MANDATORY_ALPHA_HEX ) );
urlParser.removeQueryParam( queryMatches, UrlComponent::Validator( 32, 32, false, ALLOW_HEX, MANDATORY_ALPHA_HEX ) );
urlParser.removeQueryParam( queryMatches, UrlComponent::Validator( 26, 26, false, ( ALLOW_ALPHA | ALLOW_DIGIT ), ( MANDATORY_ALPHA | MANDATORY_DIGIT ) ) );
}

@ -64,10 +64,10 @@ UrlComponent::Validator::Validator( size_t minLength, size_t maxLength, bool all
, m_allowDigit( allowCriteria & ( ALLOW_DIGIT | ALLOW_HEX ) )
, m_allowPunctuation( allowCriteria & ( ALLOW_PUNCTUATION ) )
, m_mandatoryCriteria( mandatoryCriteria )
, m_mandatoryAlpha( mandatoryCriteria & ( MANDATORY_HEX | MANDATORY_ALPHA | MANDATORY_ALPHA_LOWER | MANDATORY_ALPHA_UPPER ) )
, m_mandatoryAlpha( mandatoryCriteria & ( MANDATORY_ALPHA_HEX | MANDATORY_ALPHA | MANDATORY_ALPHA_LOWER | MANDATORY_ALPHA_UPPER ) )
, m_mandatoryAlphaLower( mandatoryCriteria & MANDATORY_ALPHA_LOWER )
, m_mandatoryAlphaUpper( mandatoryCriteria & MANDATORY_ALPHA_UPPER )
, m_mandatoryAlphaHex( mandatoryCriteria & MANDATORY_HEX )
, m_mandatoryAlphaHex( mandatoryCriteria & MANDATORY_ALPHA_HEX )
, m_mandatoryDigit( mandatoryCriteria & MANDATORY_DIGIT )
, m_mandatoryPunctuation( mandatoryCriteria & MANDATORY_PUNCTUATION ) {
}

@ -122,7 +122,7 @@ inline AllowCriteria operator&( AllowCriteria a, AllowCriteria b ) {
enum MandatoryCriteria {
MANDATORY_NONE = 0,
MANDATORY_DIGIT = 1, // must have digit
MANDATORY_HEX = 2, // must have hex
MANDATORY_ALPHA_HEX = 2, // must have alpha hex
MANDATORY_ALPHA = 4, // must have alpha (lower/upper)
MANDATORY_ALPHA_LOWER = 8, // must have alpha lower
MANDATORY_ALPHA_UPPER = 16, // must have alpha upper