Fix regression from PR233 to allow hyphen in sftpsubsys usernames again #262
Conversation
… with hyphen (-) in them. Dropped the unnecessary escaping of chars and moved hyphen last in line with the standard requirement for regex patterns.
jonasbardino
added this to the
Python3 support for general research data sites milestone
mig/src/libpam-mig/Makefile
Outdated
| @@ -29,7 +29,7 @@ MIG_DEFAULTS=-D'MIG_UID=$(shell id -u mig)' \ | |||
| -D'PASSWORD_MIN_CLASSES=3' \ | |||
| -D'SHARELINK_HOME="$(shell ~mig/mig/server/readconfval.py sharelink_home)"' \ | |||
| -D'SHARELINK_LENGTH=10' \ | |||
| -D'USERNAME_REGEX="^[a-zA-Z0-9][a-zA-Z0-9.@_\\-\\ ]{0,127}$$"' | |||
| -D'USERNAME_REGEX="^[a-zA-Z0-9][a-zA-Z0-9.@_ -]{0,127}$$"' | |||
There was a problem hiding this comment.
I would just add a note that highlights that the hyphen must be at the end, and you have to be careful that it is not being interpreted as part of a range when changed
There was a problem hiding this comment.
Well, we could move the hyphen to the front of the pattern (as in [-a-zA-Z... ]) to avoid any such append confusion, but it is a completely standard regex rule, which we use in hundreds of places and you will encounter elsewhere in the code, in logcheck rules, etc. So I think that's really just one of those need to know things.
There was a problem hiding this comment.
Then I would approve of moving it to the front to avoid the append confusion, because you typically append to the pattern when adding characters. It is a need to know, but often haven to be relearned with time as this PR sort of highlights, so its just to reduce time spent on these
Fix regression from PR233 which caused sftpsubsys to reject usernames with hyphen (
-) in them. Dropped the unnecessary escaping of chars and moved hyphen last in line with the standard requirement for regex patterns.