forked from ansible/ansible
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixing some parsing issues in authorized_key module
Also adds an integration test for authorized_key for future validation. Fixes ansible#6700
- Loading branch information
Showing
5 changed files
with
277 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
test/integration/roles/test_authorized_key/defaults/main.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- | ||
dss_key_basic: > | ||
ssh-dss DATA_BASIC root@testing | ||
dss_key_unquoted_option: > | ||
idle-timeout=5m ssh-dss DATA_UNQUOTED_OPTION root@testing | ||
dss_key_command: > | ||
command="/bin/true" ssh-dss DATA_COMMAND root@testing | ||
dss_key_complex_command: > | ||
command="echo foo 'bar baz'" ssh-dss DATA_COMPLEX_COMMAND root@testing | ||
dss_key_command_single_option: > | ||
no-port-forwarding,command="/bin/true" ssh-dss DATA_COMMAND_SINGLE_OPTIONS root@testing | ||
dss_key_command_multiple_options: > | ||
no-port-forwarding,idle-timeout=5m,command="/bin/true" ssh-dss DATA_COMMAND_MULTIPLE_OPTIONS root@testing | ||
dss_key_trailing: > | ||
ssh-dss DATA_TRAILING root@testing foo bar baz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
dependencies: | ||
- prepare_tests |
244 changes: 244 additions & 0 deletions
244
test/integration/roles/test_authorized_key/tasks/main.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,244 @@ | ||
# test code for the authorized_key module | ||
# (c) 2014, James Cammarata <[email protected]> | ||
|
||
# This file is part of Ansible | ||
# | ||
# Ansible is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation, either version 3 of the License, or | ||
# (at your option) any later version. | ||
# | ||
# Ansible is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
|
||
# ------------------------------------------------------------- | ||
# Setup steps | ||
|
||
- name: touch the authorized_keys file | ||
file: dest="{{output_dir}}/authorized_keys" state=touch | ||
register: result | ||
|
||
- name: assert that the authorized_keys file was created | ||
assert: | ||
that: | ||
- ['result.changed == True'] | ||
- ['result.state == "file"'] | ||
|
||
# ------------------------------------------------------------- | ||
# basic ssh-dss key | ||
|
||
- name: add basic ssh-dss key | ||
authorized_key: user=root key="{{ dss_key_basic }}" state=present path="{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that the key was added | ||
assert: | ||
that: | ||
- ['result.changed == True'] | ||
- ['result.key == dss_key_basic'] | ||
- ['result.key_options == None'] | ||
|
||
- name: re-add basic ssh-dss key | ||
authorized_key: user=root key="{{ dss_key_basic }}" state=present path="{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that nothing changed | ||
assert: | ||
that: | ||
- ['result.changed == False'] | ||
|
||
# ------------------------------------------------------------- | ||
# ssh-dss key with an unquoted option | ||
|
||
- name: add ssh-dss key with an unquoted option | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_unquoted_option }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that the key was added | ||
assert: | ||
that: | ||
- ['result.changed == True'] | ||
- ['result.key == dss_key_unquoted_option'] | ||
- ['result.key_options == None'] | ||
|
||
- name: re-add ssh-dss key with an unquoted option | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_unquoted_option }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that nothing changed | ||
assert: | ||
that: | ||
- ['result.changed == False'] | ||
|
||
# ------------------------------------------------------------- | ||
# ssh-dss key with a leading command="/bin/foo" | ||
|
||
- name: add ssh-dss key with a leading command | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_command }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that the key was added | ||
assert: | ||
that: | ||
- ['result.changed == True'] | ||
- ['result.key == dss_key_command'] | ||
- ['result.key_options == None'] | ||
|
||
- name: re-add ssh-dss key with a leading command | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_command }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that nothing changed | ||
assert: | ||
that: | ||
- ['result.changed == False'] | ||
|
||
# ------------------------------------------------------------- | ||
# ssh-dss key with a complex quoted leading command | ||
# ie. command="/bin/echo foo 'bar baz'" | ||
|
||
- name: add ssh-dss key with a complex quoted leading command | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_complex_command }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that the key was added | ||
assert: | ||
that: | ||
- ['result.changed == True'] | ||
- ['result.key == dss_key_complex_command'] | ||
- ['result.key_options == None'] | ||
|
||
- name: re-add ssh-dss key with a complex quoted leading command | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_complex_command }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that nothing changed | ||
assert: | ||
that: | ||
- ['result.changed == False'] | ||
|
||
# ------------------------------------------------------------- | ||
# ssh-dss key with a command and a single option, which are | ||
# in a comma-separated list | ||
|
||
- name: add ssh-dss key with a command and a single option | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_command_single_option }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that the key was added | ||
assert: | ||
that: | ||
- ['result.changed == True'] | ||
- ['result.key == dss_key_command_single_option'] | ||
- ['result.key_options == None'] | ||
|
||
- name: re-add ssh-dss key with a command and a single option | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_command_single_option }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that nothing changed | ||
assert: | ||
that: | ||
- ['result.changed == False'] | ||
|
||
# ------------------------------------------------------------- | ||
# ssh-dss key with a command and multiple other options | ||
|
||
- name: add ssh-dss key with a command and multiple options | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_command_multiple_options }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that the key was added | ||
assert: | ||
that: | ||
- ['result.changed == True'] | ||
- ['result.key == dss_key_command_multiple_options'] | ||
- ['result.key_options == None'] | ||
|
||
- name: re-add ssh-dss key with a command and multiple options | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_command_multiple_options }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that nothing changed | ||
assert: | ||
that: | ||
- ['result.changed == False'] | ||
|
||
# ------------------------------------------------------------- | ||
# ssh-dss key with multiple trailing parts, which are space- | ||
# separated and not quoted in any way | ||
|
||
- name: add ssh-dss key with trailing parts | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_trailing }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that the key was added | ||
assert: | ||
that: | ||
- ['result.changed == True'] | ||
- ['result.key == dss_key_trailing'] | ||
- ['result.key_options == None'] | ||
|
||
- name: re-add ssh-dss key with trailing parts | ||
authorized_key: | ||
user: root | ||
key: "{{ dss_key_trailing }}" | ||
state: present | ||
path: "{{output_dir|expanduser}}/authorized_keys" | ||
register: result | ||
|
||
- name: assert that nothing changed | ||
assert: | ||
that: | ||
- ['result.changed == False'] | ||
|