sipwise
/
repoapi
mirror of https://github.com/sipwise/repoapi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#19230 require logged in user for all release_dashboard views

Browse Source 
* add login/logout links on base template
* fix logout on swagger

Change-Id: If9e0b328e0e6c061568e43465a5bd2438cabac17
changes/36/37536/2
Victor Seva 5 years ago
parent 8344ed342c
commit 8b3a8d0df5
5 changed files with 131 additions and 142 deletions
Show Stats Download Patch File Download Diff File

11
panel/templates/panel/base.html
Unescape View File

@ -9,7 +9,7 @@
<title>{% block title %}{% endblock %}</title> <title>{% block title %}{% endblock %}</title>
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="{% static "panel/css/bootstrap.min.css" %}" rel="stylesheet"> <link href="{% static 'panel/css/bootstrap.min.css' %}" rel="stylesheet">
{% block extrahead %}{% endblock %} {% block extrahead %}{% endblock %}
</head> </head>
<body> <body>
@ -34,13 +34,18 @@
{% block applist%} {% block applist%}
<li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li> <li><a href="{% url 'release_dashboard:index'%}">Release Dashboard</a></li>
{% endblock %} {% endblock %}
{% if user.is_authenticated %}
<li><a class="bg-info" href="{% url 'rest_framework:logout' %}?next={% url 'panel:index' %}">logout {{ user.get_username }}</a></li>
{% else %}
<li><a href="{% url 'rest_framework:login' %}?next={{request.path}}">login</a></li>
{% endif %}
</ul> </ul>
</nav> </nav>
</div> </div>
</header> </header>
{% block content %}{% endblock %} {% block content %}{% endblock %}
<script src="{% static "panel/js/jquery-2.1.3.js" %}"></script> <script src="{% static 'panel/js/jquery-2.1.3.js' %}"></script>
<script src="{% static "panel/js/bootstrap.js" %}"></script> <script src="{% static 'panel/js/bootstrap.js' %}"></script>
{% block extrajs %}{% endblock %} {% block extrajs %}{% endblock %}
</body> </body>
</html> </html>

12
release_dashboard/test/test_views.py
Unescape View File

@ -28,3 +28,15 @@ class TestHotfix(TestCase):
self.client.force_login(user) self.client.force_login(user)
res = self.client.get(reverse("release_dashboard:hotfix")) res = self.client.get(reverse("release_dashboard:hotfix"))
self.assertEqual(res.status_code, 200) self.assertEqual(res.status_code, 200)
class TestDocker(TestCase):
def test_no_login(self):
res = self.client.get(reverse("release_dashboard:docker_images"))
self.assertNotEqual(res.status_code, 200)
def test_login_ok(self):
user = User.objects.create_user(username="test")
self.client.force_login(user)
res = self.client.get(reverse("release_dashboard:docker_images"))
self.assertEqual(res.status_code, 200)

153
release_dashboard/views/build.py
Unescape View File

