reactphp · jsor · Jul 11, 2019 · Jul 10, 2019
diff --git a/README.md b/README.md
@@ -208,10 +208,9 @@ The following example looks up the `IPv6` address for `igor.io`.
 
 ```php
 $loop = Factory::create();
-$executor = new UdpTransportExecutor($loop);
+$executor = new UdpTransportExecutor('8.8.8.8:53', $loop);
 
 $executor->query(
-    '8.8.8.8:53', 
     new Query($name, Message::TYPE_AAAA, Message::CLASS_IN)
 )->then(function (Message $message) {
     foreach ($message->answers as $answer) {
@@ -229,7 +228,7 @@ want to use this in combination with a `TimeoutExecutor` like this:
 
 ```php
 $executor = new TimeoutExecutor(
-    new UdpTransportExecutor($loop),
+    new UdpTransportExecutor($nameserver, $loop),
     3.0,
     $loop
 );
@@ -242,7 +241,7 @@ combination with a `RetryExecutor` like this:
 ```php
 $executor = new RetryExecutor(
     new TimeoutExecutor(
-        new UdpTransportExecutor($loop),
+        new UdpTransportExecutor($nameserver, $loop),
         3.0,
         $loop
     )
@@ -261,7 +260,7 @@ a `CoopExecutor` like this:
 $executor = new CoopExecutor(
     new RetryExecutor(
         new TimeoutExecutor(
-            new UdpTransportExecutor($loop),
+            new UdpTransportExecutor($nameserver, $loop),
             3.0,
             $loop
         )
@@ -284,11 +283,10 @@ use this code:
 ```php
 $hosts = \React\Dns\Config\HostsFile::loadFromPathBlocking();
 
