fic/server
2
0
Fork 0
Code Issues Pull Requests 3 Releases Wiki Activity

libfic: extract validation_regexp execution

Browse Source
This commit is contained in:
nemunaire 2019-01-16 04:52:34 +01:00
parent 0f9cc39cc7
commit 1e183f60ee
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libfic/flag_key.go
View File

@ -72,6 +72,16 @@ func getHashedFlag(raw_value []byte) [blake2b.Size]byte {
return hash
}
func ExecValidatorRegexp(vre string, val []byte) ([]byte, error) {
if re, err := regexp.Compile(vre); err != nil {
return val, err
} else if res := re.FindSubmatch(val); res == nil {
return val, errors.New("Expected flag doesn't pass through the validator_regexp")
} else {
return bytes.Join(res[1:], []byte("+")), nil
}
}
// AddRawFlagKey creates and fills a new struct FlagKey, from a non-hashed flag, and registers it into the database.
func (e Exercice) AddRawFlagKey(name string, help string, ignorecase bool, validator_regexp *string, raw_value []byte, choicescost int64) (FlagKey, error) {
if ignorecase {
@ -80,12 +90,9 @@ func (e Exercice) AddRawFlagKey(name string, help string, ignorecase bool, valid
// Check that raw value passes through the regexp
if validator_regexp != nil {
if re, err := regexp.Compile(*validator_regexp); err != nil {
var err error
if raw_value, err = ExecValidatorRegexp(*validator_regexp, raw_value); err != nil {
return FlagKey{}, err
} else if res := re.FindSubmatch(raw_value); res == nil {
return FlagKey{}, errors.New("Expected flag doesn't pass through the validator_regexp")
} else {
raw_value = bytes.Join(res[1:], []byte("+"))
}
}
@ -194,10 +201,7 @@ func (k FlagKey) Check(v interface{}) int {
// Check that raw value passes through the regexp
if k.ValidatorRegexp != nil {
re := regexp.MustCompile(*k.ValidatorRegexp)
if res := re.FindSubmatch(val); res != nil {
val = bytes.Join(res[1:], []byte("+"))
}
val, _ = ExecValidatorRegexp(*k.ValidatorRegexp, val)
}
// Check that the value is not empty