Changeset 2390

Timestamp:

06/08/20 23:07:15 (4 years ago)

Author:

nanardon

Message:

Add nethost name test to allow utf8

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases.pm (modified) (1 diff)
• Bases/Sql/Nethost.pm (modified) (3 diffs)
• Utils.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm

@@ -427 +427 @@
 
     if (my $chk = (
-        lc($otype) eq 'user' || lc($otype) eq 'group')
-        ? LATMOS::Accounts::Utils::check_ug_validity($id)
+        lc($otype) eq 'user' || lc($otype) eq 'group') ? LATMOS::Accounts::Utils::check_ug_validity($id)
+        : lc($otype) eq 'nethost' ? LATMOS::Accounts::Utils::check_host_validity($id)
         : LATMOS::Accounts::Utils::check_oid_validity($id)) {
         $self->log(LA_ERR, "Cannot create $otype with ID $id `%s:'", $chk);

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Nethost.pm

@@ -7 +7 @@
 use base qw(LATMOS::Accounts::Bases::Sql::objects);
 use LATMOS::Accounts::Log;
+use LATMOS::Accounts::Utils;
 use LATMOS::Accounts::I18N;
 use Net::IP;
@@ -111 +112 @@
                 label => l('Aliases'),
                 checkinputformat => sub {
-                    return $_[0] =~ /^[[:ascii:]]+$/ ? 1 : 0;
+                    return LATMOS::Accounts::Utils::check_host_validity($_[0]) ? 0 : 1;
                 },
             },
@@ -205 +206 @@
                 label => l('Other name'),
                 checkinputformat => sub {
-                    return $_[0] =~ /^[[:ascii:]]+$/ ? 1 : 0;
+                    return LATMOS::Accounts::Utils::check_host_validity($_[0]) ? 0 : 1;
                 },
             },

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Utils.pm

@@ -269 +269 @@
 }
 
+=head2 check_host_validity($name)
+
+Check C<$name> is suitable to be used as nethost identifier. Return the error
+text, undef if no error.
+
+=cut
+
+sub check_host_validity {
+    my ($name) = @_;
+    return "leadind space" if ($name =~ /^\s/);
+    return "trailing space" if ($name =~ /\s$/);
+    return "containing space" if ($name =~ /\s/);
+    return "containing underscore" if ($name =~ /_/);
+
+    return;
+}
+
 =head2 check_ug_validity($name)