Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hash comparison #21118

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Fix hash comparison #21118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb91aa3
Fix hash comparison
realcharmer Feb 5, 2025
13955d7
Fail on hash mismatch
realcharmer Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions tests/security/vsftpd/lftp.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,18 @@ use utils;

sub check_hash {
my ($expected_hash, $calculated_hash) = @_;
my $message = ($expected_hash eq $calculated_hash) ? "Pass: Hash values matched" : "Error: Hash values did not match. Expected: $expected_hash, Got: $calculated_hash";
record_info($message);
my $message;
my $result;

if ($expected_hash eq $calculated_hash) {
$message = 'Pass: Hash values matched';
$result = 'ok';
} else {
$message = "Error: Hash values did not match. Expected: $expected_hash, Got: $calculated_hash";
$result = 'fail';
}

record_info('Hash Check', $message, result => $result);
}

sub run {
Expand Down Expand Up @@ -47,16 +57,16 @@ sub run {
assert_script_run('ls | grep f1.txt');

# Compare file hashes
my $hash_orig = script_output("sha256sum $ftp_users_path/$user/$ftp_served_dir/f1.txt");
my $hash_downloaded = script_output('sha256sum f1.txt');
my $hash_orig = script_output(qq[sha256sum "$ftp_users_path/$user/$ftp_served_dir/f1.txt" | awk '{print \$1}']);
my $hash_downloaded = script_output(qq[sha256sum f1.txt | awk '{print \$1}']);
check_hash($hash_orig, $hash_downloaded);

# Check if file has been uploaded
assert_script_run("ls $ftp_users_path/$user/$ftp_received_dir | grep f2.txt");

# Compare file hashes
my $hash_created = script_output('sha256sum f2.txt');
my $hash_uploaded = script_output("sha256sum $ftp_users_path/$user/$ftp_received_dir/f2.txt");
my $hash_created = script_output(qq[sha256sum f2.txt | awk '{print \$1}']);
my $hash_uploaded = script_output(qq[sha256sum "$ftp_users_path/$user/$ftp_received_dir/f2.txt" | awk '{print \$1}']);
check_hash($hash_created, $hash_uploaded);
}

Expand Down