No OneTemporary
Actions

Size

49 KB

Referenced Files

None

订阅者

None

View Options

	diff --git a/data/Dockerfiles/dockerapi/dockerapi.py b/data/Dockerfiles/dockerapi/dockerapi.py
	index 965fc906..03ed5ef0 100644
	--- a/data/Dockerfiles/dockerapi/dockerapi.py
	+++ b/data/Dockerfiles/dockerapi/dockerapi.py
	@@ -1,622 +1,622 @@
	from fastapi import FastAPI, Response, Request
	import aiodocker
	import psutil
	import sys
	import re
	import time
	import os
	import json
	import asyncio
	import redis
	from datetime import datetime


	containerIds_to_update = []
	host_stats_isUpdating = False
	app = FastAPI()


	@app.get("/host/stats")
	async def get_host_update_stats():
	global host_stats_isUpdating

	if host_stats_isUpdating == False:
	print("start host stats task")
	asyncio.create_task(get_host_stats())
	host_stats_isUpdating = True

	while True:
	if redis_client.exists('host_stats'):
	break
	print("wait for host_stats results")
	await asyncio.sleep(1.5)


	print("host stats pulled")
	stats = json.loads(redis_client.get('host_stats'))
	return Response(content=json.dumps(stats, indent=4), media_type="application/json")

	@app.get("/containers/{container_id}/json")
	async def get_container(container_id : str):
	if container_id and container_id.isalnum():
	try:
	for container in (await async_docker_client.containers.list()):
	if container._id == container_id:
	container_info = await container.show()
	return Response(content=json.dumps(container_info, indent=4), media_type="application/json")

	res = {
	"type": "danger",
	"msg": "no container found"
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	except Exception as e:
	res = {
	"type": "danger",
	"msg": str(e)
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	else:
	res = {
	"type": "danger",
	"msg": "no or invalid id defined"
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")

	@app.get("/containers/json")
	async def get_containers():
	containers = {}
	try:
	for container in (await async_docker_client.containers.list()):
	container_info = await container.show()
	containers.update({container_info['Id']: container_info})
	return Response(content=json.dumps(containers, indent=4), media_type="application/json")
	except Exception as e:
	res = {
	"type": "danger",
	"msg": str(e)
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")

	@app.post("/containers/{container_id}/{post_action}")
	async def post_containers(container_id : str, post_action : str, request: Request):
	try :
	request_json = await request.json()
	except Exception as err:
	request_json = {}

	if container_id and container_id.isalnum() and post_action:
	try:
	"""Dispatch container_post api call"""
	if post_action == 'exec':
	if not request_json or not 'cmd' in request_json:
	res = {
	"type": "danger",
	"msg": "cmd is missing"
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	if not request_json or not 'task' in request_json:
	res = {
	"type": "danger",
	"msg": "task is missing"
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")

	api_call_method_name = '__'.join(['container_post', str(post_action), str(request_json['cmd']), str(request_json['task']) ])
	else:
	api_call_method_name = '__'.join(['container_post', str(post_action) ])

	docker_utils = DockerUtils(async_docker_client)
	api_call_method = getattr(docker_utils, api_call_method_name, lambda container_id: Response(content=json.dumps({'type': 'danger', 'msg':'container_post - unknown api call' }, indent=4), media_type="application/json"))


	print("api call: %s, container_id: %s" % (api_call_method_name, container_id))
	return await api_call_method(container_id, request_json)
	except Exception as e:
	print("error - container_post: %s" % str(e))
	res = {
	"type": "danger",
	"msg": str(e)
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")

	else:
	res = {
	"type": "danger",
	"msg": "invalid container id or missing action"
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")

	@app.post("/container/{container_id}/stats/update")
	async def post_container_update_stats(container_id : str):
	global containerIds_to_update

	# start update task for container if no task is running
	if container_id not in containerIds_to_update:
	asyncio.create_task(get_container_stats(container_id))
	containerIds_to_update.append(container_id)

	while True:
	if redis_client.exists(container_id + '_stats'):
	break
	await asyncio.sleep(1.5)

	stats = json.loads(redis_client.get(container_id + '_stats'))
	return Response(content=json.dumps(stats, indent=4), media_type="application/json")




	class DockerUtils:
	def __init__(self, docker_client):
	self.docker_client = docker_client

	# api call: container_post - post_action: stop
	async def container_post__stop(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	await container.stop()
	res = {
	'type': 'success',
	'msg': 'command completed successfully'
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")

	# api call: container_post - post_action: start
	async def container_post__start(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	await container.start()
	res = {
	'type': 'success',
	'msg': 'command completed successfully'
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")


	# api call: container_post - post_action: restart
	async def container_post__restart(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	await container.restart()
	res = {
	'type': 'success',
	'msg': 'command completed successfully'
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")


	# api call: container_post - post_action: top
	async def container_post__top(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	ps_exec = await container.exec("ps")
	async with ps_exec.start(detach=False) as stream:
	ps_return = await stream.read_out()

	exec_details = await ps_exec.inspect()
	if exec_details["ExitCode"] == None or exec_details["ExitCode"] == 0:
	res = {
	'type': 'success',
	'msg': ps_return.data.decode('utf-8')
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	else:
	res = {
	'type': 'danger',
	'msg': ''
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")


	# api call: container_post - post_action: exec - cmd: mailq - task: delete
	async def container_post__exec__mailq__delete(self, container_id, request_json):
	if 'items' in request_json:
	r = re.compile("^[0-9a-fA-F]+$")
	filtered_qids = filter(r.match, request_json['items'])
	if filtered_qids:
	flagged_qids = ['-d %s' % i for i in filtered_qids]
	sanitized_string = str(' '.join(flagged_qids))

	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	postsuper_r_exec = await container.exec(["/bin/bash", "-c", "/usr/sbin/postsuper " + sanitized_string])
	return await exec_run_handler('generic', postsuper_r_exec)

	# api call: container_post - post_action: exec - cmd: mailq - task: hold
	async def container_post__exec__mailq__hold(self, container_id, request_json):
	if 'items' in request_json:
	r = re.compile("^[0-9a-fA-F]+$")
	filtered_qids = filter(r.match, request_json['items'])
	if filtered_qids:
	flagged_qids = ['-h %s' % i for i in filtered_qids]
	sanitized_string = str(' '.join(flagged_qids))

	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	postsuper_r_exec = await container.exec(["/bin/bash", "-c", "/usr/sbin/postsuper " + sanitized_string])
	return await exec_run_handler('generic', postsuper_r_exec)

	# api call: container_post - post_action: exec - cmd: mailq - task: cat
	async def container_post__exec__mailq__cat(self, container_id, request_json):
	if 'items' in request_json:
	r = re.compile("^[0-9a-fA-F]+$")
	filtered_qids = filter(r.match, request_json['items'])
	if filtered_qids:
	sanitized_string = str(' '.join(filtered_qids))

	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	postcat_exec = await container.exec(["/bin/bash", "-c", "/usr/sbin/postcat -q " + sanitized_string], user='postfix')
	- return exec_run_handler('utf8_text_only', postcat_exec)
	+ return await exec_run_handler('utf8_text_only', postcat_exec)

	# api call: container_post - post_action: exec - cmd: mailq - task: unhold
	async def container_post__exec__mailq__unhold(self, container_id, request_json):
	if 'items' in request_json:
	r = re.compile("^[0-9a-fA-F]+$")
	filtered_qids = filter(r.match, request_json['items'])
	if filtered_qids:
	flagged_qids = ['-H %s' % i for i in filtered_qids]
	sanitized_string = str(' '.join(flagged_qids))

	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	postsuper_r_exec = await container.exec(["/bin/bash", "-c", "/usr/sbin/postsuper " + sanitized_string])
	return await exec_run_handler('generic', postsuper_r_exec)


	# api call: container_post - post_action: exec - cmd: mailq - task: deliver
	async def container_post__exec__mailq__deliver(self, container_id, request_json):
	if 'items' in request_json:
	r = re.compile("^[0-9a-fA-F]+$")
	filtered_qids = filter(r.match, request_json['items'])
	if filtered_qids:
	flagged_qids = ['-i %s' % i for i in filtered_qids]

	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	for i in flagged_qids:
	postsuper_r_exec = await container.exec(["/bin/bash", "-c", "/usr/sbin/postqueue " + i], user='postfix')
	async with postsuper_r_exec.start(detach=False) as stream:
	postsuper_r_return = await stream.read_out()
	# todo: check each exit code
	res = {
	'type': 'success',
	'msg': 'Scheduled immediate delivery'
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")


	# api call: container_post - post_action: exec - cmd: mailq - task: list
	async def container_post__exec__mailq__list(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	mailq_exec = await container.exec(["/usr/sbin/postqueue", "-j"], user='postfix')
	return await exec_run_handler('utf8_text_only', mailq_exec)


	# api call: container_post - post_action: exec - cmd: mailq - task: flush
	async def container_post__exec__mailq__flush(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	postsuper_r_exec = await container.exec(["/usr/sbin/postqueue", "-f"], user='postfix')
	return await exec_run_handler('generic', postsuper_r_exec)


	# api call: container_post - post_action: exec - cmd: mailq - task: super_delete
	async def container_post__exec__mailq__super_delete(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	postsuper_r_exec = await container.exec(["/usr/sbin/postsuper", "-d", "ALL"])
	return await exec_run_handler('generic', postsuper_r_exec)


	# api call: container_post - post_action: exec - cmd: system - task: fts_rescan
	async def container_post__exec__system__fts_rescan(self, container_id, request_json):
	if 'username' in request_json:
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	rescan_exec = await container.exec(["/bin/bash", "-c", "/usr/bin/doveadm fts rescan -u '" + request_json['username'].replace("'", "'\\''") + "'"], user='vmail')
	async with rescan_exec.start(detach=False) as stream:
	rescan_return = await stream.read_out()

	exec_details = await rescan_exec.inspect()
	if exec_details["ExitCode"] == None or exec_details["ExitCode"] == 0:
	res = {
	'type': 'success',
	'msg': 'fts_rescan: rescan triggered'
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	else:
	res = {
	'type': 'warning',
	'msg': 'fts_rescan error'
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")

	if 'all' in request_json:
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	rescan_exec = await container.exec(["/bin/bash", "-c", "/usr/bin/doveadm fts rescan -A"], user='vmail')
	async with rescan_exec.start(detach=False) as stream:
	rescan_return = await stream.read_out()

	exec_details = await rescan_exec.inspect()
	if exec_details["ExitCode"] == None or exec_details["ExitCode"] == 0:
	res = {
	'type': 'success',
	'msg': 'fts_rescan: rescan triggered'
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	else:
	res = {
	'type': 'warning',
	'msg': 'fts_rescan error'
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")


	# api call: container_post - post_action: exec - cmd: system - task: df
	async def container_post__exec__system__df(self, container_id, request_json):
	if 'dir' in request_json:
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	df_exec = await container.exec(["/bin/bash", "-c", "/bin/df -H '" + request_json['dir'].replace("'", "'\\''") + "' \| /usr/bin/tail -n1 \| /usr/bin/tr -s [:blank:] \| /usr/bin/tr ' ' ','"], user='nobody')
	async with df_exec.start(detach=False) as stream:
	df_return = await stream.read_out()

	print(df_return)
	print(await df_exec.inspect())
	exec_details = await df_exec.inspect()
	if exec_details["ExitCode"] == None or exec_details["ExitCode"] == 0:
	return df_return.data.decode('utf-8').rstrip()
	else:
	return "0,0,0,0,0,0"


	# api call: container_post - post_action: exec - cmd: system - task: mysql_upgrade
	async def container_post__exec__system__mysql_upgrade(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	sql_exec = await container.exec(["/bin/bash", "-c", "/usr/bin/mysql_upgrade -uroot -p'" + os.environ['DBROOT'].replace("'", "'\\''") + "'\n"], user='mysql')
	async with sql_exec.start(detach=False) as stream:
	sql_return = await stream.read_out()

	exec_details = await sql_exec.inspect()
	if exec_details["ExitCode"] == None or exec_details["ExitCode"] == 0:
	matched = False
	for line in sql_return.data.decode('utf-8').split("\n"):
	if 'is already upgraded to' in line:
	matched = True
	if matched:
	res = {
	'type': 'success',
	'msg': 'mysql_upgrade: already upgraded',
	'text': sql_return.data.decode('utf-8')
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	else:
	await container.restart()
	res = {
	'type': 'warning',
	'msg': 'mysql_upgrade: upgrade was applied',
	'text': sql_return.data.decode('utf-8')
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	else:
	res = {
	'type': 'error',
	'msg': 'mysql_upgrade: error running command',
	'text': sql_return.data.decode('utf-8')
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")

	# api call: container_post - post_action: exec - cmd: system - task: mysql_tzinfo_to_sql
	async def container_post__exec__system__mysql_tzinfo_to_sql(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	sql_exec = await container.exec(["/bin/bash", "-c", "/usr/bin/mysql_tzinfo_to_sql /usr/share/zoneinfo \| /bin/sed 's/Local time zone must be set--see zic manual page/FCTY/' \| /usr/bin/mysql -uroot -p'" + os.environ['DBROOT'].replace("'", "'\\''") + "' mysql \n"], user='mysql')
	async with sql_exec.start(detach=False) as stream:
	sql_return = await stream.read_out()

	exec_details = await sql_exec.inspect()
	if exec_details["ExitCode"] == None or exec_details["ExitCode"] == 0:
	res = {
	'type': 'info',
	'msg': 'mysql_tzinfo_to_sql: command completed successfully',
	'text': sql_return.data.decode('utf-8')
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	else:
	res = {
	'type': 'error',
	'msg': 'mysql_tzinfo_to_sql: error running command',
	'text': sql_return.data.decode('utf-8')
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")

	# api call: container_post - post_action: exec - cmd: reload - task: dovecot
	async def container_post__exec__reload__dovecot(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	reload_exec = await container.exec(["/bin/bash", "-c", "/usr/sbin/dovecot reload"])
	return await exec_run_handler('generic', reload_exec)


	# api call: container_post - post_action: exec - cmd: reload - task: postfix
	async def container_post__exec__reload__postfix(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	reload_exec = await container.exec(["/bin/bash", "-c", "/usr/sbin/postfix reload"])
	return await exec_run_handler('generic', reload_exec)


	# api call: container_post - post_action: exec - cmd: reload - task: nginx
	async def container_post__exec__reload__nginx(self, container_id, request_json):
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	reload_exec = await container.exec(["/bin/sh", "-c", "/usr/sbin/nginx -s reload"])
	return await exec_run_handler('generic', reload_exec)


	# api call: container_post - post_action: exec - cmd: sieve - task: list
	async def container_post__exec__sieve__list(self, container_id, request_json):
	if 'username' in request_json:
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	sieve_exec = await container.exec(["/bin/bash", "-c", "/usr/bin/doveadm sieve list -u '" + request_json['username'].replace("'", "'\\''") + "'"])
	return await exec_run_handler('utf8_text_only', sieve_exec)


	# api call: container_post - post_action: exec - cmd: sieve - task: print
	async def container_post__exec__sieve__print(self, container_id, request_json):
	if 'username' in request_json and 'script_name' in request_json:
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	cmd = ["/bin/bash", "-c", "/usr/bin/doveadm sieve get -u '" + request_json['username'].replace("'", "'\\''") + "' '" + request_json['script_name'].replace("'", "'\\''") + "'"]
	sieve_exec = await container.exec(cmd)
	return await exec_run_handler('utf8_text_only', sieve_exec)


	# api call: container_post - post_action: exec - cmd: maildir - task: cleanup
	async def container_post__exec__maildir__cleanup(self, container_id, request_json):
	if 'maildir' in request_json:
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:
	sane_name = re.sub(r'\W+', '', request_json['maildir'])
	cmd = ["/bin/bash", "-c", "if [[ -d '/var/vmail/" + request_json['maildir'].replace("'", "'\\''") + "' ]]; then /bin/mv '/var/vmail/" + request_json['maildir'].replace("'", "'\\''") + "' '/var/vmail/_garbage/" + str(int(time.time())) + "_" + sane_name + "'; fi"]
	maildir_cleanup_exec = await container.exec(cmd, user='vmail')
	return await exec_run_handler('generic', maildir_cleanup_exec)

	# api call: container_post - post_action: exec - cmd: rspamd - task: worker_password
	async def container_post__exec__rspamd__worker_password(self, container_id, request_json):
	if 'raw' in request_json:
	for container in (await self.docker_client.containers.list()):
	if container._id == container_id:

	cmd = "./set_worker_password.sh '" + request_json['raw'].replace("'", "'\\''") + "' 2> /dev/null"
	rspamd_password_exec = await container.exec(cmd, user='_rspamd')
	async with rspamd_password_exec.start(detach=False) as stream:
	rspamd_password_return = await stream.read_out()

	if "OK" in rspamd_password_return.data.decode('utf-8'):
	matched = True
	await container.restart()

	if matched:
	res = {
	'type': 'success',
	'msg': 'command completed successfully'
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	else:
	res = {
	'type': 'danger',
	'msg': 'command did not complete'
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")



	async def exec_run_handler(type, exec_obj):
	async with exec_obj.start(detach=False) as stream:
	exec_return = await stream.read_out()

	if exec_return == None:
	exec_return = ""
	else:
	exec_return = exec_return.data.decode('utf-8')

	if type == 'generic':
	exec_details = await exec_obj.inspect()
	if exec_details["ExitCode"] == None or exec_details["ExitCode"] == 0:
	res = {
	"type": "success",
	"msg": "command completed successfully"
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	else:
	res = {
	"type": "success",
	"msg": "'command failed: " + exec_return
	}
	return Response(content=json.dumps(res, indent=4), media_type="application/json")
	if type == 'utf8_text_only':
	return Response(content=exec_return, media_type="text/plain")

	async def get_host_stats(wait=5):
	global host_stats_isUpdating

	try:
	system_time = datetime.now()
	host_stats = {
	"cpu": {
	"cores": psutil.cpu_count(),
	"usage": psutil.cpu_percent()
	},
	"memory": {
	"total": psutil.virtual_memory().total,
	"usage": psutil.virtual_memory().percent,
	"swap": psutil.swap_memory()
	},
	"uptime": time.time() - psutil.boot_time(),
	"system_time": system_time.strftime("%d.%m.%Y %H:%M:%S")
	}

	redis_client.set('host_stats', json.dumps(host_stats), ex=10)
	except Exception as e:
	res = {
	"type": "danger",
	"msg": str(e)
	}
	print(json.dumps(res, indent=4))

	await asyncio.sleep(wait)
	host_stats_isUpdating = False


	async def get_container_stats(container_id, wait=5, stop=False):
	global containerIds_to_update

	if container_id and container_id.isalnum():
	try:
	for container in (await async_docker_client.containers.list()):
	if container._id == container_id:
	res = await container.stats(stream=False)

	if redis_client.exists(container_id + '_stats'):
	stats = json.loads(redis_client.get(container_id + '_stats'))
	else:
	stats = []
	stats.append(res[0])
	if len(stats) > 3:
	del stats[0]
	redis_client.set(container_id + '_stats', json.dumps(stats), ex=60)
	except Exception as e:
	res = {
	"type": "danger",
	"msg": str(e)
	}
	print(json.dumps(res, indent=4))
	else:
	res = {
	"type": "danger",
	"msg": "no or invalid id defined"
	}
	print(json.dumps(res, indent=4))

	await asyncio.sleep(wait)
	if stop == True:
	# update task was called second time, stop
	containerIds_to_update.remove(container_id)
	else:
	# call update task a second time
	await get_container_stats(container_id, wait=0, stop=True)


	if os.environ['REDIS_SLAVEOF_IP'] != "":
	redis_client = redis.Redis(host=os.environ['REDIS_SLAVEOF_IP'], port=os.environ['REDIS_SLAVEOF_PORT'], db=0)
	else:
	redis_client = redis.Redis(host='redis-mailcow', port=6379, db=0)

	async_docker_client = aiodocker.Docker(url='unix:///var/run/docker.sock')
	diff --git a/data/web/js/site/queue.js b/data/web/js/site/queue.js
	index 88e48d97..057ad840 100644
	--- a/data/web/js/site/queue.js
	+++ b/data/web/js/site/queue.js
	@@ -1,119 +1,123 @@
	jQuery(function($){

	$(".refresh_table").on('click', function(e) {
	e.preventDefault();
	var table_name = $(this).data('table');
	$('#' + table_name).DataTable().ajax.reload();
	});

	+
	+ function humanFileSize(i){if(Math.abs(i)<1024)return i+" B";var B=["KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"],e=-1;do{i/=1024,++e}while(Math.abs(i)>=1024&&e<B.length-1);return i.toFixed(1)+" "+B[e]}
	+
	// Queue item
	$('#showQueuedMsg').on('show.bs.modal', function (e) {
	$('#queue_msg_content').text(lang.loading);
	button = $(e.relatedTarget)
	if (button != null) {
	$('#queue_id').text(button.data('queue-id'));
	}
	$.ajax({
	type: 'GET',
	url: '/api/v1/get/postcat/' + button.data('queue-id'),
	dataType: 'text',
	complete: function (data) {
	+ console.log(data);
	$('#queue_msg_content').text(data.responseText);
	}
	});
	})

	function draw_queue() {
	// just recalc width if instance already exists
	if ($.fn.DataTable.isDataTable('#queuetable') ) {
	$('#queuetable').DataTable().columns.adjust().responsive.recalc();
	return;
	}

	$('#queuetable').DataTable({
	processing: true,
	serverSide: false,
	language: lang_datatables,
	ajax: {
	type: "GET",
	url: "/api/v1/get/mailq/all",
	dataSrc: function(data){
	$.each(data, function (i, item) {
	item.chkbox = '<input type="checkbox" data-id="mailqitems" name="multi_select" value="' + item.queue_id + '" />';
	rcpts = $.map(item.recipients, function(i) {
	return escapeHtml(i);
	});
	item.recipients = rcpts.join('<hr style="margin:1px!important">');
	item.action = '<div class="btn-group">' +
	'<a href="#" data-bs-toggle="modal" data-bs-target="#showQueuedMsg" data-queue-id="' + encodeURI(item.queue_id) + '" class="btn btn-xs btn-secondary">' + lang.queue_show_message + '</a>' +
	'</div>';
	});
	return data;
	}
	},
	columns: [
	{
	// placeholder, so checkbox will not block child row toggle
	title: '',
	data: null,
	searchable: false,
	orderable: false,
	defaultContent: ''
	},
	{
	title: '',
	data: 'chkbox',
	searchable: false,
	orderable: false,
	defaultContent: ''
	},
	{
	title: 'QID',
	data: 'queue_id',
	defaultContent: ''
	},
	{
	title: 'Queue',
	data: 'queue_name',
	defaultContent: ''
	},
	{
	- title: lang.arrival_time,
	+ title: lang_admin.arrival_time,
	data: 'arrival_time',
	defaultContent: '',
	render: function (data, type){
	var date = new Date(data ? data * 1000 : 0);
	return date.toLocaleDateString(undefined, {year: "numeric", month: "2-digit", day: "2-digit", hour: "2-digit", minute: "2-digit", second: "2-digit"});
	}
	},
	{
	- title: lang.message_size,
	+ title: lang_admin.message_size,
	data: 'message_size',
	defaultContent: '',
	render: function (data, type){
	return humanFileSize(data);
	}
	},
	{
	- title: lang.sender,
	+ title: lang_admin.sender,
	data: 'sender',
	defaultContent: ''
	},
	{
	- title: lang.recipients,
	+ title: lang_admin.recipients,
	data: 'recipients',
	defaultContent: ''
	},
	{
	- title: lang.action,
	+ title: lang_admin.action,
	data: 'action',
	className: 'text-md-end dt-sm-head-hidden dt-body-right',
	defaultContent: ''
	},
	]
	});
	}

	draw_queue();

	})
	\ No newline at end of file
	diff --git a/data/web/queue.php b/data/web/queue.php
	index 18c3b563..ffce8d8b 100644
	--- a/data/web/queue.php
	+++ b/data/web/queue.php
	@@ -1,25 +1,26 @@
	<?php
	require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/prerequisites.inc.php';

	if (!isset($_SESSION['mailcow_cc_role']) \|\| $_SESSION['mailcow_cc_role'] != "admin") {
	header('Location: /');
	exit();
	}


	require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/header.inc.php';
	$js_minifier->add('/web/js/site/queue.js');
	$_SESSION['return_to'] = $_SERVER['REQUEST_URI'];

	$role = ($_SESSION['mailcow_cc_role'] == "admin") ? 'admin' : 'domainadmin';

	$template = 'queue.twig';
	$template_data = [
	'acl' => $_SESSION['acl'],
	'acl_json' => json_encode($_SESSION['acl']),
	'role' => $role,
	'lang_admin' => json_encode($lang['admin']),
	+ 'lang_queue' => json_encode($lang['queue']),
	'lang_datatables' => json_encode($lang['datatables'])
	];

	require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/footer.inc.php';
	diff --git a/data/web/templates/modals/admin.twig b/data/web/templates/modals/admin.twig
	index a67e4848..15971e59 100644
	--- a/data/web/templates/modals/admin.twig
	+++ b/data/web/templates/modals/admin.twig
	@@ -1,263 +1,249 @@
	<!-- add settings rule modal -->
	<div class="modal fade" id="addRsettingModal" tabindex="-1" role="dialog" aria-hidden="false">
	<div class="modal-dialog modal-xl">
	<div class="modal-content">
	<div class="modal-header">
	<h3 class="modal-title">{{ lang.admin.add_settings_rule }}</h3>
	<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
	</div>
	<div class="modal-body">
	<form class="form-horizontal" data-cached-form="true" data-id="rsetting" role="form" method="post">
	<div class="row mb-2">
	<label class="control-label col-sm-2 text-sm-end" for="desc">{{ lang.admin.rsetting_desc }}:</label>
	<div class="col-sm-10">
	<input type="text" class="form-control" id="adminRspamdSettingsDesc" name="desc" required>
	</div>
	</div>
	<div class="row mb-4">
	<label class="control-label col-sm-2 text-sm-end" for="content">{{ lang.admin.rsetting_content }}:</label>
	<div class="col-sm-10">
	<textarea class="form-control" id="adminRspamdSettingsContent" name="content" rows="10"></textarea>
	</div>
	</div>
	<div class="row mb-2">
	<div class="offset-sm-2 col-sm-10">
	<div class="checkbox">
	<label><input type="checkbox" value="1" name="active" checked> {{ lang.admin.active }}</label>
	</div>
	</div>
	</div>
	<div class="row mb-4">
	<div class="offset-sm-2 col-sm-10">
	<button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="rsetting" data-api-url='add/rsetting' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
	</div>
	</div>
	</form>
	<hr>
	<p>{{ lang.admin.rspamd_com_settings \| raw }}</p>
	<ul id="rspamd_presets"></ul>
	</div>
	</div>
	</div>
	</div><!-- add settings rule modal -->
	<!-- add domain admin modal -->
	<div class="modal fade" id="addDomainAdminModal" tabindex="-1" role="dialog" aria-hidden="true">
	<div class="modal-dialog modal-xl">
	<div class="modal-content">
	<div class="modal-header">
	<h3 class="modal-title">{{ lang.admin.add_domain_admin }}</h3>
	<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
	</div>
	<div class="modal-body">
	<form class="form-horizontal" data-cached-form="true" data-id="add_domain_admin" role="form" method="post" autocomplete="off">
	<div class="row mb-2">
	<label class="control-label col-sm-2 text-sm-end" for="username">{{ lang.admin.username }}:</label>
	<div class="col-sm-10">
	<input type="text" class="form-control" name="username" onkeyup="this.value = this.value.toLowerCase();" required>
	&rdsh; <kbd>a-z - _ .</kbd>
	</div>
	</div>
	<div class="row mb-4">
	<label class="control-label col-sm-2 text-sm-end" for="name">{{ lang.admin.admin_domains }}:</label>
	<div class="col-sm-10">
	<select title="{{ lang.admin.search_domain_da }}" class="full-width-select" name="domains" size="5" multiple>
	{% for domain in domains %}
	<option>{{ domain }}</option>
	{% endfor %}
	</select>
	</div>
	</div>
	<div class="row mb-2">
	<label class="control-label col-sm-2 text-sm-end" for="password">{{ lang.admin.password }} (<a href="#" class="generate_password">{{ lang.admin.generate }}</a>)</label>
	<div class="col-sm-10">
	<input type="password" class="form-control" data-pwgen-field="true" data-hibp="true" name="password" placeholder="" autocomplete="new-password" required>
	</div>
	</div>
	<div class="row mb-4">
	<label class="control-label col-sm-2 text-sm-end" for="password2">{{ lang.admin.password_repeat }}:</label>
	<div class="col-sm-10">
	<input type="password" class="form-control" data-pwgen-field="true" name="password2" placeholder="" autocomplete="new-password" required>
	</div>
	</div>
	<div class="row mb-2">
	<div class="offset-sm-2 col-sm-10">
	<div class="checkbox">
	<label><input type="checkbox" value="1" name="active" checked> {{ lang.admin.active }}</label>
	</div>
	</div>
	</div>
	<div class="row mb-4">
	<div class="offset-sm-2 col-sm-10">
	<button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="add_domain_admin" data-api-url='add/domain-admin' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
	</div>
	</div>
	</form>
	</div>
	</div>
	</div>
	</div><!-- add domain admin modal -->
	<!-- change fido2 fn -->
	<div class="modal fade" id="fido2ChangeFn" tabindex="-1" role="dialog" aria-hidden="true">
	<div class="modal-dialog modal-xl">
	<div class="modal-content">
	<div class="modal-header">
	<h3 class="modal-title">{{ lang.fido2.set_fn }}</h3>
	<p class="text-muted" style="word-break:break-all" id="fido2_subject_desc" data-fido2-subject=""></p>
	<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
	</div>
	<div class="modal-body">
	<form class="form-horizontal" data-cached-form="false" data-id="fido2ChangeFn" role="form" method="post" autocomplete="off">
	<input type="hidden" class="form-control" name="fido2_cid" id="fido2_cid">
	<div class="row mb-4">
	<label class="control-label col-sm-4" for="fido2_fn">{{ lang.fido2.fn }}:</label>
	<div class="col-sm-8">
	<input type="text" class="form-control" name="fido2_fn">
	</div>
	</div>
	<div class="row mb-4">
	<div class="offset-sm-4 col-sm-8">
	<button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="edit_selected" data-id="fido2ChangeFn" data-item="null" data-api-url='edit/fido2-fn' data-api-attr='{}' href="#">{{ lang.admin.save }}</button>
	</div>
	</div>
	</form>
	</div>
	</div>
	</div>
	</div><!-- add domain admin modal -->
	<!-- add oauth2 client modal -->
	<div class="modal fade" id="addOAuth2ClientModal" tabindex="-1" role="dialog" aria-hidden="true">
	<div class="modal-dialog modal-xl">
	<div class="modal-content">
	<div class="modal-header">
	<h3 class="modal-title">OAuth2</h3>
	<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
	</div>
	<div class="modal-body">
	<form class="form-horizontal" data-cached-form="true" data-id="add_oauth2_client" role="form" method="post">
	<div class="row mb-4">
	<label class="control-label col-sm-2 text-sm-end" for="redirect_uri">{{ lang.admin.oauth2_redirect_uri }}:</label>
	<div class="col-sm-10">
	<input type="text" class="form-control" name="redirect_uri" required>
	</div>
	</div>
	<div class="row mb-4">
	<div class="offset-sm-2 col-sm-10">
	<button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="add_oauth2_client" data-api-url='add/oauth2-client' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
	</div>
	</div>
	</form>
	</div>
	</div>
	</div>
	</div><!-- add domain admin modal -->
	<!-- add admin modal -->
	<div class="modal fade" id="addAdminModal" tabindex="-1" role="dialog" aria-hidden="true">
	<div class="modal-dialog modal-xl">
	<div class="modal-content">
	<div class="modal-header">
	<h3 class="modal-title">{{ lang.admin.add_admin }}</h3>
	<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
	</div>
	<div class="modal-body">
	<form class="form-horizontal" data-cached-form="true" data-id="add_admin" role="form" method="post" autocomplete="off">
	<div class="row mb-4">
	<label class="control-label col-sm-2 text-sm-end" for="username">{{ lang.admin.username }}:</label>
	<div class="col-sm-10">
	<input type="text" class="form-control" name="username" onkeyup="this.value = this.value.toLowerCase();" required>
	&rdsh; <kbd>a-z - _ .</kbd>
	</div>
	</div>
	<div class="row mb-2">
	<label class="control-label col-sm-2 text-sm-end" for="password">{{ lang.admin.password }} (<a href="#" class="generate_password">{{ lang.admin.generate }}</a>):</label>
	<div class="col-sm-10">
	<input type="password" class="form-control" data-pwgen-field="true" data-hibp="true" name="password" placeholder="" autocomplete="new-password" required>
	</div>
	</div>
	<div class="row mb-4">
	<label class="control-label col-sm-2 text-sm-end" for="password2">{{ lang.admin.password_repeat }}:</label>
	<div class="col-sm-10">
	<input type="password" class="form-control" data-pwgen-field="true" name="password2" placeholder="" autocomplete="new-password" required>
	</div>
	</div>
	<div class="row mb-2">
	<div class="offset-sm-2 col-sm-10">
	<div class="checkbox">
	<label><input type="checkbox" value="1" name="active" checked> {{ lang.admin.active }}</label>
	</div>
	</div>
	</div>
	<div class="row mb-4">
	<div class="offset-sm-2 col-sm-10">
	<button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="add_admin" data-api-url='add/admin' data-api-attr='{}' href="#"><i class="bi bi-plus-lg"></i> {{ lang.admin.add }}</button>
	</div>
	</div>
	</form>
	</div>
	</div>
	</div>
	</div><!-- add admin modal -->
	<!-- test transport modal -->
	<div class="modal fade" id="testTransportModal" tabindex="-1" role="dialog" aria-hidden="true">
	<div class="modal-dialog modal-xl">
	<div class="modal-content">
	<div class="modal-header">
	<h3 class="modal-title"><i class="bi bi-info-circle-fill"></i> Transport</h3>
	<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
	</div>
	<div class="modal-body">
	<form class="form-horizontal" data-cached-form="true" id="test_transport_form" role="form" method="post">
	<input type="hidden" class="form-control" name="transport_id" id="transport_id">
	<input type="hidden" class="form-control" name="transport_type" id="transport_type">
	<div class="row mb-2">
	<label class="control-label col-sm-2 text-sm-end" for="mail_from">{{ lang.admin.relay_from }}</label>
	<div class="col-sm-10">
	<input type="text" class="form-control" name="mail_from" placeholder="relay@example.org">
	</div>
	</div>
	<div class="row mb-4">
	<label class="control-label col-sm-2 text-sm-end" for="mail_rcpt">{{ lang.admin.relay_rcpt }}</label>
	<div class="col-sm-10">
	<input type="text" class="form-control" name="mail_rcpt" placeholder="null@hosted.mailcow.de" value="null@hosted.mailcow.de">
	<p class="text-muted">{{ lang.admin.transport_test_rcpt_info\|raw }}</p>
	</div>
	</div>
	<div class="row mb-4">
	<div class="offset-sm-2 col-sm-10">
	<button class="btn btn-xs-lg d-block d-sm-inline btn-secondary" id="test_transport" href="#">{{ lang.admin.relay_run }}</button>
	</div>
	</div>
	</form>
	<hr>
	<div id="test_transport_result" style="font-size:10pt">-</div>
	</div>
	</div>
	</div>
	</div><!-- test transport modal -->
	-<!-- show queue item modal -->
	-<div class="modal fade" id="showQueuedMsg" tabindex="-1" role="dialog" aria-hidden="true">
	- <div class="modal-dialog modal-xl">
	- <div class="modal-content">
	- <div class="modal-header">
	- <h3 class="modal-title"><i class="bi bi-card-checklist" style="font-size:18px"></i> ID <span id="queue_id"></span></h3>
	- <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
	- </div>
	- <div class="modal-body">
	- <textarea class="form-control" id="queue_msg_content" name="content" rows="40"></textarea>
	- </div>
	- </div>
	- </div>
	-</div><!-- show queue item modal -->
	<!-- priv key modal -->
	<div class="modal fade" id="showDKIMprivKey" tabindex="-1" role="dialog" aria-hidden="true">
	<div class="modal-dialog">
	<div class="modal-content">
	<div class="modal-header">
	<h3 class="modal-title"><i class="bi bi-key-fill"></i> Private key</h3>
	<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
	</div>
	<div class="modal-body">
	<pre id="priv_key_pre"></pre>
	</div>
	</div>
	</div>
	</div><!-- priv key modal -->
	diff --git a/data/web/templates/modals/queue.twig b/data/web/templates/modals/queue.twig
	new file mode 100644
	index 00000000..68fe9125
	--- /dev/null
	+++ b/data/web/templates/modals/queue.twig
	@@ -0,0 +1,14 @@
	+<!-- show queue item modal -->
	+<div class="modal fade" id="showQueuedMsg" tabindex="-1" role="dialog" aria-hidden="true">
	+ <div class="modal-dialog modal-xl">
	+ <div class="modal-content">
	+ <div class="modal-header">
	+ <h3 class="modal-title"><i class="bi bi-card-checklist" style="font-size:18px"></i> ID <span id="queue_id"></span></h3>
	+ <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
	+ </div>
	+ <div class="modal-body">
	+ <textarea class="form-control" id="queue_msg_content" name="content" rows="40"></textarea>
	+ </div>
	+ </div>
	+ </div>
	+</div><!-- show queue item modal -->
	\ No newline at end of file
	diff --git a/data/web/templates/queue.twig b/data/web/templates/queue.twig
	index 49c9f8ad..22c36a27 100644
	--- a/data/web/templates/queue.twig
	+++ b/data/web/templates/queue.twig
	@@ -1,51 +1,54 @@
	{% extends 'base.twig' %}

	{% block content %}
	<div class="card mb-4">
	<div class="card-header d-flex fs-5">
	<span>{{ lang.queue.queue_manager }} <span class="badge bg-info table-lines"></span></span>
	<div class="btn-group ms-auto">
	<button class="btn btn-xs btn-secondary refresh_table" data-draw="draw_queue" data-table="queuetable">{{ lang.admin.refresh }}</button>
	</div>
	</div>
	<div class="card-body">
	<table id="queuetable" class="table table-striped dt-responsive w-100"></table>
	<div class="mass-actions-admin">
	<div class="btn-group">
	<a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="mailqitems" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
	<a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
	<ul class="dropdown-menu top33">
	<li><a class="dropdown-item" data-bs-toggle="tooltip" title="postqueue -i" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"deliver"}' href="#">{{ lang.queue.queue_deliver_mail }}</a></li>
	<li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -H" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"unhold"}' href="#">{{ lang.queue.queue_unhold_mail }}</a></li>
	<li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -h" data-action="edit_selected" data-id="mailqitems" data-api-url='edit/mailq' data-api-attr='{"action":"hold"}' href="#">{{ lang.queue.queue_hold_mail }}</a></li>
	<li><hr class="dropdown-divider"></li>
	<li><a class="dropdown-item" data-bs-toggle="tooltip" title="postsuper -d" data-action="delete_selected" data-id="mailqitems" data-api-url='delete/mailq' href="#">{{ lang.mailbox.remove }}</a></li>
	</ul>
	<a class="btn btn-sm d-block d-sm-inline btn-primary"
	data-action="edit_selected"
	data-item="mailqitems-all"
	data-api-url='edit/mailq'
	data-api-attr='{"action":"flush"}'
	data-bs-toggle="tooltip" title="postqueue -f"
	href="#"><i class="bi bi-check-all"></i> {{ lang.queue.flush_queue }}</a>
	<a class="btn btn-sm d-block d-sm-inline btn-danger"
	id="super_delete"
	data-action="edit_selected"
	data-item="mailqitems-all"
	data-api-url='edit/mailq'
	data-api-attr='{"action":"super_delete"}'
	data-bs-toggle="tooltip" title="postsuper -d ALL"
	href="#"><i class="bi bi-trash"></i> {{ lang.queue.delete_queue }}</a>
	</div>
	</div>
	</div>
	</div>

	+{% include 'modals/queue.twig' %}
	+
	<script type='text/javascript'>
	- var lang = {{ lang_admin\|raw }};
	+ var lang_admin = {{ lang_admin\|raw }};
	+ var lang = {{ lang_queue\|raw }};
	var lang_datatables = {{ lang_datatables\|raw }};
	var csrf_token = '{{ csrf_token }}';
	var pagination_size = '{{ pagination_size }}';
	var table_for_domain = '{{ domain }}';
	</script>
	{% endblock %}

File Metadata

Mime Type: text/x-diff
Expires: 9月 9 Tue, 5:42 AM (7 h, 37 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5327
默认替代文本: (49 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions