Initial version

7 files changed, 206 insertions, 4 deletions

diff --git a/nova/api/__init__.py b/nova/api/__init__.py
index 747015af5..6e6b092b3 100644
--- a/nova/api/__init__.py
+++ b/nova/api/__init__.py
@@ -15,3 +15,9 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+from nova import flags
+
+
+flags.DEFINE_boolean('use_forwarded_for', False,
+                     'Treat X-Forwarded-For as the canonical remote address. '
+                     'Only enable this if you have a sanitizing proxy.')
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 8b6e47cfb..e497b499a 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -37,9 +37,6 @@ from nova.auth import manager
 
 FLAGS = flags.FLAGS
 LOG = logging.getLogger("nova.api")
-flags.DEFINE_boolean('use_forwarded_for', False,
-                     'Treat X-Forwarded-For as the canonical remote address. '
-                     'Only enable this if you have a sanitizing proxy.')
 flags.DEFINE_integer('lockout_attempts', 5,
                      'Number of failed auths before lockout.')
 flags.DEFINE_integer('lockout_minutes', 15,
diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index 1425521a9..144697790 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -122,6 +122,7 @@ class CreateInstanceHelper(object):
             raise exc.HTTPBadRequest(explanation=msg)
 
         zone_blob = server_dict.get('blob')
+        user_data = server_dict.get('user_data')
         name = server_dict['name']
         self._validate_server_name(name)
         name = name.strip()
@@ -161,7 +162,8 @@ class CreateInstanceHelper(object):
                                   zone_blob=zone_blob,
                                   reservation_id=reservation_id,
                                   min_count=min_count,
-                                  max_count=max_count))
+                                  max_count=max_count,
+                                  user_data=user_data))
         except quota.QuotaError as error:
             self._handle_quota_error(error)
         except exception.ImageNotFound as error:
