version

app/controller/Auth.php

@@ -53,7 +53,9 @@ class Auth extends BaseController
             } else {
                 if ($user) {
                     Db::name('log')->insert(['uid' => $user['id'], 'action' => '登录失败', 'data' => 'IP:' . $this->clientip, 'addtime' => date("Y-m-d H:i:s")]);
-                    if (isset($user['totp_open']) && $user['totp_open'] == 1 && !empty($user['totp_secret'])) $login_limit_count = 10;
+                    if (isset($user['totp_open']) && $user['totp_open'] == 1 && !empty($user['totp_secret'])) {
+                        return json(['code' => -1, 'msg' => '用户名或密码错误', 'vcode' => 1]);
+                    }
                 }
                 if (!file_exists($login_limit_file)) {
                     $login_limit = ['count' => 0, 'time' => 0];

app/lib/DeployHelper.php

@@ -939,6 +939,43 @@ class DeployHelper
                 ],
             ],
         ],
+        'west' => [
+            'name' => '西部数码',
+            'class' => 2,
+            'icon' => 'west.ico',
+            'note' => '支持部署到西部数码虚拟主机',
+            'inputs' => [
+                'username' => [
+                    'name' => '用户名',
+                    'type' => 'input',
+                    'placeholder' => '',
+                    'required' => true,
+                ],
+                'api_password' => [
+                    'name' => 'API密码',
+                    'type' => 'input',
+                    'placeholder' => '',
+                    'required' => true,
+                ],
+                'proxy' => [
+                    'name' => '使用代理服务器',
+                    'type' => 'radio',
+                    'options' => [
+                        '0' => '否',
+                        '1' => '是',
+                    ],
+                    'value' => '0'
+                ],
+            ],
+            'taskinputs' => [
+                'sitename' => [
+                    'name' => 'FTP账号',
+                    'type' => 'input',
+                    'placeholder' => '',
+                    'required' => true,
+                ],
+            ],
+        ],
         'baishan' => [
             'name' => '白山云',
             'class' => 2,

app/lib/client/AWS.php

@@ -144,6 +144,7 @@ class AWS
         }
 
         $path = '/' . $this->version . $path;
+        $body = '';
         if ($method == 'GET' || $method == 'DELETE') {
             $query = $params;
         } else {
@@ -181,7 +182,7 @@ class AWS
 
         // step 1: build canonical request string
         $httpRequestMethod = $method;
-        $canonicalUri = $path;
+        $canonicalUri = $this->getCanonicalURI($path);
         $canonicalQueryString = $this->getCanonicalQueryString($query);
         [$canonicalHeaders, $signedHeaders] = $this->getCanonicalHeaders($headers);
         $hashedRequestPayload = hash("sha256", $body);
@@ -221,6 +222,17 @@ class AWS
         $replace = ['%20', '%2A', '~'];
         return str_replace($search, $replace, urlencode($str));
     }
+    
+    private function getCanonicalURI($path)
+    {
+        if (empty($path)) return '/';
+        $pattens = explode('/', $path);
+        $pattens = array_map(function ($item) {
+            return $this->escape($item);
+        }, $pattens);
+        $canonicalURI = implode('/', $pattens);
+        return $canonicalURI;
+    }
 
     private function getCanonicalQueryString($parameters)
     {

app/lib/client/AliyunNew.php

@@ -76,7 +76,7 @@ class AliyunNew
 
         // step 1: build canonical request string
         $httpRequestMethod = $method;
-        $canonicalUri = $path;
+        $canonicalUri = $this->getCanonicalURI($path);
         $canonicalQueryString = $this->getCanonicalQueryString($query);
         [$canonicalHeaders, $signedHeaders] = $this->getCanonicalHeaders($headers);
         $hashedRequestPayload = hash("sha256", $body);
@@ -108,6 +108,17 @@ class AliyunNew
         return str_replace($search, $replace, urlencode($str));
     }
 
