Added rename function

This commit is contained in:
DomySh
2022-07-08 13:13:30 +02:00
parent 646c1844b1
commit 31391f092c
18 changed files with 60 additions and 156 deletions

View File

@@ -37,10 +37,13 @@ def JWT_SECRET(): return conf.get("secret")
@app.on_event("startup")
async def startup_event():
db.init()
firewall.init_updater()
await firewall.init()
if not JWT_SECRET(): conf.put("secret", secrets.token_hex(32))
await firewall.reload()
@app.on_event("shutdown")
async def shutdown_event():
await firewall.close()
db.disconnect()
def create_access_token(data: dict):
to_encode = data.copy()
@@ -202,6 +205,16 @@ async def service_delete(service_port: int, auth: bool = Depends(is_loggined)):
await firewall.remove(service_port)
return {'status': 'ok'}
class RenameForm(BaseModel):
name:str
@app.post('/api/service/{service_port}/rename', response_model=StatusMessageModel)
async def service_rename(service_port: int, form: RenameForm, auth: bool = Depends(is_loggined)):
"""Request to change the name of a specific service"""
if not form.name: return {'status': 'The name cannot be empty!'}
db.query('UPDATE services SET name=? WHERE port = ?;', form.name, service_port)
return {'status': 'ok'}
class RegexModel(BaseModel):
regex:str
mode:str

View File

@@ -156,7 +156,6 @@ class ServiceManager:
def _stats_updater(self,filter:Filter):
print(filter, filter.blocked, filter.code)
self.db.query("UPDATE regexes SET blocked_packets = ? WHERE regex_id = ?;", filter.blocked, filter.code)
def update_stats(self):
@@ -181,8 +180,13 @@ class ProxyManager:
def init_updater(self):
if not self.updater_task:
self.updater_task = asyncio.create_task(self._stats_updater())
def close_updater(self):
if self.updater_task: self.updater_task.cancel()
async def close(self):
self.close_updater()
if self.updater_task: self.updater_task.cancel()
for key in list(self.proxy_table.keys()):
await self.remove(key)
@@ -192,7 +196,11 @@ class ProxyManager:
await self.proxy_table[port].next(STATUS.STOP)
del self.proxy_table[port]
async def init(self):
await self.reload()
async def reload(self):
self.init_updater()
async with self.lock:
for srv in self.db.query('SELECT port, status FROM services;'):
srv_port, req_status = srv["port"], srv["status"]
@@ -203,13 +211,18 @@ class ProxyManager:
await self.proxy_table[srv_port].next(req_status)
async def _stats_updater(self):
while True:
try:
for key in list(self.proxy_table.keys()):
self.proxy_table[key].update_stats()
except Exception:
traceback.print_exc()
await asyncio.sleep(1)
try:
while True:
try:
for key in list(self.proxy_table.keys()):
self.proxy_table[key].update_stats()
except Exception:
traceback.print_exc()
await asyncio.sleep(1)
except asyncio.CancelledError:
self.updater_task = None
return
def get(self,port):