Merge pull request #158 from TimSchmittmann/master

barbushin · web-flow · commit aa1d71d4ea3d · 2019-07-25T11:43:28.000+08:00
Add loopback address for ipv6 network to 'isLocal' check
diff --git a/src/PhpConsole/Connector.php b/src/PhpConsole/Connector.php
@@ -488,7 +488,7 @@ private function proceedResponsePackage() {
 					$response->auth = $this->auth->getServerAuthStatus($this->client->auth);
 				}
 				if(!$this->auth || $this->isAuthorized()) {
-					$response->isLocal = isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] == '127.0.0.1';
+					$response->isLocal = isset($_SERVER['REMOTE_ADDR']) && ($_SERVER['REMOTE_ADDR'] == '127.0.0.1' || $_SERVER['REMOTE_ADDR'] == '::1');
 					$response->docRoot = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : null;
 					$response->sourcesBasePath = $this->sourcesBasePath;
 					$response->isEvalEnabled = $this->isEvalListenerStarted;

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ private function proceedResponsePackage() {`
`488`	`488`	`$response->auth = $this->auth->getServerAuthStatus($this->client->auth);`
`489`	`489`	`}`
`490`	`490`	`if(!$this->auth \|\| $this->isAuthorized()) {`
`491`		`- $response->isLocal = isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] == '127.0.0.1';`
	`491`	`+ $response->isLocal = isset($_SERVER['REMOTE_ADDR']) && ($_SERVER['REMOTE_ADDR'] == '127.0.0.1' \|\| $_SERVER['REMOTE_ADDR'] == '::1');`
`492`	`492`	`$response->docRoot = isset($_SERVER['DOCUMENT_ROOT']) ? $_SERVER['DOCUMENT_ROOT'] : null;`
`493`	`493`	`$response->sourcesBasePath = $this->sourcesBasePath;`
`494`	`494`	`$response->isEvalEnabled = $this->isEvalListenerStarted;`