[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a
Garrett Holmstrom
gholms at fedoraproject.org
Sun Jun 16 02:29:49 UTC 2013
The following commit has been merged in the master branch:
commit 48c5e983e9d63daeb46e376b320f497a2fb94d0f
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Tue Apr 24 23:40:00 2012 -0700
Rewrite GetPasswordData
diff --git a/bin/euca-get-password b/bin/euca-get-password
index 4bd9abe..3f7bde9 100755
--- a/bin/euca-get-password
+++ b/bin/euca-get-password
@@ -1,42 +1,6 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, with or
-# without modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above
-# copyright notice, this list of conditions and the
-# following disclaimer.
-#
-# Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the
-# following disclaimer in the documentation and/or other
-# materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-# Mitch Garnaat mgarnaat at eucalyptus.com
+#!/usr/bin/python -tt
import euca2ools.commands.euca.getpassword
if __name__ == '__main__':
- cmd = euca2ools.commands.euca.getpassword.GetPassword()
- cmd.main_cli()
-
+ euca2ools.commands.euca.getpassword.GetPassword().do_cli()
diff --git a/bin/euca-get-password-data b/bin/euca-get-password-data
index bd5711f..de67f56 100755
--- a/bin/euca-get-password-data
+++ b/bin/euca-get-password-data
@@ -1,42 +1,6 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, with or
-# without modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above
-# copyright notice, this list of conditions and the
-# following disclaimer.
-#
-# Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the
-# following disclaimer in the documentation and/or other
-# materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-# Mitch Garnaat mgarnaat at eucalyptus.com
+#!/usr/bin/python -tt
import euca2ools.commands.euca.getpassworddata
if __name__ == '__main__':
- cmd = euca2ools.commands.euca.getpassworddata.GetPasswordData()
- cmd.main_cli()
-
+ euca2ools.commands.euca.getpassworddata.GetPasswordData().do_cli()
diff --git a/euca2ools/commands/euca/argtypes.py b/euca2ools/commands/euca/argtypes.py
index a05222a..97fa739 100644
--- a/euca2ools/commands/euca/argtypes.py
+++ b/euca2ools/commands/euca/argtypes.py
@@ -30,6 +30,7 @@
import argparse
from requestbuilder import EMPTY
+import sys
def block_device_mapping(map_as_str):
'''
@@ -79,6 +80,13 @@ def block_device_mapping(map_as_str):
'unrecognized block device mapping "{0}"'.format(map_as_str))
return map_dict
+def file_contents(filename):
+ if filename == '-':
+ return sys.stdin.read()
+ else:
+ with open(filename) as arg_file:
+ return arg_file.read()
+
def binary_tag_def(tag_str):
'''
Parse a tag definition from the command line. Return a dict that depends
diff --git a/euca2ools/commands/euca/getpassword.py b/euca2ools/commands/euca/getpassword.py
index b70eba7..bbd4522 100644
--- a/euca2ools/commands/euca/getpassword.py
+++ b/euca2ools/commands/euca/getpassword.py
@@ -1,6 +1,6 @@
# Software License Agreement (BSD License)
#
-# Copyright (c) 20092011, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2012, Eucalyptus Systems, Inc.
# All rights reserved.
#
# Redistribution and use of this software in source and binary forms, with or
@@ -27,36 +27,25 @@
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-# Mitch Garnaat mgarnaat at eucalyptus.com
-
-import euca2ools.commands.eucacommand
-import euca2ools.bundler
-from boto.roboto.param import Param
-
-class GetPassword(euca2ools.commands.eucacommand.EucaCommand):
-
- Description = """Retrieves decrypts the administrator password
- for a Windows instance."""
- Options = [Param(name='privatekey',
- short_name='k', long_name='priv-launch-key',
- ptype='file', optional=False,
- doc="""The file that contains the private key
- used to launch the instance.""")]
- Args = [Param(name='instance_id', ptype='string', optional=False,
- doc='unique identifier for the Windows instance')]
- def main(self):
- conn = self.make_connection_cli()
- pd = self.make_request_cli(conn, 'get_password_data',
- instance_id=self.instance_id)
- if pd:
- # TODO - this is actually in the bundler
- # TODO validate file?
- return euca2ools.bundler.Bundler(self).decrypt_string(pd, self.privatekey, encoded=True)
+import base64
+from M2Crypto import RSA
+from requestbuilder import Arg
+from .argtypes import file_contents
+from .getpassworddata import GetPasswordData
- def main_cli(self):
- pw = self.main()
- print pw
+class GetPassword(GetPasswordData):
+ Action = 'GetPasswordData'
+ Description = '''Retrieve the administrator password for an instance
+ running Windows'''
+ Args = [Arg('-k', '--priv-launch-key', metavar='PRIVKEY',
+ type=file_contents, required=True, route_to=None,
+ help='''file containing the private key corresponding to the
+ key pair supplied at instance launch time''')]
+ def print_result(self, result):
+ pwdata = result['passwordData']
+ privkey = RSA.load_key_string(self.args['priv_launch_key'])
+ password = privkey.private_decrypt(base64.b64decode(pwdata),
+ RSA.pkcs1_padding)
+ print password
diff --git a/euca2ools/commands/euca/getpassworddata.py b/euca2ools/commands/euca/getpassworddata.py
index af246b7..03e28ae 100644
--- a/euca2ools/commands/euca/getpassworddata.py
+++ b/euca2ools/commands/euca/getpassworddata.py
@@ -1,6 +1,6 @@
# Software License Agreement (BSD License)
#
-# Copyright (c) 20092011, Eucalyptus Systems, Inc.
+# Copyright (c) 2009-2012, Eucalyptus Systems, Inc.
# All rights reserved.
#
# Redistribution and use of this software in source and binary forms, with or
@@ -27,25 +27,16 @@
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-# Mitch Garnaat mgarnaat at eucalyptus.com
-
-import euca2ools.commands.eucacommand
-from boto.roboto.param import Param
-
-class GetPasswordData(euca2ools.commands.eucacommand.EucaCommand):
-
- Description = """Retrieves the encrypted administrator password
- for a Windows instance."""
- Args = [Param(name='instance_id', ptype='string', optional=False,
- doc='unique identifier for the Windows instance')]
- def main(self):
- conn = self.make_connection_cli()
- return self.make_request_cli(conn, 'get_password_data',
- instance_id=self.instance_id)
+from requestbuilder import Arg
+from . import EucalyptusRequest
- def main_cli(self):
- print self.main()
+class GetPasswordData(EucalyptusRequest):
+ Description = '''Retrieve the encrypted administrator password for an
+ instance running Windows'''
+ Args = [Arg('InstanceId', metavar='INSTANCE',
+ help='instance to obtain the initial password for')]
+ def print_result(self, result):
+ if result.get('passwordData'):
+ print result['passwordData']
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list