+ '''
+ script_last = run_info['run_script'].split(' ')[0]
+ for pid in psutil.pids():
+ p = psutil.Process(pid)
+ if p.exe() == script_last and p.cwd() == run_info['run_path']:
+ return pid
+ return None
+
+
+ def start_run(self,run_name):
+ '''
+ @name 启动指定启动项
+ @author hwliang<2021-08-06>
+ @param run_name string<启动项名称>
+ @return bool
+ '''
+ run_info = self.get_run_info(run_name)
+ if not run_info: return False
+
+ log_file = '{}/{}.log'.format(self.__run_logs_path,run_name)
+ pid_file = '{}/{}.pid'.format(self.__run_pids_path,run_name)
+ public.ExecShell("nohup {} 2>&1 >> {} & $! > {}".format(run_info['run_script'],log_file,pid_file),cwd=run_info['run_path'],env=run_info['run_env'])[0]
+ time.sleep(1)
+ pid = self.get_script_pid(run_info)
+ public.writeFile(pid_file,str(pid))
+ public.WriteLog(self.__log_name, '开机启动{}成功, PID: {}'.format(run_name,pid))
+ return True
+
+
+ def start(self):
+ '''
+ @name 启动所有启动项
+ @author hwliang<2021-08-06>
+ @param
+ @return bool
+ '''
+ run_list = self.get_run_list(public.dict_obj())
+ for run_name in run_list:
+ if not self.is_run(run_name):
+ self.start_run(run_name)
+ return True
+
+
\ No newline at end of file
diff --git a/class/panelSSL.py b/class/panelSSL.py
index 7a5a4eda..7a01bc96 100644
--- a/class/panelSSL.py
+++ b/class/panelSSL.py
@@ -736,6 +736,10 @@ class panelSSL:
if iss[0] in is_key:
result['issuer'] = iss[1].decode()
break
+ if not result['issuer']:
+ if hasattr(issuer, 'O'):
+ result['issuer'] = issuer.O
+
# 取到期时间
result['notAfter'] = self.strf_date(
bytes.decode(x509.get_notAfter())[:-1])
@@ -760,7 +764,10 @@ class panelSSL:
if sub[0] == b'CN':
result['subject'] = sub[1].decode()
break
- result['dns'].append(result['subject'])
+ # result['dns'].append(result['subject'])
+ if 'subject' in result:
+ result['dns'].append(result['subject'])
+
else:
result['subject'] = result['dns'][0]
return result
diff --git a/class/panelSite.py b/class/panelSite.py
index 03ba538b..0956a5b3 100644
--- a/class/panelSite.py
+++ b/class/panelSite.py
@@ -1890,7 +1890,8 @@ listener SSL443 {
import firewalls
get.port = '443'
get.ps = 'HTTPS'
- firewalls.firewalls().AddAcceptPort(get)
+ if not public.M('firewall').where('port=?', ('443',)).count():
+ firewalls.firewalls().AddAcceptPort(get)
public.serviceReload()
self.save_cert(get)
public.WriteLog('TYPE_SITE', 'SITE_SSL_OPEN_SUCCESS', (siteName,))
@@ -2974,13 +2975,13 @@ server
#取当前可用PHP版本
def GetPHPVersion(self,get):
- phpVersions = ('00','other','52','53','54','55','56','70','71','72','73','74','80')
+ phpVersions = ('00','other','52','53','54','55','56','70','71','72','73','74','80','81')
httpdVersion = ""
filename = self.setupPath + '/apache/version.pl'
if os.path.exists(filename): httpdVersion = public.readFile(filename).strip()
if httpdVersion == '2.2': phpVersions = ('00','52','53','54')
- if httpdVersion == '2.4': phpVersions = ('00','other','53','54','55','56','70','71','72','73','74','80')
+ if httpdVersion == '2.4': phpVersions = ('00','other','53','54','55','56','70','71','72','73','74','80','81')
if os.path.exists('/www/server/nginx/sbin/nginx'):
cfile = '/www/server/nginx/conf/enable-php-00.conf'
if not os.path.exists(cfile): public.writeFile(cfile,'')
@@ -3647,7 +3648,8 @@ RewriteRule ^%s(.*)$ http://%s/$1 [P,E=Proxy-Host:%s]
if public.get_webserver() == 'nginx':
if self.CheckLocation(get):
return self.CheckLocation(get)
-
+ if not get.proxysite.split('//')[-1]:
+ return public.returnMsg(False, 'The target URL cannot be [http:// or https://], please fill in the full URL, such as: https://aapanel.com')
proxyUrl = self.__read_config(self.__proxyfile)
proxyUrl.append({
"proxyname": get.proxyname,
@@ -3890,7 +3892,8 @@ RewriteRule ^%s(.*)$ http://%s/$1 [P,E=Proxy-Host:%s]
# if int(get.type) != 1:
# os.system("mv %s %s_bak" % (ap_conf_file, ap_conf_file))
# os.system("mv %s %s_bak" % (ng_conf_file, ng_conf_file))
- public.serviceReload()
+ if not hasattr(get, 'notreload'):
+ public.serviceReload()
return public.returnMsg(True, 'EDIT_SUCCESS')
# 设置反向代理
diff --git a/class/public.py b/class/public.py
index adde42a5..516eaef4 100644
--- a/class/public.py
+++ b/class/public.py
@@ -613,7 +613,7 @@ def GetHost(port = False):
try:
if host_tmp.find(':') == -1: host_tmp += ':80'
except:
- host_tmp = "127.0.0.1:8888"
+ host_tmp = "127.0.0.1:7800"
h = host_tmp.split(':')
if port: return h[-1]
if len(h) > 2:
@@ -621,9 +621,15 @@ def GetHost(port = False):
return h
return h[0]
+
+
+
def GetClientIp():
from flask import request
- return request.remote_addr.replace('::ffff:', '')
+ ipaddr = request.remote_addr.replace('::ffff:','')
+ if not check_ip(ipaddr): return '未知IP地址'
+ return ipaddr
+
def get_client_ip():
return GetClientIp()
@@ -1044,7 +1050,7 @@ def checkIp(ip):
#检查端口是否合法
def checkPort(port):
if not re.match("^\d+$",port): return False
- ports = ['21','25','443','8080','888','8888','8443']
+ ports = ['21','25','443','8080','888','8888','8443','7800']
if port in ports: return False
intport = int(port)
if intport < 1 or intport > 65535: return False
@@ -1254,7 +1260,7 @@ def CheckPort(port,other=None):
if type(port) == str: port = int(port)
if port < 1 or port > 65535: return False
if other:
- checks = [22, 20, 21, 8888, 3306, 11211, 888, 25]
+ checks = [22, 20, 21, 8888, 3306, 11211, 888, 25,7800]
if port in checks: return False
return True
@@ -1823,12 +1829,12 @@ def check_ip_panel():
for limit_ip in iplong_list:
if client_ip_long >= limit_ip['min'] and client_ip_long <= limit_ip['max']:
return False
-
- errorStr = ReadFile('./BTPanel/templates/' + GetConfigValue('template') + '/error2.html')
- try:
- errorStr = errorStr.format(getMsg('PAGE_ERR_TITLE'),getMsg('PAGE_ERR_IP_H1'),getMsg('PAGE_ERR_IP_P1',(GetClientIp(),)),getMsg('PAGE_ERR_IP_P2'),getMsg('PAGE_ERR_IP_P3'),getMsg('NAME'),getMsg('PAGE_ERR_HELP'))
- except IndexError:pass
- return errorStr
+ return 404
+ # errorStr = ReadFile('./BTPanel/templates/' + GetConfigValue('template') + '/error2.html')
+ # try:
+ # errorStr = errorStr.format(getMsg('PAGE_ERR_TITLE'),getMsg('PAGE_ERR_IP_H1'),getMsg('PAGE_ERR_IP_P1',(GetClientIp(),)),getMsg('PAGE_ERR_IP_P2'),getMsg('PAGE_ERR_IP_P3'),getMsg('NAME'),getMsg('PAGE_ERR_HELP'))
+ # except IndexError:pass
+ # return errorStr
#检查面板域名
def check_domain_panel():
@@ -1838,11 +1844,12 @@ def check_domain_panel():
client_ip = GetClientIp()
if client_ip in ['127.0.0.1','localhost','::1']: return False
if tmp.strip().lower() != domain.strip().lower():
- errorStr = ReadFile('./BTPanel/templates/' + GetConfigValue('template') + '/error2.html')
- try:
- errorStr = errorStr.format(getMsg('PAGE_ERR_TITLE'),getMsg('PAGE_ERR_DOMAIN_H1'),getMsg('PAGE_ERR_DOMAIN_P1'),getMsg('PAGE_ERR_DOMAIN_P2'),getMsg('PAGE_ERR_DOMAIN_P3'),getMsg('NAME'),getMsg('PAGE_ERR_HELP'))
- except:pass
- return errorStr
+ return 404
+ # errorStr = ReadFile('./BTPanel/templates/' + GetConfigValue('template') + '/error2.html')
+ # try:
+ # errorStr = errorStr.format(getMsg('PAGE_ERR_TITLE'),getMsg('PAGE_ERR_DOMAIN_H1'),getMsg('PAGE_ERR_DOMAIN_P1'),getMsg('PAGE_ERR_DOMAIN_P2'),getMsg('PAGE_ERR_DOMAIN_P3'),getMsg('NAME'),getMsg('PAGE_ERR_HELP'))
+ # except:pass
+ # return errorStr
return False
#是否离线模式
@@ -3054,13 +3061,8 @@ def check_app(check='app'):
path=get_panel_path() + '/'
if check=='app':
try:
- if not os.path.exists(path+'data/user.json') and os.path.exists(path+'config/api.json') and not os.path.exists(path+'plugin/app/user.json'):return False
- if os.path.exists(path+'plugin/app/user.json'):
- wxapp = json.loads(readFile(path+'plugin/app/user.json'))
- if wxapp:return True
- if os.path.exists(path+'data/user.json'):
- app_info = json.loads(readFile(path+'data/user.json'))
- if app_info:return True
+ if not os.path.exists("/www/server/panel/plugin/btapp/btapp_main.py"): return False
+ if not os.path.exists(path+'config/api.json'):return False
if os.path.exists(path+'config/api.json'):
btapp_info = json.loads(readFile(path+'config/api.json'))
if not btapp_info['open']:return False
@@ -3071,6 +3073,8 @@ def check_app(check='app'):
except:
return False
elif check=='app_bind':
+ if not cache_get('get_bind_status'):return False
+ if not os.path.exists("/www/server/panel/plugin/btapp/btapp_main.py"):return False
if not os.path.exists(path + 'config/api.json'):return False
btapp_info = json.loads(readFile(path +'config/api.json'))
if not btapp_info: return False
@@ -3082,6 +3086,7 @@ def check_app(check='app'):
if not app_info: return False
return True
+
#宝塔邮件报警
def send_mail(title,body,is_logs=False,is_type="aapanel login reminder"):
if is_logs:
diff --git a/class/safe_warning/sw_database_backup.py b/class/safe_warning/sw_database_backup.py
index ccbb7899..71d2b158 100644
--- a/class/safe_warning/sw_database_backup.py
+++ b/class/safe_warning/sw_database_backup.py
@@ -37,7 +37,7 @@ def check_run():
'''
if public.M('crontab').where('sType=? AND sName=?',('database','ALL')).count():
- return True,'无风险'
+ return True,'Risk-free'
db_list = public.M('databases').field('name').select()
diff --git a/class/safe_warning/sw_mysql_port.py b/class/safe_warning/sw_mysql_port.py
index 110e9a14..822f14a5 100644
--- a/class/safe_warning/sw_mysql_port.py
+++ b/class/safe_warning/sw_mysql_port.py
@@ -63,4 +63,4 @@ def check_run():
return True,'Fail2ban is enabled'
except: pass
- return False,'当前MySQL端口: {}，可被任意服务器访问，这可能导致MySQL被暴力破解，存在安全隐患'.format(port_tmp[0])
+ return False,'MySQL port: {}, can be accessed by any server, which may cause MySQL to be cracked by brute force, posing security risks'.format(port_tmp[0])
diff --git a/class/safe_warning/sw_panel_port.py b/class/safe_warning/sw_panel_port.py
index b98ff225..4824286e 100644
--- a/class/safe_warning/sw_panel_port.py
+++ b/class/safe_warning/sw_panel_port.py
@@ -37,7 +37,7 @@ def check_run():
port = public.readFile(port_file)
if not port: return True,'Rick-free'
port = int(port)
- if port != 8888:
+ if port != 8888 and port != 7800:
return True,'Rick-free'
return False,'The panel port is the default port ({}), which may cause unnecessary security risks'.format(port)
diff --git a/class/safe_warning/sw_redis_port.py b/class/safe_warning/sw_redis_port.py
index 60fad490..d2f24699 100644
--- a/class/safe_warning/sw_redis_port.py
+++ b/class/safe_warning/sw_redis_port.py
@@ -49,7 +49,7 @@ def check_run():
if not is_strong_password(redis_pass):
return False, 'Redis access password is too simple, and there are security risks'
- return True,'无风险'
+ return True,'Risk-free'
def is_strong_password(password):
diff --git a/class/setPanelLets.py b/class/setPanelLets.py
index 6b49b33a..e5418180 100644
--- a/class/setPanelLets.py
+++ b/class/setPanelLets.py
@@ -71,7 +71,7 @@ class setPanelLets:
return public.returnMsg(False, "Failed to apply for a certificate, please try to manually apply for a certificate for the panel domain name on the site management page")
get.key = cert_info['private_key']
get.csr = cert_info['cert'] + cert_info['root']
- return self._deploy_cert(get)
+ return public.returnMsg(True, self._deploy_cert(get))
# 部署证书
def _deploy_cert(self,get):
@@ -223,6 +223,8 @@ class setPanelLets:
return public.returnMsg(True, 'Panel lets set successfully')
if not create_site:
create_lets = self.__create_lets(get)
+ if not create_lets['status']:
+ return create_lets
if create_lets['msg']:
domain_cert = self.__check_cert_dir(get)
self.copy_cert(domain_cert)
diff --git a/class/sewer/cli.py b/class/sewer/cli.py
index 84947fa9..542f7b73 100644
--- a/class/sewer/cli.py
+++ b/class/sewer/cli.py
@@ -14,7 +14,7 @@ def main():
CLOUDFLARE_EMAIL=example@example.com \
CLOUDFLARE_API_KEY=api-key \
sewer \
- --dns cloudflare \
+ --model cloudflare \
--domain example.com \
--action run
@@ -23,7 +23,7 @@ def main():
CLOUDFLARE_API_KEY=api-key \
sewer \
--account_key /path/to/your/account.key \
- --dns cloudflare \
+ --model cloudflare \
--domain example.com \
--action renew
"""
@@ -34,7 +34,7 @@ def main():
CLOUDFLARE_EMAIL=example@example.com \
CLOUDFLARE_API_KEY=api-key \
sewer \
- --dns cloudflare \
+ --model cloudflare \
--domain example.com \
--action run""",
)
@@ -59,7 +59,7 @@ def main():
eg: --certificate_key /home/mycertificate.key",
)
parser.add_argument(
- "--dns",
+ "--model",
type=str,
required=True,
choices=[
@@ -72,7 +72,7 @@ def main():
"dnspod",
"duckdns",
],
- help="The name of the dns provider that you want to use.",
+ help="The name of the model provider that you want to use.",
)
parser.add_argument(
"--domain",
@@ -195,7 +195,7 @@ def main():
dns_class = CloudFlareDns(
CLOUDFLARE_EMAIL=CLOUDFLARE_EMAIL, CLOUDFLARE_API_KEY=CLOUDFLARE_API_KEY
)
- logger.info("chosen_dns_provider. Using {0} as dns provider.".format(dns_provider))
+ logger.info("chosen_dns_provider. Using {0} as model provider.".format(dns_provider))
except KeyError as e:
logger.error("ERROR:: Please supply {0} as an environment variable.".format(str(e)))
raise
@@ -210,7 +210,7 @@ def main():
dns_class = AuroraDns(
AURORA_API_KEY=AURORA_API_KEY, AURORA_SECRET_KEY=AURORA_SECRET_KEY
)
- logger.info("chosen_dns_provider. Using {0} as dns provider.".format(dns_provider))
+ logger.info("chosen_dns_provider. Using {0} as model provider.".format(dns_provider))
except KeyError as e:
logger.error("ERROR:: Please supply {0} as an environment variable.".format(str(e)))
raise
@@ -228,7 +228,7 @@ def main():
ACME_DNS_API_KEY=ACME_DNS_API_KEY,
ACME_DNS_API_BASE_URL=ACME_DNS_API_BASE_URL,
)
- logger.info("chosen_dns_provider. Using {0} as dns provider.".format(dns_provider))
+ logger.info("chosen_dns_provider. Using {0} as model provider.".format(dns_provider))
except KeyError as e:
logger.error("ERROR:: Please supply {0} as an environment variable.".format(str(e)))
raise
@@ -240,7 +240,7 @@ def main():
aliyun_secret = os.environ["ALIYUN_AK_SECRET"]
aliyun_endpoint = os.environ.get("ALIYUN_ENDPOINT", "cn-beijing")
dns_class = AliyunDns(aliyun_ak, aliyun_secret, aliyun_endpoint)
- logger.info("chosen_dns_provider. Using {0} as dns provider.".format(dns_provider))
+ logger.info("chosen_dns_provider. Using {0} as model provider.".format(dns_provider))
except KeyError as e:
logger.error("ERROR:: Please supply {0} as an environment variable.".format(str(e)))
raise
@@ -251,7 +251,7 @@ def main():
he_username = os.environ["HURRICANE_USERNAME"]
he_password = os.environ["HURRICANE_PASSWORD"]
dns_class = HurricaneDns(he_username, he_password)
- logger.info("chosen_dns_provider. Using {0} as dns provider.".format(dns_provider))
+ logger.info("chosen_dns_provider. Using {0} as model provider.".format(dns_provider))
except KeyError as e:
logger.error("ERROR:: Please supply {0} as an environment variable.".format(str(e)))
raise
@@ -262,7 +262,7 @@ def main():
RACKSPACE_USERNAME = os.environ["RACKSPACE_USERNAME"]
RACKSPACE_API_KEY = os.environ["RACKSPACE_API_KEY"]
dns_class = RackspaceDns(RACKSPACE_USERNAME, RACKSPACE_API_KEY)
- logger.info("chosen_dns_prover. Using {0} as dns provider. ".format(dns_provider))
+ logger.info("chosen_dns_prover. Using {0} as model provider. ".format(dns_provider))
except KeyError as e:
logger.error("ERROR:: Please supply {0} as an environment variable.".format(str(e)))
raise
@@ -273,7 +273,7 @@ def main():
DNSPOD_ID = os.environ["DNSPOD_ID"]
DNSPOD_API_KEY = os.environ["DNSPOD_API_KEY"]
dns_class = DNSPodDns(DNSPOD_ID, DNSPOD_API_KEY)
- logger.info("chosen_dns_prover. Using {0} as dns provider. ".format(dns_provider))
+ logger.info("chosen_dns_prover. Using {0} as model provider. ".format(dns_provider))
except KeyError as e:
logger.error("ERROR:: Please supply {0} as an environment variable.".format(str(e)))
raise
@@ -284,12 +284,12 @@ def main():
duckdns_token = os.environ["DUCKDNS_TOKEN"]
dns_class = DuckDNSDns(duckdns_token=duckdns_token)
- logger.info("chosen_dns_provider. Using {0} as dns provider.".format(dns_provider))
+ logger.info("chosen_dns_provider. Using {0} as model provider.".format(dns_provider))
except KeyError as e:
logger.error("ERROR:: Please supply {0} as an environment variable.".format(str(e)))
raise
else:
- raise ValueError("The dns provider {0} is not recognised.".format(dns_provider))
+ raise ValueError("The model provider {0} is not recognised.".format(dns_provider))
client = Client(
domain_name=domain,
diff --git a/class/sewer/client.py b/class/sewer/client.py
index 70935e46..19646113 100644
--- a/class/sewer/client.py
+++ b/class/sewer/client.py
@@ -291,7 +291,7 @@ class Client(object):
self.logger.info("apply_for_cert_issuance")
identifiers = []
for domain_name in self.all_domain_names:
- identifiers.append({"type": "dns", "value": domain_name})
+ identifiers.append({"type": "model", "value": domain_name})
payload = {"identifiers": identifiers}
url = self.ACME_NEW_ORDER_URL
@@ -354,7 +354,7 @@ class Client(object):
domain = "*." + domain
for i in res["challenges"]:
- if i["type"] == "dns-01":
+ if i["type"] == "model-01":
dns_challenge = i
dns_token = dns_challenge["token"]
dns_challenge_url = dns_challenge["url"]
@@ -684,7 +684,7 @@ class Client(object):
)
# for a case where you want certificates for *.example.com and example.com
- # you have to create both dns records AND then respond to the challenge.
+ # you have to create both model records AND then respond to the challenge.
# see issues/83
for i in responders:
# Make sure the authorization is in a status where we can submit a challenge
diff --git a/class/sewer/dns_providers/acmedns.py b/class/sewer/dns_providers/acmedns.py
index 4b778429..6c5bca1d 100644
--- a/class/sewer/dns_providers/acmedns.py
+++ b/class/sewer/dns_providers/acmedns.py
@@ -62,7 +62,7 @@ class AcmeDnsDns(common.BaseDns):
# raise error so that we do not continue to make calls to ACME
# server
raise ValueError(
- "Error creating acme-dns dns record: status_code={status_code} response={response}".format(
+ "Error creating acme-model model record: status_code={status_code} response={response}".format(
status_code=update_acmedns_dns_record_response.status_code,
response=self.log_response(update_acmedns_dns_record_response),
)
@@ -71,5 +71,5 @@ class AcmeDnsDns(common.BaseDns):
def delete_dns_record(self, domain_name, domain_dns_value):
self.logger.info("delete_dns_record")
- # acme-dns doesn't support this
+ # acme-model doesn't support this
self.logger.info("delete_dns_record_success")
diff --git a/class/sewer/dns_providers/aliyundns.py b/class/sewer/dns_providers/aliyundns.py
index 7935c601..77053909 100644
--- a/class/sewer/dns_providers/aliyundns.py
+++ b/class/sewer/dns_providers/aliyundns.py
@@ -31,7 +31,7 @@ class _ResponseForAliyun(object):
class AliyunDns(common.BaseDns):
def __init__(self, key, secret, endpoint="cn-beijing", debug=False):
"""
- aliyun dns client
+ aliyun model client
:param str key: access key
:param str secret: access sceret
:param str endpoint: endpoint
@@ -162,7 +162,7 @@ class AliyunDns(common.BaseDns):
def create_dns_record(self, domain_name, domain_dns_value):
"""
- create a dns record
+ create a model record
:param str domain_name: the value sewer client passed in, like *.menduo.example.com
:param str domain_dns_value: the value sewer client passed in.
:return _ResponseForAliyun:
@@ -200,7 +200,7 @@ class AliyunDns(common.BaseDns):
self.logger.warning(msg)
return
- self.logger.info("start to delete dns record, id: %s", record_id)
+ self.logger.info("start to delete model record, id: %s", record_id)
request = DeleteDomainRecordRequest.DeleteDomainRecordRequest()
request.set_RecordId(record_id)
diff --git a/class/sewer/dns_providers/common.py b/class/sewer/dns_providers/common.py
index a19baf51..58a4e0c9 100644
--- a/class/sewer/dns_providers/common.py
+++ b/class/sewer/dns_providers/common.py
@@ -29,10 +29,10 @@ class BaseDns(object):
def create_dns_record(self, domain_name, domain_dns_value):
"""
- Method that creates/adds a dns TXT record for a domain/subdomain name on
+ Method that creates/adds a model TXT record for a domain/subdomain name on
a chosen DNS provider.
- :param domain_name: :string: The domain/subdomain name whose dns record ought to be
+ :param domain_name: :string: The domain/subdomain name whose model record ought to be
created/added on a chosen DNS provider.
:param domain_dns_value: :string: The value/content of the TXT record that will be
created/added for the given domain/subdomain
@@ -46,16 +46,16 @@ class BaseDns(object):
whose name is '_acme-challenge' + '.' + domain_name + '.' (ie: _acme-challenge.example.com. )
and whose value/content is HAJA_4MkowIFByHhFaP8u035skaM91lTKplKld
- Using a dns client like dig(https://linux.die.net/man/1/dig) to do a dns lookup should result
+ Using a model client like dig(https://linux.die.net/man/1/dig) to do a model lookup should result
in something like:
dig TXT _acme-challenge.example.com
...
;; ANSWER SECTION:
_acme-challenge.example.com. 120 IN TXT "HAJA_4MkowIFByHhFaP8u035skaM91lTKplKld"
_acme-challenge.singularity.brandur.org. 120 IN TXT "9C0DqKC_4MkowIFByHhFaP8u0Zv4z7Wz2IHM91lTKec"
- Optionally, you may also use an online dns client like: https://toolbox.googleapps.com/apps/dig/#TXT/
+ Optionally, you may also use an online model client like: https://toolbox.googleapps.com/apps/dig/#TXT/
- Please consult your dns provider on how/format of their DNS TXT records.
+ Please consult your model provider on how/format of their DNS TXT records.
You may also want to consult the cloudflare DNS implementation that is found in this repository.
"""
self.logger.info("create_dns_record")
@@ -63,10 +63,10 @@ class BaseDns(object):
def delete_dns_record(self, domain_name, domain_dns_value):
"""
- Method that deletes/removes a dns TXT record for a domain/subdomain name on
+ Method that deletes/removes a model TXT record for a domain/subdomain name on
a chosen DNS provider.
- :param domain_name: :string: The domain/subdomain name whose dns record ought to be
+ :param domain_name: :string: The domain/subdomain name whose model record ought to be
deleted/removed on a chosen DNS provider.
:param domain_dns_value: :string: The value/content of the TXT record that will be
deleted/removed for the given domain/subdomain
diff --git a/class/sewer/dns_providers/dnspod.py b/class/sewer/dns_providers/dnspod.py
index 59a635ff..01c9b7ca 100644
--- a/class/sewer/dns_providers/dnspod.py
+++ b/class/sewer/dns_providers/dnspod.py
@@ -62,7 +62,7 @@ class DNSPodDns(common.BaseDns):
# raise error so that we do not continue to make calls to ACME
# server
raise ValueError(
- "Error creating dnspod dns record: status_code={status_code} response={response}".format(
+ "Error creating dnspod model record: status_code={status_code} response={response}".format(
status_code=create_dnspod_dns_record_response["status"]["code"],
response=create_dnspod_dns_record_response["status"]["message"],
)
diff --git a/class/sewer/dns_providers/duckdns.py b/class/sewer/dns_providers/duckdns.py
index 6a1cfabe..78d1b79d 100644
--- a/class/sewer/dns_providers/duckdns.py
+++ b/class/sewer/dns_providers/duckdns.py
@@ -49,7 +49,7 @@ class DuckDNSDns(common.BaseDns):
# raise error so that we do not continue to make calls to DuckDNS
# server
raise ValueError(
- "Error creating DuckDNS dns record: status_code={status_code} response={response}".format(
+ "Error creating DuckDNS model record: status_code={status_code} response={response}".format(
status_code=update_duckdns_dns_record_response.status_code,
response=normalized_response,
)
diff --git a/class/sewer/dns_providers/rackspace.py b/class/sewer/dns_providers/rackspace.py
index f456fb35..a52ea8b1 100644
--- a/class/sewer/dns_providers/rackspace.py
+++ b/class/sewer/dns_providers/rackspace.py
@@ -47,11 +47,11 @@ class RackspaceDns(common.BaseDns):
data = find_rackspace_api_details_response.json()
api_token = data["access"]["token"]["id"]
url_data = next(
- (item for item in data["access"]["serviceCatalog"] if item["type"] == "rax:dns"), None
+ (item for item in data["access"]["serviceCatalog"] if item["type"] == "rax:model"), None
)
if url_data is None:
raise ValueError(
- "Error finding url data for the rackspace dns api in the response from the identity server"
+ "Error finding url data for the rackspace model api in the response from the identity server"
)
else:
api_base_url = url_data["endpoints"][0]["publicURL"] + "/"
@@ -91,7 +91,7 @@ class RackspaceDns(common.BaseDns):
)
if find_dns_zone_id_response.status_code != 200:
raise ValueError(
- "Error getting rackspace dns domain info: status_code={status_code} response={response}".format(
+ "Error getting rackspace model domain info: status_code={status_code} response={response}".format(
status_code=find_dns_zone_id_response.status_code,
response=self.log_response(find_dns_zone_id_response),
)
@@ -102,7 +102,7 @@ class RackspaceDns(common.BaseDns):
)
if domain_data is None:
raise ValueError(
- "Error finding information for {dns_zone} in dns response data:\n{response_data})".format(
+ "Error finding information for {dns_zone} in model response data:\n{response_data})".format(
dns_zone=self.RACKSPACE_DNS_ZONE,
response_data=self.log_response(find_dns_zone_id_response),
)
@@ -124,7 +124,7 @@ class RackspaceDns(common.BaseDns):
self.logger.debug(url)
if find_dns_record_id_response.status_code != 200:
raise ValueError(
- "Error finding dns records for {dns_zone}: status_code={status_code} response={response}".format(
+ "Error finding model records for {dns_zone}: status_code={status_code} response={response}".format(
dns_zone=self.RACKSPACE_DNS_ZONE,
status_code=find_dns_record_id_response.status_code,
response=self.log_response(find_dns_record_id_response),
@@ -152,21 +152,21 @@ class RackspaceDns(common.BaseDns):
callback_url_response = requests.get(callback_url, headers=self.RACKSPACE_HEADERS)
if time.time() > start_time + self.HTTP_TIMEOUT:
raise ValueError(
- "Timed out polling callbackurl for dns record status. Last status_code={status_code} last response={response}".format(
+ "Timed out polling callbackurl for model record status. Last status_code={status_code} last response={response}".format(
status_code=callback_url_response.status_code,
response=self.log_response(callback_url_response),
)
)
if callback_url_response.status_code != 200:
raise Exception(
- "Could not get dns record status from callback url. Status code ={status_code}. response={response}".format(
+ "Could not get model record status from callback url. Status code ={status_code}. response={response}".format(
status_code=callback_url_response.status_code,
response=self.log_response(callback_url_response),
)
)
if callback_url_response.json()["status"] == "ERROR":
raise Exception(
- "Error in creating/deleting dns record: status_Code={status_code}. response={response}".format(
+ "Error in creating/deleting model record: status_Code={status_code}. response={response}".format(
status_code=callback_url_response.status_code,
response=self.log_response(callback_url_response),
)
@@ -196,13 +196,13 @@ class RackspaceDns(common.BaseDns):
)
if create_rackspace_dns_record_response.status_code != 202:
raise ValueError(
- "Error creating rackspace dns record: status_code={status_code} response={response}".format(
+ "Error creating rackspace model record: status_code={status_code} response={response}".format(
status_code=create_rackspace_dns_record_response.status_code,
response=create_rackspace_dns_record_response.text,
)
)
# response=self.log_response(create_rackspace_dns_record_response)))
- # After posting the dns record we want created, the response gives us a url to check that will
+ # After posting the model record we want created, the response gives us a url to check that will
# update when the job is done
callback_url = create_rackspace_dns_record_response.json()["callbackUrl"]
self.poll_callback_url(callback_url)
@@ -228,7 +228,7 @@ class RackspaceDns(common.BaseDns):
)
if delete_dns_record_response.status_code != 202:
raise ValueError(
- "Error deleting rackspace dns record: status_code={status_code} response={response}".format(
+ "Error deleting rackspace model record: status_code={status_code} response={response}".format(
status_code=delete_dns_record_response.status_code,
response=self.log_response(delete_dns_record_response),
)
diff --git a/class/sewer_Usage.py b/class/sewer_Usage.py
index 8c57036b..df4459b7 100644
--- a/class/sewer_Usage.py
+++ b/class/sewer_Usage.py
@@ -252,7 +252,7 @@ class ACMEclient(object):
print("Apply for a certificate")
identifiers = []
for domain_name in self.all_domain_names:
- identifiers.append({"type": "dns", "value": domain_name})
+ identifiers.append({"type": "model", "value": domain_name})
payload = {"identifiers": identifiers}
url = self.ACME_NEW_ORDER_URL
apply_for_cert_issuance_response = self.make_signed_acme_request(url=url, payload=payload)
@@ -299,7 +299,7 @@ class ACMEclient(object):
if wildcard:
domain = "*." + domain
for i in res["challenges"]:
- if i["type"] == "dns-01":
+ if i["type"] == "model-01":
dns_challenge = i
dns_token = dns_challenge["token"]
dns_challenge_url = dns_challenge["url"]
@@ -364,7 +364,7 @@ class ACMEclient(object):
if authorization_status in desired_status:
break
else:
- print("Failed to verify dns txt wait {} seconds to re-verify dns, returned information：".format(self.ACME_AUTH_STATUS_WAIT_PERIOD))
+ print("Failed to verify model txt wait {} seconds to re-verify model, returned information：".format(self.ACME_AUTH_STATUS_WAIT_PERIOD))
print(check_authorization_status_response.json())
public.WriteFile(os.path.join(ssl_home_path, "check_authorization_status_response"), check_authorization_status_response.text, mode="w")
# 等待
@@ -806,7 +806,7 @@ class AliyunDns(object):
msg = public.GetMsg("CANT_FIND_RECORDID"), domain_name
print(msg)
return
- print("start to delete dns record, id: ", record_id)
+ print("start to delete model record, id: ", record_id)
randomint = random.randint(11111111111111, 99999999999999)
now = datetime.datetime.utcnow()
otherStyleTime = now.strftime("%Y-%m-%dT%H:%M:%SZ")
@@ -901,7 +901,7 @@ class Dns_com(object):
def create_dns_record(self, domain_name, domain_dns_value):
root, _, acme_txt = extract_zone(domain_name)
print("create_dns_record,", acme_txt, domain_dns_value)
- result = public.ExecShell('''{} /www/server/panel/plugin/dns/dns_main.py add_txt {} {}'''.format(public.get_python_bin(),acme_txt + '.' + root, domain_dns_value))
+ result = public.ExecShell('''{} /www/server/panel/plugin/model/dns_main.py add_txt {} {}'''.format(public.get_python_bin(),acme_txt + '.' + root, domain_dns_value))
if result[0].strip() == "False":
sys.exit(json.dumps({"data": public.GetMsg("BT_DNSRES_ERR")}))
print("create_dns_record_end")
@@ -909,7 +909,7 @@ class Dns_com(object):
def delete_dns_record(self, domain_name, domain_dns_value):
root, _, acme_txt = extract_zone(domain_name)
print("delete_dns_record start: ", acme_txt, domain_dns_value)
- public.ExecShell('''{} /www/server/panel/plugin/dns/dns_main.py remove_txt {} {}'''.format(public.get_python_bin() ,acme_txt + '.' + root, domain_dns_value))
+ public.ExecShell('''{} /www/server/panel/plugin/model/dns_main.py remove_txt {} {}'''.format(public.get_python_bin() ,acme_txt + '.' + root, domain_dns_value))
print("delete_dns_record_success")
@@ -939,9 +939,9 @@ if __name__ == "__main__":#dns调用验证脚本
dns_class = AliyunDns(key=key, secret=secret)
elif dnsapi == "dns_cx": # CloudXns
dns_class = CloudxnsDns(key=key, secret=secret)
- elif dnsapi == "dns_bt": # dns.com
+ elif dnsapi == "dns_bt": # model.com
dns_class = Dns_com()
- elif dnsapi == "dns": # 手动的
+ elif dnsapi == "model": # 手动的
dns_class = Dns_Manual()
Manual = 1
domain_alt_names = data['domain_alt_names'].split(",")
diff --git a/class/site_dir_auth.py b/class/site_dir_auth.py
index 12987216..5d0bf2ef 100644
--- a/class/site_dir_auth.py
+++ b/class/site_dir_auth.py
@@ -62,6 +62,8 @@ class SiteDirAuth:
:param get:
:return:
'''
+ if len(get.username) < 3 or len(get.password) < 3:
+ return public.returnMsg(False, 'The account number or password cannot be less than 3 characters')
name = get.name
site_dir = get.site_dir
if public.get_webserver() == "openlitespeed":
diff --git a/class/ssh_security.py b/class/ssh_security.py
index be5739fa..0e648b6a 100644
--- a/class/ssh_security.py
+++ b/class/ssh_security.py
@@ -182,11 +182,15 @@ class ssh_security:
################## SSH 登陆报警设置 ####################################
def send_mail_data(self,title,body,type='mail'):
+ import threading
if type=='mail':
if self.__mail_config['user_mail']['user_name']:
if len(self.__mail_config['user_mail']['mail_list'])>=1:
for i in self.__mail_config['user_mail']['mail_list']:
- self.__mail.qq_smtp_send(i, title, body)
+ t = threading.Thread(target=self.__mail.qq_smtp_send,args=(i, title, body))
+ t.setDaemon(True)
+ t.start()
+ # self.__mail.qq_smtp_send(i, title, body)
elif type=='dingding':
if self.__mail_config['dingding']['dingding']:
self.__mail.dingding_send(title+body)
diff --git a/class/system.py b/class/system.py
index 07c1e6db..00a12d5e 100644
--- a/class/system.py
+++ b/class/system.py
@@ -411,6 +411,8 @@ class system:
for tmp in temp1:
n += 1
try:
+ if ',' in tmp:
+ tmp = re.sub(',\d+','',tmp)
inodes = tempInodes1[n-1].split()
disk = re.findall(r"^(.+)\s+([\w\.]+)\s+([\w\.]+)\s+([\w\.]+)\s+([\w\.]+)\s+([\d%]{2,4})\s+(/.{0,100})$",tmp.strip())
if disk: disk = disk[0]
@@ -902,7 +904,6 @@ class system:
public.ExecShell('/etc/init.d/nginx start')
if get.type != 'test':
public.WriteLog("TYPE_SOFT", 'SYS_EXEC_SUCCESS',(execStr,))
-
if len(result[1]) > 1 and get.name != 'pure-ftpd' and get.name != 'redis': return public.returnMsg(False, 'Warning message:
' + result[1].replace('\n','
'))
return public.returnMsg(True,'SYS_EXEC_SUCCESS')
diff --git a/class/userlogin.py b/class/userlogin.py
index 16dab766..8d05ced4 100644
--- a/class/userlogin.py
+++ b/class/userlogin.py
@@ -177,12 +177,13 @@ class userlogin:
domain = public.readFile('data/domain.conf')
if domain:
- if(public.GetHost().lower() != domain.strip().lower()):
- errorStr = public.ReadFile('./BTPanel/templates/' + public.GetConfigValue('template') + '/error2.html')
- try:
- errorStr = errorStr.format(public.getMsg('PAGE_ERR_TITLE'),public.getMsg('PAGE_ERR_DOMAIN_H1'),public.getMsg('PAGE_ERR_DOMAIN_P1'),public.getMsg('PAGE_ERR_DOMAIN_P2'),public.getMsg('PAGE_ERR_DOMAIN_P3'),public.getMsg('NAME'),public.getMsg('PAGE_ERR_HELP'))
- except IndexError:pass
- return errorStr
+ if(public.GetHost().lower() != domain.strip().lower()):
+ return 404
+ # errorStr = public.ReadFile('./BTPanel/templates/' + public.GetConfigValue('template') + '/error2.html')
+ # try:
+ # errorStr = errorStr.format(public.getMsg('PAGE_ERR_TITLE'),public.getMsg('PAGE_ERR_DOMAIN_H1'),public.getMsg('PAGE_ERR_DOMAIN_P1'),public.getMsg('PAGE_ERR_DOMAIN_P2'),public.getMsg('PAGE_ERR_DOMAIN_P3'),public.getMsg('NAME'),public.getMsg('PAGE_ERR_HELP'))
+ # except IndexError:pass
+ # return errorStr
if os.path.exists('data/limitip.conf'):
iplist = public.readFile('data/limitip.conf')
if iplist:
diff --git a/class/wxapp.py b/class/wxapp.py
index db89f981..fe68f043 100644
--- a/class/wxapp.py
+++ b/class/wxapp.py
@@ -30,7 +30,7 @@ class wxapp():
def is_scan_ok(self, get):
if os.path.exists(self.app_path+"app_login_check.pl"):
key, init_time = public.readFile(self.app_path+'app_login_check.pl').split(':')
- if time.time() - float(init_time) > 180:
+ if time.time() - float(init_time) > 60:
return public.returnMsg(False, 'QRCORE_EXPIRE')
session_id = public.get_session_id()
if cache.get(session_id) == 'True':
@@ -70,7 +70,9 @@ class wxapp():
secret_key, init_time = data.split(':')
if len(session_id)!=64:return public.returnMsg(False,'Waiting for APP scan code login 2')
if len(secret_key)!=64:return public.returnMsg(False,'Waiting for APP scan code login 2')
- if time.time() - float(init_time) < 180 and session_id != secret_key:
+ if time.time() - float(init_time) > 60:
+ return public.returnMsg(False,'Waiting for APP scan code login')
+ if session_id != secret_key:
return public.returnMsg(False,'Waiting for APP scan code login')
cache.delete(session_id)
userInfo = public.M('users').where("id=?",(1,)).field('id,username').find()
diff --git a/config/hosts.json b/config/hosts.json
index 02c9ba31..783e834d 100644
--- a/config/hosts.json
+++ b/config/hosts.json
@@ -1 +1 @@
-[ "103.224.251.67","128.1.164.196","45.76.53.20","[2001:19f0:7001:54fc:5400:2ff:fe9b:97f9]", "158.247.208.19"]
\ No newline at end of file
+["128.1.164.196","45.76.53.20","[2001:19f0:7001:54fc:5400:2ff:fe9b:97f9]", "158.247.208.19"]
\ No newline at end of file
diff --git a/data/404.html b/data/404.html
index d07f30de..6f17eaf5 100644
--- a/data/404.html
+++ b/data/404.html
@@ -1,26 +1,7 @@
-
-
-
-
-
-404
-
-
-
+404 Not Found
-404, the file you requested does not exist!
+404 Not Found
+
nginx
-
+