Merge ~newell-jensen/maas:lp1795691 into maas:master

[Newell Jensen]

LP: #1795691 -- Add 'SERVER_NAME' and 'SERVER_PORT' to the websocket protocol request so build_absolute_uri can work properly when retrieving the curtin configuration.

[Andres Rodriguez (andreserl)]

question inline.

review: Needs Information

[Blake Rouse (blake-rouse)]

review: Needs Information

f105cc1... by Newell Jensen on 2018-10-02

Use the host's IP address and port for creating the URI needed by the curtin configuration.

[Andres Rodriguez (andreserl)]

review: Needs Fixing

[Andres Rodriguez (andreserl)]

please address comment inline before landing!

review: Approve

5053dc0... by Newell Jensen on 2018-10-02

Update comment about why we are keeping the request creation in the Deploy node action.

diff --git a/src/maasserver/node_action.py b/src/maasserver/node_action.py
index e5c77ce..e30ab66 100644
--- a/src/maasserver/node_action.py
+++ b/src/maasserver/node_action.py
@@ -484,10 +484,13 @@ class Deploy(NodeAction):
 
         request = self.request
         if request is None:
-            # Being called from the websocket, just to ensure that the curtin
-            # configuration is valid. The request object does not need to be
-            # an actual request. 'SERVER_NAME' and 'SERVER_PORT' are required
-            # so `build_absolure_uri` can create an actual absolute URI.
+            # `compile_node_actions` is the path by which the node
+            # actions are instantiated.  There are other places within the
+            # code that call compile_node_actions without a request object.
+            # In this event, and for future uses of these node actions without
+            # a request being passed in, we need to create one here.
+            # 'SERVER_NAME' and 'SERVER_PORT' are required so
+            # `build_absolure_uri` can create an actual absolute URI.
             request = HttpRequest()
             request.META['SERVER_NAME'] = 'localhost'
             request.META['SERVER_PORT'] = 5248
diff --git a/src/maasserver/websockets/protocol.py b/src/maasserver/websockets/protocol.py
index b119bb5..98a8033 100644
--- a/src/maasserver/websockets/protocol.py
+++ b/src/maasserver/websockets/protocol.py
@@ -127,6 +127,10 @@ class WebSocketProtocol(Protocol):
                 self.request.META['HTTP_USER_AGENT'] = (
                     self.transport.user_agent)
                 self.request.META['REMOTE_ADDR'] = self.transport.ip_address
+                self.request.META['SERVER_NAME'] = (
+                    self.transport.host.split(':')[0])
+                self.request.META['SERVER_PORT'] = (
+                    self.transport.host.split(':')[1])
 
         d.addCallback(authenticated)
 
diff --git a/src/maasserver/websockets/tests/test_protocol.py b/src/maasserver/websockets/tests/test_protocol.py
index f1dc8b5..312ebef 100644
--- a/src/maasserver/websockets/tests/test_protocol.py
+++ b/src/maasserver/websockets/tests/test_protocol.py
@@ -110,6 +110,12 @@ class TestWebSocketProtocol(MAASTransactionServerTestCase):
         self.assertEquals(
             protocol.request.META['REMOTE_ADDR'],
             protocol.transport.ip_address)
+        self.assertEquals(
+            protocol.request.META['SERVER_NAME'],
+            protocol.transport.host.split(':')[0])
+        self.assertEquals(
+            protocol.request.META['SERVER_PORT'],
+            protocol.transport.host.split(':')[1])
 
     def test_connectionMade_sets_user_and_processes_messages(self):
         protocol, factory = self.make_protocol(patch_authenticate=False)
