summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTitanSnow <[email protected]>2017-05-22 19:37:24 +0800
committerTitanSnow <[email protected]>2017-05-22 19:37:24 +0800
commitbd775f017f77043aac5b6290c9899f7daf23e172 (patch)
tree9415a16fbdaa99b5f33470aa66332b58b4b19e8b
parentb8e4fb467d8de881749e3bc77493728a642ff145 (diff)
add module privilege to manage root privilege
-rw-r--r--xmake/core/base/os.lua6
-rw-r--r--xmake/core/base/privilege.lua92
-rw-r--r--xmake/core/main.lua9
-rw-r--r--xmake/core/sandbox/modules/import/core/base/privilege.lua26
4 files changed, 125 insertions, 8 deletions
diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua
index a56c199dd..ea6d3a9b0 100644
--- a/xmake/core/base/os.lua
+++ b/xmake/core/base/os.lua
@@ -653,11 +653,7 @@ end
-- check run command as root
function os.isroot()
-
- -- get it from cache
- if os._ISROOT ~= nil then
- return os._ISROOT
- end
+ os._ISROOT = nil
-- check it
if os.uid().euid == 0 then
diff --git a/xmake/core/base/privilege.lua b/xmake/core/base/privilege.lua
new file mode 100644
index 000000000..5c66ba5f1
--- /dev/null
+++ b/xmake/core/base/privilege.lua
@@ -0,0 +1,92 @@
+--!The Make-like Build Utility based on Lua
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015 - 2017, TBOOX Open Source Group.
+--
+-- @author TitanSnow
+-- @file privilege.lua
+--
+
+-- define module
+local privilege = privilege or {}
+
+-- load modules
+local os = require("base/os")
+
+-- store privilege
+function privilege.store()
+ -- check if root
+ if not os.isroot() then
+ return false
+ end
+
+ -- find projectdir's owner
+ local projectdir = xmake._PROJECT_DIR
+ assert(projectdir)
+ local owner = os.getown(projectdir)
+ if not owner then
+ -- fallback to current dir
+ owner = os.getown(".")
+ if not owner then
+ return false
+ end
+ end
+
+ -- set gid
+ if os.gid(owner.gid).setegid_errno ~= 0 then
+ return false
+ end
+
+ -- set uid
+ if os.uid(owner.uid).seteuid_errno ~= 0 then
+ return false
+ end
+
+ -- set flag
+ privilege._HAS_PRIVILEGE = true
+
+ -- ok
+ return true
+end
+
+-- check if has stored privilege
+function privilege.has()
+ return privilege._HAS_PRIVILEGE or false
+end
+
+function privilege.get()
+ -- has?
+ if privilege._HAS_PRIVILEGE ~= true then
+ return false
+ end
+
+ -- set uid
+ if os.uid(0).seteuid_errno ~= 0 then
+ return false
+ end
+
+ -- set gid
+ if os.gid(0).setegid_errno ~= 0 then
+ return false
+ end
+
+ return true
+end
+
+-- return module
+return privilege
diff --git a/xmake/core/main.lua b/xmake/core/main.lua
index b4ca6afab..cda338294 100644
--- a/xmake/core/main.lua
+++ b/xmake/core/main.lua
@@ -32,6 +32,7 @@ local utils = require("base/utils")
local option = require("base/option")
local profiler = require("base/profiler")
local deprecated = require("base/deprecated")
+local privilege = require("base/privilege")
local task = require("project/task")
local history = require("project/history")
@@ -143,12 +144,14 @@ function main.done()
-- check run command as root
if not option.get("root") then
if os.isroot() then
- utils.error([[Running xmake as root is extremely dangerous and no longer supported.
+ if not privilege.store() or os.isroot() then
+ utils.error([[Running xmake as root is extremely dangerous and no longer supported.
As xmake does not drop privileges on installation you would be giving all
build scripts full access to your system.
Or you can add `--root` option to allow run as root temporarily.
- ]])
- return -1
+ ]])
+ return -1
+ end
end
end
diff --git a/xmake/core/sandbox/modules/import/core/base/privilege.lua b/xmake/core/sandbox/modules/import/core/base/privilege.lua
new file mode 100644
index 000000000..8f94cdb79
--- /dev/null
+++ b/xmake/core/sandbox/modules/import/core/base/privilege.lua
@@ -0,0 +1,26 @@
+--!The Make-like Build Utility based on Lua
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015 - 2017, TBOOX Open Source Group.
+--
+-- @author TitanSnow
+-- @file privilege.lua
+--
+
+-- return module
+return require("base/privilege")