Merge pull request #1852 from aka7/ssl_cert_support

ncm-spma: support for ssl client settings for yumng and dnf backend.

Author: jrha

ncm-spma/src/main/perl/spma/dnf.pm

@@ -318,6 +318,12 @@ sub Configure
             $attr = "excludepkgs" if $attr eq 'exclude';  # Sigh...
             print $fh "$attr=$val\n";
         }
+        # configure ssl settings if defined in protocols
+        foreach my $proto_attr (qw(verify cacert clientkey clientcert)) {
+            next unless defined $prots->{$proto_attr};
+            my $val = $prots->{$proto_attr};
+            print $fh "ssl$proto_attr=$val\n";
+        }
         $fh->close();
     }
     # set module stream configs

ncm-spma/src/main/perl/spma/yumng.pm

@@ -242,6 +242,12 @@ sub Configure
             $attr = "excludepkgs" if $attr eq 'exclude';  # Sigh...
             print $fh "$attr=$val\n";
         }
+        # configure ssl settings if defined in protocols
+        foreach my $proto_attr (qw(verify cacert clientkey clientcert)) {
+            next unless defined $prots->{$proto_attr};
+            my $val = $prots->{$proto_attr};
+            print $fh "ssl$proto_attr=$val\n";
+        }
         $fh->close();
     }
 

ncm-spma/src/test/perl/dnf-configure.t

@@ -0,0 +1,42 @@
+# -*- mode: cperl -*-
+# ${license-info}
+# ${author-info}
+# ${build-info}
+
+=pod
+
+=head1 DESCRIPTION
+
+Basic tests for NCM::Component::spma::dnf module.
+
+=cut
+
+use strict;
+use warnings;
+use Test::More;
+use NCM::Component::spma::dnf;
+use CAF::Object;
+use Test::Quattor::Object;
+use Readonly;
+
+$CAF::Object::NoAction = 1;
+
+my $obj = Test::Quattor::Object->new;
+
+=pod
+
+=head2 Test component instantiation
+
+=cut
+
+my $cmp = NCM::Component::spma::dnf->new("spma", $obj);
+isa_ok($cmp, "NCM::Component::spma::dnf", "Component instantiated correctly");
+isa_ok($cmp, "NCM::Component", "Inherits from NCM::Component");
+
+=pod
+
+=head2 Test NoActionSupported flag
+
+=cut
+
+done_testing();

ncm-spma/src/test/perl/dnf-execute-cmd.t

@@ -0,0 +1,102 @@
+# -*- mode: cperl -*-
+# ${license-info}
+# ${author-info}
+# ${build-info}
+
+=pod
+
+=head1 DESCRIPTION
+
+Tests for the C<execute_command> method in NCM::Component::spma::dnf.
+This method executes shell commands and returns (exit code, stdout, stderr).
+
+=head1 TESTS
+
+The tests verify that commands are executed correctly and that
+successes and errors are properly propagated to the caller.
+
+=cut
+
+use strict;
+use warnings;
+use Readonly;
+use Test::More;
+use Test::Quattor;
+use NCM::Component::spma::dnf;
+use CAF::Object;
+
+$CAF::Object::NoAction = 1;
+
+my $cmp = NCM::Component::spma::dnf->new("spma");
+
+Readonly::Array my @TEST_CMD => ("echo", "test");
+Readonly my $CMD_LINE => join(" ", @TEST_CMD);
+Readonly my $WHY => "testing command execution";
+
+=pod
+
+=head2 Test successful command execution
+
+=cut
+
+set_desired_output($CMD_LINE, "test output");
+set_desired_err($CMD_LINE, "");
+set_command_status($CMD_LINE, 0);
+
+my ($exit, $out, $err) = $cmp->execute_command(\@TEST_CMD, $WHY, 1);
+is($exit, 0, "execute_command returns exit code 0 on success");
+is($out, "test output", "execute_command captures stdout");
+is($err, "", "execute_command captures empty stderr");
+
+my $cmd = get_command($CMD_LINE);
+ok($cmd, "Correct command called");
+is($cmd->{method}, "execute", "Correct method called");
+
+=pod
+
+=head2 Test command with stderr output
+
+=cut
+
+set_desired_output($CMD_LINE, "stdout content");
+set_desired_err($CMD_LINE, "stderr content");
+set_command_status($CMD_LINE, 0);
+
+($exit, $out, $err) = $cmp->execute_command(\@TEST_CMD, $WHY, 1);
+is($exit, 0, "exit code 0 with stderr output");
+is($out, "stdout content", "stdout captured correctly");
+is($err, "stderr content", "stderr captured correctly");
+
+=pod
+
+=head2 Test command failure (non-zero exit)
+
+=cut
+
+set_desired_output($CMD_LINE, "");
+set_desired_err($CMD_LINE, "error message");
+set_command_status($CMD_LINE, 256);
+
+($exit, $out, $err) = $cmp->execute_command(\@TEST_CMD, $WHY, 1);
+isnt($exit, 0, "non-zero exit code returned on failure");
+is($err, "error message", "error message captured");
+
+=pod
+
+=head2 Test keeps_state parameter
+
+=cut
+
+set_desired_output($CMD_LINE, "output");
+set_desired_err($CMD_LINE, "");
+set_command_status($CMD_LINE, 0);
+
+($exit, $out, $err) = $cmp->execute_command(\@TEST_CMD, $WHY, 1);
+$cmd = get_command($CMD_LINE);
+ok(!$cmd->{object}->{NoAction}, "keeps_state=1 disables NoAction for command");
+
+($exit, $out, $err) = $cmp->execute_command(\@TEST_CMD, $WHY, 0);
+$cmd = get_command($CMD_LINE);
+ok($cmd->{object}->{NoAction}, "keeps_state=0 keeps NoAction for command");
+
+done_testing();

ncm-spma/src/test/perl/dnf-installed.t

@@ -0,0 +1,82 @@
+# -*- mode: cperl -*-
+# ${license-info}
+# ${author-info}
+# ${build-info}
+
+=pod
+
+=head1 DESCRIPTION
+
+Tests for the C<get_installed_rpms> method in NCM::Component::spma::dnf.
+This method queries the RPM database and returns a C<Set::Scalar> with
+all installed packages.
+
+=head1 TESTS
+
+=cut
+
+use strict;
+use warnings;
+use Readonly;
+use Test::More;
+use Test::Quattor;
+use Test::MockModule;
+use NCM::Component::spma::dnf;
+use CAF::Object;
+
+$CAF::Object::NoAction = 1;
+
+# Suppress error logging during failure tests
+my $mock = Test::MockModule->new('NCM::Component::spma::dnf');
+my $error_count = 0;
+$mock->mock('error', sub { $error_count++; });
+
+Readonly my $CMD => join(" ", NCM::Component::spma::dnf::RPM_QUERY_INSTALLED());
+
+my $cmp = NCM::Component::spma::dnf->new("spma");
+
+=pod
+
+=head2 Test empty package list
+
+=cut
+
+set_desired_output($CMD, "");
+set_desired_err($CMD, "");
+set_command_status($CMD, 0);
+
+my $pkgs = $cmp->get_installed_rpms();
+isa_ok($pkgs, "Set::Scalar", "Received a Set::Scalar with empty input");
+is($pkgs->size, 0, "Empty set returned for empty output");
+
+=pod
+
+=head2 Test with package list
+
+=cut
+
+set_desired_output($CMD, "glibc-0:2.28-151.el8.x86_64\nkernel-0:4.18.0-305.el8.x86_64\n");
+set_desired_err($CMD, "");
+set_command_status($CMD, 0);
+
+$pkgs = $cmp->get_installed_rpms();
+isa_ok($pkgs, "Set::Scalar", "Received a Set::Scalar");
+is($pkgs->size, 2, "Set contains two packages");
+ok($pkgs->has("glibc-0:2.28-151.el8.x86_64"), "Set contains glibc package");
+ok($pkgs->has("kernel-0:4.18.0-305.el8.x86_64"), "Set contains kernel package");
+
+=pod
+
+=head2 Test RPM command failure
+
+=cut
+
+set_desired_output($CMD, "");
+set_desired_err($CMD, "rpm: error");
+set_command_status($CMD, 1);
+
+$pkgs = $cmp->get_installed_rpms();
+is($pkgs, undef, "Returns undef on RPM command failure");
+is($error_count, 1, "Error reported on failure");
+
+done_testing();

ncm-spma/src/test/perl/dnf-modules.t

@@ -0,0 +1,122 @@
+# -*- mode: cperl -*-
+# ${license-info}
+# ${author-info}
+# ${build-info}
+
+=pod
+
+=head1 DESCRIPTION
+
+Tests for the DNF module management methods in NCM::Component::spma::dnf:
+C<generate_dnf_modules> and C<set_default_modules>.
+
+=head1 TESTS
+
+=cut
+
+use strict;
+use warnings;
+use Test::More;
+use Test::Quattor qw(dnf_modules);
+use NCM::Component::spma::dnf;
+use CAF::Object;
+use Test::Quattor::Object;
+use Readonly;
+use File::Path qw(mkpath rmtree);
+
+use Test::Quattor::TextRender::Base;
+
+my $caf_trd = mock_textrender();
+
+$CAF::Object::NoAction = 1;
+
+my $obj = Test::Quattor::Object->new;
+
+my $cmp = NCM::Component::spma::dnf->new("spma", $obj);
+
+Readonly my $MODULES_DIR => "target/test/dnf.modules.defaults.d";
+
+sub initialize_modules_dir {
+    rmtree($MODULES_DIR) if -d $MODULES_DIR;
+    mkpath($MODULES_DIR);
+}
+
+sub create_module_file {
+    my ($name) = @_;
+    open(my $fh, ">", "$MODULES_DIR/$name.yaml");
+    close($fh) or die("Could not write $name.yaml: $!"); 
+}
+
+=pod
+
+=head2 Test generate_dnf_modules
+
+=cut
+
+initialize_modules_dir();
+
+my $modules = {
+    'postgresql' => { stream => '13' },
+    'nodejs' => { stream => '16' },
+};
+
+my $changes = $cmp->generate_dnf_modules($MODULES_DIR, $modules);
+ok(defined($changes), "generate_dnf_modules returns defined value");
+
+my $head = "# File generated by NCM::Component::spma::dnf. Do not edit\n";
+
+my $fh = get_file("$MODULES_DIR/postgresql.yaml");
+ok(defined($fh), "postgresql module file created");
+like("$fh", qr/postgresql/, "postgresql module file has correct content");
+
+$fh = get_file("$MODULES_DIR/nodejs.yaml");
+ok(defined($fh), "nodejs module file created");
+like("$fh", qr/nodejs/, "nodejs module file has correct content");
+
+=pod
+
+=head2 Test set_default_modules with config
+
+=cut
+
+initialize_modules_dir();
+create_module_file("wanted_mod");
+create_module_file("unwanted_mod");
+
+my $cfg = get_config_for_profile("dnf_modules");
+
+# Track cleanup calls
+my @cleaned_files;
+my $mock_cmp = Test::MockModule->new('NCM::Component::spma::dnf');
+$mock_cmp->mock('cleanup', sub {
+    my ($self, $file) = @_;
+    push @cleaned_files, $file;
+    unlink $file or warn("Failed to remove $file: $!");
+    return 1;
+});
+
+my $result = $cmp->set_default_modules($cfg, $MODULES_DIR);
+ok($result, "set_default_modules returns success");
+
+ok(!-e "$MODULES_DIR/unwanted_mod.yaml", "Unwanted module file removed");
+
+=pod
+
+=head2 Test set_default_modules with missing directory
+
+=cut
+
+rmtree($MODULES_DIR) || warn("Failed to cleanup $MODULES_DIR: $!");
+
+$result = $cmp->set_default_modules($cfg, $MODULES_DIR);
+ok($result, "set_default_modules handles missing directory");
+
+=pod
+
+=head2 Cleanup
+
+=cut
+
+rmtree($MODULES_DIR) if -d $MODULES_DIR;
+
+done_testing();