diff --git a/src/maasserver/websockets/tests/test_websockets.py b/src/maasserver/websockets/tests/test_websockets.py
index 37a47e0..3532381 100644
--- a/src/maasserver/websockets/tests/test_websockets.py
+++ b/src/maasserver/websockets/tests/test_websockets.py
@@ -596,7 +596,10 @@ class WebSocketsResourceTest(MAASTestCase):
         protocol provided by the user factory.
         """
         request = DummyRequest(b"/")
-        request.requestHeaders = Headers({b"user-agent": [b"user-agent"]})
+        request.requestHeaders = Headers({
+            b"user-agent": [b"user-agent"],
+            b"host": [b"host"],
+        })
         transport = StringTransportWithDisconnection()
         transport.protocol = Protocol()
         request.transport = transport
@@ -636,9 +639,11 @@ class WebSocketsResourceTest(MAASTestCase):
         self.resource = WebSocketsResource(lookupProtocol)
 
         request = DummyRequest(b"/")
-        request.requestHeaders = Headers(
-            {b"sec-websocket-protocol": [b"foo", b"bar"],
-             b"user-agent": [b"user-agent"]})
+        request.requestHeaders = Headers({
+            b"sec-websocket-protocol": [b"foo", b"bar"],
+            b"user-agent": [b"user-agent"],
+            b"host": [b"host"],
+        })
         transport = StringTransportWithDisconnection()
         transport.protocol = Protocol()
         request.transport = transport
@@ -761,7 +766,10 @@ class WebSocketsResourceTest(MAASTestCase):
         L{WebSocketsResource} returns a failed request with a C{502} code.
         """
         request = DummyRequest(b"/")
-        request.requestHeaders = Headers({b"user-agent": [b"user-agent"]})
+        request.requestHeaders = Headers({
+            b"user-agent": [b"user-agent"],
+            b"host": [b"host"],
+        })
         request.transport = StringTransportWithDisconnection()
         self.echoProtocol = None
         self.update_headers(request, headers={
@@ -783,7 +791,10 @@ class WebSocketsResourceTest(MAASTestCase):
         the protocol of the C{TLSMemoryBIOProtocol} instance.
         """
         request = DummyRequest(b"/")
-        request.requestHeaders = Headers({b"user-agent": [b"user-agent"]})
+        request.requestHeaders = Headers({
+            b"user-agent": [b"user-agent"],
+            b"host": [b"host"],
+        })
         transport = StringTransportWithDisconnection()
         secureProtocol = TLSMemoryBIOProtocol(Factory(), Protocol())
         transport.protocol = secureProtocol
@@ -825,7 +836,8 @@ class WebSocketsResourceTest(MAASTestCase):
             b"sec-websocket-key": b"secure",
             b"sec-websocket-version": b"13",
             b"user-agent": b"user-agent",
-            b"client": b"client"}
+            b"client": b"client",
+            b"host": b"host"}
         for key, value in headers.items():
             request.requestHeaders.setRawHeaders(key, [value])
         request.method = b"GET"
@@ -858,7 +870,10 @@ class WebSocketsResourceTest(MAASTestCase):
         self.resource = WebSocketsResource(lookupProtocol)
 
         request = DummyRequest(b"/")
-        request.requestHeaders = Headers({b"user-agent": [b"user-agent"]})
+        request.requestHeaders = Headers({
+            b"user-agent": [b"user-agent"],
+            b"host": [b"host"],
+        })
         transport = StringTransportWithDisconnection()
         transport.protocol = Protocol()
         request.transport = transport
diff --git a/src/maasserver/websockets/websockets.py b/src/maasserver/websockets/websockets.py
index 4400d60..5cfc28d 100644
--- a/src/maasserver/websockets/websockets.py
+++ b/src/maasserver/websockets/websockets.py
@@ -720,6 +720,10 @@ class WebSocketsResource(object):
         # the IP address of the client.
         transport.ip_address = request.getClientIP()
 
+        # Set the host.
+        transport.host = request.requestHeaders.getRawHeaders(
+            'host')[0]
+
         if not isinstance(protocol, WebSocketsProtocol):
             protocol = WebSocketsProtocolWrapper(protocol)