Changeset 2333

Timestamp:

01/30/20 22:43:01 (4 years ago)

Author:

nanardon

Message:

Encode name to unicode in dns zone

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/List.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm (modified) (7 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/List.pm

@@ -30 +30 @@
     my @objects = $base->list_objects($otype);
     if (my $term = $c->req->param('term')) {
-        @objects = grep { /\Q$term\E/ } @objects;
+        @objects = grep { /\Q$term\E/i } @objects;
     }
 

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

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