Changeset 2334

Timestamp:

01/30/20 22:55:33 (4 years ago)

Author:

nanardon

Message:

Use directly URI::_punycode::encode_punycode()

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm (modified) (7 diffs)

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

@@ -13 +13 @@
 use Net::IPv4Addr;
 use Net::IPv6Addr;
-use URI;
+use URI::_punycode qw(encode_punycode decode_punycode);
 
 =head1 NAME
@@ -513 +513 @@
                 $dbzone .= sprintf(
                     "%-30s IN    %-4s     %s\n",
-                    URI->new("http://$res")->host,
+                    encode_punycode($res),
                     ($ip =~ /:/ ? 'AAAA' : 'A'),
                     $ip
@@ -522 +522 @@
                     $dbzone .= sprintf(
                         "%-30s IN    %-4s     %s\n",
-                        URI->new("http://$_")->host,
+                        encode_punycode($_),
                         ($ip =~ /:/ ? 'AAAA' : 'A'),
                         $ip
@@ -540 +540 @@
                     $dbzone .= "; $msg\n";
                 } else {
-                    $dbzone .= sprintf("%-30s IN    CNAME    %s\n", URI->new("http://$_")->host, URI->new("http://$res")->host,);
+                    $dbzone .= sprintf("%-30s IN    CNAME    %s\n", encode_punycode($_), encode_punycode($res));
                 }
             }
@@ -548 +548 @@
                     $dbzone .= sprintf(
                         "%-30s IN    SSHFP    %s\n",
-                        URI->new("http://$name")->host,
+                        encode_punycode($name),
                         $sshfp,
                     );
@@ -563 +563 @@
 
     my $domain = $ozone->get_attributes('domain') || '';
-    my $punyDomain = URI->new("http://$domain")->host;
+    my $punyDomain = encode_punycode($domain);
     my $dbzone = '';
     if ($ozone->get_attributes('net')) {
@@ -633 +633 @@
             $dbzone .= sprintf($fmt, $revip,
                 $reverse =~ /\.$/
-                    ? (URI->new("http://$reverse")->host, ($punyDomain ? "$punyDomain." : '.'))
-                    : (URI->new("http://$reverse")->host, '.'));
+                    ? (encode_punycode($reverse), ($punyDomain ? "$punyDomain." : '.'))
+                    : (encode_punycode($reverse), '.'));
         }
     }