InPanel 1.2.2__tar.gz → 1.2.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.2
+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>
@@ -35,9 +35,9 @@ License: BSD 3-Clause License
         OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
         OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         
-Project-URL: Homepage, https://inpanel.org/
+Project-URL: Homepage, https://inpanel.org
 Project-URL: Repository, https://github.com/inpanel/inpanel
-Project-URL: Documentation, https://inpanel.org/
+Project-URL: Documentation, https://inpanel.org
 Project-URL: Issues, https://github.com/inpanel/inpanel/issues
 Keywords: server,management,admin,panel,linux
 Classifier: Development Status :: 5 - Production/Stable

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

@@ -9,25 +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/remote.py
+inpanel/plugin.py
 inpanel/utils.py
 inpanel/web.py
-inpanel/yum.py
-inpanel/data/bookmarks.ini
-inpanel/data/config.ini
-inpanel/data/error.log
-inpanel/data/history.txt
-inpanel/data/inpanel.pid
-inpanel/data/lastfile.ini
-inpanel/data/main.log
-inpanel/data/upgrade.ini
 inpanel/lib/__init__.py
 inpanel/lib/async_process.py
 inpanel/lib/filelock.py
@@ -35,12 +22,17 @@ 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
 inpanel/mod/config.py
 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
@@ -62,10 +54,13 @@ inpanel/mod/package_dnf.py
 inpanel/mod/package_map.py
 inpanel/mod/package_yum.py
 inpanel/mod/php.py
+inpanel/mod/pip.py
+inpanel/mod/plugins.py
 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
@@ -77,12 +72,6 @@ inpanel/mod/ufw.py
 inpanel/mod/user.py
 inpanel/mod/vsftpd.py
 inpanel/mod/yum.py
-inpanel/plugins/__init__.py
-inpanel/plugins/acme/static/index.html
-inpanel/plugins/acme/static/index.js
-inpanel/plugins/shadowsocks-libev/info.py
-inpanel/plugins/shadowsocks-libev/static/index.html
-inpanel/plugins/shadowsocks-libev/static/index.js
 inpanel/public/favicon.ico
 inpanel/public/index.html
 inpanel/public/robots.txt
@@ -94,6 +83,7 @@ inpanel/public/js/core.js
 inpanel/public/js/directives.js
 inpanel/public/js/filters.js
 inpanel/public/js/services.js
+inpanel/public/js/controllers/container.js
 inpanel/public/js/controllers/controllers.js
 inpanel/public/js/controllers/database.js
 inpanel/public/js/controllers/ecs.js
@@ -135,6 +125,7 @@ inpanel/public/partials/main.html
 inpanel/public/partials/secure.html
 inpanel/public/partials/setting.html
 inpanel/public/partials/sorry.html
+inpanel/public/partials/container/index.html
 inpanel/public/partials/database/index.html
 inpanel/public/partials/database/mysql/dbedit.html
 inpanel/public/partials/database/mysql/dbnew.html
@@ -157,12 +148,20 @@ inpanel/public/partials/ecs/index.html
 inpanel/public/partials/ecs/setings.html
 inpanel/public/partials/file/file.html
 inpanel/public/partials/file/trash.html
+inpanel/public/partials/plugins/config.html
+inpanel/public/partials/plugins/detail.html
 inpanel/public/partials/plugins/index.html
-inpanel/public/partials/plugins/plugins.html
+inpanel/public/partials/plugins/info.html
 inpanel/public/partials/service/apache.html
 inpanel/public/partials/service/cron.html
+inpanel/public/partials/service/fail2ban.html
+inpanel/public/partials/service/firewalld.html
 inpanel/public/partials/service/index.html
 inpanel/public/partials/service/iptables.html
+inpanel/public/partials/service/java11.html
+inpanel/public/partials/service/java17.html
+inpanel/public/partials/service/java21.html
+inpanel/public/partials/service/java8.html
 inpanel/public/partials/service/lighttpd.html
 inpanel/public/partials/service/mariadb.html
 inpanel/public/partials/service/memcache.html
