Unverified Commit ecd70e23 authored by Nathan Ward's avatar Nathan Ward Committed by GitHub
Browse files

Merge pull request #167 from JanderII/main 

Add virtual servers to listeners and add 'relaxed' option to attr_filter
parents 25e0fc42 3591a106

README.md

+4 −0
Original line number Diff line number Diff line
@@ -233,6 +233,10 @@ freeradius::attr { 'eduroamlocal': 
}

```



##### `relaxed`

Whether the filter removes or copies unmatched attributes, relaxed = no or yes respectively. An undefined value results in no

explicit statement, causing the default behaviour of FreeRADIUS equivalent to 'relaxed = no'. Default: `undef`.



#### `freeradius::blank`



Selectively blank certain stock config files that aren't required. This is preferable to deleting them

manifests/attr.pp

+4 −3
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ define freeradius::attr ( 
  Freeradius::Ensure $ensure             = present,

  Optional[String] $key                  = 'User-Name',

  Optional[String] $prefix               = 'filter',

  Optional[Freeradius::Boolean] $relaxed = undef,

) {

  $fr_package          = $::freeradius::params::fr_package

  $fr_service          = $::freeradius::params::fr_service

manifests/listen.pp

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ define freeradius::listen ( 
  Optional[String] $ip6                                     = undef,

  Integer $port                                             = 0,

  Optional[String] $interface                               = undef,

  Optional[String] $virtual_server                          = undef,

  Array[String] $clients                                    = [],

  Integer $max_connections                                  = 16,

  Integer $lifetime                                         = 0,

spec/defines/attr_spec.rb

+23 −0
Original line number Diff line number Diff line
@@ -26,7 +26,30 @@ describe 'freeradius::attr' do 
  it do

    is_expected.to contain_concat__fragment('attr-test')

      .with_content(%r{^attr_filter filter.test {\n\s+key = "\%{User-Name}"\n\s+filename = \${modconfdir}/\${\.:name}/test\n}})

      .without_content(%r{^\s+relaxed\s+.*$})

      .with_order('20')

      .with_target('/etc/raddb/mods-available/attr_filter')

  end



  context 'with relaxed = no' do

    let(:params) do

      super().merge(relaxed: 'no')

    end



    it do

      is_expected.to contain_concat__fragment('attr-test')

        .with_content(%r{^\s+relaxed\s+=\s+no$})

    end

  end



  context 'with relaxed = yes' do

    let(:params) do

      super().merge(relaxed: 'yes')

    end



    it do

      is_expected.to contain_concat__fragment('attr-test')

        .with_content(%r{^\s+relaxed\s+=\s+yes$})

    end

  end

end

templates/attr.erb

+3 −0
Original line number Diff line number Diff line 
attr_filter <%= @prefix %>.<%= @name %> {

	key = "%{<%= @key %>}"

	filename = ${modconfdir}/${.:name}/<%= @name %>

<% if defined?(@relaxed) -%>

	relaxed = <%= @relaxed %>

<% end -%>

}