Add PSR-7 ServerRequestInterface to the PSR-7 Request #160

legionth · 2017-04-02T23:00:24Z

This PR adds a PSR-ServerRequestInterface to the request.

This PR adds the remote address to the server params(Fixes #153). Also cookies are parsed from the raw request and added to the request object.
Uploaded files are not handled in this PR, because this would be a much bigger task and needs an asynchronous approach(which would be too much to review).

The new class makes it possible to handle parsed request bodies (#105 for v0.8.0).

clue · 2017-04-03T00:23:07Z

src/ServerRequest.php

+
+                if (!isset($cookies[$key])) {
+                    $result[$key] = $value;
+                }


Can you add some tests for multiple cookies with the same name and those using special chars?

Invalid reference?

clue · 2017-04-03T00:23:55Z

README.md

 [PSR-7 RequestInterface](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-7-http-message.md#32-psrhttpmessagerequestinterface)
+and implements the
+[PSR-7 ServerRequestInterface](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-7-http-message.md#321-psrhttpmessageserverrequestinterface)


…implements the ServerRequestInterface which in turn extends the RequestInterface?

clue · 2017-04-03T00:24:43Z

README.md

@@ -269,6 +273,20 @@ $http = new Server($socket, function (RequestInterface $request) {
 });
 ```

+As mentioned before the request implements the `ServerRequestInterface`.
+The `Server` will add server-side parameters like the remote address or cookies
+this object.


…to this object.

clue · 2017-04-03T00:25:16Z

README.md

+    return new Response(
+        200,
+        array('Content-Type' => 'text/plain'),
+        "The remote: " . $request->getServerParams()['remote_address']


Where does this name come from, are there any other params? (needs some documentation)

clue · 2017-04-03T00:26:13Z

src/ServerRequest.php

+
+        if (preg_match('(\,)', $cookie) >= 1) {
+            return false;
+        }


Should probably be moved up and could use some documentation? Looks like strpos()?

maciejmrozinski · 2017-04-03T09:33:12Z

Just wanted to ask if we really need our own implementation of Psr\Http\Message\ServerRequestInterface? Cannot we use Zend Diactoros for example and extend it for our needs?

clue · 2017-04-03T09:51:25Z

@maciejmrozinski I think you're raising a valid point here 👍

I'm perfectly fine with switching to any other PSR-7 implementation because we only expose its interfaces and everything else is basically just an implementation detail.

In this particular case, this PR only adds a very simple implementation of the ServerRequestInterface which extends an existing Request class and marks this new class as internal and not for outside usage. As such, this adds very little complexity afaict.

Switching to another implementation now would create a bigger changeset and would likely break compatibility with legacy PHP < 5.4 (which I'm not saying is a deal-breaker), but I suppose this is best left up to another PR? 👍

maciejmrozinski · 2017-04-03T12:13:54Z

@legionth OK, thx for the info, I totally agree :) Just wanted to know Your plan guys and possibilities here.

EDIT: Sorry, I meant @clue ;)

maciejmrozinski

File Server.php should be reviewed for RequestInterface methods parameters and occurrences should be changed to ServerRequestInterface.

Lines: 8, 170, 194, 333, 357

legionth · 2017-04-10T10:51:07Z

Ping @clue. I think added all the changes you mentioned.

maciejmrozinski · 2017-04-10T11:20:25Z

@legionth how about this #160 (review) ? Should it be changed or RequestInterface is correct here?

clue · 2017-04-10T11:33:00Z

README.md

+  Unix timestamp of the moment, the complete request header was received
+* `request_time_float`
+  Unix timestamp in microseconds of the moment, the complete request header wa
+  received


Where does this list come from? (ref please)

Example please?

Added an reference to the text and an example.

clue · 2017-04-10T11:33:21Z

README.md

+  received
+
+The cookies of the request, will also be added to the request object by the `Server`.
+Use the `getCookies` method to receive these cookies.


Example please?

Added example and more explanation for the cookies.

clue · 2017-04-10T11:33:42Z

README.md

+The `Server` will currently add several server-side parameters to the request like:
+
+* `server_address`
+  The current IP address of the server


What about the port?

clue · 2017-04-10T11:34:17Z

src/ServerRequest.php

+
+                if (!isset($cookies[$key])) {
+                    $result[$key] = $value;
+                }


Invalid reference?

clue · 2017-04-10T11:47:32Z

src/Server.php

@@ -90,6 +106,7 @@
 class Server extends EventEmitter
 {
    private $callback;
+    private $serverAddress;


Should probably use $conn->getLocalAddress() instead in case this is a "listen all" address?

Done. Restructured the code a bit and added an additional server parameter

legionth · 2017-04-10T15:46:19Z

@clue Have look, I added some docuementation and test for the cookies and server params.

@maciejmrozinski Thank you! Changed the type hints. Have look

maciejmrozinski · 2017-04-11T08:15:05Z

@legionth looks good to me

clue · 2017-04-13T13:47:07Z

README.md

+        $body
+    );
+});
+```


LGTM and should also be added to examples/ 👍

Added to examples/

clue · 2017-04-13T13:47:42Z

README.md

+        "Your cookie has been set."
+    );
+});
+```


LGTM, but should probably be merged with above example 👍

Merged the two examples into one and added to examples/

clue · 2017-04-13T13:49:37Z

tests/ServerRequestTest.php

+    {
+        $cookieString = 'hello=world;hello=abc';
+        $cookies = ServerRequest::parseCookie($cookieString);
+        $this->assertEquals(array('hello' => 'world'), $cookies);


I'm not saying this is wrong, but this is certainly unexpected. Does this need explicit documentation or is this common behavior / does this follow a common implementation?

Checked the $_COOKIE behavior of PHP. Changed the behavior a bit, have a look.

andig · 2017-04-17T09:21:21Z

I'm working with @maciejmrozinski at porting php-pm to the next react/http version based on this PR. After only getting 400 responses I've dug into the Server code and found- using socket 0.5- the following issue:

handleRequest will throw a notice port not defined in https://github.com/reactphp/http/pull/160/files#diff-c611f5024b5b13f69f779505d1c6735eR279
because $conn->getRemoteAddress returns empty
because stream_socket_get_name returns '' . "\0" . ''. I've verified the stream is a valid resource

Any idea what might be wrong here?

andig · 2017-04-17T09:36:25Z

Update

fixed for me by changing the socket parseAddress() to:

        if ($address == false || $address == '' . "\0" . '') {
            return null;
        }

Should I open an issue at socket? Or is it possible that anything in the Server->__construct()->on('connection', 'handleConnection()') is firing with a half-initialized stream if such a thing exists?

I've also opened https://bugs.php.net/bug.php?id=74458 for time being.

andig · 2017-04-17T11:18:26Z

pinging @clue I have the suspicion- though I can't find the root cause- that reactphp/socket@a967ef1 might be causing (or not fixing) the problem I'm seeing. Apart from false php seems to return string \0, too.

clue · 2017-04-17T14:40:25Z

@andig Thanks for spotting this and filing reactphp/socket#92 which I think is the correct place to handle this 👍

@legionth This PR should probably be rebased now that #167 is in and we should probably add the equivalent of $_SERVER['HTTPS'] = 'on' here 👍

legionth · 2017-04-18T20:24:43Z

@clue I think this should cover your change requests. Added the https to the server params. Have a look.

legionth · 2017-04-19T23:38:10Z

This PR adds a bit too much features and I can't cover them all. The fact is that this PR gets bigger and bigger, so I decided to open several smaller PRs.

clue reviewed Apr 3, 2017

View reviewed changes

clue added the new feature label Apr 3, 2017

clue added this to the v0.7.0 milestone Apr 3, 2017

legionth force-pushed the server-request branch from 82baf6d to 3f02cd0 Compare April 3, 2017 10:42

maciejmrozinski suggested changes Apr 3, 2017

View reviewed changes

legionth force-pushed the server-request branch from 3f02cd0 to 3606560 Compare April 6, 2017 18:03

maciejmrozinski mentioned this pull request Apr 7, 2017

remoteAddress property not part of PSR-7 #153

Closed

legionth force-pushed the server-request branch 2 times, most recently from 6a5d5a3 to f736962 Compare April 10, 2017 10:47

clue reviewed Apr 10, 2017

View reviewed changes

legionth force-pushed the server-request branch 4 times, most recently from cb9d103 to 1802135 Compare April 10, 2017 15:44

clue reviewed Apr 13, 2017

View reviewed changes

andig mentioned this pull request Apr 17, 2017

Handle stream_socket_get_name return "\0" reactphp/socket#92

Closed

legionth force-pushed the server-request branch from 1802135 to 1f5ebf8 Compare April 18, 2017 14:14

Add ServerRequest

c2b68d7

legionth added 2 commits April 18, 2017 16:20

Update examples

5f13ef2

Update README

16d0654

legionth force-pushed the server-request branch from 1f5ebf8 to 16d0654 Compare April 18, 2017 14:20

Update README.md

4d781d4

legionth closed this Apr 19, 2017

Add PSR-7 ServerRequestInterface to the PSR-7 Request #160

Add PSR-7 ServerRequestInterface to the PSR-7 Request #160

Conversation

legionth commented Apr 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maciejmrozinski commented Apr 3, 2017

clue commented Apr 3, 2017

maciejmrozinski commented Apr 3, 2017 • edited Loading

maciejmrozinski left a comment • edited Loading

Choose a reason for hiding this comment

legionth commented Apr 10, 2017

maciejmrozinski commented Apr 10, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

legionth Apr 10, 2017 • edited Loading

Choose a reason for hiding this comment

legionth commented Apr 10, 2017

maciejmrozinski commented Apr 11, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andig commented Apr 17, 2017

andig commented Apr 17, 2017 • edited Loading

andig commented Apr 17, 2017

clue commented Apr 17, 2017

legionth commented Apr 18, 2017

legionth commented Apr 19, 2017

maciejmrozinski commented Apr 3, 2017 •

edited

Loading

maciejmrozinski left a comment •

edited

Loading

legionth Apr 10, 2017 •

edited

Loading

andig commented Apr 17, 2017 •

edited

Loading