diff --git a/nova/api/openstack/userdatarequesthandler.py b/nova/api/openstack/userdatarequesthandler.py
new file mode 100644
index 000000000..5daa37e95
--- /dev/null
+++ b/nova/api/openstack/userdatarequesthandler.py
@@ -0,0 +1,110 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""User data request handler."""
+
+import base64
+import webob.dec
+import webob.exc
+
+from nova import log as logging
+from nova import context
+from nova import exception
+from nova import db
+from nova import flags
+from nova import wsgi
+
+
+LOG = logging.getLogger('nova.api.openstack.userdata')
+FLAGS = flags.FLAGS
+
+
+class Controller(object):
+    """ The server user-data API controller for the Openstack API """
+
+    def __init__(self):
+        super(Controller, self).__init__()
+
+    @staticmethod
+    def _format_user_data(instance_ref):
+        return base64.b64decode(instance_ref['user_data'])
+
+    def get_user_data(self, address):
+        ctxt = context.get_admin_context()
+        try:
+            instance_ref = db.instance_get_by_fixed_ip(ctxt, address)
+        except exception.NotFound:
+            instance_ref = None
+        if not instance_ref:
+            return None
+
+        data = {'user-data': self._format_user_data(instance_ref)}
+        return data
+
+
+class UserdataRequestHandler(wsgi.Application):
+    """Serve user-data from the OS API."""
+
+    def __init__(self):
+        self.cc = Controller()
+
+    def print_data(self, data):
+        if isinstance(data, dict):
+            output = ''
+            for key in data:
+                if key == '_name':
+                    continue
+                output += key
+                if isinstance(data[key], dict):
+                    if '_name' in data[key]:
+                        output += '=' + str(data[key]['_name'])
+                    else:
+                        output += '/'
+                output += '\n'
+            # Cut off last \n
+            return output[:-1]
+        elif isinstance(data, list):
+            return '\n'.join(data)
+        else:
+            return str(data)
+
+    def lookup(self, path, data):
+        items = path.split('/')
+        for item in items:
+            if item:
+                if not isinstance(data, dict):
+                    return data
+                if not item in data:
+                    return None
+                data = data[item]
+        return data
+
+    @webob.dec.wsgify(RequestClass=wsgi.Request)
+    def __call__(self, req):
+        remote_address = "10.0.1.6"#req.remote_addr
+        if FLAGS.use_forwarded_for:
+            remote_address = req.headers.get('X-Forwarded-For', remote_address)
+
+        data = self.cc.get_user_data(remote_address)
+        if data is None:
+            LOG.error(_('Failed to get user data for ip: %s'), remote_address)
+            raise webob.exc.HTTPNotFound()
+        data = self.lookup(req.path_info, data)
+        if data is None:
+            raise webob.exc.HTTPNotFound()
+        return self.print_data(data)
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 4e1e1f85a..d8fff8a32 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -371,6 +371,11 @@ def metadata_forward():
                                           '-p tcp -m tcp --dport 80 -j DNAT '
                                           '--to-destination %s:%s' % \
                                           (FLAGS.ec2_dmz_host, FLAGS.ec2_port))
+    iptables_manager.ipv4['nat'].add_rule('PREROUTING',
+                                          '-s 0.0.0.0/0 -d 169.254.169.253/32 '
+                                          '-p tcp -m tcp --dport 80 -j DNAT '
+                                          '--to-destination %s:%s' % \
+                                          (FLAGS.osapi_host, FLAGS.osapi_port))
     iptables_manager.apply()
 
 
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index d11fbf788..aa5aeef16 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -36,6 +36,7 @@ from nova.api.openstack import auth
 from nova.api.openstack import extensions
 from nova.api.openstack import versions
 from nova.api.openstack import limits
+from nova.api.openstack import userdatarequesthandler
 from nova.auth.manager import User, Project
 import nova.image.fake
 from nova.image import glance
@@ -99,6 +100,7 @@ def wsgi_app(inner_app10=None, inner_app11=None, fake_auth=True,
     mapper['/v1.0'] = api10
     mapper['/v1.1'] = api11
     mapper['/'] = openstack.FaultWrapper(versions.Versions())
+    mapper['/latest'] = userdatarequesthandler.UserdataRequestHandler()
     return mapper
 
 
diff --git a/nova/tests/api/openstack/test_userdatarequesthandler.py b/nova/tests/api/openstack/test_userdatarequesthandler.py
new file mode 100644
index 000000000..0c63076b4
--- /dev/null
+++ b/nova/tests/api/openstack/test_userdatarequesthandler.py
@@ -0,0 +1,80 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4

+

+# Copyright 2010-2011 OpenStack LLC.

+# All Rights Reserved.

+#

+#    Licensed under the Apache License, Version 2.0 (the "License"); you may

+#    not use this file except in compliance with the License. You may obtain

+#    a copy of the License at

+#

+#         http://www.apache.org/licenses/LICENSE-2.0

+#

+#    Unless required by applicable law or agreed to in writing, software

+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT

+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the

+#    License for the specific language governing permissions and limitations

+#    under the License.

+

+import base64

+import json

+import unittest

+import webob

+

+from nova import context

+from nova import db

+from nova import exception

+from nova import flags

+from nova import test

+from nova import log as logging

+

+from nova.tests.api.openstack import fakes

+

+LOG = logging.getLogger('nova.api.openstack.userdata')

+

+USER_DATA_STRING = ("This is an encoded string")

+ENCODE_STRING = base64.b64encode(USER_DATA_STRING)

+

+

+def return_server_by_address(context, address):

+    instance = {"user_data": ENCODE_STRING}

+    instance["fixed_ips"] = {"address": address,

+                             "floating_ips": []}

+    return instance

+

+

+def return_non_existing_server_by_address(context, address):

+    raise exception.NotFound()

+

+

+class TestUserdatarequesthandler(test.TestCase):

+

+    def setUp(self):

+        super(TestUserdatarequesthandler, self).setUp()

+        self.stubs.Set(db, 'instance_get_by_fixed_ip',

+                return_server_by_address)

+

+    def test_user_data(self):

+        req = webob.Request.blank('/latest/user-data')

+        res = req.get_response(fakes.wsgi_app())

+        self.assertEqual(res.status_int, 200)

+        self.assertEqual(res.body, USER_DATA_STRING)

+

+    def test_user_data_non_existing_fixed_address(self):

+        self.stubs.Set(db, 'instance_get_by_fixed_ip',

+                return_non_existing_server_by_address)

+        self.flags(use_forwarded_for=False)

+        req = webob.Request.blank('/latest/user-data')

+        res = req.get_response(fakes.wsgi_app())

+        self.assertEqual(res.status_int, 404)

+

+    def test_user_data_invalid_url(self):

+        req = webob.Request.blank('/latest/user-data-invalid')

+        res = req.get_response(fakes.wsgi_app())

+        self.assertEqual(res.status_int, 404)

+

+    def test_user_data_with_use_forwarded_header(self):

+        self.flags(use_forwarded_for=True)

+        req = webob.Request.blank('/latest/user-data')

+        res = req.get_response(fakes.wsgi_app())

+        self.assertEqual(res.status_int, 200)

+        self.assertEqual(res.body, USER_DATA_STRING)