Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of github.com:bunkerity/bunkerweb into dev

Browse source
This commit is contained in:
fl0ppy-d1sk 2024-03-12 17:14:40 +01:00
commit 169ada022a
No known key found for this signature in database
GPG key ID: 93EE47CC3D061500
5 changed files with 29 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/common/core/jobs/jobs/mmdb-asn.py
View file

@ -2,7 +2,6 @@
from datetime import date, datetime, timedelta
from gzip import decompress
from hashlib import sha1
from io import BytesIO
from os import getenv, sep
from os.path import join
@ -10,16 +9,9 @@ from pathlib import Path
from sys import exit as sys_exit, path as sys_path
from threading import Lock
from traceback import format_exc
from typing import Optional, Union
from typing import Optional
for deps_path in [
join(sep, "usr", "share", "bunkerweb", *paths)
for paths in (
("deps", "python"),
("utils",),
("db",),
)
]:
for deps_path in [join(sep, "usr", "share", "bunkerweb", *paths) for paths in (("deps", "python"), ("utils",), ("db",))]:
if deps_path not in sys_path:
sys_path.append(deps_path)
@ -27,7 +19,7 @@ from maxminddb import MODE_FD, open_database
from requests import RequestException, Response, get
from logger import setup_logger # type: ignore
from common_utils import bytes_hash # type: ignore
from common_utils import bytes_hash, file_hash # type: ignore
from jobs import Job # type: ignore
LOGGER = setup_logger("JOBS.mmdb-asn", getenv("LOG_LEVEL", "INFO"))
@ -44,24 +36,6 @@ def request_mmdb() -> Optional[Response]:
return None
def bytes_sha1(bio: Union[Path, bytes, BytesIO]) -> str:
if isinstance(bio, Path):
bio = bio.read_bytes()
if isinstance(bio, bytes):
bio = BytesIO(bio)
assert isinstance(bio, BytesIO)
_sha512 = sha1()
while True:
data = bio.read(1024)
if not data:
break
_sha512.update(data)
bio.seek(0)
return _sha512.hexdigest()
try:
dl_mmdb = True
tmp_path = Path(sep, "var", "tmp", "bunkerweb", "asn.mmdb")
@ -73,7 +47,7 @@ try:
response = request_mmdb()
if response and response.status_code == 200:
if response.content.find(bytes_sha1(tmp_path).encode()) != -1:
if response.content.find(file_hash(tmp_path, algorithm="sha1").encode()) != -1:
LOGGER.info("asn.mmdb is already the latest version, skipping download...")
dl_mmdb = False
else:
@ -89,7 +63,7 @@ try:
response = request_mmdb()
if response and response.status_code == 200:
skip_dl = response.content.find(bytes_sha1(job_cache["data"]).encode()) != -1
skip_dl = response.content.find(bytes_hash(job_cache["data"], algorithm="sha1").encode()) != -1
elif job_cache["last_update"] < (datetime.now() - timedelta(weeks=1)).timestamp():
LOGGER.warning("Unable to check if the cache file is the latest version from db-ip.com and file is older than 1 week, checking anyway...")
skip_dl = False

36
src/common/core/jobs/jobs/mmdb-country.py
View file

