Commit 4feab8a9 authored by Russ Allbery's avatar Russ Allbery
Browse files

Standardize Perl module versions

The versions of all of the wallet Perl modules now match the overall
package version except for Wallet::Schema, which is used to version
the database schema.

Import the test from rra-c-util 5.10 and exclude Wallet::Schema from
the tests.

Go through all Perl modules and standardize the syntax for setting the
version and indicating the required version of Perl.  Fix a few other
syntax issues while I'm in there.
parent 8c9c4205
......@@ -75,6 +75,10 @@ wallet 1.3 (unreleased)
Displays of ACLs and ACL entries are now sorted correctly.
The versions of all of the wallet Perl modules now match the overall
package version except for Wallet::Schema, which is used to version
the database schema.
wallet 1.2 (2014-12-08)
The duo object type has been split into several sub-types, each for a
......
......@@ -19,7 +19,7 @@ my $build = Module::Build->new(
dist_abstract => 'Secure credential management system',
dist_author => 'Russ Allbery <eagle@eyrie.org>',
dist_name => 'Wallet',
dist_version => '1.01',
dist_version => '1.03',
license => 'mit',
module_name => 'Wallet::Server',
recursive_test_files => 1,
......
# Wallet::ACL -- Implementation of ACLs in the wallet system.
# Wallet::ACL -- Implementation of ACLs in the wallet system
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2007, 2008, 2010, 2013, 2014, 2015
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,20 +12,15 @@
##############################################################################
package Wallet::ACL;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw($VERSION);
use Wallet::Object::Base;
use DateTime;
use DBI;
use Wallet::Object::Base;
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.09';
our $VERSION = '1.03';
##############################################################################
# Constructors
......
# Wallet::ACL::Base -- Parent class for wallet ACL verifiers.
# Wallet::ACL::Base -- Parent class for wallet ACL verifiers
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2007, 2010, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,16 +12,12 @@
##############################################################################
package Wallet::ACL::Base;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw($VERSION);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.03';
our $VERSION = '1.03';
##############################################################################
# Interface
......
# Wallet::ACL::External -- Wallet external ACL verifier
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
#
# See LICENSE for licensing terms.
......@@ -10,22 +9,17 @@
##############################################################################
package Wallet::ACL::External;
require 5.008;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use POSIX qw(_exit);
use Wallet::ACL::Base;
use Wallet::Config;
@ISA = qw(Wallet::ACL::Base);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.01';
our @ISA = qw(Wallet::ACL::Base);
our $VERSION = '1.03';
##############################################################################
# Interface
......
# Wallet::ACL::Krb5 -- Wallet Kerberos v5 principal ACL verifier.
# Wallet::ACL::Krb5 -- Wallet Kerberos v5 principal ACL verifier
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2007, 2010, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,20 +12,15 @@
##############################################################################
package Wallet::ACL::Krb5;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use Wallet::ACL::Base;
@ISA = qw(Wallet::ACL::Base);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.02';
our @ISA = qw(Wallet::ACL::Base);
our $VERSION = '1.03';
##############################################################################
# Interface
......
# Wallet::ACL::Krb5::Regex -- Wallet Kerberos v5 principal regex ACL verifier
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2007, 2010, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,20 +12,15 @@
##############################################################################
package Wallet::ACL::Krb5::Regex;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use Wallet::ACL::Krb5;
@ISA = qw(Wallet::ACL::Krb5);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.01';
our @ISA = qw(Wallet::ACL::Krb5);
our $VERSION = '1.03';
##############################################################################
# Interface
......
# Wallet::ACL::LDAP::Attribute -- Wallet LDAP attribute ACL verifier.
# Wallet::ACL::LDAP::Attribute -- Wallet LDAP attribute ACL verifier
#
# Written by Russ Allbery
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2012, 2013, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,23 +12,18 @@
##############################################################################
package Wallet::ACL::LDAP::Attribute;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use Authen::SASL ();
use Authen::SASL;
use Net::LDAP qw(LDAP_COMPARE_TRUE);
use Wallet::ACL::Base;
use Wallet::Config;
@ISA = qw(Wallet::ACL::Base);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.01';
our @ISA = qw(Wallet::ACL::Base);
our $VERSION = '1.03';
##############################################################################
# Interface
......
# Wallet::ACL::LDAP::Attribute::Root -- Wallet LDAP ACL verifier (root instances).
# Wallet::ACL::LDAP::Attribute::Root -- Wallet root instance LDAP ACL verifier
#
# Written by Jon Robertson <jonrober@stanford.edu>
# From Wallet::ACL::NetDB::Root by Russ Allbery <eagle@eyrie.org>
# Based on Wallet::ACL::NetDB::Root by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2015
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -12,21 +13,15 @@
##############################################################################
package Wallet::ACL::LDAP::Attribute::Root;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use Wallet::ACL::LDAP::Attribute;
use Wallet::Config;
@ISA = qw(Wallet::ACL::LDAP::Attribute);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.01';
our @ISA = qw(Wallet::ACL::LDAP::Attribute);
our $VERSION = '1.03';
##############################################################################
# Interface
......
# Wallet::ACL::Nested - ACL class for nesting ACLs
#
# Written by Jon Robertson <jonrober@stanford.edu>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2015
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,20 +12,15 @@
##############################################################################
package Wallet::ACL::Nested;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw($VERSION @ISA);
use Wallet::ACL::Base;
@ISA = qw(Wallet::ACL::Base);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.01';
our @ISA = qw(Wallet::ACL::Base);
our $VERSION = '1.03';
##############################################################################
# Interface
......
# Wallet::ACL::NetDB -- Wallet NetDB role ACL verifier.
# Wallet::ACL::NetDB -- Wallet NetDB role ACL verifier
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2007, 2010, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,21 +12,16 @@
##############################################################################
package Wallet::ACL::NetDB;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use Wallet::ACL::Base;
use Wallet::Config;
@ISA = qw(Wallet::ACL::Base);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.05';
our @ISA = qw(Wallet::ACL::Base);
our $VERSION = '1.03';
##############################################################################
# Interface
......
# Wallet::ACL::NetDB::Root -- Wallet NetDB role ACL verifier (root instances).
# Wallet::ACL::NetDB::Root -- Wallet NetDB role ACL verifier (root instances)
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2007, 2010, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,21 +12,15 @@
##############################################################################
package Wallet::ACL::NetDB::Root;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use Wallet::ACL::NetDB;
use Wallet::Config;
@ISA = qw(Wallet::ACL::NetDB);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.02';
our @ISA = qw(Wallet::ACL::NetDB);
our $VERSION = '1.03';
##############################################################################
# Interface
......
# Wallet::Admin -- Wallet system administrative interface.
# Wallet::Admin -- Wallet system administrative interface
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,19 +12,15 @@
##############################################################################
package Wallet::Admin;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw($VERSION);
use Wallet::ACL;
use Wallet::Schema;
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.08';
our $VERSION = '1.03';
# The last non-DBIx::Class version of Wallet::Schema. If a database has no
# DBIx::Class versioning, we artificially install this version number before
......
# Wallet::Config -- Configuration handling for the wallet server.
# Wallet::Config -- Configuration handling for the wallet server
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
......@@ -8,19 +8,15 @@
# See LICENSE for licensing terms.
package Wallet::Config;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw($PATH $VERSION);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.06';
our $VERSION = '1.03';
# Path to the config file to load.
$PATH = $ENV{WALLET_CONFIG} || '/etc/wallet/wallet.conf';
our $PATH = $ENV{WALLET_CONFIG} || '/etc/wallet/wallet.conf';
=head1 NAME
......
# Wallet::Database -- Wallet system database connection management.
# Wallet::Database -- Wallet system database connection management
#
# This module is a thin wrapper around DBIx::Class to handle determination
# of the database configuration settings automatically on connect. The
......@@ -6,6 +6,7 @@
# like DBIx::Class objects in the rest of the code.
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2008, 2009, 2010, 2012, 2013, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -16,21 +17,16 @@
##############################################################################
package Wallet::Database;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use Wallet::Schema;
use Wallet::Config;
use Wallet::Schema;
@ISA = qw(Wallet::Schema);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.04';
our @ISA = qw(Wallet::Schema);
our $VERSION = '1.03';
##############################################################################
# Core overrides
......
# Wallet::Kadmin -- Kerberos administration API for wallet keytab backend.
# Wallet::Kadmin -- Kerberos administration API for wallet keytab backend
#
# Written by Jon Robertson <jonrober@stanford.edu>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2009, 2010, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,18 +12,14 @@
##############################################################################
package Wallet::Kadmin;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw($VERSION);
use Wallet::Config ();
use Wallet::Config;
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.03';
our $VERSION = '1.03';
##############################################################################
# Utility functions for child classes
......
# Wallet::Kadmin::AD -- Wallet Kerberos administration API for AD.
# Wallet::Kadmin::AD -- Wallet Kerberos administration API for AD
#
# Written by Bill MacAllister <bill@ca-zephyr.org>
# Based on work by Russ Allbery <eagle@eyrie.org> and
# Jon Robertson <jonrober@stanford.edu>
# Copyright 2015
# Dropbox
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2015 Dropbox, Inc.
# Copyright 2007, 2008, 2009, 2010, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
# See LICENSE for licensing terms.
......@@ -13,26 +13,20 @@
##############################################################################
package Wallet::Kadmin::AD;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use Wallet::Config ();
use Wallet::Kadmin ();
use Authen::SASL ();
use Authen::SASL;
use Net::LDAP;
use IPC::Run qw( run timeout );
use Sys::Syslog qw( :standard :macros );
@ISA = qw(Wallet::Kadmin);
use IPC::Run qw(run timeout);
use Sys::Syslog qw(:standard :macros);
use Wallet::Config;
use Wallet::Kadmin;
# This version should be increased on any code change to this module.
# Always use two digits for the minor version with a leading zero if
# necessary so that it will sort properly.
$VERSION = '0.02';
our @ISA = qw(Wallet::Kadmin);
our $VERSION = '1.03';
##############################################################################
# kadmin Interaction
......
# Wallet::Kadmin::Heimdal -- Wallet Kerberos administration API for Heimdal.
# Wallet::Kadmin::Heimdal -- Wallet Kerberos administration API for Heimdal
#
# Written by Jon Robertson <jonrober@stanford.edu>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2009, 2010, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,22 +12,17 @@
##############################################################################
package Wallet::Kadmin::Heimdal;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use Heimdal::Kadm5 qw(KRB5_KDB_DISALLOW_ALL_TIX);
use Wallet::Config ();
use Wallet::Kadmin ();
use Wallet::Config;
use Wallet::Kadmin;
@ISA = qw(Wallet::Kadmin);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.04';
our @ISA = qw(Wallet::Kadmin);
our $VERSION = '1.03';
##############################################################################
# Utility functions
......
# Wallet::Kadmin::MIT -- Wallet Kerberos administration API for MIT.
# Wallet::Kadmin::MIT -- Wallet Kerberos administration API for MIT
#
# Written by Russ Allbery <eagle@eyrie.org>
# Pulled into a module by Jon Robertson <jonrober@stanford.edu>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2007, 2008, 2009, 2010, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -12,22 +13,17 @@
##############################################################################
package Wallet::Kadmin::MIT;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw(@ISA $VERSION);
use POSIX qw(_exit);
use Wallet::Config ();
use Wallet::Kadmin ();
use Wallet::Config;
use Wallet::Kadmin;
@ISA = qw(Wallet::Kadmin);
# This version should be increased on any code change to this module. Always
# use two digits for the minor version with a leading zero if necessary so
# that it will sort properly.
$VERSION = '0.03';
our @ISA = qw(Wallet::Kadmin);
our $VERSION = '1.03';
##############################################################################
# kadmin Interaction
......
# Wallet::Object::Base -- Parent class for any object stored in the wallet.
# Wallet::Object::Base -- Parent class for any object stored in the wallet
#
# Written by Russ Allbery <eagle@eyrie.org>
# Copyright 2016 Russ Allbery <eagle@eyrie.org>
# Copyright 2007, 2008, 2010, 2011, 2014
# The Board of Trustees of the Leland Stanford Junior University
#
......@@ -11,22 +12,17 @@
##############################################################################
package Wallet::Object::Base;
require 5.006;
use 5.008;
use strict;
use warnings;
use vars qw($VERSION);
use DateTime;
use Date::Parse qw(str2time);
use DBI;
use Text::Wrap qw(wrap);
use Wallet::ACL;