@@ -171,8 +170,19 @@ inpanel/public/partials/service/mongodb.html
 inpanel/public/partials/service/mysql.html
 inpanel/public/partials/service/named.html
 inpanel/public/partials/service/nginx.html
+inpanel/public/partials/service/nodejs18.html
+inpanel/public/partials/service/nodejs20.html
+inpanel/public/partials/service/nodejs22.html
+inpanel/public/partials/service/nodejs24.html
 inpanel/public/partials/service/ntp.html
 inpanel/public/partials/service/php.html
+inpanel/public/partials/service/php56.html
+inpanel/public/partials/service/php74.html
+inpanel/public/partials/service/php80.html
+inpanel/public/partials/service/php81.html
+inpanel/public/partials/service/php82.html
+inpanel/public/partials/service/php83.html
+inpanel/public/partials/service/php84.html
 inpanel/public/partials/service/proftpd.html
 inpanel/public/partials/service/pureftpd.html
 inpanel/public/partials/service/redis.html
@@ -180,6 +190,7 @@ inpanel/public/partials/service/samba.html
 inpanel/public/partials/service/sendmail.html
 inpanel/public/partials/service/ssh.html
 inpanel/public/partials/service/tomcat.html
+inpanel/public/partials/service/ufw.html
 inpanel/public/partials/service/vsftpd.html
 inpanel/public/partials/site/index.html
 inpanel/public/partials/site/apache/site.html
@@ -195,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.2 → inpanel-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.2
+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>
@@ -35,9 +35,9 @@ License: BSD 3-Clause License
         OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
         OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         
-Project-URL: Homepage, https://inpanel.org/
+Project-URL: Homepage, https://inpanel.org
 Project-URL: Repository, https://github.com/inpanel/inpanel
-Project-URL: Documentation, https://inpanel.org/
+Project-URL: Documentation, https://inpanel.org
 Project-URL: Issues, https://github.com/inpanel/inpanel/issues
 Keywords: server,management,admin,panel,linux
 Classifier: Development Status :: 5 - Production/Stable

{inpanel-1.2.2 → 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
@@ -20,14 +20,14 @@ import logging
 from tornado import httpserver, ioloop
 
 from . import web
-from .base import pidfile, logfile, logerror, config_file, config_path, logging_path, run_type, DEBUG, root_path
+from .base import pidfile, logfile, logerror, config_file, config_path, logging_path, run_type, DEBUG, root_path, data_path
 from .mod.process import remove_pid_file, save_pid_file, WebRequestProcess
 from .mod.config import load_config
 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)
@@ -355,11 +355,11 @@ def run_server():
         'autoreload'    : DEBUG,
         'cookie_secret' : 'debug' if DEBUG else make_cookie_secret(),
         'root_path'     : root_path,
-        'data_path'     : config_path,
-        'index_path'    : str(Path(root_path) / 'templates' / 'index.html'),
-        'template_path' : str(Path(root_path) / 'templates'),
+        'data_path'     : data_path,
+        '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(root_path) / 'plugins'),
+        'plugins_path'  : str(Path(data_path) / 'plugins'),
         'xsrf_cookies'  : True,
         'gzip'          : True
     }
@@ -374,21 +374,27 @@ 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/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),
-        (r'/page/file/preview/(.+)', web.FilePreviewHandler),
-        (r'/page/(.+)/(.+)', web.PageHandler),
         (r'/api/backend/(.+)', web.BackendHandler),
         (r'/api/sitepackage/(.+)', web.SitePackageHandler),
         (r'/api/client/(.+)', web.ClientHandler),
-        (r'/api/plugins/(.*)', web.StaticFileHandler, { 'path': settings['plugins_path']}),
+        (r'/api/plugins', web.PluginHandler),
+        (r'/api/plugins/(list|info|config|install|uninstall|toggle)', web.PluginHandler),
         (r'/api/file/download/(.+)', web.FileDownloadHandler, { 'path': '/' }),
         (r'/api/file/upload', web.FileUploadHandler),
         (r'/api/version', web.VersionHandler),
