ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-31 14:30:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add -U option to skip root check and permit run as non-privileged user.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-05-16 14:52:09 -07:00
parent 4be4908914
commit 27c5f04d68
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
one.cpp
View File

@ -881,6 +881,7 @@ static void printHelp(const char *cn,FILE *out)
fprintf(out,"Available switches:"ZT_EOL_S); fprintf(out,"Available switches:"ZT_EOL_S);
fprintf(out," -h - Display this help"ZT_EOL_S); fprintf(out," -h - Display this help"ZT_EOL_S);
fprintf(out," -v - Show version"ZT_EOL_S); fprintf(out," -v - Show version"ZT_EOL_S);
fprintf(out," -U - Run as unprivileged user (skip privilege check)"ZT_EOL_S);
fprintf(out," -p<port> - Port for UDP and TCP/HTTP (default: 9993)"ZT_EOL_S); fprintf(out," -p<port> - Port for UDP and TCP/HTTP (default: 9993)"ZT_EOL_S);
//fprintf(out," -T<path> - Override root topology, do not authenticate or update"ZT_EOL_S); //fprintf(out," -T<path> - Override root topology, do not authenticate or update"ZT_EOL_S);
#ifdef __UNIX_LIKE__ #ifdef __UNIX_LIKE__
@ -945,6 +946,7 @@ int main(int argc,char **argv)
std::string overrideRootTopology; std::string overrideRootTopology;
std::string homeDir; std::string homeDir;
unsigned int port = ZT1_DEFAULT_PORT; unsigned int port = ZT1_DEFAULT_PORT;
bool skipRootCheck = false;
for(int i=1;i<argc;++i) { for(int i=1;i<argc;++i) {
if (argv[i][0] == '-') { if (argv[i][0] == '-') {
@ -964,6 +966,10 @@ int main(int argc,char **argv)
break; break;
#endif // __UNIX_LIKE__ #endif // __UNIX_LIKE__
case 'U':
skipRootCheck = true;
break;
case 'T': // Override root topology case 'T': // Override root topology
if (argv[i][2]) { if (argv[i][2]) {
if (!OSUtils::readFile(argv[i] + 2,overrideRootTopology)) { if (!OSUtils::readFile(argv[i] + 2,overrideRootTopology)) {
@ -1082,11 +1088,10 @@ int main(int argc,char **argv)
} }
#ifdef __UNIX_LIKE__ #ifdef __UNIX_LIKE__
if (getuid() != 0) { if ((!skipRootCheck)&&(getuid() != 0)) {
fprintf(stderr,"%s: must be run as root (uid 0)"ZT_EOL_S,argv[0]); fprintf(stderr,"%s: must be run as root (uid 0)"ZT_EOL_S,argv[0]);
return 1; return 1;
} }
if (runAsDaemon) { if (runAsDaemon) {
long p = (long)fork(); long p = (long)fork();
if (p < 0) { if (p < 0) {
@ -1102,10 +1107,13 @@ int main(int argc,char **argv)
if (winRunFromCommandLine) { if (winRunFromCommandLine) {
// Running in "interactive" mode (mostly for debugging) // Running in "interactive" mode (mostly for debugging)
if (IsCurrentUserLocalAdministrator() != TRUE) { if (IsCurrentUserLocalAdministrator() != TRUE) {
fprintf(stderr,"%s: must be run as a local administrator."ZT_EOL_S,argv[0]); if (!skipRootCheck) {
return 1; fprintf(stderr,"%s: must be run as a local administrator."ZT_EOL_S,argv[0]);
return 1;
}
} else {
_winPokeAHole();
} }
_winPokeAHole();
SetConsoleCtrlHandler(&_winConsoleCtrlHandler,TRUE); SetConsoleCtrlHandler(&_winConsoleCtrlHandler,TRUE);
// continues on to ordinary command line execution code below... // continues on to ordinary command line execution code below...
} else { } else {