+    private function getCanonicalURI($path)
+    {
+        if (empty($path)) return '/';
+        $pattens = explode('/', $path);
+        $pattens = array_map(function ($item) {
+            return $this->escape($item);
+        }, $pattens);
+        $canonicalURI = implode('/', $pattens);
+        return $canonicalURI;
+    }
+
     private function getCanonicalQueryString($parameters)
     {
         if (empty($parameters)) return '';

app/lib/client/HuaweiCloud.php

@@ -70,8 +70,7 @@ class HuaweiCloud
 
         // step 1: build canonical request string
         $httpRequestMethod = $method;
-        $canonicalUri = $path;
-        if (substr($canonicalUri, -1) != "/") $canonicalUri .= "/";
+        $canonicalUri = $this->getCanonicalURI($path);
         $canonicalQueryString = $this->getCanonicalQueryString($query);
         [$canonicalHeaders, $signedHeaders] = $this->getCanonicalHeaders($headers);
         $hashedRequestPayload = hash("sha256", $body);
@@ -105,6 +104,18 @@ class HuaweiCloud
         return str_replace($search, $replace, urlencode($str));
     }
 
+    private function getCanonicalURI($path)
+    {
+        if (empty($path)) return '/';
+        $pattens = explode('/', $path);
+        $pattens = array_map(function ($item) {
+            return $this->escape($item);
+        }, $pattens);
+        $canonicalURI = implode('/', $pattens);
+        if (substr($canonicalURI, -1) != '/') $canonicalURI .= '/';
+        return $canonicalURI;
+    }
+
     private function getCanonicalQueryString($parameters)
     {
         if (empty($parameters)) return '';

app/lib/deploy/west.php

@@ -0,0 +1,131 @@
+<?php
+
+namespace app\lib\deploy;
+
+use app\lib\DeployInterface;
+use Exception;
+
+class west implements DeployInterface
+{
+    private $logger;
+    private $username;
+    private $api_password;
+    private $baseUrl = 'https://api.west.cn/api/v2';
+    private $proxy;
+
+    public function __construct($config)
+    {
+        $this->username = $config['username'];
+        $this->api_password = $config['api_password'];
+        $this->proxy = $config['proxy'] == 1;
+    }
+
+    public function check()
+    {
+        if (empty($this->username) || empty($this->api_password)) throw new Exception('用户名或API密码不能为空');
+        $this->execute('/vhost/', ['act' => 'products']);
+    }
+
+    public function deploy($fullchain, $privatekey, $config, &$info)
+    {
+        if (empty($config['sitename'])) throw new Exception('FTP账号不能为空');
+        $params = [
+            'act' => 'vhostssl',
+            'sitename' => $config['sitename'],
+            'cmd' => 'info'
+        ];
+        try {
+            $data = $this->execute('/vhost/', $params);
+        } catch (Exception $e) {
+            throw new Exception('获取虚拟主机SSL配置失败:' . $e->getMessage());
+        }
+
+        $params = [
+            'act' => 'vhostssl',
+            'sitename' => $config['sitename'],
+            'cmd' => 'import',
+            'keycontent' => $privatekey,
+            'certcontent' => $fullchain,
+        ];
+        try {
+            $this->execute('/vhost/', $params);
+        } catch (Exception $e) {
+            throw new Exception('上传SSL证书失败:' . $e->getMessage());
+        }
+        $this->log('SSL证书上传成功');
+
+        if (!isset($data['SSLEnabled']) || $data['SSLEnabled'] == 0) {
+            $params = [
+                'act' => 'vhostssl',
+                'sitename' => $config['sitename'],
+                'cmd' => 'openssl',
+            ];
+            try {
+                $this->execute('/vhost/', $params);
+            } catch (Exception $e) {
+                throw new Exception('虚拟主机部署SSL失败:' . $e->getMessage());
+            }
+        } else {
+            $params = [
+                'act' => 'vhostssl',
+                'sitename' => $config['sitename'],
+                'cmd' => 'info'
+            ];
+            try {
+                $data = $this->execute('/vhost/', $params);
+            } catch (Exception $e) {
+                throw new Exception('获取虚拟主机SSL配置失败:' . $e->getMessage());
+            }
+            if (!empty($data['sslcert']['ssl'])) {
+                foreach ($data['sslcert']['ssl'] as $domain => $row) {
+                    if (!in_array($domain, $config['domainList'])) continue;
+                    $params = [
+                        'act' => 'vhostssl',
+                        'sitename' => $config['sitename'],
+                        'cmd' => 'clearsslcache',
+                        'sslid' => $row['sysid'],
+                        'dm' => $domain,
+                    ];
+                    try {
+                        $this->execute('/vhost/', $params);
+                        $this->log('更新' . $domain . '证书缓存成功');
+                    } catch (Exception $e) {
+                        $this->log('更新' . $domain . '证书缓存失败:' . $e->getMessage());
+                    }
+                }
+            }
+        }
+        $this->log('虚拟主机' . $config['sitename'] . '部署SSL成功');
+    }
+
+    private function execute($path, $params)
+    {
+        $params['username'] = $this->username;
+        $params['time'] = getMillisecond();
+        $params['token'] = md5($this->username . $this->api_password . $params['time']);
+        $response = curl_client($this->baseUrl . $path, str_replace('+', '%20', http_build_query($params)), null, null, null, $this->proxy);
+        $response = mb_convert_encoding($response['body'], 'UTF-8', 'GBK');
+        $arr = json_decode($response, true);
+        if ($arr) {
+            if ($arr['result'] == 200) {
+                return isset($arr['data']) ? $arr['data'] : [];
+            } else {
+                throw new Exception($arr['msg']);
+            }
+        } else {
+            throw new Exception('请求失败(httpCode=' . $response['code'] . ')');
+        }
+    }
+
+    public function setLogger($func)
+    {
+        $this->logger = $func;
+    }
+
+    private function log($txt)
+    {
+        if ($this->logger) {
+            call_user_func($this->logger, $txt);
+        }
+    }
+}

app/service/CertOrderService.php

@@ -117,7 +117,9 @@ class CertOrderService
             $this->saveLog(date('Y-m-d H:i:s').' - 开始添加DNS记录');
             $this->addDns();
             $this->saveLog('添加DNS记录成功，请等待生效后进行验证...');
-            Db::name('cert_order')->where('id', $this->order['id'])->update(['retrytime' => date('Y-m-d H:i:s', time() + 300)]);
+            if (CertHelper::$cert_config[$this->atype]['cname']) {
+                Db::name('cert_order')->where('id', $this->order['id'])->update(['retrytime' => date('Y-m-d H:i:s', time() + 180)]);
+            }
             return 1;
         }
         // step4: 查询DNS

