From 4cd8911387cebfe8490e58d198ed8de85bc115c5 Mon Sep 17 00:00:00 2001 From: Tobias Wolf Date: Thu, 15 May 2025 17:48:28 +0200 Subject: [PATCH] Parse `cname` without any separators correctly Signed-off-by: Tobias Wolf --- src/gardenlinux/features/__main__.py | 2 +- src/gardenlinux/features/cname_main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gardenlinux/features/__main__.py b/src/gardenlinux/features/__main__.py index 0c2a3378..4d3bde56 100644 --- a/src/gardenlinux/features/__main__.py +++ b/src/gardenlinux/features/__main__.py @@ -61,7 +61,7 @@ def main(): if args.cname: re_match = re.match( - "([a-zA-Z0-9]+([\\_\\-][a-zA-Z0-9]+)+?)(-([a-z0-9]+)(-([a-z0-9.]+)-([a-z0-9]+))*)?$", + "([a-zA-Z0-9]+([\\_\\-][a-zA-Z0-9]+)*?)(-([a-z0-9]+)(-([a-z0-9.]+)-([a-z0-9]+))*)?$", args.cname, ) diff --git a/src/gardenlinux/features/cname_main.py b/src/gardenlinux/features/cname_main.py index 5743f13d..9f05fd23 100644 --- a/src/gardenlinux/features/cname_main.py +++ b/src/gardenlinux/features/cname_main.py @@ -26,7 +26,7 @@ def main(): args = parser.parse_args() re_match = re.match( - "([a-zA-Z0-9]+([\\_\\-][a-zA-Z0-9]+)+?)(-([a-z0-9]+)(-([a-z0-9.]+)-([a-z0-9]+))*)?$", + "([a-zA-Z0-9]+([\\_\\-][a-zA-Z0-9]+)*?)(-([a-z0-9]+)(-([a-z0-9.]+)-([a-z0-9]+))*)?$", args.cname, )