undersys/proxadmin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

activate services

Browse source
This commit is contained in:
deflax 2017-07-16 03:48:18 +03:00
parent 449e88789c
commit 9d930a0450
7 changed files with 74 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/admin/routes.py
View file

@ -129,7 +129,7 @@ def dashboard(user_pid=0):
flash('Deploy #{} unreachable. Support is notified'.format(str(cubeid)))
send_email(current_app.config['MAIL_USERNAME'], 'Cube {} is unreachable'.format(cubeid),
'vmanager/email/adm_unreachable', user=cuser, cubeid=cubeid )
current_app.logger.info('[ADMIN] {} deployments: {}, services: {}, domains: {}, services: {}'.format(cuser.email, inv_deployments_list, inv_services_list, inv_domains_list, inv_addresses_list ))
current_app.logger.warning('[ADMIN] {} deployments: {}, services: {}, domains: {}, services: {}'.format(cuser.email, inv_deployments_list, inv_services_list, inv_domains_list, inv_addresses_list ))
return render_template('main/dashboard.html', rrd=rrd, status=statuses, inv_deployments=inv_deployments, inv_services=inv_services, inv_domains=inv_domains, inv_addresses=inv_addresses, region=regions)
@admin.route("/listtransactions", methods=['GET'])

6
app/dmanager/routes.py
View file

@ -23,7 +23,7 @@ def after_request(response):
def activate(itemid=0):
if current_user.wallet < 1:
flash('Insufficient Funds')
return redirect(url_for('uinvoice.addfunds'))
return redirect(url_for('uinvoice.transactions'))
#work with disabled deploys only
result = current_user.inv_domains.all()
@ -32,9 +32,9 @@ def activate(itemid=0):
inventory.extend([invcls.pid])
if current_user.is_administrator():
current_app.logger.info('[ADMIN] Access override for domain id:{}'.format(itemid))
current_app.logger.warning('[ADMIN] Access override for domain id:{}'.format(itemid))
elif not itemid in inventory:
current_app.logger.warning('[{}] Access violation with domain id: {}'.format(current_user.email, itemid))
current_app.logger.error('[{}] Access violation with domain id: {}'.format(current_user.email, itemid))
abort(404)
#current_app.logger.info('[{}] Disabled deployments: {}'.format(current_user.email, inventory))

2
app/smanager/forms.py
View file

@ -4,5 +4,5 @@ from wtforms import validators, ValidationError
from wtforms.fields.html5 import EmailField
class ActivateForm(FlaskForm):
period = SelectField('Service Period', choices=[('1 Month', 1), ('3 Months', 3), ('6 Months', 6), ('1 Year', 12), ('2 Years', 24)])
period = SelectField('Service Period', choices=[(1, '1 Month'), (3, '3 Months'), (6, '6 Months'), (12, '1 Year'), (24, '2 Years')], coerce=int)
submit = SubmitField('Activate')

51
app/smanager/routes.py
View file

