github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change terminology from METEOR_UNSAFE_PERM to METEOR_ALLOW_SUPERUSER.

Browse Source 
The --unsafe-perm option is still supported but no longer advertised.
This commit is contained in:
Ben Newman
2016-10-27 10:06:07 -07:00
parent e4acc36f63
commit 50528819cf
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/cli/dev-bundle-bin-helpers.js
View File

@@ -82,8 +82,10 @@ exports.getEnv = function (options) {
env.NPM_CONFIG_CACHE = path.join(devBundleDir, ".npm");
}
if (env.METEOR_UNSAFE_PERM) {
env.NPM_CONFIG_UNSAFE_PERM = env.METEOR_UNSAFE_PERM;
if (env.METEOR_ALLOW_SUPERUSER) {
// Note that env.METEOR_ALLOW_SUPERUSER could be "0" or "false", which
// should propagate falsy semantics to NPM_CONFIG_UNSAFE_PERM.
env.NPM_CONFIG_UNSAFE_PERM = env.METEOR_ALLOW_SUPERUSER;
}
// This allows node-gyp to find Node headers and libraries in

24
tools/cli/main.js
View File

@@ -768,39 +768,41 @@ Fiber(function () {
rawArgs.push(term);
}
if (_.has(rawOptions, "--unsafe-perm")) {
process.env.METEOR_UNSAFE_PERM = "true";
if (_.has(rawOptions, "--allow-superuser") ||
_.has(rawOptions, "--unsafe-perm")) {
process.env.METEOR_ALLOW_SUPERUSER = "true";
delete rawOptions["--allow-superuser"];
delete rawOptions["--unsafe-perm"];
}
// Prevent running meteor as root on UNIX platforms.
if (process.getuid &&
process.getuid() === 0) {
const unsafePerm = !! (
process.env.METEOR_UNSAFE_PERM &&
JSON.parse(process.env.METEOR_UNSAFE_PERM));
const allowSuperuser = !! (
process.env.METEOR_ALLOW_SUPERUSER &&
JSON.parse(process.env.METEOR_ALLOW_SUPERUSER));
if (! unsafePerm) {
// Meteor is running as root without $METEOR_UNSAFE_PERM, notice and stop.
if (! allowSuperuser) {
// Meteor is running as root without METEOR_ALLOW_SUPERUSER, notice and stop.
Console.error("");
Console.error(
"You are attempting to run Meteor as the root user.",
"You are attempting to run Meteor as the 'root' superuser.",
"If you are developing, this is almost certainly *not* what you want to do and will likely result in incorrect file permissions.",
"However, if you are running this command in a build process (CI, etc.), or you are absolutely sure you know what you are doing,",
"set the $METEOR_UNSAFE_PERM environment variable to proceed."
"set the METEOR_ALLOW_SUPERUSER environment variable or pass --allow-superuser to proceed."
);
}
Console.info("");
Console.info(
"Even with $METEOR_UNSAFE_PERM or --unsafe-perm, permissions in your app directory will be incorrect if you ever attempt to perform any Meteor tasks as a non-root user.",
"Even with METEOR_ALLOW_SUPERUSER or --allow-superuser, permissions in your app directory will be incorrect if you ever attempt to perform any Meteor tasks as a normal user.",
"If you need to fix your permissions, run the following command from the root of your project:"
);
Console.info("");
Console.info(Console.command(" sudo chown -Rh <username> .meteor/local"));
Console.info("");
if (! unsafePerm) {
if (! allowSuperuser) {
process.exit(1);
}
}