forked from CERIT-SC/puppet-yum
-
-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Be more strict about versionlock strings
This commit locks down the versionlock defined type using a more comprehensive regular expression, storing the Pattern in a type alias. Previously two simple regular expressions were used, but they allowed for invalid inputs with wildcards that spanned multiple fields-- wildcards are only permitted within an individual field.
- Loading branch information
1 parent
d286606
commit eb3924a
Showing
3 changed files
with
55 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# This type matches strings appropriate for use with yum-versionlock. | ||
# Its basic format, using the `rpm(8)` query string format, is | ||
# `%{EPOCH}:%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}`. As a Regex, it | ||
# breaks down into five distinct parts, plus the seperators. | ||
# | ||
# # EPOCH: An unsigned integer | ||
# type Yum::PackageEpoch = Regexp[/[0-9]\*]+/] | ||
# | ||
# # NAME: Any valid package name (see https://github.com/rpm-software-management/rpm/blob/master/doc/manual/spec) | ||
# type Yum::PackageName = Regexp[/[0-9a-zA-Z\._\+%\{\}\*-]+/] | ||
# | ||
# # VERSION: Any valid version string. The only limitation here, according to the RPM manual, is that it may not contain a dash (`-`). | ||
# type Yum::PackageVersion = Regexp[/[^-]+/] | ||
# | ||
# # RELEASE: An unsigned integer | ||
# type Yum::PackageRelease = Regexp[/[0-9\*]+/] | ||
# | ||
# # ARCH: Matches a string such as `el7.x86_64`. This is actuall two sub-expressions. See below. | ||
# type Yum::PackageArch = Regexp[/([0-9a-zZ-Z_\*]+)(?:\.(noarch|x86_64|i386|arm|ppc64|ppc64le|sparc64|ia64|alpha|ip|m68k|mips|mipsel|mk68k|mint|ppc|rs6000|s390|s390x|sh|sparc|xtensa|\*))?/] | ||
# | ||
# The `%{ARCH}` sub-expression is composed of two sub-expressions | ||
# separated by a dot (`.`), where the second part is optional. The RPM | ||
# specification calls the first field the `DistTag`, and the second the | ||
# `BuildArch`. | ||
# | ||
# # DistTag: Any string consiting of only letters, numbers, or an underscore, e.g., `el6`, `sl7`, or `fc24`. | ||
# type Yum::PackageDistTag = Regexp[/[0-9a-zZ-Z_\*]+/] | ||
# | ||
# # BuildArch: Any string from the list at https://github.com/rpm-software-management/rpm/blob/master/rpmrc.in. Strings are roughly listed from most common to least common to improve performance. | ||
# type Yum::PackageBuildArch = Regexp[/noarch|x86_64|i386|arm|ppc64|ppc64le|sparc64|ia64|alpha|ip|m68k|mips|mipsel|mk68k|mint|ppc|rs6000|s390|s390x|sh|sparc|xtensa/] | ||
# | ||
# @note Each field may contain wildcard characters (`*`), but the | ||
# wildcard characters may not span the fields, may not cover the | ||
# seperators. This is an undocumented but tested limitation of | ||
# yum-versionlock. | ||
# | ||
type Yum::VersionlockString = Pattern[/^([0-9\*]+):([0-9a-zA-Z\._\+%\{\}\*-]+)-([^-]+)-([0-9\*]+)\.(([0-9a-zZ-Z_\*]+)(?:\.(noarch|x86_64|i386|arm|ppc64|ppc64le|sparc64|ia64|alpha|ip|m68k|mips|mipsel|mk68k|mint|ppc|rs6000|s390|s390x|sh|sparc|xtensa|\*))?)$/] |