From 654cad4d9dc4e87d72beb110032b61d4dfc963e4 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 8 Oct 2020 15:39:52 -0700 Subject: [PATCH] Also trim "~..." from AppArmor versions Signed-off-by: Tianon Gravi --- pkg/aaparser/aaparser.go | 2 ++ pkg/aaparser/aaparser_test.go | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/pkg/aaparser/aaparser.go b/pkg/aaparser/aaparser.go index 50ada7f788..2b5a2605f9 100644 --- a/pkg/aaparser/aaparser.go +++ b/pkg/aaparser/aaparser.go @@ -58,6 +58,8 @@ func parseVersion(output string) (int, error) { // trim "-beta1" suffix from version="3.0.0-beta1" if exists version = strings.SplitN(version, "-", 2)[0] + // also trim "~..." suffix used historically (https://gitlab.com/apparmor/apparmor/-/commit/bca67d3d27d219d11ce8c9cc70612bd637f88c10) + version = strings.SplitN(version, "~", 2)[0] // split by major minor version v := strings.Split(version, ".") diff --git a/pkg/aaparser/aaparser_test.go b/pkg/aaparser/aaparser_test.go index 64ec814729..cf9280f5f5 100644 --- a/pkg/aaparser/aaparser_test.go +++ b/pkg/aaparser/aaparser_test.go @@ -43,6 +43,14 @@ Copyright 2009-2012 Canonical Ltd. `, version: 205000, }, + { + output: `AppArmor parser version 2.2.0~rc2 +Copyright (C) 1999-2008 Novell Inc. +Copyright 2009-2012 Canonical Ltd. + +`, + version: 202000, + }, { output: `AppArmor parser version 2.9.95 Copyright (C) 1999-2008 Novell Inc.