From 05686ff9c095520941760036c732e3fa0b09086f Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Thu, 9 Oct 2025 12:26:18 +0000 Subject: [PATCH] Cookstyle auto-corrections This change is automatically generated by the GitHub Cookstyle Runner. --- libraries/helpers.rb | 2 +- spec/manage_spec.rb | 86 +++++------ .../users_test/attributes/default.rb | 136 +++++++++--------- 3 files changed, 112 insertions(+), 112 deletions(-) diff --git a/libraries/helpers.rb b/libraries/helpers.rb index 614b51c7..bf45e0f7 100644 --- a/libraries/helpers.rb +++ b/libraries/helpers.rb @@ -25,7 +25,7 @@ def keys_from_url(url) begin response = Chef::HTTP.new(host).get(path) response.split("\n") - rescue Net::HTTPServerException => e + rescue Net::HTTPClientException => e p "request: #{host}#{path}, error: #{e}" end end diff --git a/spec/manage_spec.rb b/spec/manage_spec.rb index 118fbe69..2ce3bde5 100644 --- a/spec/manage_spec.rb +++ b/spec/manage_spec.rb @@ -10,49 +10,49 @@ 'groups': %w(testgroup nfsgroup), 'manage_home': true, }, -{ - 'id': 'test_user_keys_from_url', - 'password': '$1$5cE1rI/9$4p0fomh9U4kAI23qUlZVv/', # Do not do this in a production environment. - 'uid': 9002, - 'comment': 'Test User who grabs ssh keys from a url', - 'shell': '/bin/bash', - 'ssh_keys': [ - 'https://github.com/majormoses.keys', - 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAklOUpkDHrfHY17SbrmTIpNLTGK9Tjom/BWDSU\nGPl+nafzlHDTYW7hdI4yZ5ew18JH4JW9jbhUFrviQzM7xlELEVf4h9lFX5QVkbPppSwg0cda3\nPbv7kOdJ/MTyBlWXFCR+HAo3FXRitBqxiX1nKhXpHAZsMciLq8V6RjsNAQwdsdMFvSlVK/7XA\nt3FaoJoAsncM1Q9x5+3V0Ww68/eIFmb1zuUFljQJKprrX88XypNDvjYNby6vw/Pb0rwert/En\nmZ+AW4OZPnTPI89ZPmVMLuayrD2cE86Z/il8b+gw3r3+1nKatmIkjn2so1d01QraTlMqVSsbx\nNQCPO0ZZEa1== chefuser@mylaptop.local', - ], - 'groups': %w(testgroup nfsgroup), -}, -{ - 'id': 'usertoremove', - 'action': 'remove', - 'groups': %w(testgroup), - 'force': true, - 'manage_home': true, -}, -{ - 'id': 'bogus_user', - 'action': 'remove', - 'groups': %w(nfsgroup), -}, -{ - 'id': 'user_with_dev_null_home', - 'groups': ['testgroup'], - 'shell': '/usr/bin/bash', - 'home': '/dev/null', -}, -{ - 'id': 'user_with_nfs_home_first', - 'groups': ['testgroup'], -}, -{ - 'id': 'user_with_nfs_home_second', - 'groups': ['nfsgroup'], -}, -{ - 'id': 'user_with_local_home', - 'ssh_keys': ["ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAklOUpkDHrfHY17SbrmTIpNLTGK9Tjom/BWDSU\nGPl+nafzlHDTYW7hdI4yZ5ew18JH4JW9jbhUFrviQzM7xlELEVf4h9lFX5QVkbPppSwg0cda3\nPbv7kOdJ/MTyBlWXFCR+HAo3FXRitBqxiX1nKhXpHAZsMciLq8V6RjsNAQwdsdMFvSlVK/7XA\nt3FaoJoAsncM1Q9x5+3V0Ww68/eIFmb1zuUFljQJKprrX88XypNDvjYNby6vw/Pb0rwert/En\nmZ+AW4OZPnTPI89ZPmVMLuayrD2cE86Z/il8b+gw3r3+1nKatmIkjn2so1d01QraTlMqVSsbx\nNrRFi9wrf+M7Q== chefuser@mylaptop.local"], - 'groups': ['testgroup'], -}] + { + 'id': 'test_user_keys_from_url', + 'password': '$1$5cE1rI/9$4p0fomh9U4kAI23qUlZVv/', # Do not do this in a production environment. + 'uid': 9002, + 'comment': 'Test User who grabs ssh keys from a url', + 'shell': '/bin/bash', + 'ssh_keys': [ + 'https://github.com/majormoses.keys', + 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAklOUpkDHrfHY17SbrmTIpNLTGK9Tjom/BWDSU\nGPl+nafzlHDTYW7hdI4yZ5ew18JH4JW9jbhUFrviQzM7xlELEVf4h9lFX5QVkbPppSwg0cda3\nPbv7kOdJ/MTyBlWXFCR+HAo3FXRitBqxiX1nKhXpHAZsMciLq8V6RjsNAQwdsdMFvSlVK/7XA\nt3FaoJoAsncM1Q9x5+3V0Ww68/eIFmb1zuUFljQJKprrX88XypNDvjYNby6vw/Pb0rwert/En\nmZ+AW4OZPnTPI89ZPmVMLuayrD2cE86Z/il8b+gw3r3+1nKatmIkjn2so1d01QraTlMqVSsbx\nNQCPO0ZZEa1== chefuser@mylaptop.local', + ], + 'groups': %w(testgroup nfsgroup), + }, + { + 'id': 'usertoremove', + 'action': 'remove', + 'groups': %w(testgroup), + 'force': true, + 'manage_home': true, + }, + { + 'id': 'bogus_user', + 'action': 'remove', + 'groups': %w(nfsgroup), + }, + { + 'id': 'user_with_dev_null_home', + 'groups': ['testgroup'], + 'shell': '/usr/bin/bash', + 'home': '/dev/null', + }, + { + 'id': 'user_with_nfs_home_first', + 'groups': ['testgroup'], + }, + { + 'id': 'user_with_nfs_home_second', + 'groups': ['nfsgroup'], + }, + { + 'id': 'user_with_local_home', + 'ssh_keys': ["ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAklOUpkDHrfHY17SbrmTIpNLTGK9Tjom/BWDSU\nGPl+nafzlHDTYW7hdI4yZ5ew18JH4JW9jbhUFrviQzM7xlELEVf4h9lFX5QVkbPppSwg0cda3\nPbv7kOdJ/MTyBlWXFCR+HAo3FXRitBqxiX1nKhXpHAZsMciLq8V6RjsNAQwdsdMFvSlVK/7XA\nt3FaoJoAsncM1Q9x5+3V0Ww68/eIFmb1zuUFljQJKprrX88XypNDvjYNby6vw/Pb0rwert/En\nmZ+AW4OZPnTPI89ZPmVMLuayrD2cE86Z/il8b+gw3r3+1nKatmIkjn2so1d01QraTlMqVSsbx\nNrRFi9wrf+M7Q== chefuser@mylaptop.local"], + 'groups': ['testgroup'], + }] describe 'users_manage' do step_into :users_manage diff --git a/test/fixtures/cookbooks/users_test/attributes/default.rb b/test/fixtures/cookbooks/users_test/attributes/default.rb index 988c9fb5..02b014fd 100644 --- a/test/fixtures/cookbooks/users_test/attributes/default.rb +++ b/test/fixtures/cookbooks/users_test/attributes/default.rb @@ -5,71 +5,71 @@ 'force': true, 'manage_home': true, }, -{ - 'id': 'databag_mwaddams', - 'action': 'remove', - 'groups': %w(testgroup nfsgroup), - 'manage_home': true, -}, -{ - 'id': 'user_with_dev_null_home', - 'uid': 5000, - 'gid': 4000, - 'groups': ['nfsgroup'], - 'primary_group': 'nfsgroup', - 'shell': '/bin/bash', - 'home': '/dev/null', - 'no_user_group': true, -}, -{ - 'id': 'user_with_nfs_home_first', - 'groups': ['nfsgroup'], - 'shell': '/bin/sh', - 'ssh_public_key': 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC6aZDF+x28xIlZSgyfyh3IAkencLp1VCU7JXBhJcXNy cheftestuser@laptop', -}, -{ - 'id': 'user_with_nfs_home_second', - 'groups': ['nfsgroup'], - 'ssh_public_key': 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCezwRzemhAGbqvvO/9RmiO9eOtRlUHn1HgvM4HDxxL/bFJCtUfyqbZfyQHXLqe7LJ0rRttAXWmcRLU/668bp70=', - 'ssh_private_key': "-----BEGIN OPENSSH PRIVATE KEY-----\nb3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS\n1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQQns8Ec3poQBm6r7zv/UZojvXjrUZVB\n59R4LzOBw8cS/2xSQrVH8qm2X8kB1y6nuyydK0bbQF1pnES1P+uvG6e9AAAAsD2Nf449jX\n+OAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCezwRzemhAGbqvv\nO/9RmiO9eOtRlUHn1HgvM4HDxxL/bFJCtUfyqbZfyQHXLqe7LJ0rRttAXWmcRLU/668bp7\n0AAAAgJp/B6o2OADM0+NlkgH1dFcOLK64jhr3ScbWK4iyRdOcAAAAVZm11bGxlckBzYnBs\ndGMxbWxsdmRsAQID\n-----END OPENSSH PRIVATE KEY-----\n", -}, -{ - 'id': 'user_with_local_home', - 'groups': ['nfsgroup'], - 'ssh_private_key': "-----BEGIN OPENSSH PRIVATE KEY-----\nb3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW\nQyNTUxOQAAACAummQxfsdvMSJWUoMn8odyAJHp3C6dVQlOyVwYSXFzcgAAAJjzcJxA83Cc\nQAAAAAtzc2gtZWQyNTUxOQAAACAummQxfsdvMSJWUoMn8odyAJHp3C6dVQlOyVwYSXFzcg\nAAAEC7TGfA0MU0mh0V39qw5RSThUo0idTtU2vCe9bJrHmyFS6aZDF+x28xIlZSgyfyh3IA\nkencLp1VCU7JXBhJcXNyAAAAFWZtdWxsZXJAc2JwbHRjMW1sbHZkbA==\n-----END OPENSSH PRIVATE KEY-----\n", -}, -{ - 'username': 'user_with_username_instead_of_id', - 'groups': ['nfsgroup'], - 'shell': '/bin/bash', - 'ssh_keys': ['ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC6aZDF+x28xIlZSgyfyh3IAkencLp1VCU7JXBhJcXNy cheftestuser@laptop'], - 'ssh_private_key': "-----BEGIN OPENSSH PRIVATE KEY-----\nb3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW\nQyNTUxOQAAACAummQxfsdvMSJWUoMn8odyAJHp3C6dVQlOyVwYSXFzcgAAAJjzcJxA83Cc\nQAAAAAtzc2gtZWQyNTUxOQAAACAummQxfsdvMSJWUoMn8odyAJHp3C6dVQlOyVwYSXFzcg\nAAAEC7TGfA0MU0mh0V39qw5RSThUo0idTtU2vCe9bJrHmyFS6aZDF+x28xIlZSgyfyh3IA\nkencLp1VCU7JXBhJcXNyAAAAFWZtdWxsZXJAc2JwbHRjMW1sbHZkbA==\n-----END OPENSSH PRIVATE KEY-----\n", - 'ssh_public_key': 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCezwRzemhAGbqvvO/9RmiO9eOtRlUHn1HgvM4HDxxL/bFJCtUfyqbZfyQHXLqe7LJ0rRttAXWmcRLU/668bp70=', -}, -{ - 'username': 'explicituser', - 'groups': ['explicituser'], -}, -{ - 'username': 'joins_spawned_group', - 'gid': 'string_gid', - 'no_user_group': true, - 'groups': ['user_before_group'], -}, -{ - 'username': 'primary_integer_gid', - 'groups': %w(spawns_next_group user_before_group), - 'primary_group': 'user_before_group', - 'gid': 6000, -}, -{ - 'username': 'nonstandard_homedir_perms', - 'homedir_mode': '02755', - 'ssh_keys': ['ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC6aZDF+x28xIlZSgyfyh3IAkencLp1VCU7JXBhJcXNy cheftestuser@laptop'], - 'groups': ['nonstandard_homedir_perms'], -}, -{ - 'id': 'system_user', - 'groups': ['system_group'], - 'system': true, -}] + { + 'id': 'databag_mwaddams', + 'action': 'remove', + 'groups': %w(testgroup nfsgroup), + 'manage_home': true, + }, + { + 'id': 'user_with_dev_null_home', + 'uid': 5000, + 'gid': 4000, + 'groups': ['nfsgroup'], + 'primary_group': 'nfsgroup', + 'shell': '/bin/bash', + 'home': '/dev/null', + 'no_user_group': true, + }, + { + 'id': 'user_with_nfs_home_first', + 'groups': ['nfsgroup'], + 'shell': '/bin/sh', + 'ssh_public_key': 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC6aZDF+x28xIlZSgyfyh3IAkencLp1VCU7JXBhJcXNy cheftestuser@laptop', + }, + { + 'id': 'user_with_nfs_home_second', + 'groups': ['nfsgroup'], + 'ssh_public_key': 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCezwRzemhAGbqvvO/9RmiO9eOtRlUHn1HgvM4HDxxL/bFJCtUfyqbZfyQHXLqe7LJ0rRttAXWmcRLU/668bp70=', + 'ssh_private_key': "-----BEGIN OPENSSH PRIVATE KEY-----\nb3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAaAAAABNlY2RzYS\n1zaGEyLW5pc3RwMjU2AAAACG5pc3RwMjU2AAAAQQQns8Ec3poQBm6r7zv/UZojvXjrUZVB\n59R4LzOBw8cS/2xSQrVH8qm2X8kB1y6nuyydK0bbQF1pnES1P+uvG6e9AAAAsD2Nf449jX\n+OAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCezwRzemhAGbqvv\nO/9RmiO9eOtRlUHn1HgvM4HDxxL/bFJCtUfyqbZfyQHXLqe7LJ0rRttAXWmcRLU/668bp7\n0AAAAgJp/B6o2OADM0+NlkgH1dFcOLK64jhr3ScbWK4iyRdOcAAAAVZm11bGxlckBzYnBs\ndGMxbWxsdmRsAQID\n-----END OPENSSH PRIVATE KEY-----\n", + }, + { + 'id': 'user_with_local_home', + 'groups': ['nfsgroup'], + 'ssh_private_key': "-----BEGIN OPENSSH PRIVATE KEY-----\nb3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW\nQyNTUxOQAAACAummQxfsdvMSJWUoMn8odyAJHp3C6dVQlOyVwYSXFzcgAAAJjzcJxA83Cc\nQAAAAAtzc2gtZWQyNTUxOQAAACAummQxfsdvMSJWUoMn8odyAJHp3C6dVQlOyVwYSXFzcg\nAAAEC7TGfA0MU0mh0V39qw5RSThUo0idTtU2vCe9bJrHmyFS6aZDF+x28xIlZSgyfyh3IA\nkencLp1VCU7JXBhJcXNyAAAAFWZtdWxsZXJAc2JwbHRjMW1sbHZkbA==\n-----END OPENSSH PRIVATE KEY-----\n", + }, + { + 'username': 'user_with_username_instead_of_id', + 'groups': ['nfsgroup'], + 'shell': '/bin/bash', + 'ssh_keys': ['ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC6aZDF+x28xIlZSgyfyh3IAkencLp1VCU7JXBhJcXNy cheftestuser@laptop'], + 'ssh_private_key': "-----BEGIN OPENSSH PRIVATE KEY-----\nb3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW\nQyNTUxOQAAACAummQxfsdvMSJWUoMn8odyAJHp3C6dVQlOyVwYSXFzcgAAAJjzcJxA83Cc\nQAAAAAtzc2gtZWQyNTUxOQAAACAummQxfsdvMSJWUoMn8odyAJHp3C6dVQlOyVwYSXFzcg\nAAAEC7TGfA0MU0mh0V39qw5RSThUo0idTtU2vCe9bJrHmyFS6aZDF+x28xIlZSgyfyh3IA\nkencLp1VCU7JXBhJcXNyAAAAFWZtdWxsZXJAc2JwbHRjMW1sbHZkbA==\n-----END OPENSSH PRIVATE KEY-----\n", + 'ssh_public_key': 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCezwRzemhAGbqvvO/9RmiO9eOtRlUHn1HgvM4HDxxL/bFJCtUfyqbZfyQHXLqe7LJ0rRttAXWmcRLU/668bp70=', + }, + { + 'username': 'explicituser', + 'groups': ['explicituser'], + }, + { + 'username': 'joins_spawned_group', + 'gid': 'string_gid', + 'no_user_group': true, + 'groups': ['user_before_group'], + }, + { + 'username': 'primary_integer_gid', + 'groups': %w(spawns_next_group user_before_group), + 'primary_group': 'user_before_group', + 'gid': 6000, + }, + { + 'username': 'nonstandard_homedir_perms', + 'homedir_mode': '02755', + 'ssh_keys': ['ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC6aZDF+x28xIlZSgyfyh3IAkencLp1VCU7JXBhJcXNy cheftestuser@laptop'], + 'groups': ['nonstandard_homedir_perms'], + }, + { + 'id': 'system_user', + 'groups': ['system_group'], + 'system': true, + }]