u2a 3.2.6 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "u2a",
-    "version": "3.2.6",
+    "version": "3.3.1",
     "description": "URL to App - Turn any URL into a desktop application",
     "main": "src/index.js",
     "bin": {
@@ -29,7 +29,8 @@
         "inquirer": "^8.2.5",
         "open": "^8.4.0",
         "png-to-ico": "^2.1.8",
-        "sharp": "^0.33.5"
+        "sharp": "^0.33.5",
+        "is-admin": "^3.0.0"
     },
     "homepage": "https://urltoapp.xyz",
     "repository": {

package/src/commands/create.js

@@ -6,9 +6,11 @@ const { getFavicon, processFavicon } = require('../utils/favicon');
 const { APPS_DIR, readDB, writeDB } = require('../utils/config');
 const Logger = require('../utils/logger');
 const os = require('os');
+const { sanitizeInput } = require('../utils/sanitize');
 
 const logger = new Logger('create');
 
+
 function createWindowsShortcut(appInfo) {
   try {
     const { appName, appDir, iconPath } = appInfo;
@@ -673,8 +675,8 @@ async function createApp(url, options) {
 
   try {
     url = await normalizeUrl(url);
-    const domain = getDomainName(url);
-    const appName = options.name || domain;
+    const domain = sanitizeInput(getDomainName(url));
+    const appName = sanitizeInput(options.name || domain);
 
     const db = readDB();
     if (db.hasOwnProperty(appName)) {

package/src/commands/remove.js

@@ -1,14 +1,14 @@
 const fs = require('fs');
 const inquirer = require('inquirer');
-const { normalizeUrl, getDomainName } = require('../utils/url');
 const { readDB, writeDB, APPS_DIR } = require('../utils/config');
 const Logger = require('../utils/logger');
 const { removeAppFromOS } = require('./create');
 const path = require('path');
+const { sanitizeInput } = require('../utils/sanitize');
 
 const logger = new Logger('remove');
 
-async function removeApp(appName) {
+async function processRemoval(appName) {
   try {
     const db = readDB();
 
@@ -53,6 +53,11 @@ async function removeApp(appName) {
   }
 }
 
+async function removeApp(appName) {
+  const sAppName = sanitizeInput(appName);
+  await processRemoval(sAppName);
+}
+
 module.exports = {
   removeApp
 };

package/src/index.js

@@ -1,58 +1,62 @@
 #!/usr/bin/env node
 
-ver = process.versions.node;
+const ver = process.versions.node;
 
 if (ver < '22.0.0') {
   console.error("You need a nodejs installation equal or superior to 22.0.0. Please upgrade your node installation and retry.");
   process.exit(1);
 }
 
-
 const { program } = require('commander');
 const { createApp } = require('./commands/create');
 const { listApps } = require('./commands/list');
 const { removeApp } = require('./commands/remove');
 const { version } = require('../package.json');
 const { setupConfig } = require('./utils/config');
+const { checkNotRoot } = require('./utils/noroot');
 
-setupConfig();
+(async () => {
+  await checkNotRoot();
 
-program
-  .name('u2a')
-  .description('Convert websites into desktop applications')
-  .version(version);
+  setupConfig();
 
   program
-  .command('create <url>')
-  .description('Create a new application from a URL')
-  .option('--name <name>', 'Specify the application name')
-  .option('--width <width>', 'Specify the window width', parseInt)
-  .option('--height <height>', 'Specify the window height', parseInt)
-  .option('--executable [windows|darwin|linux]', 'Create a single executable for the target system')
-  .option('--arch [x64|armv7l|arm64|universal]', 'Specify the target architecture for the executable')
-  .option('--setup', 'Creates a setup file for the executable')
-  .action((url, options) => {
-    createApp(url, options);
-  });
+    .name('u2a')
+    .description('Convert websites into desktop applications')
+    .version(version);
 
-program
-  .command('list')
-  .description('List all available applications')
-  .action(listApps);
+  program
+    .command('create <url>')
+    .description('Create a new application from a URL')
+    .option('--name <name>', 'Specify the application name')
+    .option('--width <width>', 'Specify the window width', parseInt)
+    .option('--height <height>', 'Specify the window height', parseInt)
+    .option('--executable [windows|darwin|linux]', 'Create a single executable for the target system')
+    .option('--arch [x64|armv7l|arm64|universal]', 'Specify the target architecture for the executable')
+    .option('--setup', 'Creates a setup file for the executable')
+    .action((url, options) => {
+      createApp(url, options);
+    });
 
-program
-  .command('remove <url>')
-  .description('Remove an existing application')
-  .action(removeApp);
+  program
+    .command('list')
+    .description('List all available applications')
+    .action(listApps);
 
-program.on('command:*', () => {
-  console.error(`\nInvalid command: ${program.args.join(' ')}`);
-  console.log(`\nUse --help to see the list of available commands.`);
-  process.exit(1);
-});
+  program
+    .command('remove <url>')
+    .description('Remove an existing application')
+    .action(removeApp);
+
+  program.on('command:*', () => {
+    console.error(`\nInvalid command: ${program.args.join(' ')}`);
+    console.log(`\nUse --help to see the list of available commands.`);
+    process.exit(1);
+  });
 
-program.parse(process.argv);
+  program.parse(process.argv);
 
-if (process.argv.length <= 2) {
-  program.help();
-}
+  if (process.argv.length <= 2) {
+    program.help();
+  }
+})();

package/src/utils/noroot.js

@@ -0,0 +1,32 @@
+const os = require('os');
+const isAdmin = require('is-admin');
+const Logger = require('./logger')
+
+const logger = new Logger('noroot');
+
+async function checkNotRoot() {
+  const platform = os.platform();
+
+  switch (platform) {
+    case 'win32':
+      if (await isAdmin()) {
+        logger.error('This application should not be run as an administrator.', '');
+        process.exit(1);
+      }
+      break;
+
+    case 'darwin':
+    case 'linux':
+      if (process.getuid() === 0) {
+        logger.error('This application should not be run as root.', '');
+        process.exit(1);
+      }
+      break;
+
+    default:
+      logger.error('Unsupported platform:', platform);
+      process.exit(1);
+  }
+}
+
+module.exports = { checkNotRoot };

package/src/utils/sanitize.js

@@ -0,0 +1,7 @@
+function sanitizeInput(userInput) {
+    return userInput.replace(/[^a-zA-Z0-9_-\s.]/g, '_');
+}
+
+module.exports = {
+    sanitizeInput
+}