Changeset 2388

Timestamp:

06/08/20 19:15:11 (4 years ago)

Author:

nanardon

Message:

use Net::IDN::Encode instead URI internal functions

Location:

trunk/LATMOS-Accounts

Files:

• Makefile.PL (modified) (1 diff)
• latmos-accounts.spec.in (modified) (1 diff)
• lib/LATMOS/Accounts/Task/Buildnet.pm (modified) (7 diffs)

trunk/LATMOS-Accounts/Makefile.PL

@@ -41 +41 @@
         'Text::CSV' => undef,
         'DateTime::Format::Pg' => undef,
+        'Net::IDN::Encode' => undef,
     }, # e.g., Module::Name => 1.1
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005

trunk/LATMOS-Accounts/latmos-accounts.spec.in

@@ -45 +45 @@
 BuildRequires: perl(Pod::Xhtml)
 Buildrequires: perl(DateTime::Format::Pg)
+BuildRequires: perl(Net::IDN::Encode)
 
 Requires: perl(Mail::Sendmail)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm

@@ -14 +14 @@
 use Net::IPv6Addr;
 use URI; # Ensure module is required
-use URI::_idna;
+use Net::IDN::Encode ':all';
 
 =head1 NAME
@@ -514 +514 @@
                 $dbzone .= sprintf(
                     "%-30s IN    %-4s     %s\n",
-                    URI::_idna::encode($res),
+                    domain_to_ascii($res),
                     ($ip =~ /:/ ? 'AAAA' : 'A'),
                     $ip
@@ -523 +523 @@
                     $dbzone .= sprintf(
                         "%-30s IN    %-4s     %s\n",
-                        URI::_idna::encode($_),
+                        domain_to_ascii($_),
                         ($ip =~ /:/ ? 'AAAA' : 'A'),
                         $ip
@@ -541 +541 @@
                     $dbzone .= "; $msg\n";
                 } else {
-                    $dbzone .= sprintf("%-30s IN    CNAME    %s\n", URI::_idna::encode($_), URI::_idna::encode($res));
+                    $dbzone .= sprintf("%-30s IN    CNAME    %s\n", domain_to_ascii($_), domain_to_ascii($res));
                 }
             }
@@ -549 +549 @@
                     $dbzone .= sprintf(
                         "%-30s IN    SSHFP    %s\n",
-                        URI::_idna::encode($name),
+                        domain_to_ascii($name),
                         $sshfp,
                     );
@@ -564 +564 @@
 
     my $domain = $ozone->get_attributes('domain') || '';
-    my $punyDomain = URI::_idna::encode($domain);
+    my $punyDomain = domain_to_ascii($domain);
     my $dbzone = '';
     if ($ozone->get_attributes('net')) {
@@ -634 +634 @@
             $dbzone .= sprintf($fmt, $revip,
                 $reverse =~ /\.$/
-                    ? (URI::_idna::encode($reverse), ($punyDomain ? "$punyDomain." : '.'))
-                    : (URI::_idna::encode($reverse), '.'));
+                    ? (domain_to_ascii($reverse), ($punyDomain ? "$punyDomain." : '.'))
+                    : (domain_to_ascii($reverse), '.'));
         }
     }