app/utils/CheckUtils.php

@@ -74,9 +74,10 @@ class CheckUtils
 
     public static function tcp($target, $port, $timeout)
     {
+        if (substr($target, -1) == '.') $target = substr($target, 0, -1);
         if (!filter_var($target, FILTER_VALIDATE_IP) && checkDomain($target)) {
             $target = gethostbyname($target);
-            if (!$target) return ['status' => false, 'error' => 'DNS resolve failed', 'usetime' => 0];
+            if (!$target) return ['status' => false, 'errmsg' => 'DNS resolve failed', 'usetime' => 0];
         }
         $starttime = getMillisecond();
         $fp = @fsockopen($target, $port, $errCode, $errStr, $timeout);
@@ -93,13 +94,14 @@ class CheckUtils
 
     public static function ping($target)
     {
-        if (!function_exists('exec')) return ['status' => false, 'error' => 'exec函数不可用', 'usetime' => 0];
+        if (!function_exists('exec')) return ['status' => false, 'errmsg' => 'exec函数不可用', 'usetime' => 0];
+        if (substr($target, -1) == '.') $target = substr($target, 0, -1);
         if (!filter_var($target, FILTER_VALIDATE_IP) && checkDomain($target)) {
             $target = gethostbyname($target);
-            if (!$target) return ['status' => false, 'error' => 'DNS resolve failed', 'usetime' => 0];
+            if (!$target) return ['status' => false, 'errmsg' => 'DNS resolve failed', 'usetime' => 0];
         }
         if (!filter_var($target, FILTER_VALIDATE_IP)) {
-            return ['status' => false, 'error' => 'Invalid IP address', 'usetime' => 0];
+            return ['status' => false, 'errmsg' => 'Invalid IP address', 'usetime' => 0];
         }
         $timeout = 1;
         exec('ping -c 1 -w '.$timeout.' '.$target.'', $output, $return_var);

app/view/system/proxyset.html

@@ -1,5 +1,5 @@
 {extend name="common/layout" /}
-{block name="title"}容灾切换代理设置{/block}
+{block name="title"}代理设置{/block}
 {block name="main"}
 <div class="row">
 <div class="col-xs-12 col-sm-8 col-lg-6 center-block" style="float: none;">

config/app.php

@@ -31,7 +31,7 @@ return [
     'show_error_msg'   => true,
     'exception_tmpl'   => \think\facade\App::getAppPath() . 'view/exception.tpl',
 
-    'version' => '1024',
+    'version' => '1025',
 
     'dbversion' => '1023'
 ];