penguins-eggs 25.11.21 → 25.12.7

package/dist/classes/ovary.d/user-create-live.js

@@ -1,97 +1,95 @@
 /**
- * ./src/classes/ovary.d/create-user-live.ts
+ * src/classes/ovary.d/user-create-live.ts
  * penguins-eggs v.25.7.x / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
+ * * REFACTORED: Uses "The SysUser Master" class.
+ * Creates the live user directly in the merged filesystem safely.
  */
-// packages
 import fs from 'fs';
-import path from 'node:path';
-import yaml from 'js-yaml';
-// functions
+import path from 'path';
 import { exec } from '../../lib/utils.js';
-import rexec from './rexec.js';
-import Utils from '../utils.js';
-// _dirname
-const __dirname = path.dirname(new URL(import.meta.url).pathname);
-/**
-   * list degli utenti: grep -E 1[0-9]{3}  /etc/passwd | sed s/:/\ / | awk '{print $1}'
-   * create la home per user_opt
-   * @param verbose
-   */
-export async function userCreateLive() {
-    if (this.verbose) {
-        console.log('Ovary: userCreateLive');
+import SysUsers from '../sys-users.js';
+export default async function userCreateLive() {
+    // Target: la directory "merged" dell'overlayfs
+    let target = this.settings.work_dir.merged;
+    if (!target || !fs.existsSync(target)) {
+        console.error(`SysUsers Error: Target directory not found at: ${target}`);
+        return;
     }
-    const cmds = [];
-    cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' rm /home/' + this.settings.config.user_opt + ' -rf', this.verbose));
-    cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' mkdir /home/' + this.settings.config.user_opt, this.verbose));
-    // Create user using useradd
-    cmds.push(await rexec('chroot ' + this.settings.work_dir.merged + ' useradd ' + this.settings.config.user_opt + ' --home-dir /home/' + this.settings.config.user_opt + ' --shell /bin/bash ', this.verbose));
-    // live password 
-    cmds.push(await rexec('echo ' + this.settings.config.user_opt + ':' + this.settings.config.user_opt_passwd + ' | chroot ' + this.settings.work_dir.merged + ' /usr/sbin/chpasswd', this.verbose));
-    // root password
-    cmds.push(await rexec(' echo root:' + this.settings.config.root_passwd + ' | chroot ' + this.settings.work_dir.merged + ' /usr/sbin/chpasswd', this.verbose));
-    // Alpine naked don't have /etc/skel
-    if (fs.existsSync('/etc/skel')) {
-        cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' cp /etc/skel/. /home/' + this.settings.config.user_opt + ' -R', this.verbose));
+    const familyId = this.distro?.familyId || this.familyId;
+    console.log(`Creating LIVE user in snapshot at ${target} (Family: ${familyId})...`);
+    // 1. CARICAMENTO CONFIGURAZIONE ESISTENTE
+    const sysUsers = new SysUsers(target, familyId);
+    sysUsers.load();
+    // 2. DEFINIZIONE UTENTE LIVE
+    const username = this.settings.config.user_opt || 'live';
+    const password = 'evolution'; // Password default live
+    // Shell detection
+    let shell = '/bin/bash';
+    if (!fs.existsSync(path.join(target, 'bin/bash')) && fs.existsSync(path.join(target, 'bin/ash'))) {
+        shell = '/bin/ash';
     }
