diff --git a/class/core/files_api.py b/class/core/files_api.py index 3ae98156a..e01876e88 100755 --- a/class/core/files_api.py +++ b/class/core/files_api.py @@ -606,8 +606,5 @@ done data['DIR'] = sorted(dirnames) data['FILES'] = sorted(filenames) - if path[0:2] == '//': - data['PATH'] = path[1:] - else: - data['PATH'] = path + data['PATH'] = path.replace('//', '/') return public.getJson(data) diff --git a/class/core/site_api.py b/class/core/site_api.py index 0ec168bd9..ce1306062 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -751,6 +751,68 @@ class site_api: data['filename'] = filename return public.getJson(data) + # 修改物理路径 + def setPathApi(self): + mid = request.form.get('id', '').encode('utf-8') + path = request.form.get('path', '').encode('utf-8') + + path = self.getPath(path) + print path + if path == "" or mid == '0': + return public.returnJson(False, "目录不能为空!") + + import files_api + if not files_api.files_api().checkDir(path): + return public.returnJson(False, "不能以系统关键目录作为站点目录") + + siteFind = public.M("sites").where( + "id=?", (mid,)).field('path,name').find() + if siteFind["path"] == path: + return public.returnJson(False, "与原路径一致，无需修改!") + file = self.getHostConf(siteFind['name']) + conf = public.readFile(file) + if conf: + conf = conf.replace(siteFind['path'], path) + public.writeFile(file, conf) + + # 创建basedir + userIni = path + '/.user.ini' + if os.path.exists(userIni): + public.execShell("chattr -i " + userIni) + public.writeFile(userIni, 'open_basedir=' + path + '/:/tmp/:/proc/') + public.execShell('chmod 644 ' + userIni) + public.execShell('chown root:root ' + userIni) + public.execShell('chattr +i ' + userIni) + + public.restartWeb() + public.M("sites").where("id=?", (mid,)).setField('path', path) + msg = public.getInfo('修改网站[{1}]物理路径成功!', (siteFind['name'],)) + public.writeLog('网站管理', msg) + return public.returnJson(True, "设置成功!") + + # 设置当前站点运行目录 + def setSiteRunPathApi(self): + mid = request.form.get('id', '').encode('utf-8') + runPath = request.form.get('runPath', '').encode('utf-8') + siteName = public.M('sites').where('id=?', (mid,)).getField('name') + sitePath = public.M('sites').where('id=?', (mid,)).getField('path') + + newPath = sitePath + runPath + # 处理Nginx + filename = self.getHostConf(siteName) + if os.path.exists(filename): + conf = public.readFile(filename) + rep = '\s*root\s*(.+);' + path = re.search(rep, conf).groups()[0] + conf = conf.replace(path, newPath) + public.writeFile(filename, conf) + + self.delUserInI(sitePath) + self.setDirUserINI(newPath) + + public.restartWeb() + return public.returnJson(True, '设置成功!') + def delDomainApi(self): domain = request.form.get('domain', '').encode('utf-8') webname = request.form.get('webname', '').encode('utf-8') @@ -1369,6 +1431,21 @@ location /{ continue return True + # 设置目录防御 + def setDirUserINI(self, newPath): + filename = newPath + '/.user.ini' + if os.path.exists(filename): + public.execShell("chattr -i " + filename) + os.remove(filename) + return public.returnJson(True, '已清除防跨站设置!') + + self.delUserInI(newPath) + public.writeFile(filename, 'open_basedir=' + + newPath + '/:/tmp/:/proc/') + public.execShell("chattr +i " + filename) + + return public.returnJson(True, '已打开防跨站设置!') + # 转换时间 def strfToTime(self, sdate): import time diff --git a/route/static/app/public.js b/route/static/app/public.js index 5f41641b8..a4c0ef415 100755 --- a/route/static/app/public.js +++ b/route/static/app/public.js @@ -149,16 +149,25 @@ function getLocalTime(a) { function changePath(d) { - setCookie("SetId", d); - setCookie("SetName", ""); + setCookie('SetId', d); + setCookie('SetName', ''); var c = layer.open({ type: 1, area: "650px", - title: lan.bt.dir, + title: '选择目录', closeBtn: 2, shift: 5, shadeClose: false, - content: "
"+lan.bt.path+"：
"+lan.bt.comp+"
    "+lan.bt.filename+""+lan.bt.etime+""+lan.bt.access+""+lan.bt.own+"
    " + content: "
    \ +
    当前路径：
    计算机
    \ +
      \ + \ + \ +
      文件名修改时间权限所有者
      \ + \ + \ + \ +
      " }); setCookie("ChangePath", c); var b = $("#" + d).val(); @@ -223,11 +232,11 @@ function getDiskList(b) { } $("#PathPlace").find("span").html(h.PATH); activeDisk(); - return + return; },'json'); } -function CreateFolder() { +function createFolder() { var a = "   "; if($("#tbody tr").length == 0) { $("#tbody").append(a) @@ -272,7 +281,7 @@ function NewDelFile(c) { icon: 2 }) } - getDiskList(a) + getDiskList(a); }) } @@ -306,10 +315,10 @@ function backMyComputer() { $(".default").show(); $(".file-list").hide(); $("#PathPlace").find("span").html(""); - activeDisk() + activeDisk(); } -function BackFile() { +function backFile() { var c = $("#PathPlace").find("span").text(); if(c.substr(c.length - 1, 1) == "/") { c = c.substr(0, c.length - 1) @@ -328,7 +337,7 @@ function BackFile() { if(d.length == 1) {} } -function GetfilePath() { +function getfilePath() { var a = $("#PathPlace").find("span").text(); a = a.replace(new RegExp(/(\\)/g), "/"); $("#" + getCookie("SetId")).val(a + getCookie("SetName")); @@ -1199,6 +1208,40 @@ function tasklist(a){ },'json'); } +function activeDisk() { + var a = $("#PathPlace").find("span").text().substring(0, 1); + switch(a) { + case "C": + $(".path-con-left dd:nth-of-type(1)").css("background", "#eee").siblings().removeAttr("style"); + break; + case "D": + $(".path-con-left dd:nth-of-type(2)").css("background", "#eee").siblings().removeAttr("style"); + break; + case "E": + $(".path-con-left dd:nth-of-type(3)").css("background", "#eee").siblings().removeAttr("style"); + break; + case "F": + $(".path-con-left dd:nth-of-type(4)").css("background", "#eee").siblings().removeAttr("style"); + break; + case "G": + $(".path-con-left dd:nth-of-type(5)").css("background", "#eee").siblings().removeAttr("style"); + break; + case "H": + $(".path-con-left dd:nth-of-type(6)").css("background", "#eee").siblings().removeAttr("style"); + break; + default: + $(".path-con-left dd").removeAttr("style"); + } +} + + +function backMyComputer() { + $(".default").show(); + $(".file-list").hide(); + $("#PathPlace").find("span").html(""); + activeDisk(); +} + //检查登陆状态 function check_login(){ $.post('/check_login',{},function(rdata){ diff --git a/route/static/app/site.js b/route/static/app/site.js index e6b6f578f..141ea30c5 100755 --- a/route/static/app/site.js +++ b/route/static/app/site.js @@ -306,12 +306,12 @@ function webPathEdit(id){ 网站目录\ \ \ - \ + \ \
      \ 运行目录\ \ - \ + \
      \