Skip to content

Fix file_line bug and migrate to validate_legacy #2

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

Open
mattock wants to merge 3 commits into
base: 1_6_0
Choose a base branch
from
Open

Fix file_line bug and migrate to validate_legacy #2

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
e3e7b9a
Migrate to validate_legacy functions
mattock Sep 29, 2017
0a61c29
Correctly detect Apache Location directive
mattock Sep 29, 2017
01d9a48
Merge pull request #1 from mattock/1_6_0
mattock Sep 29, 2017
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
4 changes: 2 additions & 2 deletions manifests/config/webui.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
path => '/etc/httpd/conf.d/ipa.conf',
line => " <If \"%{HTTP_HOST} != '${proxy_server_external_fqdn_and_port}'\">",
notify => Service['httpd'],
after => '<Location\ "/ipa">',
after => '^<Location\ "/ipa">',
}

file_line{'disable_kerberos_via_if_2':
Expand All @@ -59,4 +59,4 @@
after => 'ErrorDocument\ 401\ /ipa/errors/unauthorized.html',
}
}
}
}
22 changes: 6 additions & 16 deletions manifests/validate_params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
}

if $easy_ipa::ip_address != '' {
# TODO: validate_legacy
if !is_ipv4_address($easy_ipa::ip_address) {
fail('The parameter ip_address must pass validation as an IPv4 address.')
}
validate_legacy('String', 'validate_ip_address', $easy_ipa::ip_address)
}

if $easy_ipa::manage_host_entry {
Expand All @@ -25,15 +22,8 @@
fail('Parameter "idstart" must be an integer greater than 10000.')
}

# TODO: validate_legacy
if ! is_domain_name($easy_ipa::domain) {
fail('The parameter \'domain\' must pass validation as a domain name.')
}

# TODO: validate_legacy
if ! is_domain_name($easy_ipa::final_realm) {
fail('The parameter \'realm\' must pass validation as a domain name.')
}
validate_legacy('String', 'validate_domain_name', $easy_ipa::domain)
validate_legacy('String', 'validate_domain_name', $easy_ipa::final_realm)

if $easy_ipa::ipa_role == 'master' {
if length($easy_ipa::admin_password) < 8 {
Expand All @@ -53,12 +43,12 @@
# TODO: validate_legacy
if $easy_ipa::ipa_master_fqdn == ''{
fail("When creating a ${easy_ipa::ipa_role} the parameter named ipa_master_fqdn cannot be empty.")
} elsif !is_domain_name($easy_ipa::ipa_master_fqdn) {
fail('The parameter \'ipa_master_fqdn\' must pass validation as a domain name.')
}

validate_legacy('String', 'validate_domain_name', $easy_ipa::ipa_master_fqdn)

if $easy_ipa::final_domain_join_password == '' {
fail("When creating a ${easy_ipa::ipa_role} the parameter named domain_join_password cannot be empty.")
}
}
}
}