freeschema 1.0.4 → 1.0.6

package/bin/freeschema.js

@@ -114,6 +114,44 @@ function generateJwt() {
   return crypto.randomBytes(32).toString('hex');
 }
 
+// Mosquitto 2.0 $7$ PBKDF2-HMAC-SHA512 password entry
+function generateMosquittoPassword(username, password) {
+  const iterations = 101;
+  const salt       = crypto.randomBytes(12);
+  const hash       = crypto.pbkdf2Sync(password, salt, iterations, 64, 'sha512');
+  return `${username}:$7$${iterations}$${salt.toString('base64')}$${hash.toString('base64')}\n`;
+}
+
+function ensureMosquittoConfig(cwd) {
+  const dir = (sub) => path.join(cwd, 'mosquitto', sub);
+  ['config', 'data', 'log'].forEach(d => {
+    if (!fs.existsSync(dir(d))) fs.mkdirSync(dir(d), { recursive: true });
+  });
+
+  const confDest = path.join(dir('config'), 'mosquitto.conf');
+  if (!fs.existsSync(confDest)) {
+    const confSrc = path.join(TEMPLATES_DIR, 'mosquitto', 'config', 'mosquitto.conf');
+    if (fs.existsSync(confSrc)) fs.copyFileSync(confSrc, confDest);
+    else fs.writeFileSync(confDest, [
+      'listener 1883', 'allow_anonymous false',
+      'password_file /mosquitto/config/password.txt', '',
+      'listener 9001', 'protocol websockets', 'allow_anonymous false', '',
+      'persistence true', 'persistence_location /mosquitto/data/',
+      'log_dest file /mosquitto/log/mosquitto.log', '',
+    ].join('\n'));
+    console.log('  Created mosquitto/config/mosquitto.conf');
+  }
+
+  const pwDest = path.join(dir('config'), 'password.txt');
+  if (!fs.existsSync(pwDest)) {
+    const env      = readEnv();
+    const mqttUser = env.MQTT_USERNAME || 'freeschema';
+    const mqttPass = env.MQTT_PASSWORD || 'freeschema';
+    fs.writeFileSync(pwDest, generateMosquittoPassword(mqttUser, mqttPass));
+    console.log('  Created mosquitto/config/password.txt');
+  }
+}
+
 function fmtBytes(b) {
   if (b >= 1073741824) return (b / 1073741824).toFixed(1) + ' GB';
   if (b >= 1048576)    return (b / 1048576).toFixed(1)    + ' MB';
@@ -174,6 +212,11 @@ const COMPOSE_PATCHES = [
     replace: '$1    user: "1883:1883"\n',
     label:   'mosquitto user (1883:1883 to skip chown on Windows)',
   },
+  {
+    find:    /(--default-authentication-plugin=mysql_native_password)(?!\s*\n\s*--log-bin-trust)/,
+    replace: '$1\n      --log-bin-trust-function-creators=1',
+    label:   'MySQL log_bin_trust_function_creators (allows stored functions/triggers)',
+  },
 ];
 
 function patchComposeFile() {
@@ -340,6 +383,10 @@ async function cmdInit() {
     const mqttPass = await prompt('  MQTT password', readEnvVar(envPath, 'MQTT_PASSWORD') || 'freeschema');
     setEnvVar(envPath, 'MQTT_USERNAME', mqttUser);
     setEnvVar(envPath, 'MQTT_PASSWORD', mqttPass);
+    // Write password.txt with correct hash for the chosen credentials
+    const pwDir  = path.join(target, 'mosquitto', 'config');
+    if (!fs.existsSync(pwDir)) fs.mkdirSync(pwDir, { recursive: true });
+    fs.writeFileSync(path.join(pwDir, 'password.txt'), generateMosquittoPassword(mqttUser, mqttPass));
     console.log('  MQTT         configured (local) ✓');
   } else {
     console.log('\n  External MQTT broker:');
@@ -476,7 +523,10 @@ function cmdStart() {
   const profiles = [];
   const flags    = args.slice(1);
   if (flags.includes('--local-db')   || flags.includes('--db'))   profiles.push('--profile', 'local-db');
-  if (flags.includes('--local-mqtt') || flags.includes('--mqtt')) profiles.push('--profile', 'local-mqtt');
+  if (flags.includes('--local-mqtt') || flags.includes('--mqtt')) {
+    profiles.push('--profile', 'local-mqtt');
+    ensureMosquittoConfig(cwd);
+  }
 
   const seedIdx  = args.indexOf('--seed');
   const seedFile = seedIdx !== -1 ? args[seedIdx + 1] : null;
@@ -492,13 +542,14 @@ function cmdStart() {
     const env       = readEnv();
     const dbUser    = env.DB_USER     || env.MYSQL_USER     || 'freeschema';
     const dbPass    = env.DB_PASSWORD || env.MYSQL_PASSWORD || 'Freeschema@123';
+    const rootPass  = env.MYSQL_ROOT_PASSWORD || ('Admin@' + dbPass);
     const dbName    = env.DB_DATABASE || 'freeschema_db';
     const container = getMysqlContainer();
     if (!waitForMySQL(container, dbUser, dbPass)) die('MySQL did not become ready — check logs with `freeschema logs mysql-server`.');
     console.log(`  Seeding ${dbName} from ${seedFile}…`);
     const result = spawnSync(
       'docker',
-      ['exec', '-i', container, 'mysql', `-u${dbUser}`, `-p${dbPass}`, dbName],
+      ['exec', '-i', container, 'mysql', '-uroot', `-p${rootPass}`, dbName],
       { input: fs.readFileSync(seedFile), stdio: ['pipe', 'inherit', 'inherit'] }
     );
     if (result.error || result.status !== 0) die('Seed failed — check container logs.');
@@ -635,15 +686,15 @@ function cmdDbRestore() {
   if (!fs.existsSync(sqlFile)) die(`File not found: ${sqlFile}`);
 
   const env       = readEnv();
-  const dbUser    = env.DB_USER     || env.MYSQL_USER     || 'freeschema';
   const dbPass    = env.DB_PASSWORD || env.MYSQL_PASSWORD || 'Freeschema@123';
+  const rootPass  = env.MYSQL_ROOT_PASSWORD || ('Admin@' + dbPass);
   const dbName    = env.DB_DATABASE || 'freeschema_db';
   const container = getMysqlContainer();
 
   console.log(`Restoring ${sqlFile} → ${dbName}…`);
   const result = spawnSync(
     'docker',
-    ['exec', '-i', container, 'mysql', `-u${dbUser}`, `-p${dbPass}`, dbName],
+    ['exec', '-i', container, 'mysql', '-uroot', `-p${rootPass}`, dbName],
     { input: fs.readFileSync(sqlFile), stdio: ['pipe', 'inherit', 'inherit'] }
   );
   if (result.error || result.status !== 0) die('Restore failed — check container logs.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freeschema",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "FreeSchema — self-hosted deployment CLI",
   "keywords": [
     "freeschema",

package/templates/docker-compose.yml

@@ -39,6 +39,7 @@ services:
     user: "999:999"
     command: >
       --default-authentication-plugin=mysql_native_password
+      --log-bin-trust-function-creators=1
     healthcheck:
       test: ["CMD-SHELL", "mysqladmin ping -h localhost -u${MYSQL_USER:-freeschema} -p${MYSQL_PASSWORD:-Freeschema@123} --silent"]
       interval: 10s