diff --git a/.gitignore b/.gitignore
index 6a929076a..86909aa52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,3 +118,4 @@ data/json/config.json
data/site.pl
data/admin_path.pl
data/close.pl
+ssl/input.pl
diff --git a/class/core/config_api.py b/class/core/config_api.py
index 74c37dc5a..b36e33488 100755
--- a/class/core/config_api.py
+++ b/class/core/config_api.py
@@ -144,12 +144,93 @@ class config_api:
public.execShell("chown root.root " + filename)
return public.returnJson(True, '面板已关闭!')
+ def setIpv6StatusApi(self):
+ ipv6_file = 'data/ipv6.pl'
+ if os.path.exists('data/ipv6.pl'):
+ os.remove(ipv6_file)
+ public.writeLog('面板设置', '关闭面板IPv6兼容!')
+ else:
+ public.writeFile(ipv6_file, 'True')
+ public.writeLog('面板设置', '开启面板IPv6兼容!')
+ public.restartMw()
+ return public.returnJson(True, '设置成功!')
+
+ # 获取面板证书
+ def getPanelSslApi(self):
+ cert = {}
+ cert['privateKey'] = public.readFile('ssl/privateKey.pem')
+ cert['certPem'] = public.readFile('ssl/certificate.pem')
+ cert['rep'] = os.path.exists('ssl/input.pl')
+ return public.getJson(cert)
+
+ # 保存面板证书
+ def savePanelSslApi(self):
+ keyPath = 'ssl/privateKey.pem'
+ certPath = 'ssl/certificate.pem'
+ checkCert = '/tmp/cert.pl'
+
+ certPem = request.form.get('certPem', '').strip()
+ privateKey = request.form.get('privateKey', '').strip()
+
+ public.writeFile(checkCert, certPem)
+ if privateKey:
+ public.writeFile(keyPath, privateKey)
+ if certPem:
+ public.writeFile(certPath, certPem)
+ if not public.checkCert(checkCert):
+ return public.returnJson(False, '证书错误,请检查!')
+ public.writeFile('ssl/input.pl', 'True')
+ return public.returnJson(True, '证书已保存!')
+
+ # 设置面板SSL
+ def setPanelSslApi(self):
+ sslConf = public.getRunDir() + '/data/ssl.pl'
+ if os.path.exists(sslConf):
+ os.system('rm -f ' + sslConf)
+ return public.returnJson(True, 'SSL已关闭，请使用http协议访问面板!')
+ else:
+ os.system('pip install cffi==1.10')
+ os.system('pip install cryptography==2.1')
+ os.system('pip install pyOpenSSL==16.2')
+ try:
+ if not self.createSSL():
+ return public.returnJson(False, '开启失败，无法自动安装pyOpenSSL组件!请尝试手动安装: pip install pyOpenSSL
')
+ public.writeFile(sslConf, 'True')
+ except Exception as ex:
+ return public.returnJson(False, '开启失败，无法自动安装pyOpenSSL组件!请尝试手动安装: pip install pyOpenSSL
')
+ return public.returnJson(True, '开启成功，请使用https协议访问面板!')
+
def getApi(self):
data = {}
-
return public.getJson(data)
##### ----- end ----- ###
+ # 自签证书
+ def createSSL(self):
+ if os.path.exists('ssl/input.pl'):
+ return True
+ import OpenSSL
+ key = OpenSSL.crypto.PKey()
+ key.generate_key(OpenSSL.crypto.TYPE_RSA, 2048)
+ cert = OpenSSL.crypto.X509()
+ cert.set_serial_number(0)
+ cert.get_subject().CN = '120.27.27.98'
+ cert.set_issuer(cert.get_subject())
+ cert.gmtime_adj_notBefore(0)
+ cert.gmtime_adj_notAfter(86400 * 3650)
+ cert.set_pubkey(key)
+ cert.sign(key, 'md5')
+ cert_ca = OpenSSL.crypto.dump_certificate(
+ OpenSSL.crypto.FILETYPE_PEM, cert)
+ private_key = OpenSSL.crypto.dump_privatekey(
+ OpenSSL.crypto.FILETYPE_PEM, key)
+ if len(cert_ca) > 100 and len(private_key) > 100:
+ public.writeFile('ssl/certificate.pem', cert_ca)
+ public.writeFile('ssl/privateKey.pem', private_key)
+ print cert_ca, private_key
+ return True
+ return False
+
def getVersion(self):
return self.__version
@@ -171,6 +252,18 @@ class config_api:
else:
data['admin_path'] = public.readFile(admin_path_file)
+ ipv6_file = 'data/ipv6.pl'
+ if os.path.exists('data/ipv6.pl'):
+ data['ipv6'] = 'checked'
+ else:
+ data['ipv6'] = ''
+
+ ssl_file = 'data/ssl.pl'
+ if os.path.exists('data/ssl.pl'):
+ data['ssl'] = 'checked'
+ else:
+ data['ssl'] = ''
+
data['username'] = public.M('users').where(
"id=?", (1,)).getField('username')
diff --git a/data/ssl.pl b/data/ssl.pl
new file mode 100644
index 000000000..4791ed555
--- /dev/null
+++ b/data/ssl.pl
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/route/__init__.py b/route/__init__.py
index ca9cb3f10..baa50b15a 100755
--- a/route/__init__.py
+++ b/route/__init__.py
@@ -191,10 +191,9 @@ def doLogin():
@app.route('/', methods=['POST', 'GET'])
@app.route('/', methods=['POST', 'GET'])
def index(reqClass=None, reqAction=None, reqData=None):
- # comReturn = common.local()
- # print comReturn
- # if comReturn:
- # return comReturn
+ comReturn = common.local()
+ if comReturn:
+ return comReturn
if (reqClass == None):
reqClass = 'index'
diff --git a/route/static/app/config.js b/route/static/app/config.js
index b26357f58..d7f717366 100755
--- a/route/static/app/config.js
+++ b/route/static/app/config.js
@@ -1,7 +1,7 @@
-$.post('/config/get','',function(rdata){
- console.log(rdata);
-},'json');
+// $.post('/config/get','',function(rdata){
+// console.log(rdata);
+// },'json');
$(".set-submit").click(function(){
@@ -199,8 +199,117 @@ function syncDate(){
$.post('/config/sync_date','',function(rdata){
layer.close(loadT);
layer.msg(rdata.msg,{icon:rdata.status?1:2});
- setTimeout(function(){
- window.location.reload();
- },1500);
+ setTimeout(function(){window.location.reload();},1500);
},'json');
-}
\ No newline at end of file
+}
+
+
+function setIPv6() {
+ var loadT = layer.msg('正在配置,请稍候...', { icon: 16, time: 0, shade: [0.3, '#000'] });
+ $.post('/config/set_ipv6_status', {}, function (rdata) {
+ layer.close(loadT);
+ layer.msg(rdata.msg, {icon:rdata.status?1:2});
+ setTimeout(function(){window.location.reload();},1500);
+ },'json');
+}
+
+
+//设置面板SSL
+function setPanelSSL(){
+ var status = $("#sshswitch").prop("checked")==true?1:0;
+ var msg = $("#panelSSL").attr('checked')?'关闭SSL后,必需使用http协议访问面板,继续吗?':'危险！此功能不懂别开启!\
+ 必须要用到且了解此功能才决定自己是否要开启!\
+ 面板SSL是自签证书，不被浏览器信任，显示不安全是正常现象\
+ 开启后导致面板不能访问，可以点击下面链接了解解决方法\
+ \
+ \
+ 了解详情\
+
';
+ layer.confirm(msg,{title:'设置面板SSL',closeBtn:2,icon:3,area:'550px',cancel:function(){
+ if(status == 0){
+ $("#panelSSL").prop("checked",false);
+ }
+ else{
+ $("#panelSSL").prop("checked",true);
+ }
+ }},function(){
+ if(window.location.protocol.indexOf('https') == -1){
+ if(!$("#checkSSL").prop('checked')){
+ layer.msg(lan.config.ssl_ps,{icon:2});
+ return false;
+ }
+ }
+ var loadT = layer.msg('正在安装并设置SSL组件,这需要几分钟时间...',{icon:16,time:0,shade: [0.3, '#000']});
+ $.post('/config/set_panel_ssl','',function(rdata){
+ layer.close(loadT);
+ layer.msg(rdata.msg,{icon:rdata.status?1:5});
+ if(rdata.status === true){
+ $.post('/system/restart','',function (rdata) {
+ layer.close(loadT);
+ layer.msg(rdata.msg);
+ setTimeout(function(){
+ window.location.href = ((window.location.protocol.indexOf('https') != -1)?'http://':'https://') + window.location.host + window.location.pathname;
+ },3000);
+ },'json');
+ }
+ },'json');
+ },function(){
+ if(status == 0){
+ $("#panelSSL").prop("checked",false);
+ }
+ else{
+ $("#panelSSL").prop("checked",true);
+ }
+ });
+}
+
+
+function getPanelSSL(){
+ var loadT = layer.msg('正在获取证书信息...',{icon:16,time:0,shade: [0.3, '#000']});
+ $.post('/config/get_panel_ssl',{},function(cert){
+ layer.close(loadT);
+ var certBody = '\
+
\
+
密钥(KEY)
\
+ \
+
\
+
证书(PEM格式)
\
+ \
+
\
+
\
+ \
+
\
+
\
+
\
+ - 粘贴您的*.key以及*.pem内容，然后保存即可[帮助]。
\
+ - 如果浏览器提示证书链不完整,请检查是否正确拼接PEM证书
- PEM格式证书 = 域名证书.crt + 根证书(root_bundle).crt
\
+
\
+
-
面板SSL
+
监听IPv6
+
+
+
+
+