Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
b6600628
Commit
b6600628
authored
Apr 03, 2014
by
James Tanner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #6454 verify ec2 key fingerprints
parent
cdc08199
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
43 additions
and
4 deletions
+43
-4
library/cloud/ec2_key
+43
-4
No files found.
library/cloud/ec2_key
View file @
b6600628
...
@@ -132,6 +132,10 @@ except ImportError:
...
@@ -132,6 +132,10 @@ except ImportError:
print
"failed=True msg='boto required for this module'"
print
"failed=True msg='boto required for this module'"
sys
.
exit
(
1
)
sys
.
exit
(
1
)
import
random
import
string
def
main
():
def
main
():
argument_spec
=
ec2_argument_spec
()
argument_spec
=
ec2_argument_spec
()
argument_spec
.
update
(
dict
(
argument_spec
.
update
(
dict
(
...
@@ -187,10 +191,45 @@ def main():
...
@@ -187,10 +191,45 @@ def main():
# Ensure requested key is present
# Ensure requested key is present
elif
state
==
'present'
:
elif
state
==
'present'
:
if
key
:
if
key
:
'''existing key found'''
# existing key found
# Should check if the fingerprint is the same - but lack of info
if
key_material
:
# and different fingerprint provided (pub or private) depending if
# EC2's fingerprints are non-trivial to generate, so push this key
# the key has been created of imported.
# to a temporary name and make ec2 calculate the fingerprint for us.
#
# http://blog.jbrowne.com/?p=23
# https://forums.aws.amazon.com/thread.jspa?messageID=352828
# find an unused name
test
=
'empty'
while
test
:
randomchars
=
[
random
.
choice
(
string
.
ascii_letters
+
string
.
digits
)
for
x
in
range
(
0
,
10
)]
tmpkeyname
=
"ansible-"
+
''
.
join
(
randomchars
)
test
=
ec2
.
get_key_pair
(
tmpkeyname
)
# create tmp key
tmpkey
=
ec2
.
import_key_pair
(
tmpkeyname
,
key_material
)
# get tmp key fingerprint
tmpfingerprint
=
tmpkey
.
fingerprint
# delete tmp key
tmpkey
.
delete
()
if
key
.
fingerprint
!=
tmpfingerprint
:
if
not
module
.
check_mode
:
key
.
delete
()
key
=
ec2
.
import_key_pair
(
name
,
key_material
)
if
wait
:
start
=
time
.
time
()
action_complete
=
False
while
(
time
.
time
()
-
start
)
<
wait_timeout
:
if
ec2
.
get_key_pair
(
name
):
action_complete
=
True
break
time
.
sleep
(
1
)
if
not
action_complete
:
module
.
fail_json
(
msg
=
"timed out while waiting for the key to be re-created"
)
changed
=
True
pass
pass
# if the key doesn't exist, create it now
# if the key doesn't exist, create it now
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment