Merge pull request #6556 from Martchus/deceptive-realpath-resolution

Avoid showing confusing data in the needles table

Author: mergify[bot]

lib/OpenQA/WebAPI/Controller/Admin/Needle.pm

@@ -36,32 +36,13 @@ sub _translate_cond ($cond) {
     $translated ? [{$operator => $translated}, @additional_conds] : die "Unknown '$cond'";
 }
 
-sub _prepare_data_table ($self, $n, $paths, $dir_rs, $needles_rs) {
+sub _prepare_data_table ($self, $n, $dir_rs, $needles_rs) {
     my $filename = $n->filename;
     my $hash = {
         id => $n->id,
         directory => $n->directory->name,
         filename => $filename,
     };
-    my $dir_path = $n->directory->path;
-    my $real_dir_id;
-
-    if ($paths->{$dir_path}) {
-        $real_dir_id = $paths->{$dir_path}->{real_path_id} if $dir_path ne ($paths->{$dir_path}->{real_path} // '');
-    }
-    else {
-        my $real_path_id = $n->directory->id;
-        my $dir_real_path = realpath($dir_path);
-        if ($dir_real_path && $dir_real_path ne $dir_path) {
-            my $real_dir = $dir_rs->find({path => $dir_real_path});
-            $real_dir_id = $real_path_id = $real_dir->id if $real_dir;
-        }
-        $paths->{$dir_path} = {
-            real_path => $dir_real_path,
-            real_path_id => $real_path_id,
-        };
-    }
-    $n = ($real_dir_id ? $needles_rs->find({dir_id => $real_dir_id, filename => $filename}) : undef) // $n;
     return $self->populate_hash_with_needle_timestamps_and_urls($n, $hash);
 }
 
@@ -98,8 +79,7 @@ sub ajax ($self) {
         prepare_data_function => sub {
             my $needle_dirs = $self->schema->resultset('NeedleDirs');
             my $needles = $self->schema->resultset('Needles');
-            my %paths;
-            [map { $self->_prepare_data_table($_, \%paths, $needle_dirs, $needles) } shift->all];
+            [map { $self->_prepare_data_table($_, $needle_dirs, $needles) } shift->all];
         },
     );
 }

t/ui/21-admin-needles.t

@@ -96,98 +96,6 @@ like(
     "redirected to right module too"
 );
 
-subtest 'dereference symlink when displaying needles info' => sub {
-    my $real_needle_dir = getcwd . '/t/data/openqa/share/tests/opensuse';
-    my $symlink_needle_dir = getcwd . '/t/data/openqa/share/tests/test_symlink_dir';
-    unlink($symlink_needle_dir);
-    symlink($real_needle_dir, $symlink_needle_dir) or die "Cannot make symlink $!";
-    my $needle_dir = $schema->resultset('NeedleDirs');
-    my $symlink_needle_dir_id = $needle_dir->create(
-        {
-            path => $symlink_needle_dir . '/needles',
-            name => '1symlink_needle_dir'
-        })->id;
-    my $real_needle_dir_id = $needle_dir->create(
-        {
-            path => $real_needle_dir . '/needles',
-            name => 'real_needle_dir'
-        })->id;
-    my $needles = $schema->resultset('Needles');
-    my @need_deleted_needles;
-    my $symlink_needle = $needles->create(
-        {
-            dir_id => $symlink_needle_dir_id,
-            filename => 'bootloader.json',
-            last_seen_module_id => undef,
-            last_seen_time => undef,
-            last_matched_time => undef,
-            last_matched_module_id => undef,
-            file_present => 1,
-        });
-    push @need_deleted_needles, $symlink_needle;
-
-    my $default_show_needles_num = 10;
-    for (my $i = 1; $i < $default_show_needles_num; $i++) {
-        my $added_needle = $needles->create(
-            {
-                dir_id => $symlink_needle_dir_id,
-                filename => $i . '.json',
-                last_seen_module_id => undef,
-                last_seen_time => undef,
-                last_matched_time => undef,
-                last_matched_module_id => undef,
-                file_present => 1,
-            });
-        push @need_deleted_needles, $added_needle;
-    }
-    my $real_needle = $needles->create(
-        {
-            dir_id => $real_needle_dir_id,
-            filename => 'bootloader.json',
-            last_seen_module_id => 10,
-            last_seen_time => time2str('%Y-%m-%d %H:%M:%S', time - 100000, 'UTC'),
-            last_matched_module_id => 9,
-            last_matched_time => time2str('%Y-%m-%d %H:%M:%S', time - 50000, 'UTC'),
-            file_present => 1,
-            t_created => time2str('%Y-%m-%d %H:%M:%S', time - 200000, 'UTC'),
-            t_updated => time2str('%Y-%m-%d %H:%M:%S', time - 200000, 'UTC'),
-        });
-    push @need_deleted_needles, $real_needle;
-
-    my $real_needle_id = $real_needle->id;
-    my $last_seen_module_id = $real_needle->last_seen_module_id;
-    my $last_matched_module_id = $real_needle->last_matched_module_id;
-
-    $needles_table = goto_admin_needle_table;
-    wait_for_data_table($needles_table, 10);
-    my @needle_trs = $driver->find_elements('#needles tbody tr');
-    my @symlink_needle_tds = $driver->find_child_elements($needle_trs[9], 'td', 'css');
-    is((shift @symlink_needle_tds)->get_text(), '1symlink_needle_dir', 'symlink needle dir is displayed correctly');
-    is((shift @symlink_needle_tds)->get_text(), 'bootloader.json', 'symlink needle file name is displayed correctly');
-    my $last_used_td = shift @symlink_needle_tds;
-    is($last_used_td->get_text(), 'a day ago', 'symlink needle last use is displayed correctly');
-    is(
-        $last_used_td->child('a')->get_attribute('title'),
-        $real_needle->last_seen_time . '+0000Z',
-        'symlink needle last use tooltip is displayed correctly'
-    );
-    like(
-        $driver->find_child_element($last_used_td, 'a')->get_attribute('href'),
-        qr/admin\/needles\/$last_seen_module_id\/$real_needle_id/,
-        'symlink needle last used module link is correctly'
-    );
-    my $last_matched_td = shift @symlink_needle_tds;
-    is($last_matched_td->get_text(), 'about 14 hours ago', 'symlink needle last match is displayed correctly');
-    like(
-        $driver->find_child_element($last_matched_td, 'a')->get_attribute('href'),
-        qr/admin\/needles\/$last_matched_module_id\/$real_needle_id/,
-        'symlink needle last used module link is correct'
-    );
-
-    $_->delete for @need_deleted_needles;
-    unlink($symlink_needle_dir);
-};
-
 $needles_table = goto_admin_needle_table;
 wait_for_data_table($needles_table, 2);