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.

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

(#69) Stopped managing /etc/security/opasswd in this module #70

Merged
merged 1 commit into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Tue Feb 06 2024 Mike Riddle <[email protected]> - 1.0.0
- Stopped controlling /etc/security/opasswd through this module in favor of the SIMP PAM module

* Mon Oct 23 2023 Steven Pritchard <[email protected]> - 0.10.0
- [puppetsync] Add EL9 support

Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
3. [Usage - Configuration options and additional functionality](#usage)
4. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
5. [Limitations - OS compatibility, etc.](#limitations)
6. [Development - Guide for contributing to the module](#development)
6. [Deprecations](#deprecations)
7. [Development - Guide for contributing to the module](#development)
* [Acceptance Tests - Beaker env variables](#acceptance-tests)


Expand Down Expand Up @@ -53,7 +54,6 @@ This module can configure:
* `/etc/passwd-`
* `/etc/profile.d/`
* `/etc/securetty`
* `/etc/security/opasswd`
* `/etc/shadow`
* `/etc/shadow-`
* `/etc/shells`
Expand Down Expand Up @@ -88,6 +88,9 @@ Each file can be managed or unmanaged individually, using the following variable

Please refer to the [REFERENCE.md](./REFERENCE.md).

## Deprecations

As of version 1.0.0, this module will no longer manage `/etc/security/opasswd`. Version 7.0.0 and above of the [SIMP PAM Module](https://github.com/simp/pupmod-simp-pam) will allow users to specify the file they wish to store historical passwords in.

## Limitations

Expand Down
54 changes: 24 additions & 30 deletions manifests/passwd.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@
# author: SIMP Team <[email protected]>
#
class useradd::passwd {

# CCE-26953-0
# CCE-26856-5
# CCE-26868-0
file { [
'/etc/passwd',
'/etc/passwd-'
]:
owner => 'root',
group => 'root',
mode => '0644'
'/etc/passwd',
'/etc/passwd-',
]:
owner => 'root',
group => 'root',
mode => '0644',
}

# CCE-26947-2
Expand All @@ -22,33 +21,28 @@
# CCE-27026-4
# CCE-26975-3
# CCE-26951-4
file { [
'/etc/shadow',
'/etc/shadow-',
'/etc/gshadow',
'/etc/gshadow-'
]:
owner => 'root',
group => 'root',
mode => '0000'
file {
[
'/etc/shadow',
'/etc/shadow-',
'/etc/gshadow',
'/etc/gshadow-',
]:
owner => 'root',
group => 'root',
mode => '0000',
}

# CCE-26822-7
# CCE-26930-8
# CCE-26954-8
file { [
'/etc/group',
'/etc/group-'
]:
owner => 'root',
group => 'root',
mode => '0644'
file {
[
'/etc/group',
'/etc/group-',
]:
owner => 'root',
group => 'root',
mode => '0644',
}

file { '/etc/security/opasswd':
owner => 'root',
group => 'root',
mode => '0600'
}

}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simp-useradd",
"version": "0.10.0",
"version": "1.0.0",
"author": "SIMP Team",
"summary": "A SIMP puppet module for managing settings regarding users and user creation",
"license": "Apache-2.0",
Expand Down
14 changes: 2 additions & 12 deletions spec/acceptance/suites/default/00_default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class { 'useradd':
}

it 'should modify files to test management' do
on(server, 'chmod 777 /etc/passwd /etc/passwd- /etc/shadow /etc/shadow- /etc/gshadow /etc/gshadow- /etc/group /etc/group- /etc/security/opasswd')
on(server, 'chmod 777 /etc/passwd /etc/passwd- /etc/shadow /etc/shadow- /etc/gshadow /etc/gshadow- /etc/group /etc/group-')
on(server, 'echo "management_test" | tee -a /etc/profile.d/simp.sh /etc/profile.d/simp.csh /etc/libuser.conf /etc/default/nss /etc/sysconfig/init /etc/login.defs /etc/default/useradd > /dev/null')
end

Expand Down Expand Up @@ -111,11 +111,6 @@ class { 'useradd':
on(server, 'stat -c "%a %n" /etc/group-').output.strip
expect(stdout).to match(%r(777 /etc/group-))
end

it 'should not manage /etc/security/opasswd' do
on(server, 'stat -c "%a %n" /etc/security/opasswd').output.strip
expect(stdout).to match(%r(777 /etc/security/opasswd))
end
end

context 'default parameters (management)' do
Expand Down Expand Up @@ -205,11 +200,6 @@ class { 'useradd':
expect(stdout).to match(%r(644 /etc/group-))
end

it 'should manage /etc/security/opasswd' do
on(server, 'stat -c "%a %n" /etc/security/opasswd').output.strip
expect(stdout).to match(%r(600 /etc/security/opasswd))
end

it '/etc/securetty should be empty' do
on(server, 'cat /etc/securetty').output.strip
expect(stdout).to include('tty0', 'tty1', 'tty2', 'tty3', 'tty4')
Expand Down Expand Up @@ -324,7 +314,7 @@ class { 'useradd::login_defs':
end

it 'should update new user accounts' do
on(server, 'chmod 777 /etc/passwd /etc/passwd- /etc/shadow /etc/shadow- /etc/gshadow /etc/gshadow- /etc/group /etc/group- /etc/security/opasswd')
on(server, 'chmod 777 /etc/passwd /etc/passwd- /etc/shadow /etc/shadow- /etc/gshadow /etc/gshadow- /etc/group /etc/group-')
on(server, 'useradd defsuser -p password')
on(server, 'chage -l defsuser').output.strip
expect(stdout).to match(/^Minimum number of days between password change\s*:\s*0$/)
Expand Down
5 changes: 0 additions & 5 deletions spec/classes/passwd_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@
is_expected.to create_file('/etc/gshadow').with(expected_params)
is_expected.to create_file('/etc/gshadow-').with(expected_params)
}
it { is_expected.to create_file('/etc/security/opasswd').with(
:owner => 'root',
:group => 'root',
:mode => '0600'
) }

end
end
Expand Down
Loading