Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Configuration to specify that a header list is to apply for req… #82

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added Configuration to specify that a header list is to apply for req… #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ModuleFile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'citops-repose'
version '2.6.2'
version '2.6.3'
description "Repose is an api middleware that provides authentication,
filtering, ratelimitting and several other features, this deploys it."
project_page 'https://github.com/rackerlabs/puppet-repose'
Expand Down
1 change: 1 addition & 0 deletions manifests/filter/header_normalization.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
# 'default':
# header_filters => [
# {
# 'direction' => 'request',
# 'http-methods' => 'GET',
# 'blacklists' => [
# {
Expand Down
4 changes: 3 additions & 1 deletion puppet-module-repose.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%define base_name repose

Name: puppet-module-%{user}-%{base_name}
Version: 2.6.2
Version: 2.6.3
Release: 1
BuildArch: noarch
Summary: Puppet module to configure %{base_name}
Expand Down Expand Up @@ -30,6 +30,8 @@ cp -pr * %{buildroot}%{module_dir}/
%{module_dir}

%changelog
* Fri Apr 13 2018 Meynard Alconis <meynard.alconis@rackspace.com> - 2.6.3-1
- Updated header-normalization module to allow definition of blacklist/whitelist for header filters
* Wed Mar 21 2018 Meynard Alconis <meynard.alconis@rackspace.com> - 2.6.2-1
- Fix for header user module and tests
* Mon Mar 19 2018 Meynard Alconis <meynard.alconis@rackspace.com> - 2.6.1-1
Expand Down
142 changes: 141 additions & 1 deletion spec/defines/filter/header_normalization_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,147 @@
with_content(/header id="X-PP-Groups"/).
with_content(/whitelist id="creds"/).
with_content(/header id="X-Auth-Key"/).
with_content(/header id="X-Auth-User"/)
with_content(/header id="X-Auth-User"/).
without_content(/<request>/).
without_content(/<\/request>/).
without_content(/<response>/).
without_content(/<\/response>/)
}
end

context 'with direction for header_filters' do
let(:title) { 'headers' }
let(:params) { {
:header_filters => [
{
'direction' => 'request',
'uri-regex' => '/.*test',
'http-methods' => 'GET',
'blacklists' => [
{
'id' => 'rate-limit-headers',
'headers' => [
'X-PP-User',
'X-PP-Groups'
]
}
],
'whitelists' => [
{
'id' => 'creds',
'headers' => [
'X-Auth-Key',
'X-Auth-User'
]
}
],
}
]
} }
it {
should contain_file('/etc/repose/header-normalization.cfg.xml').
with_content(/uri-regex="\/\.\*test"/).
with_content(/http-methods="GET"/).
with_content(/blacklist id="rate-limit-headers"/).
with_content(/header id="X-PP-User"/).
with_content(/header id="X-PP-Groups"/).
with_content(/whitelist id="creds"/).
with_content(/header id="X-Auth-Key"/).
with_content(/header id="X-Auth-User"/).
with_content(/<request>/).
with_content(/<\/request>/).
without_content(/<response>/)
}
end

context 'with direction response for header_filters' do
let(:title) { 'headers' }
let(:params) { {
:header_filters => [
{
'direction' => 'response',
'uri-regex' => '/.*test',
'http-methods' => 'GET',
'blacklists' => [
{
'id' => 'rate-limit-headers',
'headers' => [
'X-PP-User',
'X-PP-Groups'
]
}
],
'whitelists' => [
{
'id' => 'creds',
'headers' => [
'X-Auth-Key',
'X-Auth-User'
]
}
],
}
]
} }
it {
should contain_file('/etc/repose/header-normalization.cfg.xml').
with_content(/uri-regex="\/\.\*test"/).
with_content(/http-methods="GET"/).
with_content(/blacklist id="rate-limit-headers"/).
with_content(/header id="X-PP-User"/).
with_content(/header id="X-PP-Groups"/).
with_content(/whitelist id="creds"/).
with_content(/header id="X-Auth-Key"/).
with_content(/header id="X-Auth-User"/).
without_content(/<request>/).
without_content(/<\/request>/).
with_content(/<response>/).
with_content(/<\/response>/)
}
end

context 'with two targets direction response for header_filters' do
let(:title) { 'headers' }
let(:params) { {
:header_filters => [
{
'direction' => 'response',
'blacklists' => [
{
'id' => 'rate-limit-headers',
'headers' => [
'X-PP-User',
'X-PP-Groups'
]
}
]
},
{
'direction' => 'request',
'blacklists' => [
{
'id' => 'rate-limit-headers',
'headers' => [
'X-PP-User',
'X-PP-Groups'
]
}
]
}
]
} }
it {
should contain_file('/etc/repose/header-normalization.cfg.xml').
without_content(/uri-regex="\/\.\*test"/).
without_content(/http-methods="GET"/).
with_content(/blacklist id="rate-limit-headers"/).
with_content(/header id="X-PP-User"/).
with_content(/header id="X-PP-Groups"/).
without_content(/whitelist id="creds"/).
with_content(/<request>/).
with_content(/<\/request>/).
with_content(/<response>/).
with_content(/<\/response>/)
}
end

Expand Down
15 changes: 15 additions & 0 deletions templates/header-normalization.cfg.xml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
http-methods="<%= target['http-methods'] %>"
<%- end -%>
>
<%- if target.has_key?('direction') -%>
<%- if target['direction'] == 'request' -%>
<request>
<%- elsif target['direction'] == 'response' -%>
<response>
<%- end -%>
<%- end -%>

<%- if target.has_key?('whitelists') -%>
<%- target['whitelists'].each do |whitelist| -%>
<whitelist id="<%= whitelist['id'] %>">
Expand All @@ -35,6 +43,13 @@
</blacklist>
<%- end -%>
<%- end -%>
<%- if target.has_key?('direction') -%>
<%- if target['direction'] == 'request' -%>
</request>
<%- elsif target['direction'] == 'response' -%>
</response>
<%- end -%>
<%- end -%>
</target>
<%- end -%>
</header-filters>
Expand Down