Fixed bug: password node is empty if the passed password contains XML…

… entities.
struzik-vladislav · Oct 2, 2024 · b924f06 · b924f06
1 parent 5422327
commit b924f06
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git a/src/Node/Contact/ContactPasswordNode.php b/src/Node/Contact/ContactPasswordNode.php
@@ -13,7 +13,8 @@ public static function create(RequestInterface $request, \DOMElement $parentNode
             throw new InvalidArgumentException('Invalid parameter "password".');
         }
 
-        $node = $request->getDocument()->createElement('contact:pw', $password);
+        $node = $request->getDocument()->createElement('contact:pw');
+        $node->appendChild($request->getDocument()->createTextNode($password));
         $parentNode->appendChild($node);
 
         return $node;

diff --git a/src/Node/Domain/DomainPasswordNode.php b/src/Node/Domain/DomainPasswordNode.php
@@ -13,7 +13,8 @@ public static function create(RequestInterface $request, \DOMElement $parentNode
             throw new InvalidArgumentException('Invalid parameter "password".');
         }
 
-        $node = $request->getDocument()->createElement('domain:pw', $password);
+        $node = $request->getDocument()->createElement('domain:pw');
+        $node->appendChild($request->getDocument()->createTextNode($password));
         $parentNode->appendChild($node);
 
         if ($roid !== '') {

diff --git a/src/Node/Session/NewPasswordNode.php b/src/Node/Session/NewPasswordNode.php
@@ -13,7 +13,8 @@ public static function create(RequestInterface $request, \DOMElement $parentNode
             throw new InvalidArgumentException('Invalid parameter "newPassword".');
         }
 
-        $node = $request->getDocument()->createElement('newPW', $newPassword);
+        $node = $request->getDocument()->createElement('newPW');
+        $node->appendChild($request->getDocument()->createTextNode($newPassword));
         $parentNode->appendChild($node);
 
         return $node;

diff --git a/src/Node/Session/PasswordNode.php b/src/Node/Session/PasswordNode.php
@@ -13,7 +13,8 @@ public static function create(RequestInterface $request, \DOMElement $parentNode
             throw new InvalidArgumentException('Invalid parameter "password".');
         }
 
-        $node = $request->getDocument()->createElement('pw', $password);
+        $node = $request->getDocument()->createElement('pw');
+        $node->appendChild($request->getDocument()->createTextNode($password));
         $parentNode->appendChild($node);
 
         return $node;

diff --git a/tests/Request/Contact/InfoContactRequestTest.php b/tests/Request/Contact/InfoContactRequestTest.php
@@ -40,7 +40,7 @@ public function testInfoWithPassword(): void
       <contact:info xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
         <contact:id>example-contact-id</contact:id>
         <contact:authInfo>
-          <contact:pw>password</contact:pw>
+          <contact:pw>password &amp;&lt;&gt;'"</contact:pw>
         </contact:authInfo>
       </contact:info>
     </info>
@@ -51,7 +51,7 @@ public function testInfoWithPassword(): void
 EOF;
         $request = new InfoContactRequest($this->eppClient);
         $request->setIdentifier('example-contact-id');
-        $request->setPassword('password');
+        $request->setPassword('password &<>\'"');
         $request->build();
 
         $this->assertSame($expected, $request->getDocument()->saveXML());

diff --git a/tests/Request/Domain/InfoDomainRequestTest.php b/tests/Request/Domain/InfoDomainRequestTest.php
@@ -65,7 +65,7 @@ public function testInfoWithPassword(): void
       <domain:info xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name hosts="all">example.com</domain:name>
         <domain:authInfo>
-          <domain:pw>password</domain:pw>
+          <domain:pw>password &amp;&lt;&gt;'"</domain:pw>
         </domain:authInfo>
       </domain:info>
     </info>
@@ -77,7 +77,7 @@ public function testInfoWithPassword(): void
         $request = new InfoDomainRequest($this->eppClient);
         $request->setDomain('example.com');
         $request->setHosts(DomainNameNode::HOSTS_ALL);
-        $request->setPassword('password');
+        $request->setPassword('password &<>\'"');
         $request->build();
 
         $this->assertSame($expected, $request->getDocument()->saveXML());

diff --git a/tests/Request/Session/LoginRequestTest.php b/tests/Request/Session/LoginRequestTest.php
@@ -15,7 +15,7 @@ public function testLogin(): void
   <command>
     <login>
       <clID>login</clID>
-      <pw>password</pw>
+      <pw>password &amp;&lt;&gt;'"</pw>
       <options>
         <version>1.0</version>
         <lang>en</lang>
@@ -33,7 +33,7 @@ public function testLogin(): void
 EOF;
         $request = new LoginRequest($this->eppClient);
         $request->setLogin('login');
-        $request->setPassword('password');
+        $request->setPassword('password &<>\'"');
         $request->setProtocolVersion('1.0');
         $request->setLanguage('en');
         $request->build();
@@ -49,8 +49,8 @@ public function testNewPassword(): void
   <command>
     <login>
       <clID>login</clID>
-      <pw>password</pw>
-      <newPW>new-password</newPW>
+      <pw>password &amp;&lt;&gt;'"</pw>
+      <newPW>new-password &amp;&lt;&gt;'"</newPW>
       <options>
         <version>1.0</version>
         <lang>en</lang>
@@ -68,8 +68,8 @@ public function testNewPassword(): void
 EOF;
         $request = new LoginRequest($this->eppClient);
         $request->setLogin('login');
-        $request->setPassword('password');
-        $request->setNewPassword('new-password');
+        $request->setPassword('password &<>\'"');
+        $request->setNewPassword('new-password &<>\'"');
         $request->setProtocolVersion('1.0');
         $request->setLanguage('en');
         $request->build();