InPanel 1.2.2__tar.gz → 1.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.2
+Version: 1.2.3
 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.3}/InPanel.egg-info/SOURCES.txt

@@ -16,18 +16,11 @@ 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/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
@@ -36,11 +29,13 @@ inpanel/lib/pxssh.py
 inpanel/lib/pyDes.py
 inpanel/mod/__init__.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/file.py
 inpanel/mod/firewall.py
 inpanel/mod/firewall_base.py
@@ -62,6 +57,8 @@ 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
@@ -77,12 +74,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 +85,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 +127,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 +150,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 +172,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 +192,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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.2
+Version: 1.2.3
 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.3}/inpanel/app.py

@@ -20,7 +20,7 @@ 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
@@ -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,
+        'data_path'     : data_path,
         'index_path'    : str(Path(root_path) / 'templates' / 'index.html'),
         'template_path' : str(Path(root_path) / '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
     }
@@ -377,18 +377,23 @@ def run_server():
         (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/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'] }),

{inpanel-1.2.2 → inpanel-1.2.3}/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'.
+'''The InPanel Base Information'''
 
 import sys
 import os
@@ -40,7 +41,7 @@ __author__ = 'Jackson Dou'
 __license__ = 'BSD'
 
 app_name    = 'InPanel'
-releasetime = '2026-07-07'
+releasetime = '2026-07-12'
 DEBUG       = True
 COMMENTFLAG = '#INPANEL#'
 GENBY       = 'AUTOMATICALLY GENERATED BY INPANEL'
@@ -48,6 +49,7 @@ 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.3}/inpanel/mod/apt.py

@@ -225,27 +225,156 @@ def get_repo_elastic(stack_version):
     return cmds
 
 
+import shutil
+import time
+from subprocess import getstatusoutput
+
+
+def is_installed():
+    '''check if apt is installed'''
+    return shutil.which('apt') is not None
+
+
+def get_version():
+    '''get apt version'''
+    if not is_installed():
+        return ''
+    status, output = getstatusoutput('apt --version')
+    if status != 0:
+        return ''
+    return output.strip().split('\n')[0]
+
+
+def get_status():
+    '''get apt status'''
+    status = {
+        'installed': is_installed(),
+        'version': '',
+        'running': False,
+        'config_path': sources_list_d_path,
+    }
+    if status['installed']:
+        status['version'] = get_version()
+        status['running'] = True
+    return status
+
+
+def refresh_cache():
+    '''apt update'''
+    if not is_installed():
+        return {'code': -1, 'msg': 'apt 未安装！'}
+    status, output = getstatusoutput('apt update 2>&1')
+    if status == 0:
+        return {'code': 0, 'msg': 'apt 索引已更新！'}
+    return {'code': -1, 'msg': 'apt 索引更新失败：%s' % output}
+
+
+def _source_full_path(source):
+    '''get full path of a source'''
+    if source == 'sources.list':
+        return sources_list_path
+    elif source.startswith('sources.list.d/'):
+        filename = source[len('sources.list.d/'):]
+        return str(Path(sources_list_d_path) / filename)
+    else:
+        return str(Path(sources_list_d_path) / source)
+
+
+def get_repo_list():
+    '''get structured source list with name/path/created'''
+    if base.kernel_name != 'Linux':
+        return None
+    items = get_list() or []
+    repos = []
+    for item in items:
+        full = _source_full_path(item)
+        created = ''
+        try:
+            created = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(Path(full).stat().st_ctime))
+        except Exception:
+            pass
+        repos.append({'name': item, 'path': full, 'created': created})
+    return repos
+
+
+def get_repo_detail(source):
+    '''get source detail with package list'''
+    if not source:
+        return None
+    data = get_item(source)
+    if data is None:
+        return None
+    full = _source_full_path(source)
+    created = ''
+    try:
+        created = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(Path(full).stat().st_ctime))
+    except Exception:
+        pass
+    # apt 无法精确按源列出包，这里列出系统已安装包作为参考
+    packages = []
+    st, out = getstatusoutput('dpkg -l 2>/dev/null')
+    if st == 0 and out:
+        for line in out.split('\n'):
+            if line.startswith('ii '):
+                parts = line.split()
+                if len(parts) >= 3:
+                    packages.append({'name': parts[1], 'version': parts[2]})
+    return {'name': source, 'path': full, 'created': created, 'content': data.get('content', ''), 'packages': packages}
+
+
+def search_repos(keyword):
+    '''search source files by name'''
+    if not keyword:
+        return []
+    items = get_repo_list() or []
+    kw = keyword.lower()
+    return [r for r in items if kw in r['name'].lower()]
+
+
+def install_package(name):
+    '''install package via apt'''
+    if not name:
+        return {'code': -1, 'msg': '软件名称不能为空！'}
+    if not is_installed():
+        return {'code': -1, 'msg': 'apt 未安装！'}
+    status, output = getstatusoutput('apt install -y %s 2>&1' % name)
+    if status == 0:
+        return {'code': 0, 'msg': '软件 %s 安装成功！' % name, 'data': output}
+    return {'code': -1, 'msg': '软件 %s 安装失败：%s' % (name, output)}
+
+
 def web_handler(context):
     '''Handle web requests for APT repository management'''
     action = context.get('action', '')
-    source = context.get('source', '')
-    
-    if action == 'list':
-        items = get_list()
+    source = context.get('source', '') or context.get('name', '')
+
+    if action == 'overview':
+        return {'code': 0, 'msg': '', 'data': get_status()}
+    elif action == 'refresh':
+        return refresh_cache()
+    elif action == 'list':
+        items = get_repo_list()
         if items is None:
             return {'code': -1, 'msg': '获取配置失败！'}
         else:
             return {'code': 0, 'msg': '', 'data': items}
-    
+
     elif action == 'item':
         if not source:
             return {'code': -1, 'msg': '配置文件不能为空！'}
-        data = get_item(source)
+        data = get_repo_detail(source)
         if data is None:
             return {'code': -1, 'msg': '配置文件不存在！'}
         else:
             return {'code': 0, 'msg': '', 'data': data}
-    
+
+    elif action == 'search':
+        keyword = context.get('keyword', '')
+        return {'code': 0, 'msg': '', 'data': search_repos(keyword)}
+
+    elif action == 'install':
+        return install_package(source)
+
     elif action == 'add':
         if not source:
             return {'code': -1, 'msg': '配置文件不能为空！'}