From owner-svn-ports-head@freebsd.org Wed Jan 23 16:03:34 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3976C14ABEEE; Wed, 23 Jan 2019 16:03:34 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C9F6D8069D; Wed, 23 Jan 2019 16:03:33 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B08F51B023; Wed, 23 Jan 2019 16:03:33 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0NG3XGb057838; Wed, 23 Jan 2019 16:03:33 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0NG3Xx4057836; Wed, 23 Jan 2019 16:03:33 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201901231603.x0NG3Xx4057836@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Wed, 23 Jan 2019 16:03:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491045 - in head/security/vuxml: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zi X-SVN-Commit-Paths: in head/security/vuxml: . files X-SVN-Commit-Revision: 491045 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C9F6D8069D X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.97)[-0.974,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jan 2019 16:03:34 -0000 Author: zi Date: Wed Jan 23 16:03:33 2019 New Revision: 491045 URL: https://svnweb.freebsd.org/changeset/ports/491045 Log: - Add package name validation Modified: head/security/vuxml/Makefile head/security/vuxml/files/extra-validation.py Modified: head/security/vuxml/Makefile ============================================================================== --- head/security/vuxml/Makefile Wed Jan 23 15:10:37 2019 (r491044) +++ head/security/vuxml/Makefile Wed Jan 23 16:03:33 2019 (r491045) @@ -3,7 +3,7 @@ PORTNAME= vuxml PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security textproc MASTER_SITES= http://www.vuxml.org/dtd/vuxml-1/ DISTFILES= vuxml-10.dtd vuxml-model-10.mod \ Modified: head/security/vuxml/files/extra-validation.py ============================================================================== --- head/security/vuxml/files/extra-validation.py Wed Jan 23 15:10:37 2019 (r491044) +++ head/security/vuxml/files/extra-validation.py Wed Jan 23 16:03:33 2019 (r491045) @@ -11,6 +11,7 @@ if len(sys.argv) != 2: sys.exit(1) re_date = re.compile(r'^(19|20)[0-9]{2}-[0-9]{2}-[0-9]{2}$') +re_invalid_package_name = re.compile('[@!#$%^&*()<>?/\|}{~:]') # warn if description has more than X characters DESCRIPTION_LENGTH = 5000 @@ -88,5 +89,16 @@ for vuln in root: if description_len > DESCRIPTION_LENGTH: print("Warning: description too long ({0} chars, {1} is warning threshold): {2})" \ .format(description_len, DESCRIPTION_LENGTH, vid)) + + # Walk and validate package names + affects = vuln.find(namespace + "affects") + packages = affects.findall(namespace + "package") + for package in packages: + names = package.findall(namespace + "name") + + for name in names: + if (re_invalid_package_name.search(name.text) is not None): + print("Error: invalid package name: " + name.text + " for VID " + format(vid)) + ret = 1 sys.exit(ret)