From abcbf4eada033bd364d685f56e80f0bd07a3f76a Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Tue, 5 Feb 2013 18:09:49 -0800 Subject: Refactor Stanford naming policy, add new file patterns Refactor the Wallet::Policy::Stanford module to pull some of the constants out, and then add data and support in the naming policy for the new file object naming scheme. Change-Id: Iba0c24c119ce529a1d3fd8cd3332335c4433df09 Reviewed-on: https://gerrit.stanford.edu/756 Reviewed-by: Russ Allbery Tested-by: Russ Allbery --- perl/t/stanford-naming.t | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) (limited to 'perl/t/stanford-naming.t') diff --git a/perl/t/stanford-naming.t b/perl/t/stanford-naming.t index ec3760a..2ed8014 100755 --- a/perl/t/stanford-naming.t +++ b/perl/t/stanford-naming.t @@ -16,7 +16,7 @@ use 5.008; use strict; use warnings; -use Test::More tests => 57; +use Test::More tests => 91; use lib 't/lib'; use Util; @@ -38,7 +38,28 @@ my @INVALID_KEYTABS = qw(example host/example service/example.stanford.edu thisistoolong/cgi not-valid/cgi unknown/example.stanford.edu); # Various valid file names. -my @VALID_FILES = qw(apps-example-config-file crcsg-example-db-s_example +my @VALID_FILES = qw(htpasswd/example.stanford.edu/web + password-ipmi/example.stanford.edu + password-root/example.stanford.edu + password-tivoli/example.stanford.edu + ssh-dsa/example.stanford.edu + ssh-rsa/example.stanford.edu + ssl-key/example.stanford.edu + ssl-key/example.stanford.edu/mysql + tivoli-key/example.stanford.edu + config/idg/example/foo + db/idg/example/s_foo + gpg-key/idg/debian + password/idg/example/backup + properties/idg/accounts + properties/idg/accounts/sponsorship + ssl-keystore/idg/accounts + ssl-keystore/idg/accounts/sponsorship + ssl-pkcs12/idg/accounts + ssl-pkcs12/idg/accounts/sponsorship); + +# Various valid legacy file names. +my @VALID_LEGACY_FILES = qw(apps-example-config-file crcsg-example-db-s_example idg-debian-gpg-key idg-devnull-password-root sulair-accounts-properties idg-accounts-ssl-keystore idg-accounts-ssl-pkcs12 crcsg-example-htpasswd-web sulair-example-password-ipmi @@ -47,7 +68,12 @@ my @VALID_FILES = qw(apps-example-config-file crcsg-example-db-s_example idg-openafs-tivoli-key); # Various invalid file names. -my @INVALID_FILES = qw(unknown foo-example-ssh-rsa idg-accounts-foo !!bad); +my @INVALID_FILES = qw(unknown foo-example-ssh-rsa idg-accounts-foo !!bad + htpasswd/example.stanford.edu htpasswd/example password-root/example + password-root/example.stanford.edu/foo ssh-foo/example.stanford.edu + tivoli-key/example.stanford.edu/foo tivoli-key config config/idg + config/idg/example db/idg/example password/idg/example + idg/password/example properties//accounts properties/idg/); # Global variables for the wallet server setup. my $ADMIN = 'admin@EXAMPLE.COM'; @@ -64,6 +90,9 @@ for my $name (@INVALID_KEYTABS) { for my $name (@VALID_FILES) { is(verify_name('file', $name), undef, "Valid file $name"); } +for my $name (@VALID_LEGACY_FILES) { + is(verify_name('file', $name), undef, "Valid file $name"); +} for my $name (@INVALID_FILES) { isnt(verify_name('file', $name), undef, "Invalid file $name"); } -- cgit v1.2.3