Skip to content

Commit

Permalink
Merge pull request #90 from greenbone/mergify/bp/main/pr-88
Browse files Browse the repository at this point in the history
Fix: Fix regex for new glib2.0 >= 2.73.2 (backport #88)
  • Loading branch information
bjoernricks committed Oct 12, 2022
2 parents cbf1280 + 7058ae9 commit 62c4c91
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/gsad.c
Expand Up @@ -480,7 +480,7 @@ init_validator ()
gvm_validator_add (validator, "asset_name", "(?s)^.*$");
gvm_validator_add (validator, "asset_type", "^(host|os)$");
gvm_validator_add (validator, "asset_id",
"^([[:alnum:]-_.:\\/~()']|&)+$");
"^([[:alnum:]\\-_.:\\/~()']|&)+$");
gvm_validator_add (validator, "auth_algorithm", "^(md5|sha1)$");
gvm_validator_add (validator, "auth_method", "^(0|1|2)$");
/* Defined in RFC 2253. */
Expand Down Expand Up @@ -595,7 +595,7 @@ init_validator ()
gvm_validator_add (validator, "list_fname",
"^([[:alnum:]_-]|%[%CcDFMmNTtUu])+$");
/* Used for users, credentials, and scanner login name. */
gvm_validator_add (validator, "login", "^[[:alnum:]-_@.]+$");
gvm_validator_add (validator, "login", "^[[:alnum:]\\-_@.]+$");
gvm_validator_add (validator, "lsc_password", "^.*$");
gvm_validator_add (validator, "max_result", "^[0-9]+$");
gvm_validator_add (validator, "max_groups", "^-?[0-9]+$");
Expand All @@ -605,10 +605,11 @@ init_validator ()
gvm_validator_add (validator, "note_required", "(?s)^(.)+$");
gvm_validator_add (validator, "note_id", "^[a-z0-9\\-]+$");
gvm_validator_add (validator, "override_id", "^[a-z0-9\\-]+$");
gvm_validator_add (validator, "name", "^[#-_[:alnum:], \\./]*$");
gvm_validator_add (validator, "name", "^[#\\-_[:alnum:], \\./]*$");
gvm_validator_add (validator, "info_name", "(?s)^.*$");
gvm_validator_add (validator, "info_type", "(?s)^.*$");
gvm_validator_add (validator, "info_id", "^([[:alnum:]-_.:\\/~()']|&)+$");
gvm_validator_add (validator, "info_id",
"^([[:alnum:]\\-_.:\\/~()']|&)+$");
gvm_validator_add (validator, "details", "^[0-1]$");
/* Number is special cased in params_mhd_validate to remove the space. */
gvm_validator_add (validator, "number", "^ *[0-9]+ *$");
Expand Down Expand Up @@ -660,7 +661,7 @@ init_validator ()
"filter|group|host|info|nvt|note|os|ovaldef|override|permission|port_list|"
"report|report_format|result|role|scanner|schedule|tag|target|task|ticket|"
"tls_certificate|user|vuln|)$");
gvm_validator_add (validator, "resource_id", "^[[:alnum:]-_.:\\/~]*$");
gvm_validator_add (validator, "resource_id", "^[[:alnum:]\\-_.:\\/~]*$");
gvm_validator_add (validator, "resources_action", "^(|add|set|remove)$");
gvm_validator_add (
validator, "optional_resource_type",
Expand Down Expand Up @@ -719,7 +720,7 @@ init_validator ()
gvm_validator_add (validator, "uuid", "^[0-9abcdefABCDEF\\-]{1,40}$");
gvm_validator_add (validator, "usage_type", "^(audit|policy|scan|)$");
/* This must be "login" with space and comma. */
gvm_validator_add (validator, "users", "^[[:alnum:]-_@., ]*$");
gvm_validator_add (validator, "users", "^[[:alnum:]\\-_@., ]*$");
gvm_validator_add (validator, "x_field", "^[\\[\\]_[:alnum:]]+$");
gvm_validator_add (validator, "y_fields:name", "^[0-9]+$");
gvm_validator_add (validator, "y_fields:value", "^[\\[\\]_[:alnum:]]+$");
Expand Down

0 comments on commit 62c4c91

Please sign in to comment.