-    // da problemi con il mount sshfs
-    cmds.push(await rexec('chroot  ' + this.settings.work_dir.merged + ' chown ' + this.settings.config.user_opt + ':users' + ' /home/' + this.settings.config.user_opt + ' -R', this.verbose));
-    /**
-     *
-     */
-    switch (this.familyId) {
-        case 'alpine': {
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG wheel ${this.settings.config.user_opt}`, this.verbose));
-            break;
-        }
-        case 'archlinux': {
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} gpasswd -a ${this.settings.config.user_opt} wheel`, this.verbose));
-            // check or create group: autologin
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} getent group autologin || chroot ${this.settings.work_dir.merged} groupadd autologin`, this.verbose));
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} gpasswd -a ${this.settings.config.user_opt} autologin`, this.verbose));
-            break;
-        }
-        case 'debian': {
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sudo ${this.settings.config.user_opt}`, this.verbose));
-            break;
-        }
-        case 'fedora': {
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG wheel ${this.settings.config.user_opt}`, this.verbose));
-            break;
-        }
-        case 'openmamba': {
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG sysadmin ${this.settings.config.user_opt}`, this.verbose));
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG autologin ${this.settings.config.user_opt}`, this.verbose));
-            break;
-        }
-        case 'opensuse': {
-            cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG wheel ${this.settings.config.user_opt}`, this.verbose));
-            break;
-        }
-        // No default
+    const liveUser = {
+        username: username,
+        password: 'x',
+        uid: '1000', // Live user è sempre 1000
+        gid: '1000',
+        gecos: 'Live User,,,',
+        home: `/home/${username}`,
+        shell: shell
+    };
+    // 3. CREAZIONE LOGICA (IN MEMORIA)
+    // Rimuove eventuali residui precedenti e aggiunge il nuovo
+    sysUsers.addUser(liveUser, password);
+    // Aggiungi ai gruppi amministrativi
+    let adminGroup = 'wheel';
+    if (['debian', 'ubuntu', 'linuxmint', 'pop', 'neon'].includes(familyId)) {
+        adminGroup = 'sudo';
     }
-    /**
-     * look to calamares/modules/users.conf for groups
-     */
-    let usersConf = '/etc/calamares/modules/users.conf';
-    if (!fs.existsSync(usersConf)) {
-        usersConf = '/etc/penguins-eggs.d/krill/modules/users.conf';
+    else if (familyId === 'openmamba') {
+        adminGroup = 'sysadmin';
     }
-    if (fs.existsSync(usersConf)) {
-        const o = yaml.load(fs.readFileSync(usersConf, 'utf8'));
-        for (const group of o.defaultGroups) {
-            const groupExists = await exec(`chroot ${this.settings.work_dir.merged} getent group ${group}`, { ignore: true });
-            if (groupExists.code == 0) {
-                cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} usermod -aG ${group} ${this.settings.config.user_opt} ${this.toNull}`, this.verbose));
-                Utils.warning(`added ${this.settings.config.user_opt} to group ${group}`);
-            }
-        }
+    sysUsers.addUserToGroup(username, adminGroup);
+    // GRUPPO AUTOLOGIN (Fondamentale per la live!)
+    // Creiamo il gruppo se non esiste (logica semplificata: lo aggiungiamo a sysUsers se manca?)
+    // SysUsers.addUserToGroup fallisce silenziosamente se il gruppo non c'è. 
+    // Per sicurezza su Fedora/Arch, autologin di solito esiste o va creato.
+    // Proviamo ad aggiungerlo:
+    sysUsers.addUserToGroup(username, 'autologin'); // <--- PUNTO E VIRGOLA FONDAMENTALE QUI!
+    // Aggiungiamo anche ai gruppi standard audio/video/network se esistono
+    ['video', 'audio', 'network', 'input', 'lp', 'storage', 'optical'].forEach(grp => {
+        sysUsers.addUserToGroup(username, grp);
+    });
+    // 4. SALVATAGGIO ATOMICO SU DISCO
+    await sysUsers.save();
+    // 5. CREAZIONE FISICA HOME DIRECTORY
+    const homeDir = path.join(target, 'home', username);
+    // Cleanup
+    if (fs.existsSync(homeDir))
+        await exec(`rm -rf ${homeDir}`, this.echo);
+    // Scheletro (/etc/skel)
+    const skelPath = path.join(target, 'etc', 'skel');
+    if (fs.existsSync(skelPath)) {
+        await exec(`mkdir -p ${homeDir}`, this.echo);
+        await exec(`cp -rT ${skelPath} ${homeDir}`, this.echo);
     }
     else {
-        console.log(`il file ${usersConf} non esiste!`);
-        await Utils.pressKeyToExit();
+        await exec(`mkdir -p ${homeDir}`, this.echo);
+    }
+    // Permessi
+    await exec(`chown -R 1000:1000 ${homeDir}`, this.echo);
+    // Per la live va bene anche 755, ma 700 è più sicuro. Lasciamo standard.
+    await exec(`chmod 755 ${homeDir}`, this.echo);
+    // 6. FIX SELINUX SPECIFICO PER HOME LIVE
+    if (['fedora', 'rhel', 'centos', 'almalinux', 'rocky'].includes(familyId)) {
+        try {
+            await exec(`chcon -R -t user_home_t ${homeDir}`, { echo: false }).catch(() => { });
+            // Nota: .autorelabel nella root della live potrebbe rallentare il boot, 
+            // ma è meglio averlo se i contesti sono dubbi.
+            // await exec(`touch ${target}/.autorelabel`, { echo: false }) 
+        }
+        catch (e) {
+            console.error('SELinux home fix warning:', e);
+        }
     }
+    console.log(`Live user '${username}' created successfully via SysUser Master.`);
 }

package/dist/classes/ovary.d/users-remove.d.ts

@@ -1,9 +1,8 @@
 /**
- * ./src/classes/ovary.d/users-remove.ts
+ * src/classes/ovary.d/users-remove.ts
  * penguins-eggs v.25.7.x / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
+ * * REFACTORED: Uses "The SysUser Master" class.
+ * Cleans up host users from the ISO filesystem safely.
  */
-import Ovary from './../ovary.js';
-export declare function usersRemove(this: Ovary): Promise<void>;
+import Ovary from '../ovary.js';
+export default function usersRemove(this: Ovary): Promise<void>;

package/dist/classes/ovary.d/users-remove.js

@@ -1,38 +1,68 @@
 /**
- * ./src/classes/ovary.d/users-remove.ts
+ * src/classes/ovary.d/users-remove.ts
  * penguins-eggs v.25.7.x / ecmascript 2020
- * author: Piero Proietti
- * email: piero.proietti@gmail.com
- * license: MIT
+ * * REFACTORED: Uses "The SysUser Master" class.
+ * Cleans up host users from the ISO filesystem safely.
  */
-// packages
-import path from 'node:path';
-// backup
-// interfaces
-// libraries
+import fs from 'fs';
+import path from 'path';
 import { exec } from '../../lib/utils.js';
-import rexec from './rexec.js';
-import Diversions from './../diversions.js';
-// _dirname
-const __dirname = path.dirname(new URL(import.meta.url).pathname);
-//async cleanUsersAccounts() {
-export async function usersRemove() {
-    if (this.verbose) {
-        console.log('Ovary: cleanUsersAccounts');
+import SysUsers from '../sys-users.js';
+export default async function usersRemove() {
+    // Il target corretto in Ovary è la directory "merged" dell'overlayfs
+    let target = this.settings.work_dir.merged;
+    // Assicuriamoci che il target esista per sicurezza
+    if (!target || !fs.existsSync(target)) {
+        console.error(`SysUsers Error: Merged target directory not found at: ${target}`);
+        return;
     }
-    /**
-     * delete all user in chroot
-     */
-    const cmds = [];
-    const cmd = `chroot ${this.settings.work_dir.merged} getent passwd {1000..60000} |awk -F: '{print $1}'`;
-    const result = await exec(cmd, {
-        capture: true,
-        echo: this.verbose,
-        ignore: false
-    });
-    const users = result.data.split('\n');
-    let deluser = Diversions.deluser(this.familyId);
-    for (let i = 0; i < users.length - 1; i++) {
-        cmds.push(await rexec(`chroot ${this.settings.work_dir.merged} ${deluser} ${users[i]}`, this.verbose));
+    // Nota: verifica se in Ovary hai 'this.familyId' diretto o 'this.distro.familyId'.
+    // Solitamente è this.distro.familyId, ma se hai un getter va bene così.
+    const familyId = this.distro?.familyId || this.familyId;
+    console.log(`Cleaning host users from ISO snapshot at ${target} (Family: ${familyId})...`);
+    // 2. CARICAMENTO CONFIGURAZIONE
+    const sysUsers = new SysUsers(target, familyId);
+    sysUsers.load();
+    // 3. IDENTIFICAZIONE UTENTI DA RIMUOVERE
+    // Dobbiamo leggere il file passwd raw per decidere chi rimuovere
+    // (rimuoviamo UID >= 1000 tranne 'nobody' e 'root')
+    const usersToDelete = [];
+    const passwdPath = path.join(target, 'etc/passwd');
+    if (fs.existsSync(passwdPath)) {
+        const lines = fs.readFileSync(passwdPath, 'utf8').split('\n');
+        for (const line of lines) {
+            const parts = line.split(':');
+            if (parts.length > 2) {
+                const uid = parseInt(parts[2]);
+                const username = parts[0];
+                // Logica di rimozione standard di eggs
+                if (uid >= 1000 && username !== 'nobody') {
+                    usersToDelete.push(username);
+                }
+            }
+        }
+    }
+    // 4. ESECUZIONE RIMOZIONE (IN MEMORIA)
+    for (const username of usersToDelete) {
+        console.log(`- Removing user: ${username}`);
+        sysUsers.removeUser(username);
+        // Pulizia File Fisici (Home, Mail) - Operazioni FS dirette
+        const homeDir = path.join(target, 'home', username);
+        if (fs.existsSync(homeDir)) {
+            await exec(`rm -rf ${homeDir}`, this.echo);
+        }
+        const mailFile = path.join(target, 'var/mail', username);
+        if (fs.existsSync(mailFile)) {
+            fs.unlinkSync(mailFile);
+        }
+    }
+    // 5. SALVATAGGIO ATOMICO SU DISCO
+    if (usersToDelete.length > 0) {
+        // Scrive passwd, shadow, group, gshadow, subuid... e ripara SELinux
+        await sysUsers.save();
+        console.log("User cleanup completed via SysUsers Master.");
+    }
+    else {
+        console.log("No users needed to be removed.");
     }
 }

package/dist/classes/ovary.d/xorriso-command.js

@@ -38,13 +38,9 @@ export async function xorrisoCommand(clone = false, homecrypt = false, fullcrypt
     }
     // postfix (data)
     const postfix = Utils.getPostfix();
-    console.log('prefix:', prefix);
-    console.log('prefix:', this.volid);
-    console.log('arch:', Utils.uefiArch());
-    console.log('typology:', typology);
     console.log('postfix:', postfix);
     this.settings.isoFilename = prefix + this.volid + '_' + Utils.uefiArch() + typology + postfix;
-    // node della ISO
+    console.log('isoFilename:', this.settings.isoFilename);
     const output = this.settings.config.snapshot_mnt + this.settings.isoFilename;
     let command = '';
     // const appid = `-appid "${this.settings.distro.distroId}" `

package/dist/classes/ovary.d.ts

@@ -21,9 +21,9 @@ import { createXdgAutostart } from './ovary.d/create-xdg-autostart.js';
 import { copied, merged, mergedAndOverlay } from './ovary.d/merged.js';
 import { makeIso } from './ovary.d/make-iso.js';
 import { initrdAlpine, initrdArch, initrdDebian, initrdDracut } from './ovary.d/initrd.js';
-import { userCreateLive } from './ovary.d/user-create-live.js';
+import userCreateLive from './ovary.d/user-create-live.js';
 import { syslinux } from './ovary.d/syslinux.js';
-import { usersRemove } from './ovary.d/users-remove.js';
+import usersRemove from './ovary.d/users-remove.js';
 import { makeDotDisk } from './ovary.d/make-dot-disk.js';
 import { kernelCopy } from './ovary.d/kernel-copy.js';
 import { liveCreateStructure } from './ovary.d/live-create-structure.js';

package/dist/classes/ovary.js

@@ -22,9 +22,9 @@ import { createXdgAutostart } from './ovary.d/create-xdg-autostart.js';
 import { copied, merged, mergedAndOverlay } from './ovary.d/merged.js';
 import { makeIso } from './ovary.d/make-iso.js';
 import { initrdAlpine, initrdArch, initrdDebian, initrdDracut } from './ovary.d/initrd.js';
-import { userCreateLive } from './ovary.d/user-create-live.js';
+import userCreateLive from './ovary.d/user-create-live.js';
 import { syslinux } from './ovary.d/syslinux.js';
-import { usersRemove } from './ovary.d/users-remove.js';
+import usersRemove from './ovary.d/users-remove.js';
 import { makeDotDisk } from './ovary.d/make-dot-disk.js';
 import { kernelCopy } from './ovary.d/kernel-copy.js';
 import { liveCreateStructure } from './ovary.d/live-create-structure.js';

package/dist/classes/pacman.d/alpine.js

@@ -5,7 +5,7 @@
  * email: piero.proietti@gmail.com
  * license: MIT
  */
-import shx from 'shelljs';
+import { shx } from '../../lib/utils.js';
 import { exec } from '../../lib/utils.js';
 import Utils from '../utils.js';
 /**
@@ -131,7 +131,7 @@ export default class Alpine {
      */
     static async packageInstall(packageName) {
         let retVal = false;
-        if (shx.exec(`/sbin/apk add ${packageName}`, { silent: true }) === '0') {
+        if (shx.exec('/sbin/apk add ' + packageName, { silent: true }).code === 0) {
             retVal = true;
         }
         return retVal;

package/dist/classes/pacman.d/archlinux.js

@@ -6,7 +6,7 @@
  * license: MIT
  */
 import fs from 'node:fs';
-import shx from 'shelljs';
+import { shx } from '../../lib/utils.js';
 import { exec } from '../../lib/utils.js';
 import Utils from '../utils.js';
 /**
@@ -77,7 +77,7 @@ export default class Archlinux {
      */
     static async packageInstall(packageName) {
         let retVal = false;
-        if (shx.exec(`/usr/bin/pacman -Si ${packageName}`, { silent: true }) === '0') {
+        if (shx.exec('/usr/bin/pacman -Si ' + packageName, { silent: true }).code === 0) {
             retVal = true;
         }
         return retVal;

package/dist/classes/pacman.d/debian.js

@@ -6,8 +6,7 @@
  * license: MIT
  */
 import fs from 'node:fs';
-import shx from 'shelljs';
-import { exec } from '../../lib/utils.js';
+import { exec, shx } from '../../lib/utils.js';
 import Utils from '../utils.js';
 /**
  * Debian
@@ -116,7 +115,7 @@ export default class Debian {
      */
     static async packageInstall(packageName) {
         let retVal = false;
-        if (shx.exec(`/usr/bin/apt-get install -y ${packageName}`, { silent: true }) === '0') {
+        if (shx.exec('/usr/bin/apt-get install -y ' + packageName, { silent: true }).code === 0) {
             retVal = true;
         }
         return retVal;

package/dist/classes/pacman.d/fedora.js

@@ -6,8 +6,7 @@
  * license: MIT
  */
 import fs from 'node:fs';
-import shx from 'shelljs';
-import { exec } from '../../lib/utils.js';
+import { exec, shx } from '../../lib/utils.js';
 import Utils from '../utils.js';
 /**
  * Utils: general porpourse utils
@@ -86,7 +85,7 @@ export default class Fedora {
      */
     static async packageInstall(packageName) {
         let retVal = false;
-        if (shx.exec(`/usr/bin/dnf install ${packageName}`, { silent: true }) === '0') {
+        if (shx.exec('/usr/bin/dnf install ' + packageName, { silent: true }).code === 0) {
             retVal = true;
         }
         return retVal;

package/dist/classes/pacman.d/openmamba.js

@@ -6,8 +6,7 @@
  * license: MIT
  */
 import fs from 'node:fs';
-import shx from 'shelljs';
-import { exec } from '../../lib/utils.js';
+import { exec, shx } from '../../lib/utils.js';
 import Utils from '../utils.js';
 /**
  * Utils: general porpourse utils
@@ -85,7 +84,7 @@ export default class Openmamba {
      */
     static async packageInstall(packageName) {
         let retVal = false;
-        if (shx.exec(`/usr/bin/dnf install ${packageName}`, { silent: false }) === '0') {
+        if (shx.exec('/usr/bin/dnf install ' + packageName, { silent: false }).code === 0) {
             retVal = true;
         }
         return retVal;

package/dist/classes/pacman.d/opensuse.js

@@ -6,8 +6,7 @@
  * license: MIT
  */
 import fs from 'node:fs';
-import shx from 'shelljs';
-import { exec } from '../../lib/utils.js';
+import { exec, shx } from '../../lib/utils.js';
 import Utils from '../utils.js';
 /**
  * Utils: general porpourse utils
@@ -88,7 +87,7 @@ export default class Opensuse {
      */
     static async packageInstall(packageName) {
         let retVal = false;
-        if (shx.exec(`/usr/bin/zypper install ${packageName}`, { silent: true }) === '0') {
+        if (shx.exec('/usr/bin/zypper install ' + packageName, { silent: true }).code === 0) {
             retVal = true;
         }
         return retVal;

package/dist/classes/pacman.d.ts

@@ -15,10 +15,15 @@ export default class Pacman {
     distro: IDistro;
     remix: IRemix;
     /**
-     *
+     * autocompleteInstall()
+     * @param verbose
+     */
+    static autocompleteInstall(): Promise<void>;
+    /**
+     * autocompleteRemove
      * @param verbose
      */
-    static autocompleteInstall(verbose?: boolean): Promise<void>;
+    static autocompleteRemove(verbose?: boolean): Promise<void>;
     /**
      * return true if calamares is installed
      */
@@ -35,11 +40,6 @@ export default class Pacman {
      *
      */
     static calamaresRemove(verbose?: boolean): Promise<boolean>;
-    /**
-     *
-     * @param cmd
-     */
-    static commandIsInstalled(cmd: string): boolean;
     /**
      * Restituisce VERO se i file di configurazione SONO presenti
      */
@@ -52,14 +52,14 @@ export default class Pacman {
      * Creazione del file di configurazione /etc/penguins-eggs
      */
     static configurationInstall(links?: boolean, verbose?: boolean): Promise<void>;
-    /**
-     * Ritorna vero se machine-id è uguale
-     */
-    static configurationMachineNew(verbose?: boolean): Promise<boolean>;
     /**
      * Rimozione dei file di configurazione
      */
     static configurationRemove(verbose?: boolean): Promise<void>;
+    /**
+     * Ritorna vero se machine-id è uguale
+     */
+    static configurationMachineNew(verbose?: boolean): Promise<boolean>;
     /**
      *
      * @returns
@@ -117,7 +117,11 @@ export default class Pacman {
     /**
      * Installa manPage
      */
-    static manPageInstall(verbose?: boolean): Promise<void>;
+    static manpageInstall(): Promise<void>;
+    /**
+     * manpageRemove
+     */
+    static manpageRemove(): Promise<void>;
     /**
      *
      * @param debPackage
@@ -135,5 +139,10 @@ export default class Pacman {
      * @param debPackage
      */
     static packageIsInstalled(packageName: string): boolean;
+    /**
+     *
+     * @param packageNpm
+     * @returns
+     */
     static packageNpmLast(packageNpm?: string): Promise<string>;
 }