Commit fe940a6a authored by Nathan Ward's avatar Nathan Ward
Browse files

Change implementation of "no newlines in secrets" to use a type alias with... 

Change implementation of "no newlines in secrets" to use a type alias with Pattern, and also create a type for passwords
parent d0997eda

manifests/client.pp

+2 −6
Original line number Diff line number Diff line 
# Install FreeRADIUS clients (WISMs or testing servers)

define freeradius::client (

  String $secret,

  Freeradius::Secret $secret,

  Optional[String] $shortname                        = $title,

  Optional[String] $ip                               = undef,

  Optional[String] $ip6                              = undef,
@@ -23,7 +23,7 @@ define freeradius::client ( 
    'other',

  ]] $nastype = undef,

  Optional[String] $login                            = undef,

  Optional[String] $password                         = undef,

  Optional[Freeradius::Password] $password           = undef,

  Optional[String] $coa_server                       = undef,

  Optional[String] $response_window                  = undef,

  Optional[Integer] $max_connections                 = undef,
@@ -42,10 +42,6 @@ define freeradius::client ( 
  $fr_basepath = $::freeradius::params::fr_basepath

  $fr_group    = $::freeradius::params::fr_group



  if ($secret !~ /\A[^\n]+\z/) {

    fail('Secrets cannot have newlines in them')

  }



  file { "${fr_basepath}/clients.d/${shortname}.conf":

    ensure  => $ensure,

    mode    => '0640',

manifests/home_server.pp

+2 −2
Original line number Diff line number Diff line 
# Configure a home_server for proxy config

define freeradius::home_server (

  String $secret,

  Freeradius::Secret $secret,

  Enum['udp', 'tcp'] $proto                              = 'udp',

  Enum['none', 'status-server', 'request'] $status_check = 'none',

  Enum['auth', 'acct', 'auth+acct', 'coa'] $type         = 'auth',
@@ -11,7 +11,7 @@ define freeradius::home_server ( 
  Optional[Integer] $max_outstanding                     = undef,

  Optional[Enum['no', 'yes']] $no_response_fail          = undef,

  Optional[Integer] $num_answers_to_alive                = undef,

  Optional[String] $password                             = undef,

  Optional[Freeradius::Password] $password               = undef,

  Optional[Integer] $port                                = 1812,

  Optional[Integer] $response_window                     = undef,

  Optional[Integer] $revive_interval                     = undef,

manifests/ldap.pp

+1 −1
Original line number Diff line number Diff line 
# Configure LDAP support for FreeRADIUS

define freeradius::ldap (

  String $identity,

  String $password,

  Freeradius::Password $password,

  String $basedn,

  Array[String] $server         = ['localhost'],

  Integer $port                 = 389,

manifests/module/eap.pp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ define freeradius::module::eap ( 
  Optional[String] $gtc_challenge                                   = undef,

  String $gtc_auth_type                                             = 'PAP',

  String $tls_config_name                                           = 'tls-common',

  Optional[String] $tls_private_key_password                        = undef,

  Optional[Freeradius::Password] $tls_private_key_password          = undef,

  String $tls_private_key_file                                      = "\${certdir}/server.pem",

  String $tls_certificate_file                                      = "\${certdir}/server.pem",

  String $tls_ca_file                                               = "\${certdir}/ca.pem",

manifests/module/ldap.pp

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ define freeradius::module::ldap ( 
  Array[String] $server                                               = ['localhost'],

  Integer $port                                                       = 389,

  Optional[String] $identity                                          = undef,

  Optional[String] $password                                          = undef,

  Optional[Freeradius::Password] $password                            = undef,

  Optional[Freeradius::Sasl] $sasl                                    = {},

  Optional[String] $valuepair_attribute                               = undef,

  Optional[Array[String]] $update                                     = undef,