Skip to content

Add MellonSetEnv support #2423

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

Merged
merged 3 commits into from
Jul 20, 2023
Merged

Add MellonSetEnv support #2423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cd6c14
Add MellonSetEnv support
codedevian Jun 12, 2023
57dd96c
Add Mellon unit tests
codedevian Jul 12, 2023
6de78a4
disable RSpec/ExampleLength for examples to stop ci failure
codedevian Jul 13, 2023
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
27 changes: 27 additions & 0 deletions spec/defines/vhost_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,21 @@
'ssl_verify_client' => 'optional',
'ssl_verify_depth' => 10
},
{
'path' => '/private_2',
'provider' => 'location',
'mellon_enable' => 'auth',
'mellon_sp_private_key_file' => '/etc/httpd/mellon/example.com_mellon.key',
'mellon_sp_cert_file' => '/etc/httpd/mellon/example.com_mellon.crt',
'mellon_sp_metadata_file' => '/etc/httpd/mellon/example.com_sp_mellon.xml',
'mellon_idp_metadata_file' => '/etc/httpd/mellon/example.com_idp_mellon.xml',
'mellon_set_env' => { 'isMemberOf' => 'urn:oid:1.3.6.1.4.1.5923.1.5.1.1' },
'mellon_set_env_no_prefix' => { 'isMemberOf' => 'urn:oid:1.3.6.1.4.1.5923.1.5.1.1' },
'mellon_user' => 'urn:oid:0.9.2342.19200300.100.1.1',
'mellon_saml_response_dump' => 'Off',
'mellon_cond' => ['isMemberOf "cn=example-access,ou=Groups,o=example,o=com" [MAP]'],
'mellon_session_length' => '300'
},
],
'error_log' => false,
'error_log_file' => 'httpd_error_log',
Expand Down Expand Up @@ -613,6 +628,7 @@
it { is_expected.to contain_concat__fragment('rspec.example.com-itk') }
it { is_expected.to contain_concat__fragment('rspec.example.com-fallbackresource') }

# rubocop:disable RSpec/ExampleLength
it {
expect(subject).to contain_concat__fragment('rspec.example.com-directories')
.with_content(%r{^\s+<Proxy "\*">$})
Expand Down Expand Up @@ -721,7 +737,18 @@
.with_content(%r{^\s+GssapiUseSessions\sOn$})
.with_content(%r{^\s+SSLVerifyClient\soptional$})
.with_content(%r{^\s+SSLVerifyDepth\s10$})
.with_content(%r{^\s+MellonEnable\s"auth"$})
.with_content(%r{^\s+MellonSPPrivateKeyFile\s"/etc/httpd/mellon/example\.com_mellon\.key"$})
.with_content(%r{^\s+MellonSPCertFile\s"/etc/httpd/mellon/example\.com_mellon\.crt"$})
.with_content(%r{^\s+MellonSPMetadataFile\s"/etc/httpd/mellon/example\.com_sp_mellon\.xml"$})
.with_content(%r{^\s+MellonIDPMetadataFile\s"/etc/httpd/mellon/example\.com_idp_mellon\.xml"$})
.with_content(%r{^\s+MellonSetEnv\s"isMemberOf"\s"urn:oid:1\.3\.6\.1\.4\.1\.5923\.1\.5\.1\.1"$})
.with_content(%r{^\s+MellonSetEnvNoPrefix\s"isMemberOf"\s"urn:oid:1\.3\.6\.1\.4\.1\.5923\.1\.5\.1\.1"$})
.with_content(%r{^\s+MellonUser\s"urn:oid:0\.9\.2342\.19200300\.100\.1\.1"$})
.with_content(%r{^\s+MellonCond\sisMemberOf\s"cn=example-access,ou=Groups,o=example,o=com"\s\[MAP\]$})
.with_content(%r{^\s+MellonSessionLength\s"300"$})
}
# rubocop:enable RSpec/ExampleLength

it { is_expected.to contain_concat__fragment('rspec.example.com-additional_includes') }

Expand Down
5 changes: 5 additions & 0 deletions templates/vhost/_directories.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,11 @@
<%- if directory['mellon_idp_metadata_file'] -%>
MellonIDPMetadataFile "<%= directory['mellon_idp_metadata_file'] %>"
<%- end -%>
<%- if directory['mellon_set_env'] -%>
<%- directory['mellon_set_env'].each do |key, value| -%>
MellonSetEnv "<%= key %>" "<%= value %>"
<%- end -%>
<%- end -%>
<%- if directory['mellon_set_env_no_prefix'] -%>
<%- directory['mellon_set_env_no_prefix'].each do |key, value| -%>
MellonSetEnvNoPrefix "<%= key %>" "<%= value %>"
Expand Down