From c242b0a0e94daec4e29ff91f4349bd4e8773301f Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Sep 19 2017 09:39:58 +0000 Subject: Fix #65 - Set the compose owner according to authed user. --- diff --git a/server/odcs/server/views.py b/server/odcs/server/views.py index 0b5ea70..d18bebe 100644 --- a/server/odcs/server/views.py +++ b/server/odcs/server/views.py @@ -25,7 +25,7 @@ import datetime import json from flask.views import MethodView -from flask import request, jsonify +from flask import request, jsonify, g from odcs.server import app, db, log, conf from odcs.server.errors import NotFound, BadRequest @@ -87,7 +87,12 @@ class ODCSAPI(MethodView): @login_required @requires_role('allowed_clients') def post(self): - owner = "Unknown" # TODO + if conf.auth_backend == "noauth": + owner = "unknown" + log.warn("Cannot determine the owner of compose, because " + "'noauth' auth_backend is used.") + else: + owner = g.user.username try: data = json.loads(request.get_data().decode("utf-8")) diff --git a/server/tests/test_views.py b/server/tests/test_views.py index f0421e2..630c9b7 100644 --- a/server/tests/test_views.py +++ b/server/tests/test_views.py @@ -130,7 +130,7 @@ class TestViews(ViewBaseTest): expected_json = {'source_type': 2, 'state': 0, 'time_done': None, 'state_name': 'wait', 'source': u'testmodule-master', - 'owner': u'Unknown', + 'owner': u'dev', 'result_repo': 'http://localhost/odcs/latest-odcs-%d-1/compose/Temporary' % data['id'], 'result_repofile': 'http://localhost/odcs/latest-odcs-%d-1/compose/Temporary/odcs-%d.repo' % (data['id'], data['id']), 'time_submitted': data["time_submitted"], 'id': data['id'], @@ -418,7 +418,7 @@ class TestViews(ViewBaseTest): expected_json = {'source_type': 2, 'state': 0, 'time_done': None, 'state_name': 'wait', 'source': u'testmodule-master', - 'owner': u'Unknown', + 'owner': u'unknown', 'result_repo': 'http://localhost/odcs/latest-odcs-%d-1/compose/Temporary' % data['id'], 'result_repofile': 'http://localhost/odcs/latest-odcs-%d-1/compose/Temporary/odcs-%d.repo' % (data['id'], data['id']), 'time_submitted': data["time_submitted"], 'id': data['id'],