Owasp logs part3

.github/workflows/24-pr-integration.yml

@@ -1,6 +1,7 @@
 name: "PR: Integration"
 
 on:
+  workflow_dispatch:
   pull_request:
     branches:
       - main
@@ -45,12 +46,14 @@ jobs:
       - name: Build package
         run: |
           DEB_BUILD_OPTIONS=nocheck ./packages/bddeb -d --release ${{ env.RELEASE }}
-          cp cloud-init-base*.deb ${{ runner.temp }}
+          DEB_PKG=cloud-init-base-PR-${GITHUB_REF_NAME%/*}-${{ env.RELEASE }}.deb
+          cp cloud-init-base*.deb ${{ runner.temp }}/$DEB_PKG
+          echo "DEB_PKG=${DEB_PKG}" >> $GITHUB_ENV
       - name: Archive debs as artifacts
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f  # v6.0.0
         with:
           name: 'cloud-init-${{ env.RELEASE }}-deb'
-          path: '${{ runner.temp }}/cloud-init-base*.deb'
+          path: '${{ runner.temp }}/${{ env.DEB_PKG }}'
           retention-days: 3
       - name: Setup LXD
         uses: canonical/setup-lxd@8c6a87bfb56aa48f3fb9b830baa18562d8bfd4ee  # v1
@@ -59,12 +62,12 @@ jobs:
       - name: Verify deb package
         run: |
           ls -hal '${{ runner.temp }}'
-          echo ${{ runner.temp }}/cloud-init-base*.deb || true
-          ls -hal ${{ runner.temp }}/cloud-init-base*.deb || true
+          echo ${{ runner.temp }}/${DEB_PKG} || true
+          ls -hal ${{ runner.temp }}/${DEB_PKG} || true
       - name: Set up Pycloudlib
         run: |
           ssh-keygen -P "" -q -f ~/.ssh/id_rsa
           echo "[lxd]" > /home/$USER/.config/pycloudlib.toml
       - name: Run integration Tests
         run: |
-          CLOUD_INIT_CLOUD_INIT_SOURCE="$(ls ${{ runner.temp }}/cloud-init-base*.deb)" CLOUD_INIT_OS_IMAGE=${{ env.RELEASE }} tox -e integration-tests-ci -- --color=yes tests/integration_tests/
+          CLOUD_INIT_CLOUD_INIT_SOURCE="$(ls ${{ runner.temp }}/${{ env.DEB_PKG }})" CLOUD_INIT_OS_IMAGE=${{ env.RELEASE }} tox -e integration-tests-ci -- --color=yes tests/integration_tests/

cloudinit/config/cc_set_passwords.py

@@ -11,7 +11,7 @@
 import random
 import re
 import string
-from typing import List
+from typing import List, Tuple
 
 from cloudinit import features, lifecycle, subp, util
 from cloudinit.cloud import Cloud
@@ -32,7 +32,7 @@
 LOG = logging.getLogger(__name__)
 
 
-def get_users_by_type(users_list: list, pw_type: str) -> list:
+def get_users_by_type(users_list: list, pw_type: str) -> List[Tuple[str, str]]:
     """either password or type: RANDOM is required, user is always required"""
     return (
         []

cloudinit/distros/__init__.py

@@ -31,6 +31,7 @@
     Tuple,
     Type,
     Union,
+    final,
 )
 
 import cloudinit.net.netops.iproute2 as iproute2
@@ -52,6 +53,12 @@
 from cloudinit.distros.parsers import hosts
 from cloudinit.features import ALLOW_EC2_MIRRORS_ON_NON_AWS_INSTANCE_TYPES
 from cloudinit.lifecycle import log_with_downgradable_level
+from cloudinit.log.security_event_log import (
+    sec_log_password_changed,
+    sec_log_password_changed_batch,
+    sec_log_system_shutdown,
+    sec_log_user_created,
+)
 from cloudinit.net import activators, dhcp, renderers
 from cloudinit.net.netops import NetOps
 from cloudinit.net.network_state import parse_net_config_data
@@ -659,27 +666,80 @@ def preferred_ntp_clients(self):
     def get_default_user(self):
         return self.get_option("default_user")
 
-    def add_user(self, name, **kwargs) -> bool:
-        """
-        Add a user to the system using standard GNU tools
+    def _user_groups_to_list(self, groups) -> List[str]:
+        """Return a list of designation groups with whitespace removed."""
+        if not groups:
+            return []
+        if isinstance(groups, str):
+            groups = groups.split(",")
+        return [g.strip() for g in groups]
+
+    def _get_elevated_roles(self, **kwargs) -> List[str]:
+        elevated_roles = []
+        if kwargs.get("sudo"):
+            elevated_roles.append("sudo")
+        if kwargs.get("doas"):
+            elevated_roles.append("doas")
+        return elevated_roles
+
+    @final
+    @sec_log_user_created
+    def add_user(self, name, **kwargs) -> None:
+        """Add a user to the system."""
+
+        self._add_user_preprocess_kwargs(name, kwargs)
+
+        create_groups = kwargs.pop("create_groups", True)
+
+        if isinstance(kwargs.get("groups", None), dict):
+            lifecycle.deprecate(
+                deprecated=f"The user {name} has a 'groups' config value "
+                "of type dict",
+                deprecated_version="22.3",
+                extra_message="Use a comma-delimited string or "
+                "array instead: group1,group2.",
+            )
+        groups = self._user_groups_to_list(kwargs.pop("groups", None))
+        if groups:
+            primary_group = kwargs.get("primary_group")
+            if primary_group:
+                groups.append(primary_group)
+
+        if create_groups and groups:
+            for group in groups:
+                if not util.is_group(group):
+                    self.create_group(group)
+                    LOG.debug("created group '%s' for user '%s'", group, name)
 
-        This should be overridden on distros where useradd is not desirable or
-        not available.
+        if "uid" in kwargs:
+            kwargs["uid"] = str(kwargs["uid"])
 
-        Returns False if user already exists, otherwise True.
+        LOG.debug("Adding user %s", name)
+        cmd, log_cmd = self._build_add_user_cmd(name, groups, **kwargs)
+        try:
+            subp.subp(cmd, logstring=log_cmd)
+        except Exception as e:
+            util.logexc(LOG, "Failed to create user %s", name)
+            raise e
+
+        self._post_add_user(name, groups, **kwargs)
+
+    def _add_user_preprocess_kwargs(self, name: str, kwargs: dict) -> None:
+        """Preprocess kwargs in-place before building the add-user command.
+
+        Overridden to filter for distro-specific user creation tools.
         """
-        # XXX need to make add_user idempotent somehow as we
-        # still want to add groups or modify SSH keys on pre-existing
-        # users in the image.
-        if util.is_user(name):
-            LOG.info("User %s already exists, skipping.", name)
-            return False
 
-        if "create_groups" in kwargs:
-            create_groups = kwargs.pop("create_groups")
-        else:
-            create_groups = True
+    def _build_add_user_cmd(
+        self, name: str, groups: List[str], **kwargs
+    ) -> Tuple[List[str], List[str]]:
+        """Build the useradd command for GNU/Linux systems.
+
+        Overridden  for distro-specific user-creation tools.
 
+        Returns a (cmd, log_cmd) tuple where log_cmd has sensitive values
+        redacted.
+        """
         useradd_cmd = ["useradd", name]
         log_useradd_cmd = ["useradd", name]
         if util.system_is_snappy():
@@ -694,7 +754,6 @@ def add_user(self, name, **kwargs) -> bool:
             "homedir": "--home",
             "primary_group": "--gid",
             "uid": "--uid",
-            "groups": "--groups",
             "passwd": "--password",
             "shell": "--shell",
             "expiredate": "--expiredate",
@@ -710,42 +769,10 @@ def add_user(self, name, **kwargs) -> bool:
 
         redact_opts = ["passwd"]
 
-        # support kwargs having groups=[list] or groups="g1,g2"
-        groups = kwargs.get("groups")
-        if groups:
-            if isinstance(groups, str):
-                groups = groups.split(",")
-
-            if isinstance(groups, dict):
-                lifecycle.deprecate(
-                    deprecated=f"The user {name} has a 'groups' config value "
-                    "of type dict",
-                    deprecated_version="22.3",
-                    extra_message="Use a comma-delimited string or "
-                    "array instead: group1,group2.",
-                )
-
-            # remove any white spaces in group names, most likely
-            # that came in as a string like: groups: group1, group2
-            groups = [g.strip() for g in groups]
-
-            # kwargs.items loop below wants a comma delimited string
-            # that can go right through to the command.
-            kwargs["groups"] = ",".join(groups)
-
-            primary_group = kwargs.get("primary_group")
-            if primary_group:
-                groups.append(primary_group)
-
-        if create_groups and groups:
-            for group in groups:
-                if not util.is_group(group):
-                    self.create_group(group)
-                    LOG.debug("created group '%s' for user '%s'", group, name)
-        if "uid" in kwargs.keys():
-            kwargs["uid"] = str(kwargs["uid"])
-
         # Check the values and create the command
+        if groups:
+            useradd_cmd.extend(["--groups", ",".join(groups)])
+            log_useradd_cmd.extend(["--groups", ",".join(groups)])
         for key, val in sorted(kwargs.items()):
             if key in useradd_opts and val and isinstance(val, str):
                 useradd_cmd.extend([useradd_opts[key], val])
@@ -769,17 +796,16 @@ def add_user(self, name, **kwargs) -> bool:
             useradd_cmd.append("-m")
             log_useradd_cmd.append("-m")
 
-        # Run the command
-        LOG.debug("Adding user %s", name)
-        try:
-            subp.subp(useradd_cmd, logstring=log_useradd_cmd)
-        except Exception as e:
-            util.logexc(LOG, "Failed to create user %s", name)
-            raise e
+        return useradd_cmd, log_useradd_cmd
 
-        # Indicate that a new user was created
-        return True
+    def _post_add_user(self, name: str, groups: List[str], **kwargs) -> None:
+        """Hook called after the user-creation command succeeds.
+
+        Overridden to perform distro-specific post-creation steps.
+        """
 
+    @final
+    @sec_log_user_created
     def add_snap_user(self, name, **kwargs):
         """
         Add a snappy user to the system using snappy tools
@@ -802,14 +828,10 @@ def add_snap_user(self, name, **kwargs):
                 create_user_cmd, logstring=create_user_cmd, capture=True
             )
             LOG.debug("snap create-user returned: %s:%s", out, err)
-            jobj = util.load_json(out)
-            username = jobj.get("username", None)
         except Exception as e:
             util.logexc(LOG, "Failed to create snap user %s", name)
             raise e
 
-        return username
-
     def _shadow_file_has_empty_user_password(self, username) -> bool:
         """
         Check whether username exists in shadow files with empty password.
@@ -844,6 +866,7 @@ def _shadow_file_has_empty_user_password(self, username) -> bool:
                 return True
         return False
 
+    @final
     def create_user(self, name, **kwargs):
         """
         Creates or partially updates the ``name`` user in the system.
@@ -869,8 +892,11 @@ def create_user(self, name, **kwargs):
         if "snapuser" in kwargs:
             return self.add_snap_user(name, **kwargs)
 
-        # Add the user
-        pre_existing_user = not self.add_user(name, **kwargs)
+        pre_existing_user = util.is_user(name)
+        if pre_existing_user:
+            LOG.info("User %s already exists, skipping.", name)
+        else:
+            self.add_user(name, **kwargs)
 
         has_existing_password = False
         ud_blank_password_specified = False
@@ -1021,7 +1047,6 @@ def create_user(self, name, **kwargs):
                 ssh_util.setup_user_keys(
                     set(cloud_keys), name, options=disable_option
                 )
-        return True
 
     def lock_passwd(self, name):
         """
@@ -1093,6 +1118,7 @@ def expire_passwd(self, user):
             util.logexc(LOG, "Failed to set 'expire' for %s", user)
             raise e
 
+    @sec_log_password_changed
     def set_passwd(self, user, passwd, hashed=False):
         pass_string = "%s:%s" % (user, passwd)
         cmd = ["chpasswd"]
@@ -1113,7 +1139,8 @@ def set_passwd(self, user, passwd, hashed=False):
 
         return True
 
-    def chpasswd(self, plist_in: list, hashed: bool):
+    @sec_log_password_changed_batch
+    def chpasswd(self, plist_in: List[Tuple[str, str]], hashed: bool):
         payload = (
             "\n".join(
                 (":".join([name, password]) for name, password in plist_in)
@@ -1322,9 +1349,9 @@ def create_group(self, name, members=None):
                 LOG.info("Added user '%s' to group '%s'", member, name)
 
     @classmethod
+    @final
+    @sec_log_system_shutdown
     def shutdown_command(cls, *, mode, delay, message):
-        # called from cc_power_state_change.load_power_state
-        command = ["shutdown", cls.shutdown_options_map[mode]]
         try:
             if delay != "now":
                 delay = "+%d" % int(delay)
@@ -1333,10 +1360,14 @@ def shutdown_command(cls, *, mode, delay, message):
                 "power_state[delay] must be 'now' or '+m' (minutes)."
                 " found '%s'." % (delay,)
             ) from e
-        args = command + [delay]
+        return cls._build_shutdown_command(mode, delay, message)
+
+    @classmethod
+    def _build_shutdown_command(cls, mode, delay, message):
+        command = ["shutdown", cls.shutdown_options_map[mode], delay]
         if message:
-            args.append(message)
-        return args
+            command.append(message)
+        return command
 
     @classmethod
     def reload_init(cls, rcs=None):