InPanel 1.2.3__tar.gz → 1.2.4__tar.gz

{inpanel-1.2.3 → inpanel-1.2.4}/InPanel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.3
+Version: 1.2.4
 Summary: InPanel - A Web-based Linux Server Management Tool
 Author-email: Jackson Dou <jksdou@qq.com>
 Maintainer-email: Jackson Dou <jksdou@qq.com>

{inpanel-1.2.3 → inpanel-1.2.4}/InPanel.egg-info/SOURCES.txt

@@ -9,18 +9,12 @@ InPanel.egg-info/entry_points.txt
 InPanel.egg-info/requires.txt
 InPanel.egg-info/top_level.txt
 inpanel/__init__.py
-inpanel/acme.py
-inpanel/aliyuncs.py
 inpanel/app.py
-inpanel/apt.py
 inpanel/base.py
 inpanel/config.py
-inpanel/dnf.py
 inpanel/plugin.py
-inpanel/remote.py
 inpanel/utils.py
 inpanel/web.py
-inpanel/yum.py
 inpanel/lib/__init__.py
 inpanel/lib/async_process.py
 inpanel/lib/filelock.py
@@ -28,6 +22,8 @@ inpanel/lib/magic.py
 inpanel/lib/pxssh.py
 inpanel/lib/pyDes.py
 inpanel/mod/__init__.py
+inpanel/mod/acme.py
+inpanel/mod/aliyuncs.py
 inpanel/mod/apt.py
 inpanel/mod/brew.py
 inpanel/mod/certificate.py
@@ -36,6 +32,7 @@ inpanel/mod/cron.py
 inpanel/mod/disk.py
 inpanel/mod/dnf.py
 inpanel/mod/docker.py
+inpanel/mod/docker_source.py
 inpanel/mod/file.py
 inpanel/mod/firewall.py
 inpanel/mod/firewall_base.py
@@ -63,6 +60,7 @@ inpanel/mod/process.py
 inpanel/mod/proftpd.py
 inpanel/mod/pureftpd.py
 inpanel/mod/query.py
+inpanel/mod/remote.py
 inpanel/mod/server.py
 inpanel/mod/service.py
 inpanel/mod/setting.py
@@ -208,10 +206,20 @@ inpanel/public/partials/utils/firewall.html
 inpanel/public/partials/utils/index.html
 inpanel/public/partials/utils/network.html
 inpanel/public/partials/utils/process.html
-inpanel/public/partials/utils/repository.html
 inpanel/public/partials/utils/shell.html
+inpanel/public/partials/utils/sources.html
 inpanel/public/partials/utils/ssl.html
 inpanel/public/partials/utils/time.html
 inpanel/public/partials/utils/user.html
-inpanel/templates/index.html
-inpanel/templates/file/preview.html
+inpanel/public/templates/index.html
+inpanel/public/templates/file/preview.html
+inpanel/templates/__init__.py
+inpanel/templates/sources/__init__.py
+inpanel/templates/sources/apt.json
+inpanel/templates/sources/brew.json
+inpanel/templates/sources/dnf.json
+inpanel/templates/sources/docker.json
+inpanel/templates/sources/package_map.json
+inpanel/templates/sources/pip.json
+inpanel/templates/sources/third_party.json
+inpanel/templates/sources/yum.json

{inpanel-1.2.3 → inpanel-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.3
+Version: 1.2.4
 Summary: InPanel - A Web-based Linux Server Management Tool
 Author-email: Jackson Dou <jksdou@qq.com>
 Maintainer-email: Jackson Dou <jksdou@qq.com>

{inpanel-1.2.3 → inpanel-1.2.4}/inpanel/app.py

@@ -4,7 +4,7 @@
 # Copyright (c) 2017-2026 Jackson Dou
 # All rights reserved.
 #
-# InPanel is distributed under the terms of The New BSD License.
+# InPanel is distributed under the terms of the (new) BSD License.
 # The full license can be found in 'LICENSE'.
 
 import os
@@ -27,7 +27,7 @@ from .utils import make_cookie_secret
 
 
 def _read_pid(pidfile):
-    """read pid from pidfile, return None if not exists or invalid"""
+    """从 pid 文件读取进程 ID，若文件不存在或内容无效则返回 None"""
     pidfile_path = Path(pidfile)
     if not pidfile_path.exists():
         return None
@@ -39,7 +39,7 @@ def _read_pid(pidfile):
 
 
 def _is_running(pid):
-    """check if process with pid is running"""
+    """检查指定 PID 的进程是否正在运行"""
     if pid is None or pid <= 0:
         return False
     try:
@@ -50,7 +50,7 @@ def _is_running(pid):
 
 
 def _wait_stop(pid, timeout=10):
-    """wait for process to stop, return True if stopped"""
+    """等待进程停止，超时返回 False，成功停止返回 True"""
     for _ in range(timeout * 2):
         if not _is_running(pid):
             return True
@@ -94,7 +94,7 @@ Examples:
 
 
 def cmd_start():
-    """start the service in background"""
+    """以后台守护进程方式启动服务"""
     pid = _read_pid(pidfile)
     if pid and _is_running(pid):
         print(f'InPanel is already running with PID: {pid}')
@@ -132,11 +132,11 @@ def cmd_start():
         print(f'InPanel: fork failed: {e}')
         sys.exit(1)
 
-    # child process: detach and run server
+    # 子进程：脱离终端并运行服务器
     os.setsid()
     os.umask(0)
 
-    # redirect stdin/stdout/stderr to log file
+    # 重定向标准输入/输出/错误到日志文件
     sys.stdout.flush()
     sys.stderr.flush()
     with open('/dev/null', 'r') as f:
@@ -150,7 +150,7 @@ def cmd_start():
 
 
 def cmd_stop():
-    """stop the service"""
+    """停止服务"""
     pid = _read_pid(pidfile)
     if not pid:
         print('InPanel is not running (no pid file)')
@@ -178,7 +178,7 @@ def cmd_stop():
 
 
 def cmd_status():
-    """show service status"""
+    """显示服务运行状态"""
     pid = _read_pid(pidfile)
     if not pid:
         print('InPanel: not running')
@@ -197,7 +197,7 @@ def cmd_status():
 
 
 def cmd_restart():
-    """restart the service"""
+    """重启服务"""
     pid = _read_pid(pidfile)
     if pid and _is_running(pid):
         cmd_stop()
@@ -206,13 +206,13 @@ def cmd_restart():
 
 
 def cmd_reload():
-    """reload the service (same as restart)"""
+    """重新加载服务（与重启相同）"""
     print('InPanel: reloading (restart)...')
     cmd_restart()
 
 
 def cmd_uninstall(args=None):
-    """uninstall inpanel"""
+    """卸载 InPanel"""
     if os.geteuid() != 0:
         print('Error: uninstall must be run as root.')
         sys.exit(1)
@@ -246,7 +246,7 @@ def cmd_uninstall(args=None):
 
     print('Uninstalling InPanel...')
 
-    # remove systemd service
+    # 移除 systemd 服务
     if os.path.exists(systemd_service):
         try:
             subprocess.run(['systemctl', 'stop', 'inpanel'], stderr=subprocess.DEVNULL)
@@ -263,7 +263,7 @@ def cmd_uninstall(args=None):
     except Exception:
         pass
 
-    # remove init.d script
+    # 移除 init.d 脚本
     if os.path.exists(initd_script):
         try:
             subprocess.run(['chkconfig', '--del', 'inpanel'], stderr=subprocess.DEVNULL)
@@ -276,19 +276,19 @@ def cmd_uninstall(args=None):
         os.remove(initd_script)
         print(f'  removed: {initd_script}')
 
-    # remove binary / console script
+    # 移除二进制文件 / 控制台脚本
     if os.path.exists(bin_path):
         os.remove(bin_path)
         print(f'  removed: {bin_path}')
 
-    # remove python package via pip
+    # 通过 pip 移除 Python 包
     if run_type == 'system':
         try:
             subprocess.run([sys.executable, '-m', 'pip', 'uninstall', '-y', 'inpanel'],
                           stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
             print('  removed: inpanel python package')
         except Exception:
-            # try to find and remove manually
+            # 尝试手动查找并删除
             pkg_path = Path(__file__).parent.resolve()
             if pkg_path.exists() and ('site-packages' in str(pkg_path) or 'dist-packages' in str(pkg_path)):
                 egg_info = pkg_path.parent / 'inpanel.egg-info'
@@ -297,12 +297,12 @@ def cmd_uninstall(args=None):
                 shutil.rmtree(pkg_path, ignore_errors=True)
                 print(f'  removed: {pkg_path}')
 
-    # remove config files (optional)
+    # 移除配置文件（可选）
     if purge_config and config_path and os.path.exists(config_path):
         shutil.rmtree(config_path, ignore_errors=True)
         print(f'  removed: {config_path} (config files)')
 
-    # remove log files (optional)
+    # 移除日志文件（可选）
     if purge_logs and logging_path and os.path.exists(logging_path):
         shutil.rmtree(logging_path, ignore_errors=True)
         print(f'  removed: {logging_path} (log files)')
@@ -320,7 +320,7 @@ def cmd_uninstall(args=None):
 
 
 def run_server():
-    """run the server in foreground"""
+    """以前台模式运行服务器"""
     try:
         Path(logfile).parent.mkdir(parents=True, exist_ok=True)
         Path(logerror).parent.mkdir(parents=True, exist_ok=True)
@@ -356,8 +356,8 @@ def run_server():
         'cookie_secret' : 'debug' if DEBUG else make_cookie_secret(),
         'root_path'     : root_path,
         'data_path'     : data_path,
-        'index_path'    : str(Path(root_path) / 'templates' / 'index.html'),
-        'template_path' : str(Path(root_path) / 'templates'),
+        'index_path'    : str(Path(root_path) / 'public' / 'templates' / 'index.html'),
+        'template_path' : str(Path(root_path) / 'public' / 'templates'),
         'static_path'   : str(Path(root_path) / 'public'),
         'plugins_path'  : str(Path(data_path) / 'plugins'),
         'xsrf_cookies'  : True,
@@ -374,12 +374,13 @@ def run_server():
         (r'/api/process/(.+?)(?:/(.+))?', WebRequestProcess),
         (r'/api/time/(.+?)(?:/(.+))?', web.UtilsTimeHandler),
         (r'/api/ssl/(.+?)(?:/(.+))?', web.SSLTLSHandler),
-        (r'/api/repos/yum/(.+?)(?:/(.+))?', web.RepoYumHandler),
-        (r'/api/repos/dnf/(.+?)(?:/(.+))?', web.RepoDnfHandler),
-        (r'/api/repos/apt/(.+?)(?:/(.+))?', web.RepoAptHandler),
-        (r'/api/repos/brew/(.+?)(?:/(.+))?', web.RepoBrewHandler),
-        (r'/api/repos/pip/(.+?)(?:/(.+))?', web.RepoPipHandler),
-        (r'/api/repos/supported/?', web.RepoSupportedHandler),
+        (r'/api/sources/yum/(.+?)(?:/(.+))?', web.RepoYumHandler),
+        (r'/api/sources/dnf/(.+?)(?:/(.+))?', web.RepoDnfHandler),
+        (r'/api/sources/apt/(.+?)(?:/(.+))?', web.RepoAptHandler),
+        (r'/api/sources/brew/(.+?)(?:/(.+))?', web.RepoBrewHandler),
+        (r'/api/sources/pip/(.+?)(?:/(.+))?', web.RepoPipHandler),
+        (r'/api/sources/docker/(.+?)(?:/(.+))?', web.RepoDockerHandler),
+        (r'/api/sources/supported/?', web.RepoSupportedHandler),
         (r'/api/firewall/(.+)', web.FirewallHandler),
         (r'/api/setting/(.+)', web.SettingHandler),
         (r'/api/operation/(.+)', web.OperationHandler),
@@ -468,13 +469,13 @@ def run_server():
 
 
 def main():
-    # route 'config' subcommand to config module
+    # 将 'config' 子命令路由到 config 模块
     if len(sys.argv) > 1 and sys.argv[1] == 'config':
         from .config import main as config_main
         config_main(sys.argv[2:])
         return
 
-    # service control commands
+    # 服务控制命令
     if len(sys.argv) > 1:
         cmd = sys.argv[1].lower()
         if cmd == 'start':
@@ -511,7 +512,7 @@ def main():
             _print_help()
             sys.exit(1)
 
-    # no arguments: show help
+    # 无参数：显示帮助信息
     _print_help()
 
 

{inpanel-1.2.3 → inpanel-1.2.4}/inpanel/base.py

@@ -5,7 +5,7 @@
 #
 # InPanel is distributed under the terms of the (new) BSD License.
 # The full license can be found in 'LICENSE'.
-'''The InPanel Base Information'''
+'''InPanel 基础信息模块'''
 
 import sys
 import os
@@ -41,8 +41,8 @@ __author__ = 'Jackson Dou'
 __license__ = 'BSD'
 
 app_name    = 'InPanel'
-releasetime = '2026-07-12'
-DEBUG       = True
+releasetime = '2026-07-17'
+DEBUG       = False
 COMMENTFLAG = '#INPANEL#'
 GENBY       = 'AUTOMATICALLY GENERATED BY INPANEL'
 

{inpanel-1.2.3 → inpanel-1.2.4}/inpanel/config.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+'''InPanel 配置管理命令行工具'''
+
 import sys
 import logging
 from pathlib import Path
@@ -115,7 +117,8 @@ Examples:
             from hmac import new as hmac_new
             from .utils import randstr
             key = md5(randstr().encode('utf-8')).hexdigest()
-            pwd = hmac_new(key.encode('utf-8'), value.encode('utf-8'), md5).hexdigest()
+            md5_password = md5(value.encode('utf-8')).hexdigest()
+            pwd = hmac_new(key.encode('utf-8'), md5_password.encode('utf-8'), md5).hexdigest()
             value = '%s:%s' % (pwd, key)
             logger.info(f'Password hash generated, key length: {len(key)}, hash length: {len(pwd)}')
         

{inpanel-1.2.3/inpanel → inpanel-1.2.4/inpanel/mod}/acme.py

@@ -6,7 +6,7 @@
 # InPanel is distributed under the terms of the New BSD License.
 # The full license can be found in 'LICENSE'.
 
-'''Module for getting a signed TLS certificate by ACME protocol from Let's Encrypt.'''
+'''通过 ACME 协议从 Let's Encrypt 获取已签名 TLS 证书的模块。'''
 
 import re
 from base64 import urlsafe_b64encode
@@ -26,7 +26,7 @@ except ImportError:
 
 class ACME():
 
-    # REF: https://github.com/diafygi/acme-tiny, under MIT license, author: Daniel Roesler
+    # 参考: https://github.com/diafygi/acme-tiny，MIT 许可证，作者: Daniel Roesler
     def __init__(self, account_key, csr, acme_check_dir, contact=None):
         self.account_key = account_key
         self.csr = csr
@@ -38,13 +38,13 @@ class ACME():
         self.thumbprint = None
         self.certificate = None
 
-        # Contact details (e.g. mailto:aaa@bbb.com) for your account-key
-        self.contact = contact  # 'a client of the InPanel'
+        # 账号的联系方式（例如 mailto:aaa@bbb.com）
+        self.contact = contact
         # self.ca = "https://acme-v02.api.letsencrypt.org"
-        # self.ca_directory = = "https://acme-v02.api.letsencrypt.org/directory"
-        # dev
+        # self.ca_directory = "https://acme-v02.api.letsencrypt.org/directory"
+        # 开发环境
         self.ca = "https://acme-staging-v02.api.letsencrypt.org"
-        # certificate authority directory url, default is Let's Encrypt
+        # 证书颁发机构目录 URL，默认为 Let's Encrypt
         self.ca_directory = "https://acme-staging-v02.api.letsencrypt.org/directory"
 
         self.init_api_url()
@@ -54,7 +54,7 @@ class ACME():
         # self.create_new_order()
 
     def _cmd(self, cmd_list, stdin=None, cmd_input=None, err_msg="Command Line Error"):
-        '''run external commands'''
+        '''执行外部命令'''
         proc = Popen(cmd_list, stdin=stdin, stdout=PIPE, stderr=PIPE)
         out, err = proc.communicate(cmd_input)
         if proc.returncode != 0:
@@ -62,11 +62,11 @@ class ACME():
         return out
 
     def _b64(self, b):
-        '''base64 encode for jose spec'''
+        '''JOSE 规范的 base64 编码'''
         return urlsafe_b64encode(b).decode('utf8').replace('=', '')
 
     def _request(self, url, data=None, err_msg='Error', depth=0):
-        '''make request and automatically parse json response'''
+        '''发送请求并自动解析 JSON 响应'''
         try:
             hd = {
                 "Content-Type": "application/jose+json",
@@ -84,14 +84,14 @@ class ACME():
         except ValueError:
             pass  # ignore json parsing errors
         if depth < 100 and code == 400 and res_data['type'] == 'urn:ietf:params:acme:error:badNonce':
-            raise IndexError(res_data)  # allow 100 retrys for bad nonces
+            raise IndexError(res_data)  # 允许对无效 nonce 重试 100 次
         if code not in [200, 201, 204]:
             raise ValueError("{0}:\nUrl: {1}\nData: {2}\nResponse Code: {3}\nResponse: {4}".format(
                 err_msg, url, data, code, res_data))
         return res_data, code, headers
 
     def _s_request(self, url, payload, err_msg, depth=0):
-        '''make signed requests'''
+        '''发送签名请求'''
         payload64 = self._b64(dumps(payload).encode('utf8'))
         new_nonce = self._request(self.ca_new_nonce)[2]['Replay-Nonce']
         protected = {'url': url, 'alg': self.alg, "nonce": new_nonce}
@@ -107,10 +107,10 @@ class ACME():
         })
         try:
             return self._request(url, data=data.encode('utf8'), err_msg=err_msg, depth=depth)
-        except IndexError:  # retry bad nonces (they raise IndexError)
+        except IndexError:  # 重试无效 nonce（无效 nonce 会抛出 IndexError）
             return self._s_request(url, payload, err_msg, depth=(depth + 1))
 
-    # helper function - poll until complete
+    # 辅助函数 - 轮询直到完成
     def _poll_until_not(self, url, pending_statuses, err_msg):
         while True:
             result, _, _ = self._request(url, err_msg=err_msg)
@@ -120,7 +120,7 @@ class ACME():
             return result
 
     def init_api_url(self, ca_directory=None):
-        # get the ACME directory of urls
+        # 获取 ACME 目录 URL
         print('API directory getting...')
         ca = ca_directory
         if ca is None:
@@ -135,7 +135,7 @@ class ACME():
         print('API directory ready!')
 
     def init_account(self, account_key=None):
-        # parse account key to get public key
+        # 解析账号密钥以获取公钥
         print('Account key parsing...')
         acc_key = account_key
         if acc_key is None:
@@ -160,7 +160,7 @@ class ACME():
         print('Account key ready...')
 
     def registe_account(self, contact=None):
-        # create account, update contact details (if any), and set the global key identifier
+        # 创建账号，更新联系信息（如有），并设置全局密钥标识
         print('Account registration...')
         reg_payload = {'termsOfServiceAgreed': True}
         account, code, self.acct_headers = self._s_request(
@@ -180,7 +180,7 @@ class ACME():
             print("Updated contact details:\n{0}".format("\n".join(account['contact'])))
 
     def parse_csr(self, order=False):
-        # find domains
+        # 查找域名
         print('Domains CSR parsing...')
         cmd = ['openssl', 'req', '-in', self.csr, '-noout', '-text']
         out = self._cmd(cmd, err_msg="Error loading {0}".format(self.csr))
@@ -200,8 +200,8 @@ class ACME():
             self.create_new_order(domains)
 
     def create_new_order(self, domains, disable_check=False):
-        '''create a new order
-        disable_check: disable checking if the challenge file is hosted correctly before telling the CA
+        '''创建新订单
+        disable_check: 在通知 CA 之前禁用挑战文件是否正确托管的检查
         '''
         print("Creating new order...")
         order_payload = {"identifiers": [
@@ -210,13 +210,13 @@ class ACME():
             self.ca_new_order, order_payload, "Error creating new order")
         print("Order created!")
 
-        # get the authorizations that need to be completed
+        # 获取需要完成的授权
         for auth_url in order['authorizations']:
             authorization, _, _ = self._request(auth_url, err_msg='Error getting challenges')
             domain = authorization['identifier']['value']
             print("Domain {0} Verifying...".format(domain))
 
-            # find the http-01 challenge and write the challenge file
+            # 找到 http-01 挑战并写入挑战文件
             challenge = [c for c in authorization['challenges'] if c['type'] == "http-01"][0]
             token = re.sub(r"[^A-Za-z0-9_\-]", "_", challenge['token'])
             key_auth = "{0}.{1}".format(token, self.thumbprint)
@@ -224,7 +224,7 @@ class ACME():
             with open(wellknown_path, 'w', encoding='utf-8') as f:
                 f.write(key_auth)
 
-            # check that the wellknown_file is in specified place
+            # 检查 wellknown 文件是否在指定位置
             try:
                 wellknown_url = "http://{0}/.well-known/acme-challenge/{1}".format(domain, token)
                 assert(disable_check or self._request(wellknown_url)[0] == key_auth)
@@ -233,7 +233,7 @@ class ACME():
                 raise ValueError("Wrote file to {0}, but couldn't download {1}: {2}".format(
                     wellknown_path, wellknown_url, e))
 
-            # say the challenge is done
+            # 告知挑战已完成
             self._s_request(
                 challenge['url'], {}, "Error submitting challenges: {0}".format(domain))
             authorization = self._poll_until_not(auth_url, ["pending"], "Error checking challenge status for {0}".format(domain))
@@ -241,18 +241,18 @@ class ACME():
                 raise ValueError("Challenge did not pass for {0}: {1}".format(domain, authorization))
             print("Domain {0} verified!".format(domain))
 
-        # finalize the order with the csr
+        # 使用 CSR 完成订单
         print('Certificate signing...')
         csr_der = self._cmd(['openssl', 'req', '-in', self.csr, '-outform', 'DER'], err_msg='DER Export Error')
         self._s_request(order['finalize'], {'csr': self._b64(csr_der)}, 'Error finalizing order')
-        # poll the order to monitor when it's done
+        # 轮询订单以监控其完成状态
         order = self._poll_until_not(order_headers['Location'], ['pending', 'processing'], 'Error checking order status')
         if order['status'] != 'valid':
             raise ValueError("Order failed: {0}".format(order))
         self.certificate = order['certificate']
 
     def get_certificate(self, certificate=None):
-        # download the certificate
+        # 下载证书
         crt_url = self.certificate if certificate is None else certificate
         if crt_url is None:
             return None
@@ -261,12 +261,12 @@ class ACME():
         return certificate_pem
 
     def ertificate_revoke(self, crt):
-        '''revoke certificate'''
+        '''吊销证书'''
         print(crt)
         print('Certificate revoked!')
 
     def certificate_renew(self, crt):
-        '''renew certificate'''
+        '''续签证书'''
         print(crt)
         print('Certificate updated!')
 

{inpanel-1.2.3/inpanel → inpanel-1.2.4/inpanel/mod}/aliyuncs.py

@@ -6,7 +6,7 @@
 # ECSMate is distributed under the terms of the (new) BSD License.
 # The full license can be found in 'LICENSE'.
 
-'''ECS SDK'''
+'''阿里云 ECS SDK'''
 
 import time
 import hmac