@ -36,13 +36,13 @@ logger = logging.getLogger(__name__)
def index(request): def index(request):
context = {} context = {}
return render(request, 'release_dashboard/index.html', context) return render(request, "release_dashboard/index.html", context)
@login_required @login_required
@require_http_methods(["POST", ]) @require_http_methods(["POST"])
def hotfix_build(request, branch, project): def hotfix_build(request, branch, project):
if project not in rd_settings['projects']: if project not in rd_settings["projects"]:
error = "repo:%s not valid" % project error = "repo:%s not valid" % project
logger.error(error) logger.error(error)
return HttpResponseNotFound(error) return HttpResponseNotFound(error)
@ -58,158 +58,139 @@ def hotfix_build(request, branch, project):
logger.error(error) logger.error(error)
return HttpResponseNotFound(error) return HttpResponseNotFound(error)
json_data = json.loads(request.body.decode('utf-8')) json_data = json.loads(request.body.decode("utf-8"))
if json_data['push'] == 'no': if json_data["push"] == "no":
logger.warn("dryrun for %s:%s", project, branch) logger.warn("dryrun for %s:%s", project, branch)
url = build.trigger_hotfix(project, branch, json_data['push']) url = build.trigger_hotfix(project, branch, json_data["push"])
return JsonResponse({'url': url}) return JsonResponse({"url": url})
def _build_logic(form, projects): def _build_logic(form, projects):
version_release = form.cleaned_data['version_release'] version_release = form.cleaned_data["version_release"]
distribution = form.cleaned_data['distribution'] distribution = form.cleaned_data["distribution"]
result = _hash_versions(form.cleaned_data, projects) result = _hash_versions(form.cleaned_data, projects)
context = {'projects': [], 'release': version_release} context = {"projects": [], "release": version_release}
flow_uuid = uuid.uuid4() flow_uuid = uuid.uuid4()
msg = "trying to trigger release %s, project %s"
for pro in projects: for pro in projects:
try: try:
logger.debug( logger.debug(msg, version_release, pro)
"trying to trigger release %s, project %s", url = build.trigger_build(
version_release, pro) "%s-get-code" % pro,
url = build.trigger_build("%s-get-code" % pro, version_release,
version_release, result[pro], result[pro],
distribution, flow_uuid) distribution,
context['projects'].append( flow_uuid,
{'name': pro, 'url': url}) )
context["projects"].append({"name": pro, "url": url})
except KeyError: except KeyError:
logger.error("Houston, we have a problem with" msg = "Houston, we have a problem with trigger for %s"
"trigger for %s", pro) logger.error(msg, pro)
context['projects'].append( context["projects"].append({"name": pro, "url": None})
{'name': pro, 'url': None})
return context return context
@login_required
def build_deps(request, tag_only=False): def build_deps(request, tag_only=False):
if request.method == "POST": if request.method == "POST":
form = BuildDepForm(request.POST) form = BuildDepForm(request.POST)
if form.is_valid(): if form.is_valid():
context = _build_logic(form, rd_settings['build_deps']) context = _build_logic(form, rd_settings["build_deps"])
else: else:
context = {'error': 'form validation error'} context = {"error": "form validation error"}
return render(request, 'release_dashboard/build_result.html', context) return render(request, "release_dashboard/build_result.html", context)
else: else:
context = { context = {
'projects': _projects_versions( "projects": _projects_versions(
rd_settings['build_deps'], rd_settings["build_deps"], regex_mr, True, not tag_only,
regex_mr,
True,
not tag_only,
), ),
'debian': rd_settings['debian_supported'], "debian": rd_settings["debian_supported"],
} }
_common_versions(context, True, not tag_only) _common_versions(context, True, not tag_only)
return render(request, 'release_dashboard/build_deps.html', context) return render(request, "release_dashboard/build_deps.html", context)
@login_required @login_required
def hotfix(request): def hotfix(request):
context = { prj_list = _projects_versions(rd_settings["projects"], regex_hotfix)
'projects': _projects_versions( context = {"projects": prj_list}
rd_settings['projects'], return render(request, "release_dashboard/hotfix.html", context)
regex_hotfix,
)
}
return render(request, 'release_dashboard/hotfix.html', context)
@login_required
def build_release(request, tag_only=False): def build_release(request, tag_only=False):
if request.method == "POST": if request.method == "POST":
form = BuildReleaseForm(request.POST) form = BuildReleaseForm(request.POST)
if form.is_valid(): if form.is_valid():
context = _build_logic(form, rd_settings['projects']) context = _build_logic(form, rd_settings["projects"])
else: else:
context = {'error': 'form validation error'} context = {"error": "form validation error"}
return render(request, 'release_dashboard/build_result.html', context) return render(request, "release_dashboard/build_result.html", context)
else: else:
context = { context = {
'projects': _projects_versions( "projects": _projects_versions(
rd_settings['projects'], rd_settings["projects"], regex_mr, True, not tag_only,
regex_mr,
True,
not tag_only,
), ),
'debian': rd_settings['debian_supported'], "debian": rd_settings["debian_supported"],
} }
_common_versions(context, True, not tag_only) _common_versions(context, True, not tag_only)
if tag_only: if tag_only:
return render(request, 'release_dashboard/build_tag.html', context) return render(request, "release_dashboard/build_tag.html", context)
return render(request, 'release_dashboard/build.html', context) return render(request, "release_dashboard/build.html", context)
@login_required
def refresh_all(request): def refresh_all(request):
if request.method == "POST": if request.method == "POST":
res = gerrit_fetch_all.delay() res = gerrit_fetch_all.delay()
return JsonResponse({'url': '/flower/task/%s' % res.id}) return JsonResponse({"url": "/flower/task/%s" % res.id})
else: else:
template = "release_dashboard/refresh.html"
projects = [] projects = []
for project in rd_settings['projects']: for project in rd_settings["projects"]:
info = { info = {"name": project, "tags": None}
'name': project,
'tags': None
}
projects.append(info) projects.append(info)
return render(request, 'release_dashboard/refresh.html', return render(request, template, {"projects": projects})
{'projects': projects})
@require_http_methods(["POST", ]) @require_http_methods(["POST"])
def refresh(request, project): def refresh(request, project):
res = gerrit_fetch_info.delay(project) res = gerrit_fetch_info.delay(project)
return JsonResponse({'url': '/flower/task/%s' % res.id}) return JsonResponse({"url": "/flower/task/%s" % res.id})
@login_required
def build_trunk_deps(request): def build_trunk_deps(request):
if request.method == "POST": if request.method == "POST":
form = BuildTrunkDepForm(request.POST) form = BuildTrunkDepForm(request.POST)
if form.is_valid(): if form.is_valid():
context = _build_logic(form, rd_settings['build_deps']) context = _build_logic(form, rd_settings["build_deps"])
else: else:
context = {'error': 'form validation error'} context = {"error": "form validation error"}
return render(request, 'release_dashboard/build_result.html', context) return render(request, "release_dashboard/build_result.html", context)
else: else:
template = "release_dashboard/build_trunk_deps.html"
context = { context = {
'projects': _projects_versions( "projects": _projects_versions(trunk_build_deps, regex_master,),
trunk_build_deps, "common_versions": {"tags": [], "branches": ["master"]},
regex_master, "debian": rd_settings["debian_supported"],
),
'common_versions': {
'tags': [],
'branches': ['master', ]
},
'debian': rd_settings['debian_supported'],
} }
return render(request, return render(request, template, context)
'release_dashboard/build_trunk_deps.html', context)
@login_required
def build_trunk_release(request): def build_trunk_release(request):
if request.method == "POST": if request.method == "POST":
form = BuildTrunkReleaseForm(request.POST) form = BuildTrunkReleaseForm(request.POST)
if form.is_valid(): if form.is_valid():
context = _build_logic(form, trunk_projects) context = _build_logic(form, trunk_projects)
else: else:
context = {'error': 'form validation error'} context = {"error": "form validation error"}
return render(request, 'release_dashboard/build_result.html', context) return render(request, "release_dashboard/build_result.html", context)
else: else:
context = { context = {
'projects': _projects_versions( "projects": _projects_versions(trunk_projects, regex_master,),
trunk_projects, "common_versions": {"tags": [], "branches": ["master"]},
regex_master, "debian": rd_settings["debian_supported"],
),
'common_versions': {
'tags': [],
'branches': ['master', ]
},
'debian': rd_settings['debian_supported'],
} }
return render(request, 'release_dashboard/build_trunk.html', context) return render(request, "release_dashboard/build_trunk.html", context)