+        (r'/page/plugins/(.*)', web.PluginStaticFileHandler, { 'path': settings['plugins_path']}),
+        (r'/page/file/preview/(.+)', web.FilePreviewHandler),
+        (r'/page/(.+)/(.+)', web.PageHandler),
         (r'/((?:css|js|js.min|lib|partials|images|favicon\.ico|robots\.txt)(?:\/.*)?)', web.StaticFileHandler, { 'path': settings['static_path'] }),
         (r'/', web.IndexHandler),
         (r'/($)', web.StaticFileHandler, { 'path': settings['index_path'] }),
@@ -463,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':
@@ -506,7 +512,7 @@ def main():
             _print_help()
             sys.exit(1)
 
-    # no arguments: show help
+    # 无参数：显示帮助信息
     _print_help()
 
 

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

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-'''The InPanel Base Information'''
+#
 # Copyright (c) 2017-2026 Jackson Dou
 # All rights reserved.
 #
 # InPanel is distributed under the terms of the (new) BSD License.
 # The full license can be found in 'LICENSE'.
+'''InPanel 基础信息模块'''
 
 import sys
 import os
@@ -40,14 +41,15 @@ __author__ = 'Jackson Dou'
 __license__ = 'BSD'
 
 app_name    = 'InPanel'
-releasetime = '2026-07-07'
-DEBUG       = True
+releasetime = '2026-07-17'
+DEBUG       = False
 COMMENTFLAG = '#INPANEL#'
 GENBY       = 'AUTOMATICALLY GENERATED BY INPANEL'
 
 # 版本信息
 version_info = {
     'name'        : app_name,
+    'url'         : 'https://inpanel.org',
     'changelog'   : 'https://inpanel.org/changelog.html',
     'releasetime' : releasetime,
     'version'     : __version__
@@ -60,50 +62,55 @@ app_api = {
     'download_package' : 'https://api.inpanel.org/?s=site_packages&a=download'
 }
 
+execfile       = '/usr/bin/inpanel'
+data_path      = '/var/lib/inpanel/'
+config_path    = '/etc/inpanel/'
+config_file    = '/etc/inpanel/config.ini'
+lastfile_path  = '/etc/inpanel/lastfile.ini'
+bookmarks_path = '/etc/inpanel/bookmarks.ini'
+upgrade_path   = '/etc/inpanel/upgrade.ini'
+history_path   = '/etc/inpanel/history.txt'
+logging_path   = '/var/log/inpanel/'
+logfile        = '/var/log/inpanel/main.log'
+logerror       = '/var/log/inpanel/error.log'
+pidfile        = '/var/run/inpanel.pid'
+install_type   = 'unknown'
+
+
+import shutil
+
 if hasattr(sys, 'frozen') and hasattr(sys, '_MEIPASS'):
-    run_type = 'binary'
-    root_path     = sys._MEIPASS
-    execfile      = '/usr/bin/inpanel'
-    config_path   = '/etc/inpanel/'
-    config_file   = '/etc/inpanel/config.ini'
-    lastfile_path = '/etc/inpanel/lastfile.ini'
-    bookmarks_path = '/etc/inpanel/bookmarks.ini'
-    upgrade_path  = '/etc/inpanel/upgrade.ini'
-    history_path  = '/etc/inpanel/history.txt'
-    logging_path  = '/var/log/inpanel/'
-    logfile       = '/var/log/inpanel/main.log'
-    logerror      = '/var/log/inpanel/error.log'
-    pidfile       = '/var/run/inpanel.pid'
+    run_type  = 'binary'
+    root_path = sys._MEIPASS
 else:
     package_dir = Path(__file__).parent.resolve()
     if package_dir.parts[-2] == 'site-packages' or 'dist-packages' in str(package_dir):
-        run_type = 'system'
-        root_path     = str(package_dir)
-        execfile      = '/usr/bin/inpanel'
-        config_path   = '/etc/inpanel/'
-        config_file   = '/etc/inpanel/config.ini'
-        lastfile_path = '/etc/inpanel/lastfile.ini'
-        bookmarks_path = '/etc/inpanel/bookmarks.ini'
-        upgrade_path  = '/etc/inpanel/upgrade.ini'
-        history_path  = '/etc/inpanel/history.txt'
-        logging_path  = '/var/log/inpanel/'
-        logfile       = '/var/log/inpanel/main.log'
-        logerror      = '/var/log/inpanel/error.log'
-        pidfile       = '/var/run/inpanel.pid'
+        run_type  = 'system'
+        root_path = str(package_dir)
+        pkg_str = str(package_dir)
+        if '/dist-packages/' in pkg_str:
+            install_type = 'apt'
+        elif '/site-packages/' in pkg_str:
+            from .mod.system import get_os_family
+            if '/usr/lib/python3/site-packages/' in pkg_str and get_os_family() == 'rhel':
+                install_type = 'dnf' if shutil.which('dnf') else 'yum'
+            else:
+                install_type = 'pip'
     else:
         run_type = 'source'
-        root_path     = str(Path(__file__).parent.resolve())
-        execfile      = str(Path(root_path) / 'app.py')
-        config_path   = str(Path(root_path) / 'data')
-        config_file   = str(Path(root_path) / 'data' / 'config.ini')
-        lastfile_path = str(Path(root_path) / 'data' / 'lastfile.ini')
+        root_path      = str(Path(__file__).parent.resolve())
+        execfile       = str(Path(root_path) / 'app.py')
+        data_path      = str(Path(root_path) / 'data')
+        config_path    = str(Path(root_path) / 'data')
+        config_file    = str(Path(root_path) / 'data' / 'config.ini')
+        lastfile_path  = str(Path(root_path) / 'data' / 'lastfile.ini')
         bookmarks_path = str(Path(root_path) / 'data' / 'bookmarks.ini')
-        upgrade_path  = str(Path(root_path) / 'data' / 'upgrade.ini')
-        history_path  = str(Path(root_path) / 'data' / 'history.txt')
-        logging_path  = str(Path(root_path) / 'data')
-        logfile       = str(Path(root_path) / 'data' / 'main.log')
-        logerror      = str(Path(root_path) / 'data' / 'error.log')
-        pidfile       = str(Path(root_path) / 'data' / 'inpanel.pid')
+        upgrade_path   = str(Path(root_path) / 'data' / 'upgrade.ini')
+        history_path   = str(Path(root_path) / 'data' / 'history.txt')
+        logging_path   = str(Path(root_path) / 'data')
+        logfile        = str(Path(root_path) / 'data' / 'main.log')
+        logerror       = str(Path(root_path) / 'data' / 'error.log')
+        pidfile        = str(Path(root_path) / 'data' / 'inpanel.pid')
 
 
 kernel_name, hostname, kernel_release, kernel_version, machine, processor = uname()
@@ -188,8 +195,8 @@ server_info = {
 }
 
 __all__ = [
-    '__version__', 'DEBUG', 'app_api', 'app_name', 'config_path',
-    'run_type', 'config_file', 'root_path', 'COMMENTFLAG', 'GENBY', 'execfile',
+    '__version__', 'DEBUG', 'app_api', 'app_name', 'config_path', 'data_path', 
+    'run_type', 'install_type', 'config_file', 'root_path', 'COMMENTFLAG', 'GENBY', 'execfile',
     'releasetime', 'version_info', 'server_info', 'os_name', 'os_title',
     'os_version', 'os_versint', 'os_platform', 'kernel_name', 'kernel_release',
     'kernel_version', 'hostname', 'machine', 'lastfile_path', 'bookmarks_path', 'upgrade_path',
@@ -200,4 +207,4 @@ if __name__ == '__main__':
     print(uname())
     print(mac_ver())
     print(platform())
-    print(server_info)
+    print(server_info)

{inpanel-1.2.2 → 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)}')