@ -6,10 +6,11 @@ from . import smanager
from .forms import ActivateForm
from .. import db
from ..email import send_email
from ..models import User, Permission, Service
from ..models import User, Permission, Service, Transaction
from ..decorators import admin_required, permission_required
from datetime import datetime, timedelta, date, time
from dateutil.relativedelta import relativedelta
@smanager.after_app_request
def after_request(response):
@ -21,25 +22,47 @@ def after_request(response):
@smanager.route('/activate/<int:itemid>', methods=['GET', 'POST'])
@login_required
def activate(itemid=0):
if current_user.wallet < 1:
flash('Insufficient Funds')
return redirect(url_for('uinvoice.addfunds'))
#work with disabled deploys only
result = current_user.inv_services.all()
inventory = []
for invcls in result:
inventory.extend([invcls.pid])
if current_user.is_administrator():
current_app.logger.info('[ADMIN] Access override for service id:{}'.format(itemid))
current_app.logger.warning('[ADMIN] Access override for service id:{}'.format(itemid))
elif not itemid in inventory:
current_app.logger.warning('[{}] Access violation with service id: {}'.format(current_user.email, itemid))
current_app.logger.error('[{}] Access violation with service id: {}'.format(current_user.email, itemid))
abort(404)
#current_app.logger.info('[{}] Disabled deployments: {}'.format(current_user.email, inventory))
form = ActivateForm(period=Service.query.filter_by(pid=itemid))
if current_user.confirmed and form.validate_on_submit():
current_app.logger.info('payment')
return render_template('smanager/activate.html', form=form, itemid=itemid)
service = Service.query.filter_by(pid=itemid).first()
price = float(service.price)
form = ActivateForm(period=int(service.period))
owner = service.owner
if owner.confirmed and form.validate_on_submit():
if owner.wallet < price:
flash('Insufficient Funds')
return redirect(url_for('uinvoice.transactions'))
current_app.logger.info('[{}] Charge service: {}'.format(owner.email, service.description))
today = datetime.utcnow()
expiry = today + relativedelta(today, months=+(form.period.data))
daysleft = expiry - today
extradays = relativedelta(today, days=+(service.daysleft))
service.date_last_charge = today + extradays
service.period = form.period.data
service.daysleft = daysleft.days + extradays.days - 1
service.warning = False
service.enabled = True
db.session.commit()
transaction = Transaction(user_id=int(owner.pid), description='Deployment {} activated for {} month(s)'.format(str(service.description), form.period.data), value=-price)
db.session.add(transaction)
db.session.commit()
owner.wallet = owner.wallet - price
db.session.commit()
if owner.is_administrator:
return redirect(url_for('admin.list_items'))
else:
return redirect(url_for('main.dashboard'))
return render_template('smanager/activate.html', form=form, service=service, total=service.price)

5
app/templates/main/dashboard.html
View file