94
release_dashboard/views/docker.py
Unescape View File

@ -19,6 +19,7 @@ from django.shortcuts import render
from django.http import JsonResponse, Http404 from django.http import JsonResponse, Http404
from django.views.decorators.http import require_http_methods from django.views.decorators.http import require_http_methods
from django.conf import settings from django.conf import settings
from django.contrib.auth.decorators import login_required
from rest_framework import generics, status from rest_framework import generics, status
from rest_framework.response import Response from rest_framework.response import Response
from release_dashboard.utils import docker from release_dashboard.utils import docker
@ -40,12 +41,12 @@ def _get_docker_tags(project, tag=None):
logger.debug("%s: %s" % (project, project_repos)) logger.debug("%s: %s" % (project, project_repos))
docker_tags = [] docker_tags = []
for image in project_repos: for image in project_repos:
res = {'name': image} res = {"name": image}
tags = docker.get_docker_tags(image) tags = docker.get_docker_tags(image)
if tag: if tag:
logger.degug("non filtered tags: %s" % tags) logger.degug("non filtered tags: %s" % tags)
tags = filter(re.compile(tag).match, tags) tags = filter(re.compile(tag).match, tags)
res['tags'] = tags res["tags"] = tags
docker_tags.append(res) docker_tags.append(res)
logger.debug("docker_tags: %s" % docker_tags) logger.debug("docker_tags: %s" % docker_tags)
return docker_tags return docker_tags
@ -53,88 +54,78 @@ def _get_docker_tags(project, tag=None):
def _build_docker_logic(form, projects): def _build_docker_logic(form, projects):
result = _hash_versions(form.cleaned_data, projects) result = _hash_versions(form.cleaned_data, projects)
context = {'projects': []} context = {"projects": []}
for pro in projects: for pro in projects:
try: try:
logger.debug( logger.debug(
"trying to trigger docker image at branch %s for project %s", "trying to trigger docker image at branch %s for project %s",
result[pro], pro) result[pro],
pro,
)
url = docker.trigger_docker_build(pro, result[pro]) url = docker.trigger_docker_build(pro, result[pro])
context['projects'].append( context["projects"].append({"name": pro, "url": url})
{'name': pro, 'url': url})
except KeyError: except KeyError:
logger.error("Houston, we have a problem with" msg = "Houston, we have a problem with trigger for %s"
"trigger for %s", pro) logger.error(msg, pro)
context['projects'].append( context["projects"].append({"name": pro, "url": None})
{'name': pro, 'url': None})
return context return context
@login_required
def build_docker_images(request): def build_docker_images(request):
if request.method == "POST": if request.method == "POST":
form = BuildDockerForm(request.POST) form = BuildDockerForm(request.POST)
if form.is_valid(): if form.is_valid():
context = _build_docker_logic(form, docker_projects) context = _build_docker_logic(form, docker_projects)
else: else:
context = {'error': 'form validation error'} context = {"error": "form validation error"}
return render(request, return render(request, "release_dashboard/build_result.html", context)
'release_dashboard/build_result.html',
context)
else: else:
context = { context = {
'projects': _projects_versions( "projects": _projects_versions(
docker_projects, docker_projects, regex_mr, False, True, True,
regex_mr,
False,
True,
True,
), ),
'common_versions': { "common_versions": {"tags": [], "branches": ["master"]},
'tags': [], "docker": True,
'branches': ['master', ]
},
'docker': True,
} }
_common_versions(context, False, True) _common_versions(context, False, True)
return render(request, return render(request, "release_dashboard/build_docker.html", context)
'release_dashboard/build_docker.html',
context)
@login_required
def refresh_all(request): def refresh_all(request):
if request.method == "POST": if request.method == "POST":
res = tasks.docker_fetch_all.delay() res = tasks.docker_fetch_all.delay()
return JsonResponse({'url': '/flower/task/%s' % res.id}) return JsonResponse({"url": "/flower/task/%s" % res.id})
else: else:
template = "release_dashboard/refresh_docker.html"
projects = [] projects = []
for project in docker_projects: for project in docker_projects:
info = { info = {"name": project, "tags": None}
'name': project,
'tags': None
}
projects.append(info) projects.append(info)
return render(request, 'release_dashboard/refresh_docker.html', return render(request, template, {"projects": projects})
{'projects': projects})
@require_http_methods(["POST", ]) @login_required
@require_http_methods(["POST"])
def refresh(request, project): def refresh(request, project):
res = tasks.docker_fetch_project.delay(project) res = tasks.docker_fetch_project.delay(project)
return JsonResponse({'url': '/flower/task/%s' % res.id}) return JsonResponse({"url": "/flower/task/%s" % res.id})
@require_http_methods(["GET", ]) @login_required
@require_http_methods(["GET"])
def docker_images(request): def docker_images(request):
images = DockerImage.objects.images_with_tags images = DockerImage.objects.images_with_tags
context = { context = {
'images': images, "images": images,
'URL_BASE': settings.DOCKER_REGISTRY_URL.format(''), "URL_BASE": settings.DOCKER_REGISTRY_URL.format(""),
} }
return render(request, 'release_dashboard/docker_images.html', return render(request, "release_dashboard/docker_images.html", context)
context)
@require_http_methods(["GET", ]) @login_required
@require_http_methods(["GET"])
def docker_project_images(request, project): def docker_project_images(request, project):
try: try:
Project.objects.get(name=project) Project.objects.get(name=project)
@ -142,14 +133,14 @@ def docker_project_images(request, project):
raise Http404("Project does not exist") raise Http404("Project does not exist")
images = DockerImage.objects.images_with_tags(project) images = DockerImage.objects.images_with_tags(project)
context = { context = {
'images': images, "images": images,
'URL_BASE': settings.DOCKER_REGISTRY_URL.format(''), "URL_BASE": settings.DOCKER_REGISTRY_URL.format(""),
} }
return render(request, 'release_dashboard/docker_images.html', return render(request, "release_dashboard/docker_images.html", context)
context)
@require_http_methods(["GET", ]) @login_required
@require_http_methods(["GET"])
def docker_image_tags(request, project, image): def docker_image_tags(request, project, image):
try: try:
proj = Project.objects.get(name=project) proj = Project.objects.get(name=project)
@ -159,11 +150,10 @@ def docker_image_tags(request, project, image):
except DockerImage.DoesNotExist: except DockerImage.DoesNotExist:
raise Http404("Project does not exist") raise Http404("Project does not exist")
context = { context = {
'images': [image, ], "images": [image],
'URL_BASE': settings.DOCKER_REGISTRY_URL.format(''), "URL_BASE": settings.DOCKER_REGISTRY_URL.format(""),
} }
return render(request, 'release_dashboard/docker_image.html', return render(request, "release_dashboard/docker_image.html", context)
context)
class DockerImageList(generics.ListAPIView): class DockerImageList(generics.ListAPIView):

3
repoapi/settings/common.py
Unescape View File

@ -57,7 +57,8 @@ MIDDLEWARE_CLASSES = (
) )
ROOT_URLCONF = "repoapi.urls" ROOT_URLCONF = "repoapi.urls"
LOGIN_URL = "/api-auth/login/" LOGIN_URL = "rest_framework:login"
LOGOUT_URL = "rest_framework:logout"
TEMPLATES = [ TEMPLATES = [
{ {
"BACKEND": "django.template.backends.django.DjangoTemplates", "BACKEND": "django.template.backends.django.DjangoTemplates",

Write Preview
Loading…
Cancel
Save