@ -2,7 +2,6 @@
from datetime import date, datetime, timedelta
from gzip import decompress
from hashlib import sha1
from io import BytesIO
from os import getenv, sep
from os.path import join
@ -10,16 +9,9 @@ from pathlib import Path
from sys import exit as sys_exit, path as sys_path
from threading import Lock
from traceback import format_exc
from typing import Optional, Union
from typing import Optional
for deps_path in [
join(sep, "usr", "share", "bunkerweb", *paths)
for paths in (
("deps", "python"),
("utils",),
("db",),
)
]:
for deps_path in [join(sep, "usr", "share", "bunkerweb", *paths) for paths in (("deps", "python"), ("utils",), ("db",))]:
if deps_path not in sys_path:
sys_path.append(deps_path)
@ -27,7 +19,7 @@ from maxminddb import MODE_FD, open_database
from requests import RequestException, Response, get
from logger import setup_logger # type: ignore
from common_utils import bytes_hash # type: ignore
from common_utils import bytes_hash, file_hash # type: ignore
from jobs import Job # type: ignore
LOGGER = setup_logger("JOBS.mmdb-country", getenv("LOG_LEVEL", "INFO"))
@ -44,24 +36,6 @@ def request_mmdb() -> Optional[Response]:
return None
def bytes_sha1(bio: Union[Path, bytes, BytesIO]) -> str:
if isinstance(bio, Path):
bio = bio.read_bytes()
if isinstance(bio, bytes):
bio = BytesIO(bio)
assert isinstance(bio, BytesIO)
_sha512 = sha1()
while True:
data = bio.read(1024)
if not data:
break
_sha512.update(data)
bio.seek(0)
return _sha512.hexdigest()
try:
dl_mmdb = True
tmp_path = Path(sep, "var", "tmp", "bunkerweb", "country.mmdb")
@ -73,7 +47,7 @@ try:
response = request_mmdb()
if response and response.status_code == 200:
if response.content.find(bytes_sha1(tmp_path).encode()) != -1:
if response.content.find(file_hash(tmp_path, algorithm="sha1").encode()) != -1:
LOGGER.info("country.mmdb is already the latest version, skipping download...")
dl_mmdb = False
else:
@ -89,7 +63,7 @@ try:
response = request_mmdb()
if response and response.status_code == 200:
skip_dl = response.content.find(bytes_sha1(job_cache["data"]).encode()) != -1
skip_dl = response.content.find(bytes_hash(job_cache["data"], algorithm="sha1").encode()) != -1
elif job_cache["last_update"] < (datetime.now() - timedelta(weeks=1)).timestamp():
LOGGER.warning("Unable to check if the cache file is the latest version from db-ip.com and file is older than 1 week, checking anyway...")
skip_dl = False

2
src/common/core/selfsigned/jobs/self-signed.py
View file

@ -106,7 +106,7 @@ try:
sys_exit(0)
skipped_servers = []
if not getenv("MULTISITE", "no") == "yes":
if getenv("MULTISITE", "no") == "no":
servers = [servers[0]]
if getenv("GENERATE_SELF_SIGNED_SSL", "no") == "no":
LOGGER.info("Generate self-signed SSL is not enabled, skipping certificate generation ...")

8
src/common/db/Database.py
View file

@ -1091,11 +1091,15 @@ class Database:
)
.filter_by(service_id=service.id, setting_id=key)
):
value = service_setting.value
if key == "SERVER_NAME" and service.id not in value.split(" "):
value = f"{service.id} {value}".strip()
config[f"{service.id}_{key}" + (f"_{service_setting.suffix}" if service_setting.suffix > 0 else "")] = (
service_setting.value
value
if not methods
else {
"value": service_setting.value,
"value": value,
"global": False,
"method": service_setting.method,
}

22
src/common/utils/common_utils.py
View file

@ -1,4 +1,4 @@
from hashlib import sha512
from hashlib import new as new_hash
from io import BytesIO
from os import getenv, sep
from pathlib import Path
@ -50,8 +50,8 @@ def get_os_info() -> Dict[str, str]:
return os_data
def file_hash(file: Union[str, Path]) -> str:
_sha512 = sha512()
def file_hash(file: Union[str, Path], *, algorithm: str = "sha512") -> str:
_hash = new_hash(algorithm)
if not isinstance(file, Path):
file = Path(file)
@ -60,21 +60,23 @@ def file_hash(file: Union[str, Path]) -> str:
data = f.read(1024)
if not data:
break
_sha512.update(data)
return _sha512.hexdigest()
_hash.update(data)
return _hash.hexdigest()
def bytes_hash(bio: Union[bytes, BytesIO]) -> str:
if isinstance(bio, bytes):
def bytes_hash(bio: Union[str, bytes, BytesIO], *, algorithm: str = "sha512") -> str:
if isinstance(bio, str):
bio = BytesIO(bio.encode("utf-8"))
elif isinstance(bio, bytes):
bio = BytesIO(bio)
assert isinstance(bio, BytesIO)
_sha512 = sha512()
_hash = new_hash(algorithm)
while True:
data = bio.read(1024)
if not data:
break
_sha512.update(data)
_hash.update(data)
bio.seek(0)
return _sha512.hexdigest()
return _hash.hexdigest()