mirror of
https://github.com/ComputerScienceHouse/proxstar.git
synced 2025-03-09 15:40:09 +00:00
Pylint
This commit is contained in:
parent
1bfdf398bb
commit
7555232926
2 changed files with 46 additions and 40 deletions
|
@ -271,29 +271,32 @@ class VM:
|
|||
# command='change vnc 127.0.0.1:{}'.format(port)
|
||||
# )
|
||||
|
||||
def configure_vnc_in_vm_config(self, ssh_user, ssh_pass):
|
||||
def configure_vnc_in_vm_config():#self, ssh_user, ssh_pass):
|
||||
"""Sets the vm up for VNC. Enables it to open a socket on localhost
|
||||
with a pre-determined password, which proxstar can then proxy to a noVNC
|
||||
instance.
|
||||
FIXME (willnilges): Dead Code. Remove this function.
|
||||
"""
|
||||
# proxmox = connect_proxmox()
|
||||
config = f'args: -object secret,id=secvnc{self.id},data={self.id} -vnc 127.0.0.1:{int(self.id)+5900},password-secret=secvnc{self.id}'
|
||||
path = f'/etc/pve/local/qemu-server/{self.id}.conf'
|
||||
with paramiko.SSHClient() as ssh:
|
||||
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
|
||||
ssh.connect(
|
||||
self.node,
|
||||
port=22,
|
||||
username=ssh_user,
|
||||
key_filename='proxmox_ssh_key',
|
||||
passphrase=ssh_pass,
|
||||
)
|
||||
ssh.exec_command(
|
||||
f"if grep -- '{config}' {path}; then echo identical config found; else sed -i /dev/null '/-vnc/d' {path}"
|
||||
) # YOLO
|
||||
ssh.exec_command(
|
||||
f"if grep -- '-vnc' {path}; then echo found config; else echo {config} >> {path}; fi"
|
||||
)
|
||||
# config = f'args: -object secret,id=secvnc{self.id},data={self.id} -vnc
|
||||
# 127.0.0.1:{int(self.id)+5900},password-secret=secvnc{self.id}'
|
||||
# path = f'/etc/pve/local/qemu-server/{self.id}.conf'
|
||||
# with paramiko.SSHClient() as ssh:
|
||||
# ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
|
||||
# ssh.connect(
|
||||
# self.node,
|
||||
# port=22,
|
||||
# username=ssh_user,
|
||||
# key_filename='proxmox_ssh_key',
|
||||
# passphrase=ssh_pass,
|
||||
# )
|
||||
# ssh.exec_command(
|
||||
# f"if grep -- '{config}' {path}; then echo identical config found;
|
||||
# else sed -i /dev/null '/-vnc/d' {path}"
|
||||
# ) # YOLO
|
||||
# ssh.exec_command(
|
||||
# f"if grep -- '-vnc' {path}; then echo found config; else echo {config} >> {path}; fi"
|
||||
# )
|
||||
|
||||
@retry(wait=wait_fixed(2), stop=stop_after_attempt(5))
|
||||
def eject_iso(self):
|
||||
|
|
|
@ -2,10 +2,10 @@ import os
|
|||
import subprocess
|
||||
import time
|
||||
|
||||
import urllib.parse
|
||||
import requests
|
||||
from flask import current_app as app
|
||||
from sshtunnel import SSHTunnelForwarder
|
||||
import urllib.parse
|
||||
|
||||
from proxstar import logging
|
||||
from proxstar.util import gen_password
|
||||
|
@ -75,27 +75,27 @@ def open_vnc_session(vmid, node, proxmox_user, proxmox_pass):
|
|||
# Get Proxmox API ticket and CSRF_Prevention_Token
|
||||
# TODO (willnilges): Use Proxmoxer to get this information
|
||||
# TODO (willnilges): Report errors
|
||||
data = {"username": proxmox_user, "password": proxmox_pass}
|
||||
data = {'username': proxmox_user, 'password': proxmox_pass}
|
||||
response_data = requests.post(
|
||||
f"https://{node}.csh.rit.edu:8006/" + "api2/json/access/ticket",
|
||||
f'https://{node}.csh.rit.edu:8006/' + 'api2/json/access/ticket',
|
||||
verify=False,
|
||||
data=data,
|
||||
).json()["data"]
|
||||
).json()['data']
|
||||
if response_data is None:
|
||||
raise AuthenticationError(
|
||||
"Could not authenticate against `ticket` endpoint! Check uname/password"
|
||||
raise requests.AuthenticationError(
|
||||
'Could not authenticate against `ticket` endpoint! Check uname/password'
|
||||
)
|
||||
csrf_prevention_token = response_data['CSRFPreventionToken']
|
||||
ticket = response_data['ticket']
|
||||
proxy_params = {"node": node, "vmid": str(vmid), "websocket": '1', "generate-password": '0'}
|
||||
proxy_params = {'node': node, 'vmid': str(vmid), 'websocket': '1', 'generate-password': '0'}
|
||||
vncproxy_response_data = requests.post(
|
||||
f"https://{node}.csh.rit.edu:8006/api2/json/nodes/{node}/qemu/{vmid}/vncproxy",
|
||||
f'https://{node}.csh.rit.edu:8006/api2/json/nodes/{node}/qemu/{vmid}/vncproxy',
|
||||
verify=False,
|
||||
timeout=5,
|
||||
params=proxy_params,
|
||||
headers={"CSRFPreventionToken": csrf_prevention_token},
|
||||
cookies={"PVEAuthCookie": ticket},
|
||||
).json()["data"]
|
||||
headers={'CSRFPreventionToken': csrf_prevention_token},
|
||||
cookies={'PVEAuthCookie': ticket},
|
||||
).json()['data']
|
||||
|
||||
return urllib.parse.quote_plus(vncproxy_response_data['ticket']), vncproxy_response_data['port']
|
||||
|
||||
|
@ -118,18 +118,21 @@ def start_ssh_tunnel(node, port):
|
|||
return server
|
||||
|
||||
|
||||
def stop_ssh_tunnel(vmid, ssh_tunnels):
|
||||
def stop_ssh_tunnel():#vmid, ssh_tunnels):
|
||||
# FIXME (willnilges): Dead code. Delete this function.
|
||||
# Tear down the SSH tunnel and VNC target entry for a given VM
|
||||
port = 5900 + int(vmid)
|
||||
tunnel = next((tunnel for tunnel in ssh_tunnels if tunnel.local_bind_port == port), None)
|
||||
if tunnel:
|
||||
logging.info('tearing down SSH tunnel for VM %s', vmid)
|
||||
try:
|
||||
tunnel.stop()
|
||||
except:
|
||||
pass
|
||||
ssh_tunnels.remove(tunnel)
|
||||
delete_vnc_target(port)
|
||||
print(f'This code is useless')
|
||||
pass
|
||||
# port = 5900 + int(vmid)
|
||||
# tunnel = next((tunnel for tunnel in ssh_tunnels if tunnel.local_bind_port == port), None)
|
||||
# if tunnel:
|
||||
# logging.info('tearing down SSH tunnel for VM %s', vmid)
|
||||
# try:
|
||||
# tunnel.stop()
|
||||
# except:
|
||||
# pass
|
||||
# ssh_tunnels.remove(tunnel)
|
||||
# delete_vnc_target(port)
|
||||
|
||||
|
||||
def send_stop_ssh_tunnel(vmid):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue