mptcp/openmptcprouter-vps-admin
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps-admin.git synced 2025-02-12 10:31:52 +00:00
Code Issues Releases Wiki Activity

Remove netjson dependancy

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-07-23 15:02:04 +02:00
parent 969a80125c
commit f4bf679620
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
omr-vps-admin (0.11+20240723) unstable; urgency=medium
* Remove netjson dependency and endpoint using it
-- OpenMPTCProuter <contact@openmptcprouter.com> Tue, 23 Jul 2024 15:01:25 +0200
omr-vps-admin (0.11+20240705) unstable; urgency=medium
* psutil.cpu_freq only available in psutil >5.1.0 put request in a try/except block

30
omr-admin.py
View file

@ -39,7 +39,7 @@ import requests
from jwt import PyJWTError
from netaddr import *
from ipaddress import ip_address, IPv4Address, IPv6Address
from netjsonconfig import OpenWrt
#from netjsonconfig import OpenWrt
from fastapi import Depends, FastAPI, HTTPException, Security, Query, Request, UploadFile
from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm, SecurityScopes, OAuth2
from passlib.context import CryptContext
@ -3120,21 +3120,21 @@ def list_backup(current_user: User = Depends(get_current_user)):
else:
return {'backup': False}
@app.get('/backupshow', summary="Show current user backup")
def show_backup(current_user: User = Depends(get_current_user)):
if os.path.isfile('/var/opt/openmptcprouter/' + current_user.username + '-backup.tar.gz'):
router = OpenWrt(native=open('/var/opt/openmptcprouter/' + current_user.username + '-backup.tar.gz'))
return {'backup': True, 'data': router}
else:
return {'backup': False}
#@app.get('/backupshow', summary="Show current user backup")
#def show_backup(current_user: User = Depends(get_current_user)):
# if os.path.isfile('/var/opt/openmptcprouter/' + current_user.username + '-backup.tar.gz'):
# router = OpenWrt(native=open('/var/opt/openmptcprouter/' + current_user.username + '-backup.tar.gz'))
# return {'backup': True, 'data': router}
# else:
# return {'backup': False}
@app.post('/backupedit', summary="Modify current user backup")
def edit_backup(params, current_user: User = Depends(get_current_user)):
if current_user.permissions == "ro":
return {'result': 'permission', 'reason': 'Read only user', 'route': 'backupedit'}
o = OpenWrt(params)
o.write(current_user.username + '-backup', path='/var/opt/openmptcprouter/')
return {'result': 'done'}
#@app.post('/backupedit', summary="Modify current user backup")
#def edit_backup(params, current_user: User = Depends(get_current_user)):
# if current_user.permissions == "ro":
# return {'result': 'permission', 'reason': 'Read only user', 'route': 'backupedit'}
# o = OpenWrt(params)
# o.write(current_user.username + '-backup', path='/var/opt/openmptcprouter/')
# return {'result': 'done'}
#class VPN(str, Enum):
# openvpn = "openvpn"