-$executor = new UdpTransportExecutor($loop);
+$executor = new UdpTransportExecutor('8.8.8.8:53', $loop);
 $executor = new HostsFileExecutor($hosts, $executor);
 
 $executor->query(
-    '8.8.8.8:53', 
     new Query('localhost', Message::TYPE_A, Message::CLASS_IN)
 );
 ```

diff --git a/examples/91-query-a-and-aaaa.php b/examples/91-query-a-and-aaaa.php
@@ -8,19 +8,19 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = Factory::create();
-$executor = new UdpTransportExecutor($loop);
+$executor = new UdpTransportExecutor('8.8.8.8:53', $loop);
 
 $name = isset($argv[1]) ? $argv[1] : 'www.google.com';
 
 $ipv4Query = new Query($name, Message::TYPE_A, Message::CLASS_IN);
 $ipv6Query = new Query($name, Message::TYPE_AAAA, Message::CLASS_IN);
 
-$executor->query('8.8.8.8:53', $ipv4Query)->then(function (Message $message) {
+$executor->query($ipv4Query)->then(function (Message $message) {
     foreach ($message->answers as $answer) {
         echo 'IPv4: ' . $answer->data . PHP_EOL;
     }
 }, 'printf');
-$executor->query('8.8.8.8:53', $ipv6Query)->then(function (Message $message) {
+$executor->query($ipv6Query)->then(function (Message $message) {
     foreach ($message->answers as $answer) {
         echo 'IPv6: ' . $answer->data . PHP_EOL;
     }

diff --git a/examples/92-query-any.php b/examples/92-query-any.php
@@ -9,13 +9,13 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = Factory::create();
-$executor = new UdpTransportExecutor($loop);
+$executor = new UdpTransportExecutor('8.8.8.8:53', $loop);
 
 $name = isset($argv[1]) ? $argv[1] : 'google.com';
 
 $any = new Query($name, Message::TYPE_ANY, Message::CLASS_IN);
 
-$executor->query('8.8.8.8:53', $any)->then(function (Message $message) {
+$executor->query($any)->then(function (Message $message) {
     foreach ($message->answers as $answer) {
         /* @var $answer Record */
 

diff --git a/src/Query/CachingExecutor.php b/src/Query/CachingExecutor.php
@@ -24,24 +24,24 @@ public function __construct(ExecutorInterface $executor, CacheInterface $cache)
         $this->cache = $cache;
     }
 
-    public function query($nameserver, Query $query)
+    public function query(Query $query)
     {
         $id = $query->name . ':' . $query->type . ':' . $query->class;
         $cache = $this->cache;
         $that = $this;
         $executor = $this->executor;
 
         $pending = $cache->get($id);
-        return new Promise(function ($resolve, $reject) use ($nameserver, $query, $id, $cache, $executor, &$pending, $that) {
+        return new Promise(function ($resolve, $reject) use ($query, $id, $cache, $executor, &$pending, $that) {
             $pending->then(
-                function ($message) use ($nameserver, $query, $id, $cache, $executor, &$pending, $that) {
+                function ($message) use ($query, $id, $cache, $executor, &$pending, $that) {
                     // return cached response message on cache hit
                     if ($message !== null) {
                         return $message;
                     }
 
                     // perform DNS lookup if not already cached
-                    return $pending = $executor->query($nameserver, $query)->then(
+                    return $pending = $executor->query($query)->then(
                         function (Message $message) use ($cache, $id, $that) {
                             // DNS response message received => store in cache when not truncated and return
                             if (!$message->tc) {

diff --git a/src/Query/CoopExecutor.php b/src/Query/CoopExecutor.php
@@ -27,7 +27,7 @@
  * $executor = new CoopExecutor(
  *     new RetryExecutor(
  *         new TimeoutExecutor(
- *             new UdpTransportExecutor($loop),
+ *             new UdpTransportExecutor($nameserver, $loop),
  *             3.0,
  *             $loop
  *         )
@@ -46,7 +46,7 @@ public function __construct(ExecutorInterface $base)
         $this->executor = $base;
     }
 
-    public function query($nameserver, Query $query)
+    public function query(Query $query)
     {
         $key = $this->serializeQueryToIdentity($query);
         if (isset($this->pending[$key])) {
@@ -55,7 +55,7 @@ public function query($nameserver, Query $query)
             ++$this->counts[$key];
         } else {
             // no such query pending, so start new query and keep reference until it's fulfilled or rejected
-            $promise = $this->executor->query($nameserver, $query);
+            $promise = $this->executor->query($query);
             $this->pending[$key] = $promise;
             $this->counts[$key] = 1;
 

diff --git a/src/Query/ExecutorInterface.php b/src/Query/ExecutorInterface.php
@@ -4,5 +4,5 @@
 
 interface ExecutorInterface
 {
-    public function query($nameserver, Query $query);
+    public function query(Query $query);
 }
diff --git a/src/Query/HostsFileExecutor.php b/src/Query/HostsFileExecutor.php
@@ -25,7 +25,7 @@ public function __construct(HostsFile $hosts, ExecutorInterface $fallback)
         $this->fallback = $fallback;
     }
 
-    public function query($nameserver, Query $query)
+    public function query(Query $query)
     {
         if ($query->class === Message::CLASS_IN && ($query->type === Message::TYPE_A || $query->type === Message::TYPE_AAAA)) {
             // forward lookup for type A or AAAA
@@ -61,7 +61,7 @@ public function query($nameserver, Query $query)
             }
         }
 
-        return $this->fallback->query($nameserver, $query);
+        return $this->fallback->query($query);
     }
 
     private function getIpFromHost($host)

diff --git a/src/Query/RetryExecutor.php b/src/Query/RetryExecutor.php
@@ -16,12 +16,12 @@ public function __construct(ExecutorInterface $executor, $retries = 2)
         $this->retries = $retries;
     }
 
-    public function query($nameserver, Query $query)
+    public function query(Query $query)
     {
-        return $this->tryQuery($nameserver, $query, $this->retries);
+        return $this->tryQuery($query, $this->retries);
     }
 
-    public function tryQuery($nameserver, Query $query, $retries)
+    public function tryQuery(Query $query, $retries)
     {
         $deferred = new Deferred(function () use (&$promise) {
             if ($promise instanceof CancellablePromiseInterface) {
@@ -35,7 +35,7 @@ public function tryQuery($nameserver, Query $query, $retries)
         };
 
         $executor = $this->executor;
-        $errorback = function ($e) use ($deferred, &$promise, $nameserver, $query, $success, &$errorback, &$retries, $executor) {
+        $errorback = function ($e) use ($deferred, &$promise, $query, $success, &$errorback, &$retries, $executor) {
             if (!$e instanceof TimeoutException) {
                 $errorback = null;
                 $deferred->reject($e);
@@ -62,14 +62,14 @@ public function tryQuery($nameserver, Query $query, $retries)
                 $r->setValue($e, $trace);
             } else {
                 --$retries;
-                $promise = $executor->query($nameserver, $query)->then(
+                $promise = $executor->query($query)->then(
                     $success,
                     $errorback
                 );
             }
         };
 
-        $promise = $this->executor->query($nameserver, $query)->then(
+        $promise = $this->executor->query($query)->then(
             $success,
             $errorback
         );

diff --git a/src/Query/TimeoutExecutor.php b/src/Query/TimeoutExecutor.php
@@ -20,9 +20,9 @@ public function __construct(ExecutorInterface $executor, $timeout, LoopInterface
         $this->timeout = $timeout;
     }
 
-    public function query($nameserver, Query $query)
+    public function query(Query $query)
     {
-        return Timer\timeout($this->executor->query($nameserver, $query), $this->timeout, $this->loop)->then(null, function ($e) use ($query) {
+        return Timer\timeout($this->executor->query($query), $this->timeout, $this->loop)->then(null, function ($e) use ($query) {
             if ($e instanceof Timer\TimeoutException) {
                 $e = new TimeoutException(sprintf("DNS query for %s timed out", $query->name), 0, $e);
             }

diff --git a/src/Query/UdpTransportExecutor.php b/src/Query/UdpTransportExecutor.php
@@ -19,10 +19,9 @@
  *
  * ```php
  * $loop = Factory::create();
- * $executor = new UdpTransportExecutor($loop);
+ * $executor = new UdpTransportExecutor('8.8.8.8:53', $loop);
  *
  * $executor->query(
- *     '8.8.8.8:53',
  *     new Query($name, Message::TYPE_AAAA, Message::CLASS_IN)
  * )->then(function (Message $message) {
  *     foreach ($message->answers as $answer) {
@@ -40,7 +39,7 @@
  *
  * ```php
  * $executor = new TimeoutExecutor(
- *     new UdpTransportExecutor($loop),
+ *     new UdpTransportExecutor($nameserver, $loop),
  *     3.0,
  *     $loop
  * );
@@ -53,7 +52,7 @@
  * ```php
  * $executor = new RetryExecutor(
  *     new TimeoutExecutor(
- *         new UdpTransportExecutor($loop),
+ *         new UdpTransportExecutor($nameserver, $loop),
  *         3.0,
  *         $loop
  *     )
@@ -72,7 +71,7 @@
  * $executor = new CoopExecutor(
  *     new RetryExecutor(
  *         new TimeoutExecutor(
- *             new UdpTransportExecutor($loop),
+ *             new UdpTransportExecutor($nameserver, $loop),
  *             3.0,
  *             $loop
  *         )
@@ -93,11 +92,12 @@ class UdpTransportExecutor implements ExecutorInterface
     private $dumper;
 
     /**
+     * @param string            $nameserver
      * @param LoopInterface     $loop
      * @param null|Parser       $parser optional/advanced: DNS protocol parser to use
      * @param null|BinaryDumper $dumper optional/advanced: DNS protocol dumper to use
      */
-    public function __construct(LoopInterface $loop, Parser $parser = null, BinaryDumper $dumper = null)
+    public function __construct($nameserver, LoopInterface $loop, Parser $parser = null, BinaryDumper $dumper = null)
     {
         if ($parser === null) {
             $parser = new Parser();
@@ -106,12 +106,23 @@ public function __construct(LoopInterface $loop, Parser $parser = null, BinaryDu
             $dumper = new BinaryDumper();
         }
 
+        if (strpos($nameserver, '[') === false && substr_count($nameserver, ':') >= 2) {
+            // several colons, but not enclosed in square brackets => enclose IPv6 address in square brackets
+            $nameserver = '[' . $nameserver . ']';
+        }
+
+        $parts = parse_url('udp://' . $nameserver);
+        if (!isset($parts['scheme'], $parts['host']) || $parts['scheme'] !== 'udp') {
+            throw new \InvalidArgumentException('Invalid nameserver address given');
+        }
+
+        $this->nameserver = 'udp://' . $parts['host'] . ':' . (isset($parts['port']) ? $parts['port'] : 53);
         $this->loop = $loop;
         $this->parser = $parser;
         $this->dumper = $dumper;
     }
 
-    public function query($nameserver, Query $query)
+    public function query(Query $query)
     {
         $request = Message::createRequestForQuery($query);
 
@@ -123,7 +134,7 @@ public function query($nameserver, Query $query)
         }
 
         // UDP connections are instant, so try connection without a loop or timeout
-        $socket = @\stream_socket_client("udp://$nameserver", $errno, $errstr, 0);
+        $socket = @\stream_socket_client($this->nameserver, $errno, $errstr, 0);
         if ($socket === false) {
             return \React\Promise\reject(new \RuntimeException(
                 'DNS query for ' . $query->name . ' failed: Unable to connect to DNS server ('  . $errstr . ')',

diff --git a/src/Resolver/Factory.php b/src/Resolver/Factory.php
@@ -18,10 +18,9 @@ class Factory
 {
     public function create($nameserver, LoopInterface $loop)
     {
-        $nameserver = $this->addPortToServerIfMissing($nameserver);
-        $executor = $this->decorateHostsFileExecutor($this->createRetryExecutor($loop));
+        $executor = $this->decorateHostsFileExecutor($this->createRetryExecutor($nameserver, $loop));
 
-        return new Resolver($nameserver, $executor);
+        return new Resolver($executor);
     }
 
     public function createCached($nameserver, LoopInterface $loop, CacheInterface $cache = null)
@@ -31,10 +30,9 @@ public function createCached($nameserver, LoopInterface $loop, CacheInterface $c
             $cache = new ArrayCache(256);
         }
 
-        $nameserver = $this->addPortToServerIfMissing($nameserver);
-        $executor = $this->decorateHostsFileExecutor($this->createCachedExecutor($loop, $cache));
+        $executor = $this->decorateHostsFileExecutor($this->createCachedExecutor($nameserver, $loop, $cache));
 
-        return new Resolver($nameserver, $executor);
+        return new Resolver($executor);
     }
 
     /**
@@ -67,36 +65,25 @@ private function decorateHostsFileExecutor(ExecutorInterface $executor)
         return $executor;
     }
 
-    protected function createExecutor(LoopInterface $loop)
+    protected function createExecutor($nameserver, LoopInterface $loop)
     {
         return new TimeoutExecutor(
-            new UdpTransportExecutor($loop),
+            new UdpTransportExecutor(
+                $nameserver,
+                $loop
+            ),
             5.0,
             $loop
         );
     }
 
-    protected function createRetryExecutor(LoopInterface $loop)
+    protected function createRetryExecutor($namserver, LoopInterface $loop)
     {
-        return new CoopExecutor(new RetryExecutor($this->createExecutor($loop)));
+        return new CoopExecutor(new RetryExecutor($this->createExecutor($namserver, $loop)));
     }
 
-    protected function createCachedExecutor(LoopInterface $loop, CacheInterface $cache)
+    protected function createCachedExecutor($namserver, LoopInterface $loop, CacheInterface $cache)
     {
-        return new CachingExecutor($this->createRetryExecutor($loop), $cache);
-    }
-
-    protected function addPortToServerIfMissing($nameserver)
-    {
-        if (strpos($nameserver, '[') === false && substr_count($nameserver, ':') >= 2) {
-            // several colons, but not enclosed in square brackets => enclose IPv6 address in square brackets
-            $nameserver = '[' . $nameserver . ']';
-        }
-        // assume a dummy scheme when checking for the port, otherwise parse_url() fails
-        if (parse_url('dummy://' . $nameserver, PHP_URL_PORT) === null) {
-            $nameserver .= ':53';
-        }
-
-        return $nameserver;
+        return new CachingExecutor($this->createRetryExecutor($namserver, $loop), $cache);
     }
 }