Skip to content
This repository has been archived by the owner on Mar 17, 2024. It is now read-only.

Commit

Permalink
Feature/SK-342 | Remove access to URL for rule "user can create" (#80)
Browse files Browse the repository at this point in the history 
Co-authored-by: Fredrik Wrede <fredrik@scaleoutsystems.com>
  • Loading branch information
@niklastheman @Wrede
niklastheman and Wrede authored Feb 28, 2023
1 parent 18a4e78 commit 51deea2
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 111 deletions.
87 changes: 87 additions & 0 deletions helpers.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
import time
import uuid

from django.apps import apps
from django.conf import settings
from django.template import engines

from .models import AppInstance, AppStatus
from .serialize import serialize_app
from .tasks import deploy_resource

ReleaseName = apps.get_model(app_label=settings.RELEASENAME_MODEL)


def create_instance_params(instance, action="create"):
Expand Down Expand Up @@ -113,3 +122,81 @@ def handle_permissions(parameters, project):
access = "private"

return access


def create_app_instance(user, project, app, app_settings, data=[], wait=False):
app_name = data.get("app_name")

parameters_out, app_deps, model_deps = serialize_app(
data, project, app_settings, user.username
)

authorized = can_access_app_instances(app_deps, user, project)

if not authorized:
raise Exception("Not authorized to use specified app dependency")

access = handle_permissions(parameters_out, project)

app_instance = AppInstance(
name=app_name,
access=access,
app=app,
project=project,
info={},
parameters=parameters_out,
owner=user,
)

create_instance_params(app_instance, "create")

# Attempt to create a ReleaseName model object
rel_name_obj = []
if "app_release_name" in data and data.get("app_release_name") != "":
submitted_rn = data.get("app_release_name")
try:
rel_name_obj = ReleaseName.objects.get(
name=submitted_rn, project=project, status="active"
)
rel_name_obj.status = "in-use"
rel_name_obj.save()
app_instance.parameters["release"] = submitted_rn
except Exception as e:
print("Error: Submitted release name not owned by project.")
print(e)
return [False, None, None]

# Add fields for apps table:
# to be displayed as app details in views
if app_instance.app.table_field and app_instance.app.table_field != "":
django_engine = engines["django"]
info_field = django_engine.from_string(
app_instance.app.table_field
).render(app_instance.parameters)
app_instance.table_field = eval(info_field)
else:
app_instance.table_field = {}

# Setting status fields before saving app instance
status = AppStatus(appinstance=app_instance)
status.status_type = "Created"
status.info = app_instance.parameters["release"]
app_instance.save()
# Saving ReleaseName, permissions, status and
# setting up dependencies
if rel_name_obj:
rel_name_obj.app = app_instance
rel_name_obj.save()
status.save()
app_instance.app_dependencies.set(app_deps)
app_instance.model_dependencies.set(model_deps)

# Finally, attempting to create apps resources
res = deploy_resource.delay(app_instance.pk, "create")

# wait is passed as a function parameter
if wait:
while not res.ready():
time.sleep(0.1)

return [True, project.slug, app_instance.app.category.slug]
143 changes: 32 additions & 111 deletions views.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import time
from datetime import datetime, timedelta
from json import load

Expand All @@ -10,18 +9,13 @@
from django.db.models import Q, Subquery
from django.http import HttpResponseNotFound, JsonResponse
from django.shortcuts import HttpResponseRedirect, render, reverse
from django.template import engines
from django.utils.decorators import method_decorator
from django.views import View
from guardian.decorators import permission_required_or_403

from .generate_form import generate_form
from .helpers import (
can_access_app_instances,
create_instance_params,
handle_permissions,
)
from .models import AppCategories, AppInstance, Apps, AppStatus
from .helpers import create_app_instance, handle_permissions
from .models import AppCategories, AppInstance, Apps
from .serialize import serialize_app
from .tasks import delete_resource, deploy_resource

Expand Down Expand Up @@ -341,125 +335,52 @@ def get(

return render(request, template, locals())

def post(
self, request, user, project, app_slug, data=[], wait=False, call=False
):
def post(self, request, user, project, app_slug, data=[], wait=False):
project, app, app_settings = self.get_shared_data(project, app_slug)
if not data:
data = request.POST
data = request.POST
user = request.user

app_name = data.get("app_name")
user = request.user if not call else User.objects.get(username=user)
if not app.user_can_create:
raise Exception("User not allowed to create app")

parameters_out, app_deps, model_deps = serialize_app(
data, project, app_settings, user.username
successful, project_slug, app_category_slug = create_app_instance(
user, project, app, app_settings, data, wait
)

authorized = can_access_app_instances(app_deps, user, project)

if not authorized:
raise Exception("Not authorized to use specified app dependency")

access = handle_permissions(parameters_out, project)

app_instance = AppInstance(
name=app_name,
access=access,
app=app,
project=project,
info={},
parameters=parameters_out,
owner=user,
)

create_instance_params(app_instance, "create")

# Attempt to create a ReleaseName model object
rel_name_obj = []
if "app_release_name" in data and data.get("app_release_name") != "":
submitted_rn = data.get("app_release_name")
try:
rel_name_obj = ReleaseName.objects.get(
name=submitted_rn, project=project, status="active"
if not successful:
return HttpResponseRedirect(
reverse(
"projects:details",
kwargs={
"user": request.user,
"project_slug": str(project.slug),
},
)
rel_name_obj.status = "in-use"
rel_name_obj.save()
app_instance.parameters["release"] = submitted_rn
except Exception as e:
print("Error: Submitted release name not owned by project.")
print(e)
)

if "from" in request.GET:
from_page = request.GET.get("from")
if from_page == "overview":
return HttpResponseRedirect(
reverse(
"projects:details",
kwargs={
"user": request.user,
"project_slug": str(project.slug),
"project_slug": str(project_slug),
},
)
)

# Add fields for apps table:
# to be displayed as app details in views
if app_instance.app.table_field and app_instance.app.table_field != "":
django_engine = engines["django"]
info_field = django_engine.from_string(
app_instance.app.table_field
).render(app_instance.parameters)
app_instance.table_field = eval(info_field)
else:
app_instance.table_field = {}

# Setting status fields before saving app instance
status = AppStatus(appinstance=app_instance)
status.status_type = "Created"
status.info = app_instance.parameters["release"]
app_instance.save()
# Saving ReleaseName, permissions, status and
# setting up dependencies
if rel_name_obj:
rel_name_obj.app = app_instance
rel_name_obj.save()
status.save()
app_instance.app_dependencies.set(app_deps)
app_instance.model_dependencies.set(model_deps)

# Finally, attempting to create apps resources
res = deploy_resource.delay(app_instance.pk, "create")

# wait is passed as a function parameter
if wait:
while not res.ready():
time.sleep(0.1)

# End of Create action

# Forming a final response
if request:
if "from" in request.GET:
from_page = request.GET.get("from")
if from_page == "overview":
return HttpResponseRedirect(
reverse(
"projects:details",
kwargs={
"user": request.user,
"project_slug": str(project.slug),
},
)
)

return HttpResponseRedirect(
reverse(
"apps:filtered",
kwargs={
"user": request.user,
"project": str(project.slug),
"category": app_instance.app.category.slug,
},
)
return HttpResponseRedirect(
reverse(
"apps:filtered",
kwargs={
"user": request.user,
"project": str(project_slug),
"category": app_category_slug,
},
)
else:
return JsonResponse({"status": "ok"})
)


@permission_required_or_403("can_view_project", (Project, "slug", "project"))
Expand Down

0 comments on commit 51deea2

Please sign in to comment.