zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-05-15 17:16:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

Even more RST fixes

Browse source
This commit is contained in:
Pinga 2025-04-29 01:25:19 +03:00
parent 7c3ed1da81
commit 5f45f83c1d
2 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
automation/escrow.php
View file

@ -110,14 +110,14 @@ try {
// Array of objURI values // Array of objURI values
$objURIs = [ $objURIs = [
'urn:ietf:params:xml:ns:rdeHeader-1.0',
'urn:ietf:params:xml:ns:rdeContact-1.0', 'urn:ietf:params:xml:ns:rdeContact-1.0',
'urn:ietf:params:xml:ns:rdeHost-1.0', 'urn:ietf:params:xml:ns:rdeHost-1.0',
'urn:ietf:params:xml:ns:rdeDomain-1.0', 'urn:ietf:params:xml:ns:rdeDomain-1.0',
'urn:ietf:params:xml:ns:rdeRegistrar-1.0', 'urn:ietf:params:xml:ns:rdeRegistrar-1.0',
'urn:ietf:params:xml:ns:rdeIDN-1.0', 'urn:ietf:params:xml:ns:rdeIDN-1.0',
'urn:ietf:params:xml:ns:rdeNNDN-1.0', 'urn:ietf:params:xml:ns:rdeNNDN-1.0',
'urn:ietf:params:xml:ns:rdeEppParams-1.0' 'urn:ietf:params:xml:ns:rdeEppParams-1.0',
'urn:ietf:params:xml:ns:rdePolicy-1.0'
]; ];
// Write each rde:objURI element // Write each rde:objURI element
@ -157,17 +157,22 @@ try {
$xml->startElement('rdeHeader:count'); $xml->startElement('rdeHeader:count');
$xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeIDN-1.0'); $xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeIDN-1.0');
$xml->text('0'); $xml->text('1');
$xml->endElement(); $xml->endElement();
$xml->startElement('rdeHeader:count'); $xml->startElement('rdeHeader:count');
$xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeNNDN-1.0'); $xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeNNDN-1.0');
$xml->text('0'); $xml->text('0');
$xml->endElement(); $xml->endElement();
$xml->startElement('rdeHeader:count');
$xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdePolicy-1.0');
$xml->text('1');
$xml->endElement();
$xml->startElement('rdeHeader:count'); $xml->startElement('rdeHeader:count');
$xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeEppParams-1.0'); $xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeEppParams-1.0');
$xml->text('0'); $xml->text('1');
$xml->endElement(); $xml->endElement();
$xml->endElement(); // Closing rdeHeader:header $xml->endElement(); // Closing rdeHeader:header
@ -666,14 +671,14 @@ try {
// Array of objURI values // Array of objURI values
$objURIs = [ $objURIs = [
'urn:ietf:params:xml:ns:rdeHeader-1.0',
'urn:ietf:params:xml:ns:rdeContact-1.0', 'urn:ietf:params:xml:ns:rdeContact-1.0',
'urn:ietf:params:xml:ns:rdeHost-1.0', 'urn:ietf:params:xml:ns:rdeHost-1.0',
'urn:ietf:params:xml:ns:rdeDomain-1.0', 'urn:ietf:params:xml:ns:rdeDomain-1.0',
'urn:ietf:params:xml:ns:rdeRegistrar-1.0', 'urn:ietf:params:xml:ns:rdeRegistrar-1.0',
'urn:ietf:params:xml:ns:rdeIDN-1.0', 'urn:ietf:params:xml:ns:rdeIDN-1.0',
'urn:ietf:params:xml:ns:rdeNNDN-1.0', 'urn:ietf:params:xml:ns:rdeNNDN-1.0',
'urn:ietf:params:xml:ns:rdeEppParams-1.0' 'urn:ietf:params:xml:ns:rdeEppParams-1.0',
'urn:ietf:params:xml:ns:rdePolicy-1.0'
]; ];
// Write each rde:objURI element // Write each rde:objURI element
@ -713,17 +718,22 @@ try {
$xml->startElement('rdeHeader:count'); $xml->startElement('rdeHeader:count');
$xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeIDN-1.0'); $xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeIDN-1.0');
$xml->text('0'); $xml->text('1');
$xml->endElement(); $xml->endElement();
$xml->startElement('rdeHeader:count'); $xml->startElement('rdeHeader:count');
$xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeNNDN-1.0'); $xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeNNDN-1.0');
$xml->text('0'); $xml->text('0');
$xml->endElement(); $xml->endElement();
$xml->startElement('rdeHeader:count');
$xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdePolicy-1.0');
$xml->text('1');
$xml->endElement();
$xml->startElement('rdeHeader:count'); $xml->startElement('rdeHeader:count');
$xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeEppParams-1.0'); $xml->writeAttribute('uri', 'urn:ietf:params:xml:ns:rdeEppParams-1.0');
$xml->text('0'); $xml->text('1');
$xml->endElement(); $xml->endElement();
$xml->endElement(); // Closing rdeHeader:header $xml->endElement(); // Closing rdeHeader:header

14
epp/src/helpers.php
View file

@ -1035,9 +1035,23 @@ function validateHostName(string $hostName): bool
} }
function ipMatches($ip, $cidr) { function ipMatches($ip, $cidr) {
if (strpos($cidr, '/') === false) {
return false; // invalid CIDR
}
list($subnet, $mask) = explode('/', $cidr); list($subnet, $mask) = explode('/', $cidr);
if (!is_numeric($mask) || $mask < 0 || $mask > 32) {
return false; // invalid mask
}
$ipLong = ip2long($ip); $ipLong = ip2long($ip);
$subnetLong = ip2long($subnet); $subnetLong = ip2long($subnet);
if ($ipLong === false || $subnetLong === false) {
return false; // invalid IP
}
$maskLong = -1 << (32 - (int)$mask); $maskLong = -1 << (32 - (int)$mask);
return ($ipLong & $maskLong) === ($subnetLong & $maskLong); return ($ipLong & $maskLong) === ($subnetLong & $maskLong);
} }