@ -172,14 +172,13 @@ addEventListener("DOMContentLoaded", function() {
<button class="command command-vmstart btn btn-default btn-success" value="vmstart" vmid="{{ deploy.machine_id }}"><span class="glyphicon glyphicon-play" aria-hidden="true"></span> Start</button>
{% endif %}</td>
<td data-title="Remote">{% if status[deploy.machine_id] == 'running' %}
<button class="btn btn-default btn-info" onclick="window.open('/vmanager/vmvnc/{{ deploy.machine_id }}', '_blank');"><span class="glyphicon glyphicon-console" aria-hidden="true"></span> Console</button>
<button class="btn btn-default btn-info" onclick="window.open('/vmanager/vmvnc/{{ deploy.machine_id }}', '_blank');"><span class="glyphicon glyphicon-console" aria-hidden="true"></span> Console</button>{% endif %}
{% if deploy.warning == True %}
<td data-title="Time Left"><button class="btn btn-default btn-success" onclick="window.open('/vmanager/activate/{{ deploy.machine_id }}');"><span class="glyphicon glyphicon-bell" aria-hidden="true"></span> Renew ({{ deploy.daysleft }} days left)</button></td>
{% else %}
<td data-title="Time Left">{{ deploy.daysleft }} day(s)</td>
{% endif %}
{% endif %}</td>
</td>
</tr>
{% endif %}
{% endfor %}

12
app/templates/smanager/activate.html
View file

@ -1,6 +1,6 @@
{% extends "base.html" %}
{% block title %}Activate{% endblock %}
{% block title %}Activate service #{{ service.pid }}{% endblock %}
{% block page_content %}
@ -11,12 +11,16 @@
<div class="panel-heading">Activate</div>
<div class="panel-body">
<form method="POST" action"{{ url_for('smanager.activate', itemid=itemid) }}">
<p>{{ form.period.label }}<br />{{ form.period }}<br />
<form method="POST" action"{{ url_for('smanager.activate', itemid=service.pid) }}">
<h3>
{{ form.period.label }} {{ form.period }}<br />
{% for error in form.period.errors %}
{{ error }}<br />
{% endfor %}
</p>
---<br />
Total = {{ total }}
</h3>
<p>
{{ form.csrf_token() }}
{{ form.submit }}

46
app/vmanager/routes.py
View file

@ -121,15 +121,14 @@ def deploy(product_id=None):
@vmanager.route('/activate/<int:itemid>', methods=['GET', 'POST'])
@login_required
def activate(itemid=0):
#work with disabled deploys only
result = current_user.inv_deployments.all()
inventory = []
for invcls in result:
inventory.extend([invcls.machine_id])
if current_user.is_administrator():
current_app.logger.info('[ADMIN] Access override for deployment id:{}'.format(itemid))
current_app.logger.warning('[ADMIN] Access override for deployment id:{}'.format(itemid))
elif not itemid in inventory:
current_app.logger.warning('[{}] Access violation with deployment id: {}'.format(current_user.email, itemid))
current_app.logger.error('[{}] Access violation with deployment id: {}'.format(current_user.email, itemid))
abort(404)
deploy = Deployment.query.filter_by(machine_id=itemid).first()
@ -139,44 +138,43 @@ def activate(itemid=0):
total = round(cpu_cost + mem_cost + hdd_cost,2)
form = ActivateForm(period=int(deploy.period))
if current_user.confirmed and form.validate_on_submit():
if current_user.wallet < total:
owner = deploy.owner
if owner.confirmed and form.validate_on_submit():
if owner.wallet < total:
flash('Insufficient Funds')
return redirect(url_for('uinvoice.transactions'))
current_app.logger.info('[{}] Charge deployment: {}'.format(current_user.email, deploy.machine_id))
current_app.logger.info('[{}] Charge deployment: {}'.format(owner.email, deploy.machine_id))
today = datetime.utcnow()
current_app.logger.info(form.period.data)
daysleft = relativedelta(today, months=+(form.period.data))
deploy.date_last_charge = today
expiry = today + relativedelta(today, months=+(form.period.data))
daysleft = expiry - today
extradays = relativedelta(today, days=+(deploy.daysleft))
deploy.date_last_charge = today + extradays
deploy.period = form.period.data
deploy.daysleft = form.period.data * daysleft.days
deploy.daysleft = daysleft.days + extradays.days - 1
deploy.warning = False
deploy.enabled = True
db.session.commit()
transaction = Transaction(user_id=int(current_user.pid), description='Deployment {} activated for {} month(s)'.format(str(deploy.machine_alias), form.period.data), value=-total)
transaction = Transaction(user_id=int(owner.pid), description='Deployment {} activated for {} month(s)'.format(str(deploy.machine_alias), form.period.data), value=-total)
db.session.add(transaction)
db.session.commit()
current_user.wallet = current_user.wallet - total
owner.wallet = owner.wallet - total
db.session.commit()
return redirect(url_for('main.dashboard'))
if owner.is_administrator:
return redirect(url_for('admin.list_items'))
else:
return redirect(url_for('main.dashboard'))
return render_template('vmanager/activate.html', form=form, deploy=deploy, cpu_cost=cpu_cost, mem_cost=mem_cost, hdd_cost=hdd_cost, total=total)
@vmanager.route('/<cmd>/<int:vmid>')
@login_required
def command(cmd=None, vmid=0):
valid_commands = ['vmstatus', 'vmstart', 'vmshutdown', 'vmstop', 'vmvnc']
#checks whether this is a valid command
valid_commands = ['vmstatus', 'vmstart', 'vmshutdown', 'vmstop', 'vmvnc']
if not cmd in valid_commands:
current_app.logger.warning(cmd + ' is not a valid command!')
abort(404)
#if cmd == 'vmstart' and current_user.wallet < 3.0:
# flash('Недостатъчно средства в сметката за тази операция')
# return redirect(url_for('uinvoice.addfunds'))
#work with enabled deploys only
result = current_user.inv_deployments.filter_by(enabled=True)
@ -185,19 +183,19 @@ def command(cmd=None, vmid=0):
inventory.extend([invcls.machine_id])
if current_user.is_administrator():
current_app.logger.info('[ADMIN] Access override for cube id:{}'.format(vmid))
current_app.logger.warning('[ADMIN] Access override for cube id:{}'.format(vmid))
db_result = contact_proxmaster({}, cmd, vmid)
if cmd == 'vmvnc':
return redirect(db_result['url'])
else:
#checks if current user owns this vmid
if not vmid in inventory:
current_app.logger.warning('[{}] Access violation with cube id: {}'.format(current_user.email, vmid))
current_app.logger.error('[{}] Access violation with cube id: {}'.format(current_user.email, vmid))
#TODO: log ips
else:
db_result = contact_proxmaster({}, cmd, vmid)
#print(db_result)
if cmd == 'vmvnc':
return redirect(db_result['url'])
if cmd == 'vmvnc':
return redirect(db_result['url'])
abort(404)