-
[Cron] Add scheduled backup tasks to the page!
+
[Cron]
{{data['lan']['BTN1']}}
{{data['lan']['BTN2']}}
diff --git a/BTPanel/templates/default/xterm.html b/BTPanel/templates/default/xterm.html
new file mode 100644
index 00000000..4280ca1d
--- /dev/null
+++ b/BTPanel/templates/default/xterm.html
@@ -0,0 +1,108 @@
+{% extends "layout.html" %}
+
+{% block content %}
+
+
+
+{% endblock %}
+{% block scripts %}
+
+
+
+
+
+{% endblock %}
diff --git a/class/cachelib/__init__.py b/class/cachelib/__init__.py
new file mode 100644
index 00000000..cae7aae9
--- /dev/null
+++ b/class/cachelib/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+from cachelib.base import BaseCache, NullCache
+from cachelib.simple import SimpleCache
+from cachelib.file import FileSystemCache
+from cachelib.memcached import MemcachedCache
+from cachelib.redis import RedisCache
+from cachelib.uwsgi import UWSGICache
+
+__all__ = [
+ 'BaseCache',
+ 'NullCache',
+ 'SimpleCache',
+ 'FileSystemCache',
+ 'MemcachedCache',
+ 'RedisCache',
+ 'UWSGICache',
+]
+
+__version__ = '0.1'
+__author__ = 'Pallets Team'
diff --git a/class/cachelib/_compat.py b/class/cachelib/_compat.py
new file mode 100644
index 00000000..d52e65b5
--- /dev/null
+++ b/class/cachelib/_compat.py
@@ -0,0 +1,26 @@
+# flake8: noqa
+import sys
+
+PY2 = sys.version_info[0] == 2
+
+if PY2:
+ text_type = unicode
+ string_types = (str, unicode)
+ integer_types = (int, long)
+ iteritems = lambda d, *args, **kwargs: d.iteritems(*args, **kwargs)
+
+ def to_native(x, charset=sys.getdefaultencoding(), errors='strict'):
+ if x is None or isinstance(x, str):
+ return x
+ return x.encode(charset, errors)
+
+else:
+ text_type = str
+ string_types = (str, )
+ integer_types = (int, )
+ iteritems = lambda d, *args, **kwargs: iter(d.items(*args, **kwargs))
+
+ def to_native(x, charset=sys.getdefaultencoding(), errors='strict'):
+ if x is None or isinstance(x, str):
+ return x
+ return x.decode(charset, errors)
diff --git a/class/cachelib/base.py b/class/cachelib/base.py
new file mode 100644
index 00000000..bc5d346b
--- /dev/null
+++ b/class/cachelib/base.py
@@ -0,0 +1,198 @@
+# -*- coding: utf-8 -*-
+from cachelib._compat import iteritems
+
+
+def _items(mappingorseq):
+ """Wrapper for efficient iteration over mappings represented by dicts
+ or sequences::
+
+ >>> for k, v in _items((i, i*i) for i in xrange(5)):
+ ... assert k*k == v
+
+ >>> for k, v in _items(dict((i, i*i) for i in xrange(5))):
+ ... assert k*k == v
+
+ """
+ if hasattr(mappingorseq, 'items'):
+ return iteritems(mappingorseq)
+ return mappingorseq
+
+
+class BaseCache(object):
+
+ """Baseclass for the cache systems. All the cache systems implement this
+ API or a superset of it.
+
+ :param default_timeout: the default timeout (in seconds) that is used if
+ no timeout is specified on :meth:`set`. A timeout
+ of 0 indicates that the cache never expires.
+ """
+
+ def __init__(self, default_timeout=300):
+ self.default_timeout = default_timeout
+
+ def _normalize_timeout(self, timeout):
+ if timeout is None:
+ timeout = self.default_timeout
+ return timeout
+
+ def get(self, key):
+ """Look up key in the cache and return the value for it.
+
+ :param key: the key to be looked up.
+ :returns: The value if it exists and is readable, else ``None``.
+ """
+ return None
+
+ def delete(self, key):
+ """Delete `key` from the cache.
+
+ :param key: the key to delete.
+ :returns: Whether the key existed and has been deleted.
+ :rtype: boolean
+ """
+ return True
+
+ def get_many(self, *keys):
+ """Returns a list of values for the given keys.
+ For each key an item in the list is created::
+
+ foo, bar = cache.get_many("foo", "bar")
+
+ Has the same error handling as :meth:`get`.
+
+ :param keys: The function accepts multiple keys as positional
+ arguments.
+ """
+ return [self.get(k) for k in keys]
+
+ def get_dict(self, *keys):
+ """Like :meth:`get_many` but return a dict::
+
+ d = cache.get_dict("foo", "bar")
+ foo = d["foo"]
+ bar = d["bar"]
+
+ :param keys: The function accepts multiple keys as positional
+ arguments.
+ """
+ return dict(zip(keys, self.get_many(*keys)))
+
+ def set(self, key, value, timeout=None):
+ """Add a new key/value to the cache (overwrites value, if key already
+ exists in the cache).
+
+ :param key: the key to set
+ :param value: the value for the key
+ :param timeout: the cache timeout for the key in seconds (if not
+ specified, it uses the default timeout). A timeout of
+ 0 indicates that the cache never expires.
+ :returns: ``True`` if key has been updated, ``False`` for backend
+ errors. Pickling errors, however, will raise a subclass of
+ ``pickle.PickleError``.
+ :rtype: boolean
+ """
+ return True
+
+ def add(self, key, value, timeout=None):
+ """Works like :meth:`set` but does not overwrite the values of already
+ existing keys.
+
+ :param key: the key to set
+ :param value: the value for the key
+ :param timeout: the cache timeout for the key in seconds (if not
+ specified, it uses the default timeout). A timeout of
+ 0 indicates that the cache never expires.
+ :returns: Same as :meth:`set`, but also ``False`` for already
+ existing keys.
+ :rtype: boolean
+ """
+ return True
+
+ def set_many(self, mapping, timeout=None):
+ """Sets multiple keys and values from a mapping.
+
+ :param mapping: a mapping with the keys/values to set.
+ :param timeout: the cache timeout for the key in seconds (if not
+ specified, it uses the default timeout). A timeout of
+ 0 indicates that the cache never expires.
+ :returns: Whether all given keys have been set.
+ :rtype: boolean
+ """
+ rv = True
+ for key, value in _items(mapping):
+ if not self.set(key, value, timeout):
+ rv = False
+ return rv
+
+ def delete_many(self, *keys):
+ """Deletes multiple keys at once.
+
+ :param keys: The function accepts multiple keys as positional
+ arguments.
+ :returns: Whether all given keys have been deleted.
+ :rtype: boolean
+ """
+ return all(self.delete(key) for key in keys)
+
+ def has(self, key):
+ """Checks if a key exists in the cache without returning it. This is a
+ cheap operation that bypasses loading the actual data on the backend.
+
+ This method is optional and may not be implemented on all caches.
+
+ :param key: the key to check
+ """
+ raise NotImplementedError(
+ '%s doesn\'t have an efficient implementation of `has`. That '
+ 'means it is impossible to check whether a key exists without '
+ 'fully loading the key\'s data. Consider using `self.get` '
+ 'explicitly if you don\'t care about performance.'
+ )
+
+ def clear(self):
+ """Clears the cache. Keep in mind that not all caches support
+ completely clearing the cache.
+
+ :returns: Whether the cache has been cleared.
+ :rtype: boolean
+ """
+ return True
+
+ def inc(self, key, delta=1):
+ """Increments the value of a key by `delta`. If the key does
+ not yet exist it is initialized with `delta`.
+
+ For supporting caches this is an atomic operation.
+
+ :param key: the key to increment.
+ :param delta: the delta to add.
+ :returns: The new value or ``None`` for backend errors.
+ """
+ value = (self.get(key) or 0) + delta
+ return value if self.set(key, value) else None
+
+ def dec(self, key, delta=1):
+ """Decrements the value of a key by `delta`. If the key does
+ not yet exist it is initialized with `-delta`.
+
+ For supporting caches this is an atomic operation.
+
+ :param key: the key to increment.
+ :param delta: the delta to subtract.
+ :returns: The new value or `None` for backend errors.
+ """
+ value = (self.get(key) or 0) - delta
+ return value if self.set(key, value) else None
+
+
+class NullCache(BaseCache):
+
+ """A cache that doesn't cache. This can be useful for unit testing.
+
+ :param default_timeout: a dummy parameter that is ignored but exists
+ for API compatibility with other caches.
+ """
+
+ def has(self, key):
+ return False
diff --git a/class/cachelib/file.py b/class/cachelib/file.py
new file mode 100644
index 00000000..8c0ba052
--- /dev/null
+++ b/class/cachelib/file.py
@@ -0,0 +1,190 @@
+# -*- coding: utf-8 -*-
+import os
+import errno
+import tempfile
+from hashlib import md5
+from time import time
+try:
+ import cPickle as pickle
+except ImportError: # pragma: no cover
+ import pickle
+
+from cachelib.base import BaseCache
+from cachelib._compat import text_type
+
+
+class FileSystemCache(BaseCache):
+
+ """A cache that stores the items on the file system. This cache depends
+ on being the only user of the `cache_dir`. Make absolutely sure that
+ nobody but this cache stores files there or otherwise the cache will
+ randomly delete files therein.
+
+ :param cache_dir: the directory where cache files are stored.
+ :param threshold: the maximum number of items the cache stores before
+ it starts deleting some. A threshold value of 0
+ indicates no threshold.
+ :param default_timeout: the default timeout that is used if no timeout is
+ specified on :meth:`~BaseCache.set`. A timeout of
+ 0 indicates that the cache never expires.
+ :param mode: the file mode wanted for the cache files, default 0600
+ """
+
+ #: used for temporary files by the FileSystemCache
+ _fs_transaction_suffix = '.__wz_cache'
+ #: keep amount of files in a cache element
+ _fs_count_file = '__wz_cache_count'
+
+ def __init__(self, cache_dir, threshold=500, default_timeout=300,
+ mode=0o600):
+ BaseCache.__init__(self, default_timeout)
+ self._path = cache_dir
+ self._threshold = threshold
+ self._mode = mode
+
+ try:
+ os.makedirs(self._path)
+ except OSError as ex:
+ if ex.errno != errno.EEXIST:
+ raise
+
+ # If there are many files and a zero threshold,
+ # the list_dir can slow initialisation massively
+ if self._threshold != 0:
+ self._update_count(value=len(self._list_dir()))
+
+ @property
+ def _file_count(self):
+ return self.get(self._fs_count_file) or 0
+
+ def _update_count(self, delta=None, value=None):
+ # If we have no threshold, don't count files
+ if self._threshold == 0:
+ return
+
+ if delta:
+ new_count = self._file_count + delta
+ else:
+ new_count = value or 0
+ self.set(self._fs_count_file, new_count, mgmt_element=True)
+
+ def _normalize_timeout(self, timeout):
+ timeout = BaseCache._normalize_timeout(self, timeout)
+ if timeout != 0:
+ timeout = time() + timeout
+ return int(timeout)
+
+ def _list_dir(self):
+ """return a list of (fully qualified) cache filenames
+ """
+ mgmt_files = [self._get_filename(name).split('/')[-1]
+ for name in (self._fs_count_file,)]
+ return [os.path.join(self._path, fn) for fn in os.listdir(self._path)
+ if not fn.endswith(self._fs_transaction_suffix)
+ and fn not in mgmt_files]
+
+ def _prune(self):
+ if self._threshold == 0 or not self._file_count > self._threshold:
+ return
+
+ entries = self._list_dir()
+ now = time()
+ for idx, fname in enumerate(entries):
+ try:
+ remove = False
+ with open(fname, 'rb') as f:
+ expires = pickle.load(f)
+ remove = (expires != 0 and expires <= now) or idx % 3 == 0
+
+ if remove:
+ os.remove(fname)
+ except (IOError, OSError):
+ pass
+ self._update_count(value=len(self._list_dir()))
+
+ def clear(self):
+ for fname in self._list_dir():
+ try:
+ os.remove(fname)
+ except (IOError, OSError):
+ self._update_count(value=len(self._list_dir()))
+ return False
+ self._update_count(value=0)
+ return True
+
+ def _get_filename(self, key):
+ if isinstance(key, text_type):
+ key = key.encode('utf-8') # XXX unicode review
+ hash = md5(key).hexdigest()
+ return os.path.join(self._path, hash)
+
+ def get(self, key):
+ filename = self._get_filename(key)
+ try:
+ with open(filename, 'rb') as f:
+ pickle_time = pickle.load(f)
+ if pickle_time == 0 or pickle_time >= time():
+ return pickle.load(f)
+ else:
+ os.remove(filename)
+ return None
+ except (IOError, OSError, pickle.PickleError):
+ return None
+
+ def add(self, key, value, timeout=None):
+ filename = self._get_filename(key)
+ if not os.path.exists(filename):
+ return self.set(key, value, timeout)
+ return False
+
+ def set(self, key, value, timeout=None, mgmt_element=False):
+ # Management elements have no timeout
+ if mgmt_element:
+ timeout = 0
+
+ # Don't prune on management element update, to avoid loop
+ else:
+ self._prune()
+
+ timeout = self._normalize_timeout(timeout)
+ filename = self._get_filename(key)
+ try:
+ fd, tmp = tempfile.mkstemp(suffix=self._fs_transaction_suffix,
+ dir=self._path)
+ with os.fdopen(fd, 'wb') as f:
+ pickle.dump(timeout, f, 1)
+ pickle.dump(value, f, pickle.HIGHEST_PROTOCOL)
+
+ os.rename(tmp, filename)
+ os.chmod(filename, self._mode)
+ except (IOError, OSError):
+ return False
+ else:
+ # Management elements should not count towards threshold
+ if not mgmt_element:
+ self._update_count(delta=1)
+ return True
+
+ def delete(self, key, mgmt_element=False):
+ try:
+ os.remove(self._get_filename(key))
+ except (IOError, OSError):
+ return False
+ else:
+ # Management elements should not count towards threshold
+ if not mgmt_element:
+ self._update_count(delta=-1)
+ return True
+
+ def has(self, key):
+ filename = self._get_filename(key)
+ try:
+ with open(filename, 'rb') as f:
+ pickle_time = pickle.load(f)
+ if pickle_time == 0 or pickle_time >= time():
+ return True
+ else:
+ os.remove(filename)
+ return False
+ except (IOError, OSError, pickle.PickleError):
+ return False
diff --git a/class/cachelib/memcached.py b/class/cachelib/memcached.py
new file mode 100644
index 00000000..f76cf328
--- /dev/null
+++ b/class/cachelib/memcached.py
@@ -0,0 +1,186 @@
+# -*- coding: utf-8 -*-
+
+import re
+from time import time
+from cachelib._compat import iteritems, to_native
+from cachelib.base import BaseCache, _items
+
+
+_test_memcached_key = re.compile(r'[^\x00-\x21\xff]{1,250}$').match
+
+
+class MemcachedCache(BaseCache):
+
+ """A cache that uses memcached as backend.
+
+ The first argument can either be an object that resembles the API of a
+ :class:`memcache.Client` or a tuple/list of server addresses. In the
+ event that a tuple/list is passed, Werkzeug tries to import the best
+ available memcache library.
+
+ This cache looks into the following packages/modules to find bindings for
+ memcached:
+
+ - ``pylibmc``
+ - ``google.appengine.api.memcached``
+ - ``memcached``
+ - ``libmc``
+
+ Implementation notes: This cache backend works around some limitations in
+ memcached to simplify the interface. For example unicode keys are encoded
+ to utf-8 on the fly. Methods such as :meth:`~BaseCache.get_dict` return
+ the keys in the same format as passed. Furthermore all get methods
+ silently ignore key errors to not cause problems when untrusted user data
+ is passed to the get methods which is often the case in web applications.
+
+ :param servers: a list or tuple of server addresses or alternatively
+ a :class:`memcache.Client` or a compatible client.
+ :param default_timeout: the default timeout that is used if no timeout is
+ specified on :meth:`~BaseCache.set`. A timeout of
+ 0 indicates that the cache never expires.
+ :param key_prefix: a prefix that is added before all keys. This makes it
+ possible to use the same memcached server for different
+ applications. Keep in mind that
+ :meth:`~BaseCache.clear` will also clear keys with a
+ different prefix.
+ """
+
+ def __init__(self, servers=None, default_timeout=300, key_prefix=None):
+ BaseCache.__init__(self, default_timeout)
+ if servers is None or isinstance(servers, (list, tuple)):
+ if servers is None:
+ servers = ['127.0.0.1:11211']
+ self._client = self.import_preferred_memcache_lib(servers)
+ if self._client is None:
+ raise RuntimeError('no memcache module found')
+ else:
+ # NOTE: servers is actually an already initialized memcache
+ # client.
+ self._client = servers
+
+ self.key_prefix = to_native(key_prefix)
+
+ def _normalize_key(self, key):
+ key = to_native(key, 'utf-8')
+ if self.key_prefix:
+ key = self.key_prefix + key
+ return key
+
+ def _normalize_timeout(self, timeout):
+ timeout = BaseCache._normalize_timeout(self, timeout)
+ if timeout > 0:
+ timeout = int(time()) + timeout
+ return timeout
+
+ def get(self, key):
+ key = self._normalize_key(key)
+ # memcached doesn't support keys longer than that. Because often
+ # checks for so long keys can occur because it's tested from user
+ # submitted data etc we fail silently for getting.
+ if _test_memcached_key(key):
+ return self._client.get(key)
+
+ def get_dict(self, *keys):
+ key_mapping = {}
+ have_encoded_keys = False
+ for key in keys:
+ encoded_key = self._normalize_key(key)
+ if not isinstance(key, str):
+ have_encoded_keys = True
+ if _test_memcached_key(key):
+ key_mapping[encoded_key] = key
+ _keys = list(key_mapping)
+ d = rv = self._client.get_multi(_keys)
+ if have_encoded_keys or self.key_prefix:
+ rv = {}
+ for key, value in iteritems(d):
+ rv[key_mapping[key]] = value
+ if len(rv) < len(keys):
+ for key in keys:
+ if key not in rv:
+ rv[key] = None
+ return rv
+
+ def add(self, key, value, timeout=None):
+ key = self._normalize_key(key)
+ timeout = self._normalize_timeout(timeout)
+ return self._client.add(key, value, timeout)
+
+ def set(self, key, value, timeout=None):
+ key = self._normalize_key(key)
+ timeout = self._normalize_timeout(timeout)
+ return self._client.set(key, value, timeout)
+
+ def get_many(self, *keys):
+ d = self.get_dict(*keys)
+ return [d[key] for key in keys]
+
+ def set_many(self, mapping, timeout=None):
+ new_mapping = {}
+ for key, value in _items(mapping):
+ key = self._normalize_key(key)
+ new_mapping[key] = value
+
+ timeout = self._normalize_timeout(timeout)
+ failed_keys = self._client.set_multi(new_mapping, timeout)
+ return not failed_keys
+
+ def delete(self, key):
+ key = self._normalize_key(key)
+ if _test_memcached_key(key):
+ return self._client.delete(key)
+
+ def delete_many(self, *keys):
+ new_keys = []
+ for key in keys:
+ key = self._normalize_key(key)
+ if _test_memcached_key(key):
+ new_keys.append(key)
+ return self._client.delete_multi(new_keys)
+
+ def has(self, key):
+ key = self._normalize_key(key)
+ if _test_memcached_key(key):
+ return self._client.append(key, '')
+ return False
+
+ def clear(self):
+ return self._client.flush_all()
+
+ def inc(self, key, delta=1):
+ key = self._normalize_key(key)
+ return self._client.incr(key, delta)
+
+ def dec(self, key, delta=1):
+ key = self._normalize_key(key)
+ return self._client.decr(key, delta)
+
+ def import_preferred_memcache_lib(self, servers):
+ """Returns an initialized memcache client. Used by the constructor."""
+ try:
+ import pylibmc
+ except ImportError:
+ pass
+ else:
+ return pylibmc.Client(servers)
+
+ try:
+ from google.appengine.api import memcache
+ except ImportError:
+ pass
+ else:
+ return memcache.Client()
+
+ try:
+ import memcache
+ except ImportError:
+ pass
+ else:
+ return memcache.Client(servers)
+
+ try:
+ import libmc
+ except ImportError:
+ pass
+ else:
+ return libmc.Client(servers)
diff --git a/class/cachelib/redis.py b/class/cachelib/redis.py
new file mode 100644
index 00000000..6199a0d4
--- /dev/null
+++ b/class/cachelib/redis.py
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+try:
+ import cPickle as pickle
+except ImportError: # pragma: no cover
+ import pickle
+
+from cachelib.base import BaseCache, _items
+from cachelib._compat import string_types, integer_types
+
+
+class RedisCache(BaseCache):
+ """Uses the Redis key-value store as a cache backend.
+
+ The first argument can be either a string denoting address of the Redis
+ server or an object resembling an instance of a redis.Redis class.
+
+ Note: Python Redis API already takes care of encoding unicode strings on
+ the fly.
+
+ :param host: address of the Redis server or an object which API is
+ compatible with the official Python Redis client (redis-py).
+ :param port: port number on which Redis server listens for connections.
+ :param password: password authentication for the Redis server.
+ :param db: db (zero-based numeric index) on Redis Server to connect.
+ :param default_timeout: the default timeout that is used if no timeout is
+ specified on :meth:`~BaseCache.set`. A timeout of
+ 0 indicates that the cache never expires.
+ :param key_prefix: A prefix that should be added to all keys.
+
+ Any additional keyword arguments will be passed to ``redis.Redis``.
+ """
+
+ def __init__(self, host='localhost', port=6379, password=None,
+ db=0, default_timeout=300, key_prefix=None, **kwargs):
+ BaseCache.__init__(self, default_timeout)
+ if host is None:
+ raise ValueError('RedisCache host parameter may not be None')
+ if isinstance(host, string_types):
+ try:
+ import redis
+ except ImportError:
+ raise RuntimeError('no redis module found')
+ if kwargs.get('decode_responses', None):
+ raise ValueError('decode_responses is not supported by '
+ 'RedisCache.')
+ self._client = redis.Redis(host=host, port=port, password=password,
+ db=db, **kwargs)
+ else:
+ self._client = host
+ self.key_prefix = key_prefix or ''
+
+ def _normalize_timeout(self, timeout):
+ timeout = BaseCache._normalize_timeout(self, timeout)
+ if timeout == 0:
+ timeout = -1
+ return timeout
+
+ def dump_object(self, value):
+ """Dumps an object into a string for redis. By default it serializes
+ integers as regular string and pickle dumps everything else.
+ """
+ t = type(value)
+ if t in integer_types:
+ return str(value).encode('ascii')
+ return b'!' + pickle.dumps(value)
+
+ def load_object(self, value):
+ """The reversal of :meth:`dump_object`. This might be called with
+ None.
+ """
+ if value is None:
+ return None
+ if value.startswith(b'!'):
+ try:
+ return pickle.loads(value[1:])
+ except pickle.PickleError:
+ return None
+ try:
+ return int(value)
+ except ValueError:
+ # before 0.8 we did not have serialization. Still support that.
+ return value
+
+ def get(self, key):
+ return self.load_object(self._client.get(self.key_prefix + key))
+
+ def get_many(self, *keys):
+ if self.key_prefix:
+ keys = [self.key_prefix + key for key in keys]
+ return [self.load_object(x) for x in self._client.mget(keys)]
+
+ def set(self, key, value, timeout=None):
+ timeout = self._normalize_timeout(timeout)
+ dump = self.dump_object(value)
+ if timeout == -1:
+ result = self._client.set(name=self.key_prefix + key,
+ value=dump)
+ else:
+ result = self._client.setex(name=self.key_prefix + key,
+ value=dump, time=timeout)
+ return result
+
+ def add(self, key, value, timeout=None):
+ timeout = self._normalize_timeout(timeout)
+ dump = self.dump_object(value)
+ return (
+ self._client.setnx(name=self.key_prefix + key, value=dump) and
+ self._client.expire(name=self.key_prefix + key, time=timeout)
+ )
+
+ def set_many(self, mapping, timeout=None):
+ timeout = self._normalize_timeout(timeout)
+ # Use transaction=False to batch without calling redis MULTI
+ # which is not supported by twemproxy
+ pipe = self._client.pipeline(transaction=False)
+
+ for key, value in _items(mapping):
+ dump = self.dump_object(value)
+ if timeout == -1:
+ pipe.set(name=self.key_prefix + key, value=dump)
+ else:
+ pipe.setex(name=self.key_prefix + key, value=dump,
+ time=timeout)
+ return pipe.execute()
+
+ def delete(self, key):
+ return self._client.delete(self.key_prefix + key)
+
+ def delete_many(self, *keys):
+ if not keys:
+ return
+ if self.key_prefix:
+ keys = [self.key_prefix + key for key in keys]
+ return self._client.delete(*keys)
+
+ def has(self, key):
+ return self._client.exists(self.key_prefix + key)
+
+ def clear(self):
+ status = False
+ if self.key_prefix:
+ keys = self._client.keys(self.key_prefix + '*')
+ if keys:
+ status = self._client.delete(*keys)
+ else:
+ status = self._client.flushdb()
+ return status
+
+ def inc(self, key, delta=1):
+ return self._client.incr(name=self.key_prefix + key, amount=delta)
+
+ def dec(self, key, delta=1):
+ return self._client.decr(name=self.key_prefix + key, amount=delta)
diff --git a/class/cachelib/simple.py b/class/cachelib/simple.py
new file mode 100644
index 00000000..a0723e9f
--- /dev/null
+++ b/class/cachelib/simple.py
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+from time import time
+import os,struct
+try:
+ import cPickle as pickle
+except ImportError: # pragma: no cover
+ import pickle
+
+from cachelib.base import BaseCache
+
+
+class SimpleCache(BaseCache):
+
+ """Simple memory cache for single process environments. This class exists
+ mainly for the development server and is not 100% thread safe. It tries
+ to use as many atomic operations as possible and no locks for simplicity
+ but it could happen under heavy load that keys are added multiple times.
+
+ :param threshold: the maximum number of items the cache stores before
+ it starts deleting some.
+ :param default_timeout: the default timeout that is used if no timeout is
+ specified on :meth:`~BaseCache.set`. A timeout of
+ 0 indicates that the cache never expires.
+ """
+ __session_key = 'BT_:'
+ __session_basedir = '/www/server/panel/data/session'
+
+ def __init__(self, threshold=500, default_timeout=300):
+ BaseCache.__init__(self, default_timeout)
+ self._cache = {}
+ self.clear = self._cache.clear
+ self._threshold = threshold
+
+ def _prune(self):
+ if len(self._cache) > self._threshold:
+ now = time()
+ toremove = []
+ for idx, (key, (expires, _)) in enumerate(self._cache.items()):
+ if (expires != 0 and expires <= now) or idx % 3 == 0:
+ toremove.append(key)
+ for key in toremove:
+ self._cache.pop(key, None)
+
+
+ def _normalize_timeout(self, timeout):
+ timeout = BaseCache._normalize_timeout(self, timeout)
+ if timeout > 0:
+ timeout = time() + timeout
+ return timeout
+
+ def get(self, key):
+ try:
+
+ expires, value = self._cache[key]
+ if expires == 0 or expires > time():
+ return pickle.loads(value)
+
+ except (KeyError, pickle.PickleError):
+ try:
+ if key[:4] == self.__session_key:
+ filename = '/'.join((self.__session_basedir,self.md5(key)))
+ if not os.path.exists(filename): return None
+
+ with open(filename, 'rb') as fp:
+ _val = fp.read()
+ fp.close()
+
+ expires = struct.unpack('f',_val[:4])[0]
+ if expires == 0 or expires > time():
+ value = _val[4:]
+
+ self._cache[key] = (expires,value)
+ return pickle.loads(value)
+ except :pass
+ return None
+
+ def set(self, key, value, timeout=None):
+
+ expires = self._normalize_timeout(timeout)
+ self._prune()
+
+ _val = pickle.dumps(value, pickle.HIGHEST_PROTOCOL)
+ self._cache[key] = (expires,_val)
+ try:
+ if key[:4] == self.__session_key:
+ if len(_val) < 256: return True
+ if not os.path.exists(self.__session_basedir): os.makedirs(self.__session_basedir,384)
+
+ expires = struct.pack('f',expires)
+ filename = '/'.join((self.__session_basedir,self.md5(key)))
+ fp = open(filename, 'wb+')
+ fp.write(expires + _val)
+ fp.close()
+ os.chmod(filename,384)
+ except :pass
+ return True
+
+ def add(self, key, value, timeout=None):
+ expires = self._normalize_timeout(timeout)
+ self._prune()
+ item = (expires, pickle.dumps(value,
+ pickle.HIGHEST_PROTOCOL))
+ if key in self._cache:
+ return False
+ self._cache.setdefault(key, item)
+ return True
+
+ def delete(self, key):
+ result = self._cache.pop(key, None) is not None
+ try:
+ if key[:4] == self.__session_key:
+ filename = '/'.join((self.__session_basedir,self.md5(key)))
+ if os.path.exists(filename): os.remove(filename)
+ except : pass
+ return result
+
+ def has(self, key):
+ try:
+ expires, value = self._cache[key]
+ return expires == 0 or expires > time()
+ except KeyError:
+ return False
+
+ def md5(self,strings):
+ """
+ 生成MD5
+ @strings 要被处理的字符串
+ return string(32)
+ """
+ import hashlib
+ m = hashlib.md5()
+
+ m.update(strings.encode('utf-8'))
+ return m.hexdigest()
+
diff --git a/class/cachelib/uwsgi.py b/class/cachelib/uwsgi.py
new file mode 100644
index 00000000..97546094
--- /dev/null
+++ b/class/cachelib/uwsgi.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+import platform
+try:
+ import cPickle as pickle
+except ImportError: # pragma: no cover
+ import pickle
+
+from cachelib.base import BaseCache
+
+
+class UWSGICache(BaseCache):
+ """ Implements the cache using uWSGI's caching framework.
+
+ .. note::
+ This class cannot be used when running under PyPy, because the uWSGI
+ API implementation for PyPy is lacking the needed functionality.
+
+ :param default_timeout: The default timeout in seconds.
+ :param cache: The name of the caching instance to connect to, for
+ example: mycache@localhost:3031, defaults to an empty string, which
+ means uWSGI will cache in the local instance. If the cache is in the
+ same instance as the werkzeug app, you only have to provide the name of
+ the cache.
+ """
+ def __init__(self, default_timeout=300, cache=''):
+ BaseCache.__init__(self, default_timeout)
+
+ if platform.python_implementation() == 'PyPy':
+ raise RuntimeError("uWSGI caching does not work under PyPy, see "
+ "the docs for more details.")
+
+ try:
+ import uwsgi
+ self._uwsgi = uwsgi
+ except ImportError:
+ raise RuntimeError("uWSGI could not be imported, are you "
+ "running under uWSGI?")
+
+ self.cache = cache
+
+ def get(self, key):
+ rv = self._uwsgi.cache_get(key, self.cache)
+ if rv is None:
+ return
+ return pickle.loads(rv)
+
+ def delete(self, key):
+ return self._uwsgi.cache_del(key, self.cache)
+
+ def set(self, key, value, timeout=None):
+ return self._uwsgi.cache_update(key, pickle.dumps(value),
+ self._normalize_timeout(timeout),
+ self.cache)
+
+ def add(self, key, value, timeout=None):
+ return self._uwsgi.cache_set(key, pickle.dumps(value),
+ self._normalize_timeout(timeout),
+ self.cache)
+
+ def clear(self):
+ return self._uwsgi.cache_clear(self.cache)
+
+ def has(self, key):
+ return self._uwsgi.cache_exists(key, self.cache) is not None
diff --git a/class/common.py b/class/common.py
index a2ebba85..392e7db5 100644
--- a/class/common.py
+++ b/class/common.py
@@ -6,8 +6,7 @@
# +-------------------------------------------------------------------
# | Author: hwliang
# +-------------------------------------------------------------------
-from flask import request, redirect, g
-from BTPanel import session, cache
+from BTPanel import session, cache , request, redirect, g
from datetime import datetime
import os
import public
@@ -34,10 +33,11 @@ class panelSetup:
ua = ua.lower()
if ua.find('spider') != -1 or ua.find('bot') != -1:
return redirect('https://www.google.com')
- g.version = '6.8.2'
+ g.version = '6.8.4'
g.title = public.GetConfigValue('title')
g.uri = request.path
g.debug = os.path.exists('data/debug.pl')
+ g.pyversion = sys.version_info[0]
if not g.debug:
g.cdn_url = public.get_cdn_url()
if not g.cdn_url:
@@ -50,6 +50,19 @@ class panelSetup:
session['version'] = g.version
session['title'] = g.title
g.is_aes = False
+
+ dirPath = '/www/server/phpmyadmin/pma'
+ if os.path.exists(dirPath):
+ public.ExecShell("rm -rf {}".format(dirPath))
+
+ dirPath = '/www/server/adminer'
+ if os.path.exists(dirPath):
+ public.ExecShell("rm -rf {}".format(dirPath))
+
+ dirPath = '/www/server/panel/adminer'
+ if os.path.exists(dirPath):
+ public.ExecShell("rm -rf {}".format(dirPath))
+
return None
@@ -59,6 +72,9 @@ class panelAdmin(panelSetup):
# 本地请求
def local(self):
result = panelSetup().init()
+ if result:
+ return result
+ result = self.check_login()
if result:
return result
result = self.setSession()
@@ -68,9 +84,6 @@ class panelAdmin(panelSetup):
if result:
return result
result = self.checkWebType()
- if result:
- return result
- result = self.check_login()
if result:
return result
result = self.checkConfig()
@@ -99,7 +112,7 @@ class panelAdmin(panelSetup):
if not 'lan' in session:
session['lan'] = public.GetLanguage()
if not 'home' in session:
- session['home'] = 'http://www.aapanel.com'
+ session['home'] = 'https://console.aapanel.com'
return None
# 检查Web服务器类型
@@ -185,26 +198,37 @@ class panelAdmin(panelSetup):
return redirect('/login')
from BTPanel import get_input
get = get_input()
-
-
+ client_ip = public.GetClientIp()
if not 'client_bind_token' in get:
if not 'request_token' in get or not 'request_time' in get:
return redirect('/login')
- client_ip = public.GetClientIp()
+
+ num_key = client_ip + '_api'
+ if not public.get_error_num(num_key,20):
+ return public.returnMsg(False,'AUTH_FAILED1')
+
+
if not client_ip in api_config['limit_addr']:
- return public.returnJson(False,'%s[' % public.GetMsg("CHECK_IP_FALSE")+client_ip+']')
+ public.set_error_num(num_key)
+ return public.returnJson(False,'%s[' % public.GetMsg("AUTH_FAILED1")+client_ip+']')
else:
+ num_key = client_ip + '_app'
+ if not public.get_error_num(num_key,20):
+ return public.returnMsg(False,'AUTH_FAILED1')
a_file = '/dev/shm/' + get.client_bind_token
if not os.path.exists(a_file):
import panelApi
if not panelApi.panelApi().get_app_find(get.client_bind_token):
- return public.returnMsg(False, 'Unbound device')
- public.writeFile(a_file, '')
+ public.set_error_num(num_key)
+ return public.returnMsg(False,'UNBOUND_DEVICE')
+ public.writeFile(a_file,'')
if not 'key' in api_config:
- return public.returnJson(False, 'Key verification failed')
+ public.set_error_num(num_key)
+ return public.returnJson(False, 'KEY_ERR')
if not 'form_data' in get:
- return public.returnJson(False, 'No form_data data found')
+ public.set_error_num(num_key)
+ return public.returnJson(False, 'FORM_DATA_ERR')
g.form_data = json.loads(public.aes_decrypt(get.form_data, api_config['key']))
@@ -215,7 +239,9 @@ class panelAdmin(panelSetup):
g.aes_key = api_config['key']
request_token = public.md5(get.request_time + api_config['token'])
if get.request_token == request_token:
+ public.set_error_num(num_key,True)
return False
+ public.set_error_num(num_key)
return public.returnJson(False,'SECRET_KEY_CHECK_FALSE')
# 检查系统配置
diff --git a/class/config.py b/class/config.py
index 3a35503c..dcb0d0b5 100644
--- a/class/config.py
+++ b/class/config.py
@@ -12,8 +12,7 @@ try:
except:
public.ExecShell("pip install pyotp &")
try:
- from BTPanel import session,admin_path_checks,g
- from flask import request
+ from BTPanel import session,admin_path_checks,g,request
import send_mail
except:pass
class config:
diff --git a/class/db.py b/class/db.py
index 1fc0cab9..61721ef9 100644
--- a/class/db.py
+++ b/class/db.py
@@ -10,7 +10,8 @@
import sqlite3
import os,time,sys
os.chdir('/www/server/panel')
-sys.path.insert(0,'class')
+if not 'class/' in sys.path:
+ sys.path.insert(0,'class/')
import public
class Sql():
@@ -29,7 +30,13 @@ class Sql():
def __init__(self):
self.__DB_FILE = 'data/default.db'
-
+
+ def __enter__(self):
+ return self
+
+ def __exit__(self,exc_type,exc_value,exc_trackback):
+ self.close()
+
def __GetConn(self):
#取数据库对象
try:
@@ -306,7 +313,8 @@ class Sql():
#写锁
def write_lock(self):
self.is_lock()
- open(self.__LOCK,'wb+').close()
+ with open(self.__LOCK,'wb+') as f:
+ f.close()
#解锁
def rm_lock(self):
diff --git a/class/files.py b/class/files.py
index bc06f456..ca82f391 100644
--- a/class/files.py
+++ b/class/files.py
@@ -164,7 +164,7 @@ session.save_handler = files'''.format(path, sess_path, sess_path)
# 上传文件
def UploadFile(self, get):
from werkzeug.utils import secure_filename
- from flask import request
+ from BTPanel import request
if sys.version_info[0] == 2:
get.path = get.path.encode('utf-8')
if not os.path.exists(get.path):
diff --git a/class/jobs.py b/class/jobs.py
index 5679926a..b4acad42 100644
--- a/class/jobs.py
+++ b/class/jobs.py
@@ -10,7 +10,21 @@ import time,public,db,os,sys,json,re
os.chdir('/www/server/panel')
def control_init():
+ dirPath = '/www/server/phpmyadmin/pma'
+ if os.path.exists(dirPath):
+ public.ExecShell("rm -rf {}".format(dirPath))
+
+ dirPath = '/www/server/adminer'
+ if os.path.exists(dirPath):
+ public.ExecShell("rm -rf {}".format(dirPath))
+
+ dirPath = '/www/server/panel/adminer'
+ if os.path.exists(dirPath):
+ public.ExecShell("rm -rf {}".format(dirPath))
+
+
time.sleep(1)
+
sql = db.Sql().dbfile('system')
if not sql.table('sqlite_master').where('type=? AND name=?', ('table', 'load_average')).count():
csql = '''CREATE TABLE IF NOT EXISTS `load_average` (
@@ -105,7 +119,7 @@ def control_init():
public.ExecShell(c)
p_file = 'class/plugin2.so'
if os.path.exists(p_file): public.ExecShell("rm -f class/*.so")
- # public.ExecShell("chmod -R 600 /www/server/panel/data;chmod -R 600 /www/server/panel/config;chmod -R 700 /www/server/cron;chmod -R 600 /www/server/cron/*.log;chown -R root:root /www/server/panel/data;chown -R root:root /www/server/panel/config;chown -R www:www /www/server/phpmyadmin;chmod -R 700 /www/server/phpmyadmin")
+ public.ExecShell("chmod -R 600 /www/server/panel/data;chmod -R 600 /www/server/panel/config;chmod -R 700 /www/server/cron;chmod -R 600 /www/server/cron/*.log;chown -R root:root /www/server/panel/data;chown -R root:root /www/server/panel/config;chown -R root:root /www/server/phpmyadmin;chmod -R 755 /www/server/phpmyadmin")
if os.path.exists("/www/server/mysql"):
public.ExecShell("chown mysql:mysql /etc/my.cnf;chmod 600 /etc/my.cnf")
stop_path = '/www/server/stop'
@@ -113,6 +127,14 @@ def control_init():
os.makedirs(stop_path)
public.ExecShell("chown -R root:root {path};chmod -R 755 {path}".format(path=stop_path))
public.ExecShell('chmod 755 /www;chmod 755 /www/server')
+ if os.path.exists('/www/server/phpmyadmin/pma'):
+ public.ExecShell("rm -rf /www/server/phpmyadmin/pma")
+ if os.path.exists("/www/server/adminer"):
+ public.ExecShell("rm -rf /www/server/adminer")
+ if os.path.exists("/www/server/panel/adminer"):
+ public.ExecShell("rm -rf /www/server/panel/adminer")
+ if os.path.exists('/dev/shm/session.db'):
+ os.remove('/dev/shm/session.db')
#disable_putenv('putenv')
clean_session()
#set_crond()
@@ -141,7 +163,15 @@ def files_set_mode():
["/www/server/speed","/*.lua","root",755,False],
["/www/server/speed/total","","www",755,True],
["/www/server/btwaf","/*.lua","root",755,False],
-
+ ["/www/backup","","root",600,True],
+ ["/www/wwwlogs","","www",700,True],
+ ["/www/enterprise_backup","","root",600,True],
+ ["/www/server/cron","","root",700,True],
+ ["/www/server/cron","/*.log","root",600,True],
+ ["/www/server/stop","","root",755,True],
+ ["/www/server/redis","","redis",700,True],
+ ["/www/server/redis/redis.conf","","redis",600,False],
+ ["/www/Recycle_bin","","root",600,True],
["/www/server/panel/class","","root",600,True],
["/www/server/panel/data","","root",600,True],
["/www/server/panel/plugin","","root",600,False],
@@ -163,8 +193,8 @@ def files_set_mode():
["/dev/shm/session.db","","root",600,False],
["/dev/shm/session_py3","","root",600,True],
["/dev/shm/session_py2","","root",600,True],
-
- ["/www/server/adminer","","www",700,True]
+ ["/www/server/phpmyadmin","","root",755,True],
+ ["/www/server/coll","","root",700,True]
]
for m in m_paths:
diff --git a/class/panelPHP.py b/class/panelPHP.py
index 0dc828c2..dba051e8 100644
--- a/class/panelPHP.py
+++ b/class/panelPHP.py
@@ -12,8 +12,6 @@
# +-------------------------------------------------------------------
import json,os,public,time,re,sys
-if __name__ != "__main__":
- from BTPanel import request,abort,send_file,Resp,cache
import time
import fastcgiClient as fcgi_client
import struct
@@ -57,11 +55,21 @@ class panelPHP:
#将参数写到文件
def __write_args(self,args):
+ from BTPanel import request
if os.path.exists(self.__args_tmp): os.remove(self.__args_tmp)
self.__clean_args_file()
data = {}
data['GET'] = request.args.to_dict()
- data['POST'] = request.form.to_dict()
+ data['POST'] = {}
+ x_token = request.headers.get('x-http-token')
+ if x_token:
+ aes_pwd = x_token[:8] + x_token[40:48]
+ for key in request.form.keys():
+ data['POST'][key] = str(request.form.get(key,''))
+ if x_token:
+ if len(data['POST'][key]) > 5:
+ if data['POST'][key][:6] == 'BT-CRT':
+ data['POST'][key] = public.aes_decrypt(data['POST'][key][6:],aes_pwd)
data['POST']['client_ip'] = public.GetClientIp()
data = json.dumps(data)
public.writeFile(self.__args_tmp,data)
@@ -127,273 +135,275 @@ class panelPHP:
break
return php_v
- def get_phpmyadmin_phpversion(self):
- '''
- @name 获取当前phpmyadmin设置的PHP版本
- @author hwliang<2020-07-13>
- @return string
- '''
- ikey = 'pma_phpv'
- phpv = cache.get(ikey)
- if phpv: return phpv
- webserver = public.get_webserver()
- if webserver == 'nginx':
- filename = public.GetConfigValue('setup_path') + '/nginx/conf/enable-php.conf'
- conf = public.readFile(filename)
- if not conf: return None
- rep = r"php-cgi-(\d+)\.sock"
- phpv = re.findall(rep,conf)
- elif webserver == 'openlitespeed':
- filename = public.GetConfigValue('setup_path') + "/panel/vhost/openlitespeed/detail/phpmyadmin.conf"
- conf = public.readFile(filename)
- if not conf: return None
- rep = r"/usr/local/lsws/lsphp(\d+)/bin/lsphp"
- phpv = re.findall(rep,conf)
- else:
- filename = public.GetConfigValue('setup_path') + '/apache/conf/extra/httpd-vhosts.conf'
- conf = public.readFile(filename)
- if not conf: return None
- rep = r"php-cgi-(\d+)\.sock"
- phpv = re.findall(rep,conf)
+# def get_phpmyadmin_phpversion(self):
+# '''
+# @name 获取当前phpmyadmin设置的PHP版本
+# @author hwliang<2020-07-13>
+# @return string
+# '''
+# from BTPanel import cache
+# ikey = 'pma_phpv'
+# phpv = cache.get(ikey)
+# if phpv: return phpv
+# webserver = public.get_webserver()
+# if webserver == 'nginx':
+# filename = public.GetConfigValue('setup_path') + '/nginx/conf/enable-php.conf'
+# conf = public.readFile(filename)
+# if not conf: return None
+# rep = r"php-cgi-(\d+)\.sock"
+# phpv = re.findall(rep,conf)
+# elif webserver == 'openlitespeed':
+# filename = public.GetConfigValue('setup_path') + "/panel/vhost/openlitespeed/detail/phpmyadmin.conf"
+# conf = public.readFile(filename)
+# if not conf: return None
+# rep = r"/usr/local/lsws/lsphp(\d+)/bin/lsphp"
+# phpv = re.findall(rep,conf)
+# else:
+# filename = public.GetConfigValue('setup_path') + '/apache/conf/extra/httpd-vhosts.conf'
+# conf = public.readFile(filename)
+# if not conf: return None
+# rep = r"php-cgi-(\d+)\.sock"
+# phpv = re.findall(rep,conf)
- if not phpv: return None
- cache.set(ikey,phpv[0],3)
- return phpv[0]
-
- def get_pma_root(self):
- '''
- @name 获取phpmyadmin根目录
- @author hwliang<2020-07-13>
- @return string
- '''
- pma_path = '/www/server/phpmyadmin/'
- if not os.path.exists(pma_path):
- os.makedirs(pma_path)
- for dname in os.listdir(pma_path):
- if dname.find('phpmyadmin_') != -1:
- return os.path.join(pma_path,dname)
- return None
-
- def check_phpmyadmin_phpversion(self):
- '''
- @name 检查当前phpmyadmin版本可用的php版本列表
- @author hwliang<2020-07-13>
- @return list
- '''
- pma_path = '/www/server/phpmyadmin/'
- pma_version_f1 = os.path.join(pma_path,'version_check.pl')
- pma_root = os.path.join(pma_path,'pma')
- pma_version_f2 = os.path.join(pma_root,'version_check.pl')
- if not os.path.exists(pma_version_f1):
- src_vfile = os.path.join(pma_path,'version.pl')
- if os.path.exists(src_vfile):
- public.writeFile(pma_version_f1,public.readFile(src_vfile))
- v_sync = public.readFile(pma_version_f1) == public.readFile(pma_version_f2)
-
- if not os.path.exists(pma_root + '/index.php') or not v_sync:
- o_pma_root = self.get_pma_root()
-
- if o_pma_root:
- if not os.path.exists(pma_root):
- os.makedirs(pma_root)
- public.ExecShell("\cp -arf {}/* {}/".format(o_pma_root,pma_root))
- public.ExecShell("chown -R www:www {}".format(pma_root))
- public.ExecShell("chmod -R 700 {}".format(pma_root))
- public.ExecShell("\cp -arf {} {}".format(pma_version_f1,pma_version_f2))
- index = public.readFile(pma_root + '/index.php')
- if index:
- if index.find("use PhpMyAdmin\\Util") != -1:
- resp = "use PhpMyAdmin\\Util;\nif(function_exists('opcache_invalidate')) opcache_invalidate('/www/server/phpmyadmin/pma/config.inc.php');"
- index = index.replace("use PhpMyAdmin\\Util;",resp)
- elif index.find("use PMA\libraries\LanguageManager;") != -1:
- resp = "use PMA\libraries\LanguageManager;\nif(function_exists('opcache_invalidate')) opcache_invalidate('/www/server/phpmyadmin/pma/config.inc.php');"
- index = index.replace("use PMA\libraries\LanguageManager;",resp)
- elif index.find("require_once 'libraries/common.inc.php';") != -1:
- resp = "if(function_exists('opcache_invalidate')) opcache_invalidate('/www/server/phpmyadmin/pma/config.inc.php');\nrequire_once 'libraries/common.inc.php';"
- index = index.replace("require_once 'libraries/common.inc.php';",resp)
-
-
- public.writeFile(pma_root + '/index.php',index)
-
- if not os.path.exists(pma_version_f2):
- return False
-
- pma_version = public.readFile(pma_version_f2)
- self.pma_version = pma_version
- if pma_version:
- pma_version = pma_version[:3]
-
- if pma_version == '4.4':
- return ['53','54','55','56']
- elif pma_version == '4.0':
- return ['52','53']
- elif pma_version == '4.6':
- return None
- elif pma_version == '4.7':
- return ['55','56','70','71','72']
- elif pma_version in ['4.8','4.9','5.0']:
- return ['70','71','72','73','74']
- else:
- return ['55','56','70','71','72']
-
- def get_mysql_port(self):
- '''
- @name 获取mysql当前端口号
- @author hwliang<2020-07-13>
- @return int
- '''
- try:
- myconf = public.readFile('/etc/my.cnf')
- rep = r"port\s*=\s*([0-9]+)"
- port = int(re.search(rep,myconf).groups()[0])
- if not port: port = 3306
- return port
- except:
- return 3306
-
- def write_pma_passwd(self,username,password):
- '''
- @name 写入mysql帐号密码到配置文件
- @author hwliang<2020-07-13>
- @param username string(用户名)
- @param password string(密码)
- @return bool
- '''
-
- self.check_phpmyadmin_phpversion()
- pconfig = 'cookie'
- if username:
- pconfig = 'config'
- pma_path = '/www/server/phpmyadmin/'
- pma_config_file = os.path.join(pma_path,'pma/config.inc.php')
- conf = public.readFile(pma_config_file)
- if not conf: return False
- rep = r"/\* Authentication type \*/(.|\n)+/\* Server parameters \*/"
- rstr = '''/* Authentication type */
-$cfg['Servers'][$i]['auth_type'] = '{}';
-$cfg['Servers'][$i]['host'] = 'localhost';
-$cfg['Servers'][$i]['port'] = '{}';
-$cfg['Servers'][$i]['user'] = '{}';
-$cfg['Servers'][$i]['password'] = '{}';
-/* Server parameters */'''.format(pconfig,self.get_mysql_port(),username,password)
- conf = re.sub(rep,rstr,conf)
- public.writeFile(pma_config_file,conf)
- return True
-
- def request_php(self,uri):
- '''
- @name 发起fastcgi请求到PHP-FPM
- @author hwliang<2020-07-11>
- @param puri string(URI地址)
- @return socket
- '''
- php_unix_socket = '/tmp/php-cgi-{}.sock'.format(self.php_version)
- f = FPM(php_unix_socket,self.document_root,self.last_path)
-
- if request.full_path.find('?') != -1:
- uri = request.full_path[request.full_path.find(uri):]
- if self.re_io:
- sock = f.load_url(uri,content=self.re_io)
- else:
- sock = f.load_url(uri,content=request.stream)
- return sock
-
- def start(self,puri,document_root,last_path = ''):
- '''
- @name 开始处理PHP请求
- @author hwliang<2020-07-11>
- @param puri string(URI地址)
- @return socket or Response
- '''
- if puri in ['/','',None]: puri = 'index.php'
- if puri[0] == '/': puri = puri[1:]
- self.document_root = document_root
- self.last_path = last_path
- filename = document_root + puri
-
-
- #如果是PHP文件
- if puri[-4:] == '.php':
- if request.path.find('/phpmyadmin/') != -1:
- ikey = 'pma_php_version'
- self.php_version = cache.get(ikey)
- if not self.php_version:
- php_version = self.get_phpmyadmin_phpversion()
- php_versions = self.check_phpmyadmin_phpversion()
- if not php_versions:
- if php_versions == False:
- return Resp(
- 'Phpmyadmin is not installed, or support for phpMyAdmin4.6 has been discontinued due to security issues, uninstall and install other secure versions in the software store!')
- else:
- return Resp('phpmyadmin is not installed')
- if not php_version or not php_version in php_versions:
- php_version = php_versions
- self.php_version = self.get_php_version(php_version)
- if not self.php_version:
- php_version = self.check_phpmyadmin_phpversion()
- self.php_version = self.get_php_version(php_version)
- if not php_version:
- return Resp('No supported PHP version found: {}'.format(php_versions))
-
- if not self.php_version in php_versions:
- self.php_version = self.get_php_version(php_versions)
-
- if not self.php_version:
- return Resp('No supported PHP version found: {}'.format(php_versions))
- cache.set(ikey,self.php_version,1)
- if request.method == 'POST':
- #登录phpmyadmin
- if puri in ['index.php','/index.php']:
- content = public.url_encode(request.form.to_dict())
- if not isinstance(content,bytes):
- content = content.encode()
- self.re_io = StringIO(content)
- username = request.form.get('pma_username')
- if username:
- password = request.form.get('pma_password')
- if not self.write_pma_passwd(username,password):
- return Resp('Phpmyadmin is not installed')
-
- if puri in ['logout.php', '/logout.php']:
- self.write_pma_passwd(None, None)
- else:
- src_path = '/www/server/panel/adminer'
- dst_path = '/www/server/adminer'
- if os.path.exists(src_path):
- if not os.path.exists(dst_path): os.makedirs(dst_path)
- public.ExecShell("\cp -arf {}/* {}/".format(src_path, dst_path))
- public.ExecShell("chown -R www:www {}".format(dst_path))
- public.ExecShell("chmod -R 700 {}".format(dst_path))
- public.ExecShell("rm -rf {}".format(src_path))
-
- if not os.path.exists(dst_path + '/index.php'):
- return Resp("The AdMiner file is missing. Please try again after the [Fix] panel on the first page!")
-
- ikey = 'aer_php_version'
- self.php_version = cache.get(ikey)
- if not self.php_version:
- self.php_version = self.get_php_version(None)
- cache.set(ikey, self.php_version, 10)
- if not self.php_version:
- return Resp('没有找到可用的PHP版本')
-
- #文件是否存在？
- if not os.path.exists(filename):
- return abort(404)
-
- #发送到FPM
- try:
- return self.request_php(puri)
- except Exception as ex:
- if str(ex).find('No such file or directory') != -1:
- return Resp('Specify PHP version: {}, not started, or unable to connect!'.format(self.php_version))
- return Resp(str(ex))
-
- if not os.path.exists(filename):
- return abort(404)
-
- #如果是静态文件
- return send_file(filename)
+# if not phpv: return None
+# cache.set(ikey,phpv[0],3)
+# return phpv[0]
+#
+# def get_pma_root(self):
+# '''
+# @name 获取phpmyadmin根目录
+# @author hwliang<2020-07-13>
+# @return string
+# '''
+# pma_path = '/www/server/phpmyadmin/'
+# if not os.path.exists(pma_path):
+# os.makedirs(pma_path)
+# for dname in os.listdir(pma_path):
+# if dname.find('phpmyadmin_') != -1:
+# return os.path.join(pma_path,dname)
+# return None
+#
+# def check_phpmyadmin_phpversion(self):
+# '''
+# @name 检查当前phpmyadmin版本可用的php版本列表
+# @author hwliang<2020-07-13>
+# @return list
+# '''
+# return
+# pma_path = '/www/server/phpmyadmin/'
+# pma_version_f1 = os.path.join(pma_path,'version_check.pl')
+# pma_root = os.path.join(pma_path,'pma')
+# pma_version_f2 = os.path.join(pma_root,'version_check.pl')
+# if not os.path.exists(pma_version_f1):
+# src_vfile = os.path.join(pma_path,'version.pl')
+# if os.path.exists(src_vfile):
+# public.writeFile(pma_version_f1,public.readFile(src_vfile))
+# v_sync = public.readFile(pma_version_f1) == public.readFile(pma_version_f2)
+#
+# if not os.path.exists(pma_root + '/index.php') or not v_sync:
+# o_pma_root = self.get_pma_root()
+#
+# if o_pma_root:
+# if not os.path.exists(pma_root):
+# os.makedirs(pma_root)
+# public.ExecShell("\cp -arf {}/* {}/".format(o_pma_root,pma_root))
+# public.ExecShell("chown -R www:www {}".format(pma_root))
+# public.ExecShell("chmod -R 700 {}".format(pma_root))
+# public.ExecShell("\cp -arf {} {}".format(pma_version_f1,pma_version_f2))
+# index = public.readFile(pma_root + '/index.php')
+# if index:
+# if index.find("use PhpMyAdmin\\Util") != -1:
+# resp = "use PhpMyAdmin\\Util;\nif(function_exists('opcache_invalidate')) opcache_invalidate('/www/server/phpmyadmin/pma/config.inc.php');"
+# index = index.replace("use PhpMyAdmin\\Util;",resp)
+# elif index.find("use PMA\libraries\LanguageManager;") != -1:
+# resp = "use PMA\libraries\LanguageManager;\nif(function_exists('opcache_invalidate')) opcache_invalidate('/www/server/phpmyadmin/pma/config.inc.php');"
+# index = index.replace("use PMA\libraries\LanguageManager;",resp)
+# elif index.find("require_once 'libraries/common.inc.php';") != -1:
+# resp = "if(function_exists('opcache_invalidate')) opcache_invalidate('/www/server/phpmyadmin/pma/config.inc.php');\nrequire_once 'libraries/common.inc.php';"
+# index = index.replace("require_once 'libraries/common.inc.php';",resp)
+#
+#
+# public.writeFile(pma_root + '/index.php',index)
+#
+# if not os.path.exists(pma_version_f2):
+# return False
+#
+# pma_version = public.readFile(pma_version_f2)
+# self.pma_version = pma_version
+# if pma_version:
+# pma_version = pma_version[:3]
+#
+# if pma_version == '4.4':
+# return ['53','54','55','56']
+# elif pma_version == '4.0':
+# return ['52','53']
+# elif pma_version == '4.6':
+# return None
+# elif pma_version == '4.7':
+# return ['55','56','70','71','72']
+# elif pma_version in ['4.8','4.9','5.0']:
+# return ['70','71','72','73','74']
+# else:
+# return ['55','56','70','71','72']
+#
+# def get_mysql_port(self):
+# '''
+# @name 获取mysql当前端口号
+# @author hwliang<2020-07-13>
+# @return int
+# '''
+# try:
+# myconf = public.readFile('/etc/my.cnf')
+# rep = r"port\s*=\s*([0-9]+)"
+# port = int(re.search(rep,myconf).groups()[0])
+# if not port: port = 3306
+# return port
+# except:
+# return 3306
+#
+# def write_pma_passwd(self,username,password):
+# '''
+# @name 写入mysql帐号密码到配置文件
+# @author hwliang<2020-07-13>
+# @param username string(用户名)
+# @param password string(密码)
+# @return bool
+# '''
+#
+# self.check_phpmyadmin_phpversion()
+# pconfig = 'cookie'
+# if username:
+# pconfig = 'config'
+# pma_path = '/www/server/phpmyadmin/'
+# pma_config_file = os.path.join(pma_path,'pma/config.inc.php')
+# conf = public.readFile(pma_config_file)
+# if not conf: return False
+# rep = r"/\* Authentication type \*/(.|\n)+/\* Server parameters \*/"
+# rstr = '''/* Authentication type */
+# $cfg['Servers'][$i]['auth_type'] = '{}';
+# $cfg['Servers'][$i]['host'] = 'localhost';
+# $cfg['Servers'][$i]['port'] = '{}';
+# $cfg['Servers'][$i]['user'] = '{}';
+# $cfg['Servers'][$i]['password'] = '{}';
+# /* Server parameters */'''.format(pconfig,self.get_mysql_port(),username,password)
+# conf = re.sub(rep,rstr,conf)
+# public.writeFile(pma_config_file,conf)
+# return True
+#
+# def request_php(self,uri):
+# '''
+# @name 发起fastcgi请求到PHP-FPM
+# @author hwliang<2020-07-11>
+# @param puri string(URI地址)
+# @return socket
+# '''
+# php_unix_socket = '/tmp/php-cgi-{}.sock'.format(self.php_version)
+# f = FPM(php_unix_socket,self.document_root,self.last_path)
+#
+# if request.full_path.find('?') != -1:
+# uri = request.full_path[request.full_path.find(uri):]
+# if self.re_io:
+# sock = f.load_url(uri,content=self.re_io)
+# else:
+# sock = f.load_url(uri,content=request.stream)
+# return sock
+#
+# def start(self,puri,document_root,last_path = ''):
+# '''
+# @name 开始处理PHP请求
+# @author hwliang<2020-07-11>
+# @param puri string(URI地址)
+# @return socket or Response
+# '''
+# if puri in ['/','',None]: puri = 'index.php'
+# if puri[0] == '/': puri = puri[1:]
+# self.document_root = document_root
+# self.last_path = last_path
+# filename = document_root + puri
+#
+#
+# #如果是PHP文件
+# if puri[-4:] == '.php':
+# if request.path.find('/phpmyadmin/') != -1:
+# ikey = 'pma_php_version'
+# self.php_version = cache.get(ikey)
+# if not self.php_version:
+# php_version = self.get_phpmyadmin_phpversion()
+# php_versions = self.check_phpmyadmin_phpversion()
+# if not php_versions:
+# if php_versions == False:
+# return Resp(
+# 'Phpmyadmin is not installed, or support for phpMyAdmin4.6 has been discontinued due to security issues, uninstall and install other secure versions in the software store!')
+# else:
+# return Resp('phpmyadmin is not installed')
+# if not php_version or not php_version in php_versions:
+# php_version = php_versions
+# self.php_version = self.get_php_version(php_version)
+# if not self.php_version:
+# php_version = self.check_phpmyadmin_phpversion()
+# self.php_version = self.get_php_version(php_version)
+# if not php_version:
+# return Resp('No supported PHP version found: {}'.format(php_versions))
+#
+# if not self.php_version in php_versions:
+# self.php_version = self.get_php_version(php_versions)
+#
+# if not self.php_version:
+# return Resp('No supported PHP version found: {}'.format(php_versions))
+# cache.set(ikey,self.php_version,1)
+# if request.method == 'POST':
+# #登录phpmyadmin
+# if puri in ['index.php','/index.php']:
+# content = public.url_encode(request.form.to_dict())
+# if not isinstance(content,bytes):
+# content = content.encode()
+# self.re_io = StringIO(content)
+# username = request.form.get('pma_username')
+# if username:
+# password = request.form.get('pma_password')
+# if not self.write_pma_passwd(username,password):
+# return Resp('Phpmyadmin is not installed')
+#
+# if puri in ['logout.php', '/logout.php']:
+# self.write_pma_passwd(None, None)
+# else:
+# src_path = '/www/server/panel/adminer'
+# dst_path = '/www/server/adminer'
+# if os.path.exists(src_path):
+# if not os.path.exists(dst_path): os.makedirs(dst_path)
+# public.ExecShell("\cp -arf {}/* {}/".format(src_path, dst_path))
+# public.ExecShell("chown -R www:www {}".format(dst_path))
+# public.ExecShell("chmod -R 700 {}".format(dst_path))
+# public.ExecShell("rm -rf {}".format(src_path))
+#
+# if not os.path.exists(dst_path + '/index.php'):
+# return Resp("The AdMiner file is missing. Please try again after the [Fix] panel on the first page!")
+#
+# ikey = 'aer_php_version'
+# self.php_version = cache.get(ikey)
+# if not self.php_version:
+# self.php_version = self.get_php_version(None)
+# cache.set(ikey, self.php_version, 10)
+# if not self.php_version:
+# return Resp('没有找到可用的PHP版本')
+#
+# #文件是否存在？
+# if not os.path.exists(filename):
+# return abort(404)
+#
+# #发送到FPM
+# try:
+# return self.request_php(puri)
+# except Exception as ex:
+# if str(ex).find('No such file or directory') != -1:
+# return Resp('Specify PHP version: {}, not started, or unable to connect!'.format(self.php_version))
+# return Resp(str(ex))
+#
+# if not os.path.exists(filename):
+# return abort(404)
+#
+# #如果是静态文件
+# return send_file(filename)
@@ -529,7 +539,7 @@ class FPM(object):
except ValueError:
script_name = url
query_string = ''
-
+ from BTPanel import request
env = {
'SCRIPT_FILENAME': '%s%s' % (self.document_root, script_name),
'QUERY_STRING': query_string,
diff --git a/class/panelPlugin.py b/class/panelPlugin.py
index 232f4fa1..13e1ce96 100644
--- a/class/panelPlugin.py
+++ b/class/panelPlugin.py
@@ -171,6 +171,8 @@ class panelPlugin:
if 'status' in result:
if result['status']:
public.httpPost(public.GetConfigValue('home') + '/api/panel/plugin_total',{"pid":pluginInfo['id'],'p_name':pluginInfo['name']},3)
+ get.force = 1
+ self.get_cloud_list(get)
except:pass
return result
@@ -1891,8 +1893,7 @@ class panelPlugin:
return panelPHP.panelPHP(get.name).exec_php_script(get)
return public.returnMsg(False,'PLUGIN_INPUT_B')
if not self.check_accept(get):return public.returnMsg(False,public.to_string([24744, 26410, 36141, 20080, 91, 37, 115, 93, 25110, 25480, 26435, 24050, 21040, 26399, 33]) % (self.get_title_byname(get),))
- if not path in sys.path:
- sys.path.insert(0,path)
+ public.package_path_append(path)
plugin_main = __import__(get.name+'_main')
try:
reload(plugin_main)
diff --git a/class/panelSite.py b/class/panelSite.py
index 4dd3d7f3..1e35bc68 100644
--- a/class/panelSite.py
+++ b/class/panelSite.py
@@ -11,7 +11,10 @@
# 网站管理类
#------------------------------
import io,re,public,os,sys,shutil,json,hashlib,socket,time
-from BTPanel import session
+try:
+ from BTPanel import session
+except:
+ pass
from panelRedirect import panelRedirect
import site_dir_auth
class panelSite(panelRedirect):
@@ -93,10 +96,10 @@ class panelSite(panelRedirect):
for key in tmp:
if key == port: return False
- listen = "\nListen "+tmp[0]
+ listen = "\nListen "+ tmp[0] + "\n"
listen_ipv6 = ''
#if self.is_ipv6: listen_ipv6 = "\nListen [::]:" + port
- allConf = allConf.replace(listen,listen + "\nListen " + port + listen_ipv6)
+ allConf = allConf.replace(listen,listen + "Listen " + port + listen_ipv6 + "\n")
public.writeFile(filename, allConf)
return True
@@ -633,7 +636,7 @@ include /www/server/panel/vhost/openlitespeed/proxy/BTSITENAME/*.conf
public.ExecShell("rm -f " + public.GetConfigValue('logs_path') + '/' + siteName + "-*")
#删除备份
- public.ExecShell("rm -f "+session['config']['backup_path']+'/site/'+siteName+'_*')
+ #public.ExecShell("rm -f "+session['config']['backup_path']+'/site/'+siteName+'_*')
#删除根目录
if 'path' in get:
@@ -1423,10 +1426,11 @@ listener SSL443 {
ssl_certificate /www/server/panel/vhost/cert/%s/fullchain.pem;
ssl_certificate_key /www/server/panel/vhost/cert/%s/privkey.pem;
ssl_protocols TLSv1.1 TLSv1.2%s;
- ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
+ ssl_ciphers EECDH+CHACHA20:EECDH+CHACHA20-draft:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
ssl_prefer_server_ciphers on;
ssl_session_cache shared:SSL:10m;
ssl_session_timeout 10m;
+ add_header Strict-Transport-Security "max-age=31536000";
error_page 497 https://$host$request_uri;
""" % (get.first_domain, get.first_domain,self.get_tls13())
if (conf.find('ssl_certificate') != -1):
@@ -1500,7 +1504,7 @@ listener SSL443 {
SSLEngine On
SSLCertificateFile /www/server/panel/vhost/cert/%s/fullchain.pem
SSLCertificateKeyFile /www/server/panel/vhost/cert/%s/privkey.pem
- SSLCipherSuite EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH
+ SSLCipherSuite EECDH+CHACHA20:EECDH+CHACHA20-draft:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5
SSLProtocol All -SSLv2 -SSLv3 -TLSv1
SSLHonorCipherOrder On
%s
@@ -1701,7 +1705,6 @@ listener SSL443 {
detail_file = self.setupPath + '/panel/vhost/openlitespeed/detail/' + siteName + '.conf'
force_https = self.setupPath + '/panel/vhost/openlitespeed/redirect/' + siteName
string = 'rm -f {}/force_https.conf*'.format(force_https)
- public.writeFile("/tmp/2",string)
public.ExecShell(string)
detail_conf = public.readFile(detail_file)
if detail_conf:
@@ -1739,6 +1742,7 @@ listener SSL443 {
type = 0
if os.path.exists(path + '/README'): type = 1
if os.path.exists(path + '/partnerOrderId'): type = 2
+ if os.path.exists(path + '/certOrderId'): type = 3
csrpath = path + "/fullchain.pem" # 生成证书路径
keypath = path + "/privkey.pem" # 密钥文件路径
key = public.readFile(keypath)
@@ -1792,8 +1796,11 @@ listener SSL443 {
if 'dnsapi' in crontab_config[siteName]:
auth_type = 'dns'
-
- return {'status': status, 'domain': domains, 'key': key, 'csr': csr, 'type': type, 'httpTohttps': toHttps,'cert_data':cert_data,'email':email,"index":index,'auth_type':auth_type}
+ if os.path.exists(path + '/certOrderId'): type = 3
+ oid = -1
+ if type == 3:
+ oid = int(public.readFile(path + '/certOrderId'))
+ return {'status': status,'oid':oid, 'domain': domains, 'key': key, 'csr': csr, 'type': type, 'httpTohttps': toHttps,'cert_data':cert_data,'email':email,"index":index,'auth_type':auth_type}
#启动站点
@@ -2887,7 +2894,7 @@ server
if get.todomain:
if not re.search(tod,get.todomain):
return public.returnMsg(False, 'SENT_DOMAIN_FORMAT', (get.todomain,))
- else:
+ if public.get_webserver() != 'openlitespeed':
get.todomain = "$host"
# 检测目标URL格式
@@ -3085,9 +3092,10 @@ RewriteRule ^%s(.*)$ http://%s/$1 [P,E=Proxy-Host:%s]
status = self.SetProxy(get)
if not status["status"]:
return status
- get.version = '00'
- get.siteName = get.sitename
- self.SetPHPVersion(get)
+ if get.proxydir == '/':
+ get.version = '00'
+ get.siteName = get.sitename
+ self.SetPHPVersion(get)
public.serviceReload()
return public.returnMsg(True, 'ADD_SUCCESS')
diff --git a/class/panelTask.py b/class/panelTask.py
index 41edeeeb..113281d6 100644
--- a/class/panelTask.py
+++ b/class/panelTask.py
@@ -17,15 +17,16 @@ import public
import sys
import os
import re
-sys.path.insert(0, '/www/server/panel/class')
os.chdir('/www/server/panel')
-
+if not 'class/' in sys.path:
+ sys.path.insert(0,'class/')
class bt_task:
__table = 'task_list'
__task_tips = '/dev/shm/bt_task_now.pl'
__task_path = '/www/server/panel/tmp/'
down_log_total_file = '/tmp/download_total.pl'
+ not_web = False
def __init__(self):
# 创建数据表
@@ -66,7 +67,7 @@ class bt_task:
data = sql.field('id,name,type,shell,other,status,exectime,endtime,addtime').order(
'id asc').limit('10').select()
if type(data) == str:
- public.WriteLog('Task queue',data)
+ public.WriteLog('TASK_QUEUE',data)
return []
if not 'num' in get:
get.num = 15
@@ -139,7 +140,7 @@ class bt_task:
"kill -9 $(ps aux|grep '"+task_info['shell']+"'|grep -v grep|awk '{print $2}')")
public.ExecShell("/etc/init.d/bt start")
- return public.returnMsg(True, '任务已取消!')
+ return public.returnMsg(True, 'TASK_CANCEL')
# 取一条任务
def get_task_find(self, id):
@@ -219,7 +220,9 @@ class bt_task:
log_file = self.__task_path + str(id) + '.log'
if not os.path.exists(log_file):
data = ''
- if(task_type == '1'): data = {'name':public.GetMsg("DOWNLOAD_FILE"),'total':0,'used':0,'pre':0,'speed':0}
+ if(task_type == '1'):
+ data = {'name': public.GetMsg("DOWNLOAD_FILE"), 'total': 0, 'used': 0,
+ 'pre': 0, 'speed': 0, 'time': 0}
return data
if(task_type == '1'):
@@ -245,7 +248,7 @@ class bt_task:
speed_total = re.findall(
r"([\d\.]+[BbKkMmGg]).+\s+(\d+)%\s+([\d\.]+[KMBGkmbg])\s+(\w+[sS])", speed_tmp)
if not speed_total:
- data = {'name':'download file {}'.format(filename),'total':0,'used':0,'pre':0,'speed':0,'time':0}
+ data = {'name':public.getMsg('DOWNLOAD_FILE1',(filename,)),'total':0,'used':0,'pre':0,'speed':0,'time':0}
else:
speed_total = speed_total[0]
used = speed_total[0]
@@ -312,7 +315,7 @@ class bt_task:
return public.returnMsg(False,'NOT_SUP_COMP_FORMAT')
self.set_file_accept(dfile)
- public.WriteLog("TYPE_FILE", 'ZIP_SUCCESS', (sfiles, dfile))
+ public.WriteLog("TYPE_FILE", 'ZIP_SUCCESS', (sfiles, dfile),not_web = self.not_web)
return public.returnMsg(True, 'ZIP_SUCCESS')
# 文件解压
@@ -356,7 +359,7 @@ class bt_task:
user = pwd.getpwuid(os.stat(dfile).st_uid).pw_name
public.ExecShell("chown %s:%s %s" % (user, user, dfile))
- public.WriteLog("TYPE_FILE", 'UNZIP_SUCCESS', (sfile, dfile))
+ public.WriteLog("TYPE_FILE", 'UNZIP_SUCCESS', (sfile, dfile),not_web = self.not_web)
return public.returnMsg(True, 'UNZIP_SUCCESS')
# 备份网站
@@ -378,7 +381,7 @@ class bt_task:
sql = public.M('backup').add('type,name,pid,filename,size,addtime',
(0, fileName, find['id'], zipName, 0, public.getDate()))
- public.WriteLog('TYPE_SITE', 'SITE_BACKUP_SUCCESS', (find['name'],))
+ public.WriteLog('TYPE_SITE', 'SITE_BACKUP_SUCCESS', (find['name'],),not_web = self.not_web)
return public.returnMsg(True, 'BACKUP_SUCCESS')
# 备份数据库
@@ -405,7 +408,7 @@ class bt_task:
addTime = time.strftime('%Y-%m-%d %X', time.localtime())
sql.add('type,name,pid,filename,size,addtime',
(1, fileName, id, backupName, 0, addTime))
- public.WriteLog("TYPE_DATABASE", "DATABASE_BACKUP_SUCCESS", (name,))
+ public.WriteLog("TYPE_DATABASE", "DATABASE_BACKUP_SUCCESS", (name,),not_web = self.not_web)
return public.returnMsg(True, 'BACKUP_SUCCESS')
# 导入数据库
@@ -454,7 +457,7 @@ class bt_task:
'setup_path') + "/mysql/bin/mysql -uroot -p" + root + " --force \"" + name + "\" < " + file)
self.mypass(False, root)
- public.WriteLog("TYPE_DATABASE", 'DATABASE_INPUT_SUCCESS', (name,))
+ public.WriteLog("TYPE_DATABASE", 'DATABASE_INPUT_SUCCESS', (name,),not_web = self.not_web)
return public.returnMsg(True, 'DATABASE_INPUT_SUCCESS')
# 配置
@@ -479,7 +482,6 @@ class bt_task:
from collections import namedtuple
get = namedtuple('get',['path'])
get.path = filename
- public.writeFile('/tmp/2',str(get.path))
files.files().fix_permissions(get)
# 检查敏感目录
diff --git a/class/panel_restore.py b/class/panel_restore.py
index 2a46cae1..22a65a8e 100644
--- a/class/panel_restore.py
+++ b/class/panel_restore.py
@@ -164,7 +164,8 @@ class panel_restore:
result = self._restore_backup(self._local_file, site_info, args)
else:
return public.ExecShell(False,'Currently only supports restoring local, Google storage and AWS S3 backups')
- os.remove(self._local_file)
+ if os.path.exists(self._local_file):
+ os.remove(self._local_file)
if result:
self._progress_rewrite('Recovery failed: {}'.format(str(site_info['site_path'])))
return result
diff --git a/class/public.py b/class/public.py
index c46c3283..2372f71e 100644
--- a/class/public.py
+++ b/class/public.py
@@ -32,8 +32,9 @@ def M(table):
ps: 默认访问data/default.db
"""
import db
- sql = db.Sql()
- return sql.table(table)
+ with db.Sql() as sql:
+ #sql = db.Sql()
+ return sql.table(table)
def HttpGet(url,timeout = 6,headers = {}):
"""
@@ -317,7 +318,7 @@ def GetJson(data):
try:
return dumps(data,ensure_ascii=False)
except:
- return dumps(returnMsg(False,"Wrong response: %s" % str(data)))
+ return dumps(returnMsg(False,"WRONG_RESPONSE", (str(data))))
def getJson(data):
return GetJson(data)
@@ -341,10 +342,10 @@ def ReadFile(filename,mode = 'r'):
f_body = fp.read()
fp.close()
except Exception as ex2:
- WriteLog('Open File',str(ex2))
+ WriteLog('OPEN_FILE',str(ex2))
return False
else:
- WriteLog('Open File',str(ex))
+ WriteLog('OPEN_FILE',str(ex))
return False
return f_body
@@ -375,19 +376,20 @@ def WriteFile(filename,s_body,mode='w+'):
def writeFile(filename,s_body,mode='w+'):
return WriteFile(filename,s_body,mode)
-def WriteLog(type,logMsg,args=()):
+def WriteLog(type,logMsg,args=(),not_web = False):
#写日志
#try:
import time,db,json
username = 'system'
uid = 1
- try:
- from BTPanel import session
- if 'username' in session:
- username = session['username']
- uid = session['uid']
- except:
- pass
+ if not not_web:
+ try:
+ from BTPanel import session
+ if 'username' in session:
+ username = session['username']
+ uid = session['uid']
+ except:
+ pass
global _LAN_LOG
if not _LAN_LOG:
_LAN_LOG = json.loads(ReadFile('BTPanel/static/language/' + GetLanguage() + '/log.json'))
@@ -624,8 +626,10 @@ def get_url(timeout = 0.5):
mnode1 = []
mnode2 = []
mnode3 = []
+ new_node_list = {}
for node in node_list:
node['net'],node['ping'] = get_timeout(node['protocol'] + node['address'] + ':' + node['port'] + '/net_test',1)
+ new_node_list[node['address']] = node['ping']
if not node['ping']: continue
if node['ping'] < 100: #当响应时间<100ms且可用带宽大于1500KB时
if node['net'] > 1500:
@@ -645,6 +649,16 @@ def get_url(timeout = 0.5):
mnode = sorted(mnode2,key= lambda x:x['ping'],reverse=False)
if not mnode: return 'http://download.bt.cn'
+
+ new_node_keys = new_node_list.keys()
+ for i in range(len(node_list)):
+ if node_list[i]['address'] in new_node_keys:
+ node_list[i]['ping'] = new_node_list[node_list[i]['address']]
+ else:
+ node_list[i]['ping'] = 500
+
+ new_node_list = sorted(node_list,key=lambda x: x['ping'],reverse=False)
+ writeFile(nodeFile,json.dumps(new_node_list))
return mnode[0]['protocol'] + mnode[0]['address'] + ':' + mnode[0]['port']
except:
return 'http://download.bt.cn'
@@ -1356,7 +1370,7 @@ def write_request_log(reques = None):
log_file = getDate(format='%Y-%m-%d') + '.json'
if not os.path.exists(log_path): os.makedirs(log_path)
- from flask import request
+ from BTPanel import request
log_data = []
log_data.append(getDate())
log_data.append(GetClientIp() + ':' + str(request.environ.get('REMOTE_PORT')))
@@ -1364,6 +1378,7 @@ def write_request_log(reques = None):
log_data.append(request.full_path)
log_data.append(request.headers.get('User-Agent'))
WriteFile(log_path + '/' + log_file,json.dumps(log_data) + "\n",'a+')
+ rep_sys_path()
except: pass
# 重载模块
@@ -1545,6 +1560,7 @@ def auto_backup_panel():
shutil.copytree(panel_paeh + '/data',backup_path + '/data')
shutil.copytree(panel_paeh + '/config',backup_path + '/config')
shutil.copytree(panel_paeh + '/vhost',backup_path + '/vhost')
+ ExecShell("chmod -R 600 {path};chown -R root.root {path}".format(paht=b_path))
time_now = time.time() - (86400 * 15)
for f in os.listdir(b_path):
try:
@@ -1723,7 +1739,7 @@ def import_cdn_plugin():
try:
import static_cdn_main
except:
- sys.path.insert(0,plugin_path)
+ package_path_append(plugin_path)
import static_cdn_main
@@ -1737,6 +1753,8 @@ def get_cdn_hosts():
def get_cdn_url():
try:
+ if os.path.exists('plugin/static_cdn/not_open.pl'):
+ return False
from BTPanel import cache
cdn_url = cache.get('cdn_url')
if cdn_url: return cdn_url
@@ -1921,6 +1939,74 @@ def restore_file(file, act=None):
file_type = "_def"
ExecShell("/usr/bin/cp -p {1} {0}".format(file, file + file_type))
+
+def package_path_append(path):
+ if not path in sys.path:
+ sys.path.insert(0, path)
+
+
+def rep_sys_path():
+ sys_path = []
+ for p in sys.path:
+ if p in sys_path: continue
+ sys_path.append(p)
+ sys.path = sys_path
+
+
+def get_ssh_port():
+ '''
+ @name 获取本机SSH端口
+ @author hwliang<2020-08-07>
+ @return int
+ '''
+ s_file = '/etc/ssh/sshd_config'
+ conf = readFile(s_file)
+ if not conf: conf = ''
+ rep = r"#*Port\s+([0-9]+)\s*\n"
+ tmp1 = re.search(rep, conf)
+ ssh_port = 22
+ if tmp1:
+ ssh_port = int(tmp1.groups(0)[0])
+ return ssh_port
+
+def set_error_num(key,empty = False,expire=3600):
+ '''
+ @name 设置失败次数(每调用一次+1)
+ @author hwliang<2020-08-21>
+ @param key 索引
+ @param empty 是否清空计数
+ @param expire 计数器生命周期(秒)
+ @return bool
+ '''
+ from BTPanel import cache
+ num = cache.get(key)
+ if not num:
+ num = 0
+ else:
+ if empty:
+ cache.delete(key)
+ return True
+ cache.set(key,num + 1,expire)
+ return True
+
+def get_error_num(key,limit=False):
+ '''
+ @name 获取失败次数
+ @author hwliang<2020-08-21>
+ @param key 索引
+ @param limit 如果为False，则直接返回失败次数，否则与失败次数比较，若大于失败次数返回True，否则返回False
+ @return int or bool
+ '''
+ from BTPanel import cache
+ num = cache.get(key)
+ if not num: num = 0
+ if not limit:
+ return num
+ if limit > num:
+ return True
+ return False
+
+
#取通用对象
class dict_obj:
def __contains__(self, key):
diff --git a/class/ssh_terminal.py b/class/ssh_terminal.py
index 36231fe2..e50aaba8 100644
--- a/class/ssh_terminal.py
+++ b/class/ssh_terminal.py
@@ -6,200 +6,919 @@
# +-------------------------------------------------------------------
# | Author: hwliang
# +-------------------------------------------------------------------
-try:
- import paramiko
-except: pass
import json
import time
import os
import sys
import socket
import threading
+import re
-sys.path.insert(0, '/www/server/panel/class/')
-import public
+
+if not 'class/' in sys.path:
+ sys.path.insert(0,'class/')
from io import BytesIO, StringIO
-from BTPanel import session
+
+def returnMsg(status,msg):
+ return {'status':status,'msg':msg}
+
+import public
class ssh_terminal:
- __log_type = 'aaPanel terminal'
- _coll_user = None
+ _panel_path = '/www/server/panel'
+ _save_path = _panel_path + '/config/ssh_info/'
_host = None
- _web_socket = None
- _ssh_info = None
- _ssh_socket = None
- _en_key = '4BbA7076e19H'
- _thread = None
- _my_terms = {}
- _room = "ssh_data"
- _send_last = False
- _send_last_time = 0
- _connect_time = 0
+ _port = 22
+ _user = None
+ _pass = None
+ _pkey = None
+ _ws = None
+ _ssh = None
+ _last_cmd = ""
+ _last_cmd_tip = 0
+ _log_type = public.getMsg('TYPE_TERMINAL')
+ _history_len = 0
+ _client = ""
+ _rep_ssh_config = False
+ _sshd_config_backup = None
+ _rep_ssh_service = False
- def __init__(self):
- pass
+ def connect(self):
+ '''
+ @name 连接服务器
+ @author hwliang<2020-08-07>
+ @return dict{
+ status: bool 状态
+ msg: string 详情
+ }
+ '''
+ if not self._host: return returnMsg(False,'错误的连接地址')
+ if not self._user: self._user = 'root'
+ if not self._port: self._port = 22
+ self.is_local()
- def connect(self, ssh_info=None):
- if ssh_info: self._ssh_info = ssh_info
- if not self._host: self._host = self._ssh_info['host']
- # print('----------连接时的ssh_info--------------')
- if self._ssh_info['host'] in self._my_terms:
- if time.time() - self._my_terms[self._host].last_time < 86400:
- return True
try:
+ if self._rep_ssh_config: time.sleep(0.1)
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 262144)
- sock.connect((self._ssh_info['host'], int(self._ssh_info['port'])))
+ sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 8192)
+ sock.connect((self._host, self._port))
except Exception as e:
- self._web_socket.send("\rServer connection failed!\r")
- return False
- # 使用Transport连接
- p1 = paramiko.Transport(sock)
- p1.start_client()
- if not 'pkey' in self._ssh_info: self._ssh_info['pkey'] = None
- if not 'c_type' in self._ssh_info: self._ssh_info['c_type'] = None
+ self.set_sshd_config(True)
+ return returnMsg(False,"CONCTION_FAILURE")
+ import paramiko
+
+ self._ssh = paramiko.Transport(sock)
+
try:
- # 如果有pkey时则使用RSA私钥登录
- if self._ssh_info['pkey'] and self._ssh_info['c_type']:
- # print('------使用私钥登陆---------')
- # 将RSA私钥转换为io对象，然后生成rsa_key对象
- p_file = StringIO(self._ssh_info['pkey'])
+ self._ssh.start_client()
+ if not self._pass and not self._pkey:
+ self.set_sshd_config(True)
+ return public.returnMsg(False,'SSH_LOGIN_INFO_ERR',(self._host,self._port))
+ self._ssh.banner_timeout=60
+ if self._pkey:
+ if sys.version_info[0] == 2:
+ p_file = BytesIO(self._pkey)
+ else:
+ p_file = StringIO(self._pkey)
pkey = paramiko.RSAKey.from_private_key(p_file)
- p1.auth_publickey(username=self._ssh_info['username'].strip(), key=pkey)
+ self._ssh.auth_publickey(username=self._user, key=pkey)
else:
- # print('-----------使用密码登陆-----------')
- p1.auth_password(username=self._ssh_info['username'].strip(), password=self._ssh_info['password'])
+ self._ssh.auth_password(username=self._user, password=self._pass)
except Exception as e:
- self._web_socket.send("\rWrong user name or password!\r")
- p1.close()
+ self.set_sshd_config(True)
+ self._ssh.close()
+ e = str(e)
+ if e.find('Authentication failed') != -1:
+ if self._host in ['127.0.0.1','localhost'] and self._pkey:
+ return returnMsg(False,'SSH_LOGIN_ERR')
+ return returnMsg(False,'SSH_LOGIN_ERR1',(e + "," + self._user,))
+ if e.find('Bad authentication type; allowed types') != -1:
+ return returnMsg(False,'SSH_LOGIN_ERR2',(e,))
+ if e.find('Connection reset by peer') != -1:
+ return returnMsg(False,'SSH_LOGIN_ERR3')
+ if e.find('Error reading SSH protocol banner') != -1:
+ return returnMsg(False,'SSH_LOGIN_ERR4',(e,))
+ if not e:
+ return returnMsg(False,"SSH_LOGIN_ERR5")
+ return returnMsg(False,"SSH_LOGIN_ERR6",(public.get_error_info(),))
+
+ self._ssh = self._ssh.open_session()
+ self._ssh.get_pty(term='xterm', width=100, height=34)
+ self._ssh.invoke_shell()
+ self._connect_time = time.time()
+ self._last_send = []
+ from BTPanel import request
+ self._client = public.GetClientIp() +':' + str(request.environ.get('REMOTE_PORT'))
+ public.WriteLog(self._log_type,'SSH_LOGIN',(self._host,self._port))
+ self.history_send("LOGIN_SUCCESS2")
+ self.set_sshd_config(True)
+ return returnMsg(True,'CONNECTION_SUCCEEDED')
+
+
+ def get_login_user(self):
+ '''
+ @name 获取本地登录用户
+ @author hwliang<2020-08-07>
+ @return string
+ '''
+
+ if self._user != 'root': return self._user
+ l_user = 'root'
+ ssh_config_file = '/etc/ssh/sshd_config'
+ ssh_config = public.readFile(ssh_config_file)
+ if not ssh_config: return l_user
+
+ if ssh_config.find('PermitRootLogin yes') != -1: return l_user
+
+
+ user_list = self.get_ulist()
+ login_user = ''
+ for u_info in user_list:
+ if u_info['user'] == 'root': continue
+ if u_info['login'] == '/bin/bash':
+ login_user = u_info['user']
+ break
+
+ if not login_user:
+ return l_user
+
+ return login_user
+
+
+ def get_ulist(self):
+ '''
+ @name 获取本地用户列表
+ @author hwliang<2020-08-07>
+ @return list
+ '''
+ u_data = public.readFile('/etc/passwd')
+ u_list = []
+ for i in u_data.split("\n"):
+ u_tmp = i.split(':')
+ if len(u_tmp) < 3: continue
+ u_info = {}
+ u_info['user'],u_info['pass'],u_info['uid'],u_info['gid'],u_info['user_msg'],u_info['home'],u_info['login'] = u_tmp
+ u_list.append(u_info)
+ return u_list
+
+ def is_local(self):
+ '''
+ @name 处理本地连接
+ @author hwliang<2020-08-07>
+ @ps 如果host为127.0.0.1或localhost，则尝试自动使用publicKey登录
+ @return void
+ '''
+
+ if self._pass: return
+ if self._host in ['127.0.0.1','localhost']:
+ try:
+ login_user = self.get_login_user()
+ self.set_sshd_config()
+ if self._user == 'root' and login_user == 'root':
+ id_rsa_file = ['/root/.ssh/id_rsa','/root/.ssh/id_rsa_bt']
+ for ifile in id_rsa_file:
+ if os.path.exists(ifile):
+ self._pkey = public.readFile(ifile)
+ host_path = self._save_path + self._host
+ if not os.path.exists(host_path):
+ os.makedirs(host_path,384)
+ return
+
+
+ if not self._pass or not self._pkey or not self._user:
+ home_path = '/home/' + login_user
+ if login_user == 'root':
+ home_path = '/root'
+ self._user = login_user
+ id_rsa_file = [home_path + '/.ssh/id_rsa',home_path + '/.ssh/id_rsa_bt']
+ for ifile in id_rsa_file:
+ if os.path.exists(ifile):
+ self._pkey = public.readFile(ifile)
+ return
+
+ _ssh_ks = home_path + '/.ssh'
+ if not os.path.exists(_ssh_ks):
+ os.makedirs(_ssh_ks,384)
+ os.system("ssh-keygen -t rsa -P '' -f {}/.ssh/id_rsa |echo y".format(home_path))
+ pub_file = home_path + '/.ssh/id_rsa.pub'
+ az_file = home_path + '/.ssh/authorized_keys'
+ rsa_file = home_path + '/.ssh/id_rsa'
+ public.ExecShell('cat {} >> {} && chmod 600 {} {}'.format(pub_file, az_file, az_file,rsa_file))
+ os.remove(pub_file)
+ public.ExecShell("chown -R {}:{} {}".format(self._user,self._user,_ssh_ks))
+ public.ExecShell("chmod -R 600 {}".format(_ssh_ks))
+ self._pkey = public.readFile(rsa_file)
+ except:
+ return
+
+ def get_sys_version(self):
+ '''
+ @name 获取操作系统版本
+ @author hwliang<2020-08-13>
+ @return bool
+ '''
+ version = public.readFile('/etc/redhat-release')
+ if not version:
+ version = public.readFile('/etc/issue').strip().split("\n")[0].replace('\\n','').replace('\l','').strip()
+ else:
+ version = version.replace('release ','').replace('Linux','').replace('(Core)','').strip()
+ return version
+
+ def get_ssh_status(self):
+ '''
+ @name 获取SSH服务状态
+ @author hwliang<2020-08-13>
+ @return bool
+ '''
+ version = self.get_sys_version()
+ if os.path.exists('/usr/bin/apt-get'):
+ if os.path.exists('/etc/init.d/sshd'):
+ status = public.ExecShell("service sshd status | grep -P '(dead|stop|not running)'|grep -v grep")
+ else:
+ status = public.ExecShell("service ssh status | grep -P '(dead|stop|not running)'|grep -v grep")
+ else:
+ if version.find(' 7.') != -1 or version.find(' 8.') != -1 or version.find('Fedora') != -1:
+ status = public.ExecShell("systemctl status sshd.service | grep 'dead'|grep -v grep")
+ else:
+ status = public.ExecShell("/etc/init.d/sshd status | grep -e 'stopped' -e '已停'|grep -v grep")
+ if len(status[0]) > 3:
+ status = False
+ else:
+ status = True
+ return status
+
+ def is_running(self,rep = False):
+ '''
+ @name 处理SSH服务状态
+ @author hwliang<2020-08-13>
+ @param rep 是否恢复原来的SSH服务状态
+ @return bool
+ '''
+ try:
+ if rep and self._rep_ssh_service:
+ self.restart_ssh('stop')
+ return True
+
+ ssh_status = self.get_ssh_status()
+ if not ssh_status:
+ self.restart_ssh('start')
+ self._rep_ssh_service = True
+ return True
+ return False
+ except:
return False
- self._my_terms[self._host] = public.dict_obj()
- self._my_terms[self._host].last_time = time.time()
- self._my_terms[self._host].connect_time = time.time()
- # 打开会话
- self._my_terms[self._host].tty = p1.open_session()
- # 获取终端对象
- self._my_terms[self._host].tty.get_pty(term='xterm', width=100, height=34)
- self._my_terms[self._host].tty.invoke_shell()
- # 记录登陆记录
- #public.M('ssh_records').add('coll_user,ssh_user,host,cmd,addtime', (self._coll_user, self._ssh_info['username'], self._ssh_info['host'], 'login', int(time.time())))
- #print("登录成功")
- self._my_terms[self._host].last_send = []
- self._send_last = True
- self._connect_time = time.time()
- return True
- def resize(self, data):
+ def set_sshd_config(self,rep = False):
+ '''
+ @name 设置本地SSH配置文件，以支持pubkey认证
+ @author hwliang<2020-08-13>
+ @param rep 是否恢复ssh配置文件
+ @return bool
+ '''
+ self.is_running(rep)
+ if rep and not self._rep_ssh_config:
+ return False
+
try:
- data = json.loads(data)
- self._my_terms[self._host].tty.resize_pty(width=data['width'], height=data['height'], width_pixels=data['width_px'], height_pixels=data['height_px'])
+ sshd_config_file = '/etc/ssh/sshd_config'
+ if not os.path.exists(sshd_config_file):
+ return False
+
+ sshd_config = public.readFile(sshd_config_file)
+
+ if not sshd_config:
+ return False
+
+ if rep:
+ if self._sshd_config_backup:
+ public.writeFile(sshd_config_file,self._sshd_config_backup)
+ self.restart_ssh()
+ return True
+
+ pin = r'^\s*PubkeyAuthentication\s+(yes|no)'
+ pubkey_status = re.findall(pin,sshd_config,re.I)
+ if pubkey_status:
+ if pubkey_status[0] == 'yes':
+ pubkey_status = True
+ else:
+ pubkey_status = False
+
+ pin = r'^\s*RSAAuthentication\s+(yes|no)'
+ rsa_status = re.findall(pin,sshd_config,re.I)
+ if rsa_status:
+ if rsa_status[0] == 'yes':
+ rsa_status = True
+ else:
+ rsa_status = False
+
+ self._sshd_config_backup = sshd_config
+ is_write = False
+ if not pubkey_status:
+ sshd_config = re.sub(r'\n#?PubkeyAuthentication\s\w+','\nPubkeyAuthentication yes',sshd_config)
+ is_write = True
+ if not rsa_status:
+ sshd_config = re.sub(r'\n#?RSAAuthentication\s\w+','\nRSAAuthentication yes',sshd_config)
+ is_write = True
+
+ if is_write:
+ public.writeFile(sshd_config_file,sshd_config)
+ self._rep_ssh_config = True
+ self.restart_ssh()
+ else:
+ self._sshd_config_backup = None
+
return True
except:
- print(public.get_error_info())
return False
- def send(self):
- try:
- while not self._web_socket.closed:
- c_data = self._web_socket.receive()
- if not c_data: continue
- if len(c_data) > 10:
- if c_data.find('new_terminal') != -1:
- if not self._host in self._my_terms:
- self.connect()
- else:
- if time.time() - self._connect_time > 3:
- self.last_send()
- continue
- if c_data.find("reset_connect") != -1:
- if not self._host in self._my_terms: self.connect()
- continue
+ def restart_ssh(self,act = 'reload'):
+ '''
+ 重启ssh 无参数传递
+ '''
+ version = public.readFile('/etc/redhat-release')
+ if not os.path.exists('/etc/redhat-release'):
+ public.ExecShell('service ssh ' + act)
+ elif version.find(' 7.') != -1 or version.find(' 8.') != -1:
+ public.ExecShell("systemctl " + act + " sshd.service")
+ else:
+ public.ExecShell("/etc/init.d/sshd " + act)
- if self._host in self._my_terms:
- self._my_terms[self._host].last_time = time.time()
- self._my_terms[self._host].tty.send(c_data)
- else:
- return
+ def resize(self, data):
+ '''
+ @name 调整终端大小
+ @author hwliang<2020-08-07>
+ @param data 终端尺寸数据
+ {
+ cols: int 列
+ rows: int 行
+ }
+ @return bool
+ '''
+ try:
+ data = json.loads(data)
+ self._ssh.resize_pty(width=data['cols'], height=data['rows'])
+ return True
except:
- print(public.get_error_info())
+ return False
+
def recv(self):
+ '''
+ @name 读取tty缓冲区数据
+ @author hwliang<2020-08-07>
+ @return void
+ '''
try:
- n = 0
- while not self._web_socket.closed:
- self.not_send()
- #if n == 0: self.last_send()
- data = self._my_terms[self._host].tty.recv(1024)
- self.not_send()
- if not data:
+ while not self._ws.closed:
+ resp_line = self._ssh.recv(1024)
+ if not resp_line:
+ self._ws.send(public.getMsg('RECONNECT_SSH'))
self.close()
- self._web_socket.send('The connection has been disconnected and pressing Enter will attempt to reconnect!')
+ return
+
+ if not resp_line: continue
+ if self._ws.closed:
return
try:
- result = data.decode()
+ result = resp_line.decode()
except:
- result = str(data)
- if not result: continue
- if self._web_socket.closed:
- self._my_terms[self._host].not_send = result
- return
- self.set_last_send(result)
- if not n: n = 1
- self._web_socket.send(result)
+ result = str(resp_line)
+ self._ws.send(result)
+
+ self.history_recv(result)
except:
- print(public.get_error_info())
+ self._ws.send(public.get_error_info())
+ self.close()
- def set_last_send(self,result):
- last_size = 1024
- if not 'last_send' in self._my_terms[self._host]:
- self._my_terms[self._host].last_send = []
+ def send(self):
+ '''
+ @name 写入数据到缓冲区
+ @author hwliang<2020-08-07>
+ @return void
+ '''
+ try:
+ while not self._ws.closed:
+ client_data = self._ws.receive()
+ if not client_data: continue
+ if len(client_data) > 10:
+ if client_data.find('{"host":"') != -1:
+ continue
+ if client_data.find('"resize":1') != -1:
+ self.resize(client_data)
+ continue
+ self._ssh.send(client_data)
+ self.history_send(client_data)
+ except Exception as ex:
+ ex = str(ex)
+ if ex.find('_io.BufferedReader') != -1:
+ self.send()
+ return
+ self.close()
- self._my_terms[self._host].last_send.append(result)
- last_len = len(self._my_terms[self._host].last_send)
- if last_len > last_size:
- self._my_terms[self._host].last_send = self._my_terms[self._host].last_send[last_len-last_size:]
- def not_send(self):
- if 'not_send' in self._my_terms[self._host]:
- if self._my_terms[self._host].not_send:
- self._web_socket.send(self._my_terms[self._host].not_send)
- self._my_terms[self._host].not_send = ""
+ def history_recv(self,recv_data):
+ '''
+ @name 从接收实体保存命令
+ @author hwliang<2020-08-12>
+ @param recv_data 数据实体
+ @return void
+ '''
+ #处理TAB补登
+ if self._last_cmd_tip == 1:
+ if not recv_data.startswith('\r\n'):
+ self._last_cmd += recv_data.replace('\u0007','').strip()
+ self._last_cmd_tip = 0
+
+ #上下切换命令
+ if self._last_cmd_tip == 2:
+ self._last_cmd = recv_data.strip().replace("\x08","").replace("\x07","").replace("\x1b[K","")
+ self._last_cmd_tip = 0
+
+ def history_send(self,send_data):
+ '''
+ @name 从发送实体保存命令
+ @author hwliang<2020-08-12>
+ @param send_data 数据实体
+ @return void
+ '''
+ if not send_data: return
+ his_path = self._save_path + self._host
+ if not os.path.exists(his_path): return
+ his_file = his_path + '/history.pl'
+
+ #上下切换命令
+ if send_data in ["\x1b[A","\x1b[B"]:
+ self._last_cmd_tip = 2
+ return
+
+ #退格
+ if send_data == "\x7f":
+ self._last_cmd = self._last_cmd[:-1]
+ return
+
+ #过滤特殊符号
+ if send_data in ["\x1b[C","\x1b[D","\x1b[K","\x07","\x08","\x03","\x01","\x02","\x04","\x05","\x06","\u0007"]:
+ return
+
+ #Tab补全处理
+ if send_data == '\t':
+ self._last_cmd_tip = 1
+ return
+
+ if send_data[-1] in ['\r','\n']:
+ if not self._last_cmd: return
+ his_shell = [int(time.time()),self._client,self._user,self._last_cmd]
+ public.writeFile(his_file, json.dumps(his_shell) + "\n","a+")
+ self._last_cmd = ""
+
+ #超过5M则保留最新的200行
+ if os.stat(his_file).st_size > 5242880:
+ his_tmp = public.GetNumLines(his_file,200)
+ public.writeFile(his_file, his_tmp)
+ else:
+ self._last_cmd += send_data
- def last_send(self):
- if time.time()- self._send_last_time < 3: return False
- self._send_last_time = time.time()
- time.sleep(0.3)
- if not self._host in self._my_terms: return False
- if 'last_send' in self._my_terms[self._host]:
- for d in self._my_terms[self._host].last_send:
- self._web_socket.send(d)
def close(self):
+ '''
+ @name 释放连接
+ @author hwliang<2020-08-07>
+ @return void
+ '''
try:
- self._my_terms[self._host].tty.close()
- except:pass
- if self._host in self._my_terms:
- del self._my_terms[self._host]
- self._thread = None
+ if self._ssh:
+ self._ssh.close()
+ self._ssh = None
+ if not self._ws.closed:
+ self._ws.close()
+ self._ws = None
+ except:
+ pass
+
+
+ def set_attr(self,ssh_info):
+ '''
+ @name 设置对象属性，并连接服务器
+ @author hwliang<2020-08-07>
+ @return void
+ '''
+ self._host = ssh_info['host'].strip()
+ self._port = int(ssh_info['port'])
+ if 'username' in ssh_info:
+ self._user = ssh_info['username']
+ if 'pkey' in ssh_info:
+ self._pkey = ssh_info['pkey']
+ if 'password' in ssh_info:
+ self._pass = ssh_info['password']
+
+ result = self.connect()
+ return result
def run(self,web_socket, ssh_info=None):
- self._web_socket = web_socket
- if 'id' in ssh_info:
- self._ssh_info = self.get_server_ssh_info(ssh_info)
+ '''
+ @name 启动SSH客户端对象
+ @author hwliang<2020-08-07>
+ @param web_socket websocket句柄对像
+ @param ssh_info SSH信息{
+ host: 主机地址,
+ port: 端口
+ username: 用户名
+ password: 密码
+ pkey: 密钥(如果不为空，将使用密钥连接)
+ }
+ @return void
+ '''
+ self._ws = web_socket
+ if not self._ssh:
+ if not ssh_info:
+ return
+
+ result = self.set_attr(ssh_info)
else:
- self._ssh_info = ssh_info
- if not self._ssh_info:
- return
- result = self.connect()
- time.sleep(0.1)
- if result:
+ result = returnMsg(True,'已连接')
+
+ if result['status']:
sendt = threading.Thread(target=self.send)
recvt = threading.Thread(target=self.recv)
sendt.start()
recvt.start()
sendt.join()
recvt.join()
- if time.time() - self._my_terms[self._host].last_time > 86400: self.close()
- self._web_socket = None
+ self.close()
+ self._ws = None
+ else:
+ self._ws.send(result['msg'])
+
+ def __del__(self):
+ '''
+ 自动释放
+ '''
+ self.close()
+
+
+
+class ssh_host_admin(ssh_terminal):
+ _panel_path = '/www/server/panel'
+ _save_path = _panel_path + '/config/ssh_info/'
+ _pass_file = _panel_path + '/data/a_pass.pl'
+ _user_command_file = _save_path + '/user_command.json'
+ _sys_command_file = _save_path + '/sys_command.json'
+ _pass_str = None
+
+ def __init__(self):
+ if not os.path.exists(self._save_path):
+ os.makedirs(self._save_path,384)
+ if not os.path.exists(self._pass_file):
+ public.writeFile(self._pass_file,public.GetRandomString(16))
+ public.set_mode(self._pass_file,600)
+ if not self._pass_str:
+ self._pass_str = public.readFile(self._pass_file)
+
+ def get_host_list(self,args = None):
+ '''
+ @name 获取本机保存的SSH信息列表
+ @author hwliang<2020-08-07>
+ @param args
+ @return list
+ '''
+
+ host_list = []
+ for name in os.listdir(self._save_path):
+ info_file = self._save_path + name +'/info.json'
+ if not os.path.exists(info_file): continue
+ info_tmp = self.get_ssh_info(name)
+ host_info = {}
+ host_info['host'] = name
+ host_info['port'] = info_tmp['port']
+ host_info['ps'] = info_tmp['ps']
+ host_info['sort'] = int(info_tmp['sort'])
+
+ host_list.append(host_info)
+
+ host_list = sorted(host_list,key=lambda x: x['sort'],reverse=False)
+ return host_list
+
+ def get_host_find(self,args):
+ '''
+ @name 获取指定SSH信息
+ @author hwliang<2020-08-07>
+ @param args{
+ host: 主机地址
+ }
+ @return dict
+ '''
+ args.host = args.host.strip()
+ info_file = self._save_path + args.host +'/info.json'
+ if not os.path.exists(info_file):
+ return public.returnMsg(False,'SSH_LOGIN_ERR7')
+ info_tmp = self.get_ssh_info(args.host)
+ host_info = {}
+ host_info['host'] = args.host
+ host_info['port'] = info_tmp['port']
+ host_info['ps'] = info_tmp['ps']
+ host_info['sort'] = info_tmp['sort']
+ host_info['username'] = info_tmp['username']
+ host_info['password'] = info_tmp['password']
+ host_info['pkey'] = info_tmp['pkey']
+ return host_info
+
+ def modify_host(self,args):
+ '''
+ @name 修改SSH信息
+ @author hwliang<2020-08-07>
+ @param args{
+ host: 被修改的主机地址,
+ new_host: 新的主机地址,
+ port: 端口
+ ps: 备注
+ sort: 排序(可选)
+ username: 用户名
+ password: 密码
+ pkey: 密钥(如果不为空，将使用密钥连接)
+ }
+ @return dict
+ '''
+ args.new_host = args.new_host.strip()
+ args.host = args.host.strip()
+ if args.host != args.new_host:
+ info_file = self._save_path + args.new_host +'/info.json'
+ if os.path.exists(info_file):
+ return public.returnMsg(False,'SSH_LOGIN_ERR8')
+
+ info_file = self._save_path + args.host +'/info.json'
+
+ if not os.path.exists(info_file):
+ return public.returnMsg(False,'SSH_LOGIN_ERR7')
+
+ if not 'sort' in args:
+ r_data = public.aes_decrypt(public.readFile(info_file),self._pass_str)
+ info_tmp = json.loads(r_data)
+ args.sort = info_tmp['sort']
+
+ host_info = {}
+ host_info['host'] = args.new_host
+ host_info['port'] = int(args['port'])
+ host_info['ps'] = args['ps']
+ host_info['sort'] = args['sort']
+ host_info['username'] = args['username']
+ host_info['password'] = args['password']
+ host_info['pkey'] = args['pkey']
+ if not host_info['pkey']: host_info['pkey'] = ''
+ result = self.set_attr(host_info)
+ if not result['status']: return result
+ self.save_ssh_info(args.host,host_info)
+ if args.host != args.new_host:
+ public.ExecShell('mv {} {}'.format(self._save_path + args.host,self._save_path + args.new_host))
+ public.WriteLog(self._log_type,'MODIFY_SSH_INFO',(args.host,))
+ return public.returnMsg(True,'EDIT_SUCCESS')
+
+ def create_host(self,args):
+ '''
+ @name 添加SSH信息
+ @author hwliang<2020-08-07>
+ @param args{
+ host: 主机地址,
+ port: 端口
+ ps: 备注
+ sort: 排序(可选，默认0)
+ username: 用户名
+ password: 密码
+ pkey: 密钥(如果不为空，将使用密钥连接)
+ }
+ @return dict
+ '''
+ args.host = args.host.strip()
+ host_path = self._save_path + args.host
+ info_file = host_path +'/info.json'
+ if os.path.exists(info_file):
+ return public.returnMsg(False,'SSH_LOGIN_ERR8')
+ if not os.path.exists(host_path):
+ os.makedirs(host_path,384)
+ if not 'sort' in args: args.sort = 0
+ if not 'ps' in args: args.ps = args.host
+ host_info = {}
+ host_info['host'] = args.host
+ host_info['port'] = int(args['port'])
+ host_info['ps'] = args['ps']
+ host_info['sort'] = int(args['sort'])
+ host_info['username'] = args['username']
+ host_info['password'] = args['password']
+ host_info['pkey'] = args['pkey']
+ result = self.set_attr(host_info)
+ if not result['status']: return result
+ self.save_ssh_info(args.host,host_info)
+ public.WriteLog(self._log_type,'ADD_SSH_INFO',(args.host,))
+ return public.returnMsg(True,'SET_SUCCESS')
+
+
+ def remove_host(self,args):
+ '''
+ @name 删除指定SSH信息
+ @author hwliang<2020-08-07>
+ @param args{
+ host: 主机地址
+ }
+ @return dict
+ '''
+ args.host = args.host.strip()
+ if not args.host: return public.returnMsg(False,'INIT_ARGS_ERR')
+ host_path = self._save_path + args.host
+ if not os.path.exists(host_path):
+ return public.returnMsg(False,'SSH_LOGIN_ERR7!')
+ public.ExecShell("rm -rf {}".format(host_path))
+ public.WriteLog(self._log_type,'DEL_SSH_INFO',(args.host,))
+ return public.returnMsg(True,'SET_SUCCESS')
+
+
+ def get_ssh_info(self,host):
+ '''
+ @name 获取并解密指定SSH信息
+ @author hwliang<2020-08-07>
+ @param host 主机地址
+ @return dict or False
+ '''
+ info_file = self._save_path + host + '/info.json'
+ if not os.path.exists(info_file): return False
+ r_data = public.aes_decrypt(public.readFile(info_file),self._pass_str)
+ return json.loads(r_data)
+
+ def save_ssh_info(self,host,host_info):
+ '''
+ @name 获取并解密指定SSH信息
+ @author hwliang<2020-08-07>
+ @param host 主机地址
+ @param host_info ssh信息字典
+ @return bool
+ '''
+ host_path = self._save_path + host
+ if not os.path.exists(host_path):
+ os.makedirs(host_path,384)
+ info_file = host_path +'/info.json'
+ r_data = public.aes_encrypt(json.dumps(host_info),self._pass_str)
+ public.writeFile(info_file,r_data)
+ return True
+
+ def set_sort(self,args):
+ '''
+ @name 获取并解密指定SSH信息
+ @author hwliang<2020-08-07>
+ @param args{
+ sort_list{
+ 主机host : 排序编号,
+ 主机host : 排序编号,
+ ...
+ }
+ }
+ @return bool
+ '''
+ if not 'sort_list' in args:
+ return public.returnMsg(False,'SSH_LOGIN_ERR9')
+ sort_list = json.loads(args.sort_list)
+ for name in sort_list.keys():
+ info_file = self._save_path + name + '/info.json'
+ if not os.path.exists(info_file): continue
+
+ ssh_info = self.get_ssh_info(name)
+ ssh_info['sort'] = int(sort_list[name])
+ self.save_ssh_info(name,ssh_info)
+ return public.returnMsg(True,'SET_SUCCESS')
+
+ def get_command_list(self,args = None, user_cmd = False , sys_cmd = False):
+ '''
+ @name 获取常用命令列表
+ @author hwliang<2020-08-08>
+ @param args
+ @param user_cmd 是否不获取用户配置
+ @param sys_cmd 是否不获取系统配置
+ @return list
+ '''
+
+ sys_command = []
+ if not sys_cmd:
+ if os.path.exists(self._sys_command_file):
+ sys_command = json.loads(public.readFile(self._sys_command_file))
+
+ user_command = []
+ if not user_cmd:
+ if os.path.exists(self._user_command_file):
+ user_command = json.loads(public.readFile(self._user_command_file))
+
+ command = sys_command + user_command
+ return command
+
+
+ def command_exists(self,command,title):
+ '''
+ @name 判断命令是否存在
+ @author hwliang<2020-08-08>
+ @param command 常用命令列表
+ @param title 命令标题
+ @return bool
+ '''
+ for cmd in command:
+ if cmd['title'] == title: return True
+ return False
+
+ def save_command(self,command,sys_cmd=False):
+ '''
+ @name 保存常用命令
+ @author hwliang<2020-08-08>
+ @param command 常用命令列表
+ @param sys_cmd 是否为系统配置
+ @return void
+ '''
+ s_file = self._user_command_file
+ if sys_cmd:
+ s_file = self._sys_command_file
+ public.writeFile(s_file,json.dumps(command))
+
+ def create_command(self,args):
+ '''
+ @name 创建常用命令
+ @author hwliang<2020-08-08>
+ @param args{
+ title 标题
+ shell 命令文本
+ }
+ @return dict
+ '''
+ args.title = args.title.strip()
+ command = self.get_command_list(sys_cmd=True)
+
+ if self.command_exists(command,args.title):
+ return public.returnMsg(False,'COMMAND_NAME_EXIST')
+
+ cmd = {
+ "title": args.title,
+ "shell": args.shell.strip()
+ }
+
+ command.append(cmd)
+ self.save_command(command)
+ public.WriteLog(self._log_type,'ADD_COMMAND_COMMAND',(args.title,))
+ return public.returnMsg(True,'SET_SUCCESS')
+
+ def get_command_find(self,args = None, title=None):
+ '''
+ @name 获取指定命令信息
+ @author hwliang<2020-08-08>
+ @param args{
+ title 标题
+ } 可选
+ @param title 标题 可选
+ @return dict
+ '''
+ if args: title = args.title.strip()
+ command = self.get_command_list()
+ for cmd in command:
+ if cmd['title'] == title:
+ return cmd
+ return public.returnMsg(False,'COMMAND_NOTEXIST')
+
+ def modify_command(self,args):
+ '''
+ @name 修改常用命令
+ @author hwliang<2020-08-08>
+ @param args{
+ title 标题
+ new_title 新标题
+ shell 命令文本
+ }
+ @return dict
+ '''
+ args.title = args.title.strip()
+ command = self.get_command_list(sys_cmd=True)
+ if not self.command_exists(command,args.title):
+ return public.returnMsg(False,'COMMAND_NOTEXIST')
+ for i in range(len(command)):
+ if command[i]['title'] == args.title:
+ command[i]['title'] = args.new_title
+ command[i]['shell'] = args.shell.strip()
+ break
+ self.save_command(command)
+ public.WriteLog(self._log_type,'EDIT_COMMAND_COMMAND',(args.title,))
+ return public.returnMsg(True,'SET_SUCCESS')
+
+ def remove_command(self,args):
+ '''
+ @name 删除指定命令
+ @author hwliang<2020-08-08>
+ @param args{
+ title 标题
+ }
+ @return dict
+ '''
+ args.title = args.title.strip()
+ command = self.get_command_list(sys_cmd=True)
+ if not self.command_exists(command,args.title):
+ return public.returnMsg(False,'COMMAND_NOTEXIST')
+ for i in range(len(command)):
+ if command[i]['title'] == args.title:
+ del(command[i])
+ break
+
+ self.save_command(command)
+ public.WriteLog(self._log_type,'DEL_COMMAND_COMMAND'.format(args.title))
+ return public.returnMsg(True,'SET_SUCCESS')
\ No newline at end of file
diff --git a/class/system.py b/class/system.py
index 5b9741ac..466dc170 100644
--- a/class/system.py
+++ b/class/system.py
@@ -12,19 +12,19 @@ try:
except:
pass
class system:
- setupPath = None;
+ setupPath = None
ssh = None
shell = None
def __init__(self):
- self.setupPath = public.GetConfigValue('setup_path');
+ self.setupPath = public.GetConfigValue('setup_path')
def GetConcifInfo(self,get=None):
#取环境配置信息
if not 'config' in session:
- session['config'] = public.M('config').where("id=?",('1',)).field('webserver,sites_path,backup_path,status,mysql_root').find();
+ session['config'] = public.M('config').where("id=?",('1',)).field('webserver,sites_path,backup_path,status,mysql_root').find()
if not 'email' in session['config']:
- session['config']['email'] = public.M('users').where("id=?",('1',)).getField('email');
+ session['config']['email'] = public.M('users').where("id=?",('1',)).getField('email')
data = {}
data = session['config']
data['webserver'] = session['config']['webserver']
@@ -66,8 +66,8 @@ class system:
if rtmp:
phpport = rtmp.groups()[0]
- if conf.find('AUTH_START') != -1: pauth = True;
- if conf.find(self.setupPath + '/stop') == -1: pstatus = True;
+ if conf.find('AUTH_START') != -1: pauth = True
+ if conf.find(self.setupPath + '/stop') == -1: pstatus = True
configFile = self.setupPath + '/nginx/conf/enable-php.conf'
conf = public.readFile(configFile)
rep = "php-cgi-([0-9]+)\.sock"
@@ -75,7 +75,7 @@ class system:
if rtmp:
phpversion = rtmp.groups()[0]
except:
- pass;
+ pass
elif os.path.exists(self.setupPath+'/apache'):
data['webserver'] = 'apache'
@@ -93,8 +93,8 @@ class system:
rtmp = re.search(rep,conf)
if rtmp:
phpport = rtmp.groups()[0]
- if conf.find('AUTH_START') != -1: pauth = True;
- if conf.find(self.setupPath + '/stop') == -1: pstatus = True;
+ if conf.find('AUTH_START') != -1: pauth = True
+ if conf.find(self.setupPath + '/stop') == -1: pstatus = True
except:
pass
elif os.path.exists('/usr/local/lsws/bin/lswsctrl'):
@@ -480,10 +480,16 @@ class system:
ntime = time.time()
networkInfo = {}
+ up = cache.get('up')
+ down = cache.get('down')
+ if not up:
+ up = networkIo[0]
+ if not down:
+ down = networkIo[1]
networkInfo['upTotal'] = networkIo[0]
networkInfo['downTotal'] = networkIo[1]
- networkInfo['up'] = round(float(networkIo[0] - cache.get("up")) / 1024 / (ntime - otime),2)
- networkInfo['down'] = round(float(networkIo[1] - cache.get("down")) / 1024 / (ntime - otime),2)
+ networkInfo['up'] = round(float(networkIo[0] - up) / 1024 / (ntime - otime),2)
+ networkInfo['down'] = round(float(networkIo[1] - down) / 1024 / (ntime - otime),2)
networkInfo['downPackets'] =networkIo[3]
networkInfo['upPackets'] =networkIo[2]
diff --git a/config/hosts.json b/config/hosts.json
index 563ad513..898af086 100644
--- a/config/hosts.json
+++ b/config/hosts.json
@@ -1 +1 @@
-["45.32.116.160", "103.224.251.67", "119.188.210.21", "183.60.107.171", "125.88.182.172"]
\ No newline at end of file
+[ "119.147.144.34", "103.224.251.67","45.76.53.20","120.206.184.160","[2001:19f0:7001:54fc:5400:2ff:fe9b:97f9]", "45.32.116.160", "[240e:ff:9000:1100:0:3:0:34]" ]
\ No newline at end of file
diff --git a/config/menu.json b/config/menu.json
index 028ef870..8959d033 100644
--- a/config/menu.json
+++ b/config/menu.json
@@ -48,32 +48,40 @@
"id": "memuAfiles",
"sort": 7
},
+ {
+ "title": "Terminal",
+ "href": "/xterm",
+ "class": "menu_xterm",
+ "id": "memuAxterm",
+ "sort": 8
+ },
{
"title": "Cron",
"href": "/crontab",
"class": "menu_day",
"id": "memuAcrontab",
- "sort": 8
+ "sort": 9
},
+
{
"title": "App Store",
"href": "/soft",
"class": "menu_soft",
"id": "memuAsoft",
- "sort": 9
+ "sort": 10
},
{
"title": "Settings",
"href": "/config",
"class": "menu_set",
"id": "memuAconfig",
- "sort": 10
+ "sort": 11
},
{
"title": "Log out",
"href": "/login?dologin=True",
"class": "menu_exit",
"id": "dologin",
- "sort": 11
+ "sort": 12
}
]
\ No newline at end of file
diff --git a/data/default.db b/data/default.db
index d673496b..e801a831 100644
Binary files a/data/default.db and b/data/default.db differ
diff --git a/data/node.json b/data/node.json
index 54be8df0..3824c76d 100644
--- a/data/node.json
+++ b/data/node.json
@@ -29,12 +29,6 @@
"port": "80",
"ping": 500
},
- {
- "protocol": "http://",
- "address": "125.88.182.172",
- "port": "5880",
- "ping": 500
- },
{
"protocol": "http://",
"address": "123.129.198.197",
diff --git a/init.sh b/init.sh
index 557ddac5..9aec922a 100644
--- a/init.sh
+++ b/init.sh
@@ -304,6 +304,7 @@ case "$1" in
$pythonV $panel_path/tools.py cli $2
;;
'default')
+ LOCAL_IP=$(ip addr | grep -E -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | grep -E -v "^127\.|^255\.|^0\." | head -n 1)
port=$(cat $panel_path/data/port.pl)
password=$(cat $panel_path/default.pl)
if [ -f $panel_path/data/domain.conf ];then
@@ -322,7 +323,8 @@ case "$1" in
echo -e "=================================================================="
echo -e "\033[32maaPanel default info!\033[0m"
echo -e "=================================================================="
- echo "Bt-Panel-URL: $pool://$address:$port$auth_path"
+ echo "aaPanel Internet Address: $pool://$address:$port$auth_path"
+ echo "aaPanel Internal Address: $pool://${LOCAL_IP}:$port$auth_path"
echo -e `$pythonV $panel_path/tools.py username`
echo -e "password: $password"
echo -e "\033[33mWarning:\033[0m"
diff --git a/script/logsBackup b/script/logsBackup
index d0ae72c7..943299e0 100644
--- a/script/logsBackup
+++ b/script/logsBackup
@@ -21,31 +21,55 @@ if os.path.exists('/www/server/nginx/logs/nginx.pid'): is_nginx = True
px = '.log'
if not is_nginx: px = '-access_log'
-def split_logs(oldFileName,num):
- global logsPath
- if not os.path.exists(oldFileName):
- print('|---'+oldFileName+'file does not exist!')
- return
+def build_errlog(sitename):
+ if is_nginx:
+ log = sitename + '.error.log'
+ elif os.path.exists('/usr/local/lsws/bin/lswsctrl'):
+ log = sitename + '_ols.error_log'
+ else:
+ log = sitename + '-error_log'
+ return log
- logs=sorted(glob.glob(oldFileName+"_*"))
+def clean_backlog(logname,num):
+ logs=sorted(glob.glob(logname+"_*"))
count=len(logs)
num=count - num
for i in range(count):
if i>num: break;
os.remove(logs[i])
- print('|---Extra log ['+logs[i]+'] has been deleted!')
+ print('|---The extra log ['+logs[i]+'] has been deleted!')
+
+def split_logs(oldFileName,num,site_name):
+ global logsPath
+ errlog_name = build_errlog(site_name)
+ old_errlog = logsPath + errlog_name
+
+ if not os.path.exists(oldFileName):
+ print('|---'+oldFileName+'file does not exist!')
+ return
+
+ clean_backlog(oldFileName,num)
+ clean_backlog(old_errlog,num)
newFileName=oldFileName+'_'+time.strftime("%Y-%m-%d_%H%M%S")+'.log'
shutil.move(oldFileName,newFileName)
- os.system("gzip %s" % newFileName)
- print('|---The log has been cut to: '+newFileName+'.gz')
+ new_errlog = old_errlog+'_'+time.strftime("%Y-%m-%d_%H%M%S")+'.log'
+ shutil.move(old_errlog, new_errlog)
+ if not os.path.exists('/www/server/panel/data/log_not_gzip.pl'):
+ os.system("gzip %s" % newFileName)
+ os.system("gzip %s" % new_errlog)
+ print('|---The log has been cut to:' + newFileName + '.gz')
+ print('|---The log has been cut to:' + new_errlog + '.gz')
+ else:
+ print('|---The log has been cut to:'+newFileName+'.log')
+ print('|---The log has been cut to:' + new_errlog + '.log')
def split_all(save):
sites = public.M('sites').field('name').select()
for site in sites:
oldFileName = logsPath + site['name'] + px
- split_logs(oldFileName,save)
+ split_logs(oldFileName,save,site['name'])
if __name__ == '__main__':
num = int(sys.argv[2])
@@ -53,14 +77,18 @@ if __name__ == '__main__':
split_all(num)
else:
siteName = sys.argv[1]
- if siteName[-4:] == '.log':
+ if siteName[-4:] == '.log':
siteName = siteName[:-4]
- else:
+ elif siteName[-11:] == '-access_log':
siteName = siteName.replace("-access_log",'')
+ else:
+ siteName = siteName.replace("_ols.access_log", '')
oldFileName = logsPath+sys.argv[1]
- split_logs(oldFileName,num)
+ split_logs(oldFileName,num,siteName)
if is_nginx:
- os.system("kill -USR1 `cat /www/server/nginx/logs/nginx.pid`");
+ os.system("kill -USR1 `cat /www/server/nginx/logs/nginx.pid`")
+ elif os.path.exists('/usr/local/lsws/bin/lswsctl'):
+ os.system('/usr/local/lsws/bin/lswsctl restart')
else:
- os.system('/etc/init.d/httpd reload');
\ No newline at end of file
+ os.system('/etc/init.d/httpd reload')
\ No newline at end of file
diff --git a/script/logsBackup.py b/script/logsBackup.py
index 6d19f136..6daa506f 100644
--- a/script/logsBackup.py
+++ b/script/logsBackup.py
@@ -21,13 +21,17 @@ if os.path.exists('/www/server/nginx/logs/nginx.pid'): is_nginx = True
px = '.log'
if not is_nginx: px = '-access_log'
-def split_logs(oldFileName,num):
- global logsPath
- if not os.path.exists(oldFileName):
- print('|---'+oldFileName+'file does not exist!')
- return
+def build_errlog(sitename):
+ if is_nginx:
+ log = sitename + '.error.log'
+ elif os.path.exists('/usr/local/lsws/bin/lswsctl'):
+ log = sitename + '-error_log'
+ else:
+ log = sitename + '_ols.error_log'
+ return log
- logs=sorted(glob.glob(oldFileName+"_*"))
+def clean_backlog(logname,num):
+ logs=sorted(glob.glob(logname+"_*"))
count=len(logs)
num=count - num
@@ -36,16 +40,33 @@ def split_logs(oldFileName,num):
os.remove(logs[i])
print('|---The extra log ['+logs[i]+'] has been deleted!')
+def split_logs(oldFileName,num,site_name):
+ global logsPath
+ errlog_name = build_errlog(site_name)
+ old_errlog = logsPath + errlog_name
+ if not os.path.exists(oldFileName):
+ print('|---'+oldFileName+'file does not exist!')
+ return
+
+ clean_backlog(oldFileName,num)
+ clean_backlog(old_errlog,num)
+
newFileName=oldFileName+'_'+time.strftime("%Y-%m-%d_%H%M%S")+'.log'
shutil.move(oldFileName,newFileName)
- os.system("gzip %s" % newFileName)
- print('|---The log has been cut to:'+newFileName+'.gz')
+ new_errlog = build_errlog(site_name)+'_'+time.strftime("%Y-%m-%d_%H%M%S")+'.log'
+ shutil.move(old_errlog, newFileName)
+ if not os.path.exists('/www/server/panel/data/log_not_gzip.pl'):
+ os.system("gzip %s" % newFileName)
+ os.system("gzip %s" % new_errlog)
+ print('|---The log has been cut to:' + newFileName + '.gz')
+ else:
+ print('|---The log has been cut to:'+newFileName+'.log')
def split_all(save):
sites = public.M('sites').field('name').select()
for site in sites:
oldFileName = logsPath + site['name'] + px
- split_logs(oldFileName,save)
+ split_logs(oldFileName,save,site['name'])
if __name__ == '__main__':
num = int(sys.argv[2])
@@ -53,14 +74,18 @@ if __name__ == '__main__':
split_all(num)
else:
siteName = sys.argv[1]
- if siteName[-4:] == '.log':
+ if siteName[-4:] == '.log':
siteName = siteName[:-4]
- else:
+ elif siteName[-11:] == '-access_log':
siteName = siteName.replace("-access_log",'')
+ else:
+ siteName = siteName.replace("_ols.access_log", '')
oldFileName = logsPath+sys.argv[1]
- split_logs(oldFileName,num)
+ split_logs(oldFileName,num,siteName)
if is_nginx:
- os.system("kill -USR1 `cat /www/server/nginx/logs/nginx.pid`");
+ os.system("kill -USR1 `cat /www/server/nginx/logs/nginx.pid`")
+ elif os.path.exists('/usr/local/lsws/bin/lswsctl'):
+ os.system('/usr/local/lsws/bin/lswsctl restart')
else:
- os.system('/etc/init.d/httpd reload');
\ No newline at end of file
+ os.system('/etc/init.d/httpd reload')
\ No newline at end of file
diff --git a/task.py b/task.py
index bd584552..a153483a 100644
--- a/task.py
+++ b/task.py
@@ -14,6 +14,7 @@
import sys
import os
+import logging
from json import dumps,loads
from psutil import Process,pids,cpu_count,cpu_percent,net_io_counters,disk_io_counters,virtual_memory
sys.path.insert(0,"/www/server/panel/class/")
@@ -21,7 +22,6 @@ import db
import public
import time
import panelTask
-import setPanelLets
global pre,timeoutCount,logPath,isTask,oldEdate,isCheck
pre = 0
timeoutCount = 0
@@ -30,29 +30,23 @@ oldEdate = None
logPath = '/tmp/panelExec.log'
isTask = '/tmp/panelTask.pl'
-class MyBad():
- _msg = None
- def __init__(self,msg):
- self._msg = msg
- def __repr__(self):
- return self._msg
-
+def get_python_bin():
+ bin_file = '/www/server/panel/pyenv/bin/python'
+ if os.path.exists(bin_file):
+ return bin_file
+ return '/usr/bin/python'
-def ExecShell(cmdstring, cwd=None, timeout=None, shell=True):
- try:
- global logPath
- import shlex
- import datetime
- import subprocess
- import time
- sub = subprocess.Popen(cmdstring+' &> '+logPath, cwd=cwd, stdin=subprocess.PIPE,shell=shell,bufsize=4096)
-
- while sub.poll() is None:
- time.sleep(0.1)
-
- return sub.returncode
- except:
- return None
+def ReadFile(filename,mode = 'r'):
+ """
+ 读取文件内容
+ @filename 文件名
+ return string(bin) 若文件不存在，则返回None
+ """
+ if not os.path.exists(filename): return False
+ f_body = None
+ with open(filename, mode) as fp:
+ f_body = fp.read()
+ return f_body
#下载文件
def DownloadFile(url,filename):
@@ -60,7 +54,7 @@ def DownloadFile(url,filename):
import urllib,socket
socket.setdefaulttimeout(10)
urllib.urlretrieve(url,filename=filename ,reporthook= DownloadHook)
- public.ExecShell('chown www.www ' + filename)
+ os.system('chown www.www ' + filename)
WriteLogs('done')
except:
WriteLogs('done')
@@ -82,41 +76,62 @@ def DownloadHook(count, blockSize, totalSize):
def WriteLogs(logMsg):
try:
global logPath
- fp = open(logPath,'w+')
- fp.write(logMsg)
- fp.close()
+ with open(logPath,'w+') as fp:
+ fp.write(logMsg)
+ fp.close()
except:
pass
-#任务队列
+
+def ExecShell(cmdstring, cwd=None, timeout=None, shell=True):
+ try:
+ global logPath
+ import shlex
+ import datetime
+ import subprocess
+ import time
+ sub = subprocess.Popen(cmdstring+' &> '+logPath, cwd=cwd, stdin=subprocess.PIPE,shell=shell,bufsize=4096)
+
+ while sub.poll() is None:
+ time.sleep(0.1)
+
+ return sub.returncode
+ except:
+ return None
+
+
+#任务队列
def startTask():
global isTask
try:
while True:
try:
if os.path.exists(isTask):
- sql = db.Sql()
- sql.table('tasks').where("status=?",('-1',)).setField('status','0')
- taskArr = sql.table('tasks').where("status=?",('0',)).field('id,type,execstr').order("id asc").select()
- for value in taskArr:
- start = int(time.time())
- if not sql.table('tasks').where("id=?",(value['id'],)).count(): continue
- sql.table('tasks').where("id=?",(value['id'],)).save('status,start',('-1',start))
- if value['type'] == 'download':
- argv = value['execstr'].split('|bt|')
- DownloadFile(argv[0],argv[1])
- elif value['type'] == 'execshell':
- ExecShell(value['execstr'])
- end = int(time.time())
- sql.table('tasks').where("id=?",(value['id'],)).save('status,end',('1',end))
- if(sql.table('tasks').where("status=?",('0')).count() < 1):
- if os.path.exists(isTask): os.remove(isTask)
- #ExecShell('rm -f ' + isTask)
+ with db.Sql() as sql:
+ sql.table('tasks').where("status=?",('-1',)).setField('status','0')
+ taskArr = sql.table('tasks').where("status=?",('0',)).field('id,type,execstr').order("id asc").select()
+ for value in taskArr:
+ start = int(time.time())
+ if not sql.table('tasks').where("id=?",(value['id'],)).count(): continue
+ sql.table('tasks').where("id=?",(value['id'],)).save('status,start',('-1',start))
+ if value['type'] == 'download':
+ argv = value['execstr'].split('|bt|')
+ DownloadFile(argv[0],argv[1])
+ elif value['type'] == 'execshell':
+ ExecShell(value['execstr'])
+ end = int(time.time())
+ sql.table('tasks').where("id=?",(value['id'],)).save('status,end',('1',end))
+ if(sql.table('tasks').where("status=?",('0')).count() < 1):
+ if os.path.exists(isTask): os.remove(isTask)
+ #ExecShell('rm -f ' + isTask)
+ sql.close()
+ taskArr = None
except:
pass
siteEdate()
time.sleep(2)
- except:
+ except Exception as ex:
+ logging.debug(ex)
time.sleep(60)
startTask()
@@ -124,22 +139,14 @@ def startTask():
def siteEdate():
global oldEdate
try:
- if not oldEdate: oldEdate = public.readFile('data/edate.pl')
+ if not oldEdate: oldEdate = ReadFile('data/edate.pl')
if not oldEdate: oldEdate = '0000-00-00'
mEdate = time.strftime('%Y-%m-%d',time.localtime())
if oldEdate == mEdate: return False
- edateSites = public.M('sites').where('edate>? AND edate /dev/null")
+ except Exception as ex:
+ logging.debug(ex)
+ pass
def GetLoadAverage():
c = os.getloadavg()
@@ -157,8 +164,9 @@ def GetLoadAverage():
def systemTask():
try:
filename = 'data/control.conf'
- sql = db.Sql().dbfile('system')
- csql = '''CREATE TABLE IF NOT EXISTS `load_average` (
+ with db.Sql() as sql:
+ sql = sql.dbfile('system')
+ csql = '''CREATE TABLE IF NOT EXISTS `load_average` (
`id` INTEGER PRIMARY KEY AUTOINCREMENT,
`pro` REAL,
`one` REAL,
@@ -166,7 +174,9 @@ def systemTask():
`fifteen` REAL,
`addtime` INTEGER
)'''
- sql.execute(csql,())
+ sql.execute(csql,())
+ sql.close()
+
count = 0
reloadNum=0
network_up = network_down = diskio_1 = diskio_2 = networkInfo = cpuInfo = diskInfo = None
@@ -177,7 +187,7 @@ def systemTask():
day = 30
try:
- day = int(public.readFile(filename))
+ day = int(ReadFile(filename))
if day < 1:
time.sleep(10)
continue
@@ -243,14 +253,15 @@ def systemTask():
diskInfo['write_time'] += tmp['write_time']
diskio_1 = diskio_2
- except:disk_ios = False
+ except:
+ logging.info(public.get_error_info())
+ disk_ios = False
#print diskInfo
if count >= 12:
try:
- sql.close()
sql = db.Sql().dbfile('system')
addtime = int(time.time())
deltime = addtime - (day * 86400)
@@ -272,23 +283,26 @@ def systemTask():
lpro = round((load_average['one'] / load_average['max']) * 100,2)
if lpro > 100: lpro = 100
sql.table('load_average').add('pro,one,five,fifteen,addtime',(lpro,load_average['one'],load_average['five'],load_average['fifteen'],addtime))
-
+ sql.close()
+
lpro = None
load_average = None
cpuInfo = None
networkInfo = None
diskInfo = None
+ data = None
count = 0
reloadNum += 1
if reloadNum > 1440:
reloadNum = 0
except Exception as ex:
- print(str(ex))
+ logging.debug(str(ex))
del(tmp)
time.sleep(5)
count +=1
- except:
+ except Exception as ex:
+ logging.debug(ex)
time.sleep(30)
systemTask()
@@ -307,15 +321,15 @@ def GetMemUsed():
#检查502错误
def check502():
try:
- phpversions = ['53','54','55','56','70','71','72','73','74']
+ phpversions = ['53','54','55','56','70','71','72','73','74','80']
for version in phpversions:
php_path = '/www/server/php/' + version + '/sbin/php-fpm'
if not os.path.exists(php_path): continue
if checkPHPVersion(version): continue
if startPHPVersion(version):
- public.WriteLog('PHP守护程序','检测到PHP-' + version + '处理异常,已自动修复!')
- except:
- pass
+ public.WriteLog('PHP daemon','PHP-' + version + 'processing exception was detected and has been automatically fixed!',not_web = True)
+ except Exception as ex:
+ logging.info(ex)
#处理指定PHP版本
def startPHPVersion(version):
@@ -327,105 +341,44 @@ def startPHPVersion(version):
return False
#尝试重载服务
- public.ExecShell(fpm + ' reload')
+ os.system(fpm + ' reload')
if checkPHPVersion(version): return True
#尝试重启服务
cgi = '/tmp/php-cgi-'+version + '.sock'
pid = '/www/server/php/'+version+'/var/run/php-fpm.pid'
- public.ExecShell('pkill -9 php-fpm-'+version)
+ os.system('pkill -9 php-fpm-'+version)
time.sleep(0.5)
- if not os.path.exists(cgi): public.ExecShell('rm -f ' + cgi)
- if not os.path.exists(pid): public.ExecShell('rm -f ' + pid)
- public.ExecShell(fpm + ' start')
+ if not os.path.exists(cgi): os.system('rm -f ' + cgi)
+ if not os.path.exists(pid): os.system('rm -f ' + pid)
+ os.system(fpm + ' start')
if checkPHPVersion(version): return True
#检查是否正确启动
if os.path.exists(cgi): return True
- except:
+ except Exception as ex:
+ logging.debug(ex)
return True
#检查指定PHP版本
def checkPHPVersion(version):
try:
- url = 'http://127.0.0.1/phpfpm_'+version+'_status'
- result = HttpGet(url)
- #检查nginx
- if result.find('Bad Gateway') != -1: return False
- #检查Apache
- if result.find('Service Unavailable') != -1: return False
- if result.find('Not Found') != -1: CheckPHPINFO()
-
- #检查Web服务是否启动
- if result.find('Connection refused') != -1:
- global isTask
- if os.path.exists(isTask):
- isStatus = public.readFile(isTask)
- if isStatus == 'True': return True
- filename = '/etc/init.d/nginx'
- if os.path.exists(filename): public.ExecShell(filename + ' start')
- filename = '/etc/init.d/httpd'
- if os.path.exists(filename): public.ExecShell(filename + ' start')
-
+ uri = "/phpfpm_"+version+"_status?json"
+ result = public.request_php(version,uri,'')
+ loads(result)
return True
except:
- return True
+ logging.info("PHP-{} unreachable detected".format(version))
+ return False
-#检测PHPINFO配置
-def CheckPHPINFO():
- php_versions = ['53','54','55','56','70','71','72','73','74']
- setupPath = '/www/server'
- path = setupPath +'/panel/vhost/nginx/phpinfo.conf'
- if not os.path.exists(path):
- opt = ""
- for version in php_versions:
- opt += "\n\tlocation /"+version+" {\n\t\tinclude enable-php-"+version+".conf;\n\t}"
-
- phpinfoBody = '''server
-{
- listen 80;
- server_name 127.0.0.2;
- allow 127.0.0.1;
- index phpinfo.php index.html index.php;
- root /www/server/phpinfo;
-%s
-}''' % (opt,)
- public.writeFile(path,phpinfoBody)
-
-
- path = setupPath + '/panel/vhost/apache/phpinfo.conf'
- if not os.path.exists(path):
- opt = ""
- for version in php_versions:
- opt += """\n
- SetHandler "proxy:unix:/tmp/php-cgi-%s.sock|fcgi://localhost"
- """ % (version,version)
-
- phpinfoBody = '''
-
-DocumentRoot "/www/server/phpinfo"
-ServerAdmin phpinfo
-ServerName 127.0.0.2
-%s
-
- SetOutputFilter DEFLATE
- Options FollowSymLinks
- AllowOverride All
- Order allow,deny
- Allow from all
- DirectoryIndex index.php index.html index.htm default.php default.html default.htm
-
-
-''' % (opt,)
- public.writeFile(path,phpinfoBody)
-
#502错误检查线程
def check502Task():
try:
while True:
if os.path.exists('/www/server/panel/data/502Task.pl'): check502()
+ sess_expire()
time.sleep(600)
except:
time.sleep(600)
@@ -456,7 +409,7 @@ def panel_status():
pool = 'http://'
if os.path.exists(panel_path + '/data/ssl.pl'): pool = 'https://'
port = '8888'
- if os.path.exists(panel_path + '/data/port.pl'): port = public.readFile(panel_path + '/data/port.pl').strip()
+ if os.path.exists(panel_path + '/data/port.pl'): port = ReadFile(panel_path + '/data/port.pl').strip()
panel_url = pool + '127.0.0.1:' + port + '/service_status'
panel_pid = get_panel_pid()
n = 0
@@ -464,7 +417,6 @@ def panel_status():
v = 0
while True:
time.sleep(5)
- check_session()
if not panel_pid: panel_pid = get_panel_pid()
if not panel_pid: service_panel('start')
@@ -496,11 +448,11 @@ def panel_status():
if e_body.find('table session') != -1:
sess_file = '/dev/shm/session.db'
if os.path.exists(sess_file): os.remove(sess_file)
- public.ExecShell("bash /www/server/panel/init.sh reload &")
+ os.system("bash /www/server/panel/init.sh reload &")
time.sleep(10)
result = HttpGet(panel_url)
if result == 'True':
- public.WriteLog('TYPE_SOFE','Checked to panel service exception, has been automatically restored!')
+ public.WriteLog('TYPE_SOFE','Checked to panel service exception, has been automatically restored!',not_web = True)
if n > 18000:
n = 0
@@ -511,7 +463,7 @@ def panel_status():
update_panel()
result = HttpGet(panel_url)
if result == 'True':
- public.WriteLog('TYPE_SOFE','Checked to panel service exception, has been automatically restored!')
+ public.WriteLog('TYPE_SOFE','Checked to panel service exception, has been automatically restored!',not_web = True)
time.sleep(10)
continue
@@ -523,29 +475,7 @@ def service_panel(action = 'reload'):
if not os.path.exists('/www/server/panel/init.sh'):
update_panel()
else:
- public.ExecShell("bash /www/server/panel/init.sh {} &".format(action))
-
-
-def check_session():
- try:
- session_file = '/dev/shm/session.db'
- if not os.path.exists(session_file): #如果session文件不存在
- return False
- s_size = os.path.getsize(session_file)
- if s_size < 1024 * 1024 * 2: return False
- if s_size > 1024 * 1024 * 10:
- #大于10MB
- if os.path.exists(session_file): os.remove(session_file)
- public.ExecShell("bash /www/server/panel/init.sh reload &")
- else:
- sql = db.Sql()
- sql._Sql__DB_FILE = session_file
- sql.table('session').where('expiry {}".format(url,ex))
return str(ex)
+#定时任务去检测邮件信息
+def send_mail_time():
+ p_path = '/www/server/panel/data/'
+ p_reload = p_path + '/send_to_user.pl'
+ if not os.path.exists(p_path):
+ return
+ while True:
+ try:
+ if os.path.exists(p_reload):
+ os.system(get_python_bin() + " /www/server/panel/script/mail_task.py > /dev/null")
+ os.remove(p_reload)
+ time.sleep(60)
+ except:
+ time.sleep(180)
+ send_mail_time()
+
def main():
main_pid = 'logs/task.pid'
if os.path.exists(main_pid):
@@ -619,13 +560,9 @@ def main():
sys.stdout.flush()
sys.stderr.flush()
task_log_file='logs/task.log'
- if not os.path.exists(task_log_file):
- open(task_log_file,'w+').close()
- err_f = open(task_log_file,'a+')
- os.dup2(err_f.fileno(),sys.stderr.fileno())
- err_f.close()
- public.ExecShell('rm -rf /www/server/phpinfo/*')
+ logging.basicConfig(level = logging.DEBUG,format = '%(asctime)s [%(levelname)s] at %(lineno)d: %(message)s',datefmt = '%Y-%m-%d(%a)%H:%M:%S',filename = task_log_file,filemode = 'a+')
+ logging.info('Service started')
import threading
t = threading.Thread(target=systemTask)
@@ -648,7 +585,12 @@ def main():
p.setDaemon(True)
p.start()
+ p = threading.Thread(target=send_mail_time)
+ p.setDaemon(True)
+ p.start()
+
task_obj = panelTask.bt_task()
+ task_obj.not_web = True
p = threading.Thread(target=task_obj.start_task)
p.setDaemon(True)
p.start()