external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-03-09 15:40:09 +00:00
Code Issues Releases Wiki Activity

rework console so migrating vms isnt dumb and ssh tunnels can be torn down

Browse source
This commit is contained in:
Jordan Rodgers 2018-02-19 23:31:02 -05:00
parent 08821b0b75
commit f84b205f15
3 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
proxstar/__init__.py
View file

@ -68,7 +68,7 @@ if 'generate_pool_cache' not in scheduler:
id='generate_pool_cache', id='generate_pool_cache',
scheduled_time=datetime.datetime.utcnow(), scheduled_time=datetime.datetime.utcnow(),
func=generate_pool_cache_task, func=generate_pool_cache_task,
interval=60) interval=90)
if 'process_expiring_vms' not in scheduler: if 'process_expiring_vms' not in scheduler:
scheduler.cron( scheduler.cron(
@ -176,7 +176,7 @@ def vm_power(vmid, action):
return '', 403 return '', 403
@app.route("/vm/<string:vmid>/console", methods=['POST']) @app.route("/console/vm/<string:vmid>", methods=['POST'])
@auth.oidc_auth @auth.oidc_auth
def vm_console(vmid): def vm_console(vmid):
user = build_user_dict(session, db) user = build_user_dict(session, db)
@ -186,13 +186,28 @@ def vm_console(vmid):
port = str(5900 + int(vmid)) port = str(5900 + int(vmid))
token = add_vnc_target(port) token = add_vnc_target(port)
node = "{}.csh.rit.edu".format(get_vm_node(proxmox, vmid)) node = "{}.csh.rit.edu".format(get_vm_node(proxmox, vmid))
print("Creating SSH tunnel to {} for VM {}.".format(node, vmid)) tunnel = next((tunnel for tunnel in ssh_tunnels
try: if tunnel.local_bind_port == int(port)), None)
if tunnel:
if tunnel.ssh_host != node:
print(
"Tunnel already exists for VM {} to the wrong Proxmox node.".
format(vmid))
tunnel.stop()
ssh_tunnels.remove(tunnel)
print("Creating SSH tunnel to {} for VM {}.".format(
node, vmid))
tunnel = start_ssh_tunnel(node, port)
ssh_tunnels.append(tunnel)
start_vm_vnc(proxmox, vmid, port)
else:
print("Tunnel already exists to {} for VM {}.".format(
node, vmid))
else:
print("Creating SSH tunnel to {} for VM {}.".format(node, vmid))
tunnel = start_ssh_tunnel(node, port) tunnel = start_ssh_tunnel(node, port)
ssh_tunnels.append(tunnel) ssh_tunnels.append(tunnel)
except: start_vm_vnc(proxmox, vmid, port)
print('SSH tunnel already exists.')
start_vm_vnc(proxmox, vmid)
return token, 200 return token, 200
else: else:
return '', 403 return '', 403

7
proxstar/proxmox.py
View file

@ -25,7 +25,7 @@ def get_vms_for_user(proxmox, db, user):
pools = get_pools(proxmox, db) pools = get_pools(proxmox, db)
if user not in pools: if user not in pools:
if is_user(user) and not is_rtp(user): if is_user(user) and not is_rtp(user):
proxmox.pools.post(poolid=user, comment='Managed by Proxstar') proxmox.pools.post(poolid=user, comment='Managed by Proxstar')
else: else:
return [] return []
vms = proxmox.pools(user).get()['members'] vms = proxmox.pools(user).get()['members']
@ -253,10 +253,11 @@ def change_vm_mem(proxmox, vmid, mem):
node.qemu(vmid).config.put(memory=mem) node.qemu(vmid).config.put(memory=mem)
def start_vm_vnc(proxmox, vmid): def start_vm_vnc(proxmox, vmid, port):
node = proxmox.nodes(get_vm_node(proxmox, vmid)) node = proxmox.nodes(get_vm_node(proxmox, vmid))
port = str(int(port) - 5900)
node.qemu(vmid).monitor.post( node.qemu(vmid).monitor.post(
command="change vnc 127.0.0.1:{}".format(vmid)) command="change vnc 127.0.0.1:{}".format(port))
def get_isos(proxmox, storage): def get_isos(proxmox, storage):

2
proxstar/static/js/script.js
View file

@ -808,7 +808,7 @@ function hide_for_template(obj) {
$("#console-vm").click(function(){ $("#console-vm").click(function(){
const vmname = $(this).data('vmname'); const vmname = $(this).data('vmname');
const vmid = $(this).data('vmid'); const vmid = $(this).data('vmid');
fetch(`/vm/${vmid}/console`, { fetch(`https://proxstar-vnc.csh.rit.edu/console/vm/${vmid}`, {
credentials: 'same-origin', credentials: 'same-origin',
method: 'post' method: 'post'
}).then((response) => { }).then((response) => {