Commit 106f21ce authored by Daniel Schreiber's avatar Daniel Schreiber

Merge branch 'django22_vektorfix' into 'django22'

Bugfix Attribut Update

See merge request !16
parents 6c34b578 39407155
Pipeline #34172 passed with stage
in 32 seconds
......@@ -243,7 +243,9 @@ class Resource(models.Model):
if self.reject_request(is_sp_local, local_attrib, rmt_attrib, user_type):
attrib_dict.update({
"status": "rejected"
"status": "rejected",
"vec_sp": local_attrib.vec_sp,
"vec_idp": local_attrib.vec_idp,
})
res.append({attrib_name: attrib_dict})
else:
......@@ -271,10 +273,10 @@ class Resource(models.Model):
return res
def reject_request(self, is_sp_local, local_attrib, rmt_attrib, user_type):
local_vec = VersionVector(local_attrib.vec_sp, local_attrib.vec_idp)
remote_vec = VersionVector(rmt_attrib.get("vec_sp"), rmt_attrib.get("vec_idp"))
reject_request = False
if user_type == UserType.TYPE_SYNC:
local_vec = VersionVector(local_attrib.vec_sp, local_attrib.vec_idp)
remote_vec = VersionVector(rmt_attrib.get("vec_sp"), rmt_attrib.get("vec_idp"))
if local_vec.concurrent_to(remote_vec) or remote_vec.happened_before(local_vec):
# As this is represents a conflict situation - depending on prioritization -
# we might have to reject this request in order to keep ours dominant
......@@ -285,7 +287,29 @@ class Resource(models.Model):
if local_attrib.prio == PriorityRole.ROLE_IDP and not is_sp_local:
# We are IdP and this attribute prioritizes IdP
reject_request = True
# else: Local changes only require incrementing our local component
# jetzt müssen wir noch testen, dass die andere Seite nicht fälschlicherweise unseren Teil der Vektoruhr updatet
if is_sp_local:
if remote_vec.sp and remote_vec.sp != local_vec.sp:
reject_request = True
else:
if remote_vec.idp and remote_vec.idp != local_vec.idp:
reject_request = True
else: # Local changes only require incrementing our local component
if remote_vec.idp and remote_vec.sp:
if local_vec.concurrent_to(remote_vec) or remote_vec.happened_before(local_vec):
reject_request = True
if remote_vec.idp and remote_vec.idp < local_vec.idp:
reject_request = True
if remote_vec.sp and remote_vec.sp < local_vec.sp:
reject_request = True
if remote_vec.sp and user_type == UserType.TYPE_IDP and remote_vec.sp != local_vec.sp:
# IDP Darf SP Wert nicht verändern
reject_request = True
if remote_vec.idp and user_type == UserType.TYPE_SP and remote_vec.idp != local_vec.idp:
# SP Darf IDP Wert nicht verändern
reject_request = True
return reject_request
......
......@@ -14,7 +14,7 @@ from django.test.client import encode_multipart
from rest_framework.renderers import JSONRenderer
from rest_framework.reverse import reverse
from rest_framework.test import APITestCase
from api.models import QueueJob, Resource, ServiceProvider, TokenAuthUser, UserType
from api.models import Attribute, QueueJob, Resource, ServiceProvider, TokenAuthUser, UserType
from api.serializers import ResourceSerializer
......@@ -225,6 +225,231 @@ class ResourceGetTest(APITestCase):
self.assertEqual(r.status_code, 200)
class ResourceUpdateTest(APITestCase):
def setUp(self):
self.sp = ServiceProvider.objects.create(
name="TestService",
expiry_date=timezone.now(),
realm="a.edu"
)
self.sp_user = TokenAuthUser.objects.create_superuser(
username='sp',
email='foo@bar.com',
password='sp',
user_type=UserType.TYPE_SP,
api_url="http://api.a.edu:7000/",
realm="a.edu",
sp=self.sp,
)
self.idp_user = TokenAuthUser.objects.create_superuser(
username='idp',
email='foo@bar.com',
password='idp',
user_type=UserType.TYPE_IDP,
api_url="http://api.b.edu:7000/",
realm="b.edu",
)
self.sync_user = TokenAuthUser.objects.create_superuser(
username='sync',
email='foo@bar.com',
password='idp',
user_type=UserType.TYPE_SYNC,
api_url="http://api.b.edu:7000/",
realm="b.edu",
)
self.r = Resource(sp=self.sp, expiry_date=timezone.now(), deletion_date=timezone.now(), setup_token="1234", eppn="foo@b.edu")
self.r.full_clean()
self.r.save()
self.attr1 = Attribute(name='test', value='foo', vec_sp=3, vec_idp=1, resource=self.r)
self.attr1.full_clean()
self.attr1.save()
self.attr2 = Attribute(name='other', value='bar', vec_sp=5, vec_idp=2, resource=self.r)
self.attr2.full_clean()
self.attr2.save()
def test_get(self):
self.client.force_authenticate(self.sp_user)
r = self.client.get(reverse('api:resource_list'))
self.maxDiff=None
self.assertEqual(r.status_code, 200)
self.assertEqual(r.json(),[{
'uuid': str(self.r.uuid),
'added': self.r.added.astimezone(timezone.get_default_timezone()).isoformat(),
'updated': self.r.updated.astimezone(timezone.get_default_timezone()).isoformat(),
'deletion_date': self.r.deletion_date.astimezone(timezone.get_default_timezone()).isoformat(),
'expiry_date': self.r.expiry_date.astimezone(timezone.get_default_timezone()).isoformat(),
'eppn': 'foo@b.edu',
'realm_idp': 'b.edu',
'setup_token': '1234',
'sp': str(self.sp.uuid),
'sp_primary_key': '',
'attributes': [
{
'name': 'test',
'value': 'foo',
'default_value': '',
'vec_sp': 3,
'vec_idp': 1
},
{
'name': 'other',
'value': 'bar',
'default_value': '',
'vec_sp': 5,
'vec_idp': 2
},
]
}])
def _run_test_update(self, vec_sp, vec_idp):
self._run_test_update_with_result(vec_sp, vec_idp, 200, vec_sp, vec_idp, 'updated')
def _run_test_update_with_result(self, vec_sp, vec_idp, expected_status_code, expected_vec_sp, expected_vec_idp, expected_status):
data = [
{
'name': 'other',
'value': 'bar2',
'default_value': '',
'vec_sp': vec_sp,
'vec_idp': vec_idp
},
]
url = reverse("api:resource_attributes", args=(self.r.pk,))
res = self.client.put(url, data, format='json')
self.assertEqual(res.status_code, expected_status_code)
result_data = res.json()
result_dict = result_data[0]['other']
self.assertEqual(result_dict, {
'status': expected_status,
'vec_sp': expected_vec_sp,
'vec_idp': expected_vec_idp,
})
attr = Attribute.objects.get(pk=self.attr2.pk)
self.assertEqual({
'vec_sp': attr.vec_sp,
'vec_idp': attr.vec_idp,
}, {
'vec_sp': expected_vec_sp,
'vec_idp': expected_vec_idp,
})
if vec_sp == expected_vec_sp and vec_idp == expected_vec_idp:
self.assertEqual(attr.value, 'bar2')
else:
self.assertEqual(attr.value, 'bar')
def test_update_ok_as_sp(self):
self.assertEqual(self.sp.is_local, True)
self.client.force_authenticate(self.sp_user)
self._run_test_update(6, 2)
def test_update_conflict_as_sp(self):
"""
Dieses Update muss fehlschlagen, weil es eine Nebenläufigkeit der Vektoruhren gibt.
"""
self.assertEqual(self.sp.is_local, True)
self.client.force_authenticate(self.sp_user)
self._run_test_update_with_result(6, 1, 200, 5, 2, 'rejected')
def test_update_too_old_as_sp(self):
"""
Dieses Update muss fehlschlagen, weil der SP Nutzer auf der SP Instanz
versucht, einen Wert zu aktualisieren, obwohl der mitgeschickte vec_sp
Zähler zu alt ist
"""
self.assertEqual(self.sp.is_local, True)
self.client.force_authenticate(self.sp_user)
self._run_test_update_with_result(4, 2, 200, 5, 2, 'rejected')
def test_update_sp_must_not_incement_idp(self):
"""
Dieses Update muss fehlschlagen, weil der SP den Zähler vom IDP nicht erhöhen darf.
"""
self.assertEqual(self.sp.is_local, True)
self.client.force_authenticate(self.sp_user)
self._run_test_update_with_result(6, 3, 200, 5, 2, 'rejected')
self._run_test_update_with_result(5, 3, 200, 5, 2, 'rejected')
@override_settings(SERVER_REALM="b.edu")
def test_update_ok_as_idp(self):
self.assertEqual(self.sp.is_local, False)
self.client.force_authenticate(self.idp_user)
self._run_test_update(5, 3)
@override_settings(SERVER_REALM="b.edu")
def test_conflict_as_idp(self):
"""
Dieses Update muss fehlschlagen, weil es eine Nebenläufigkeit der Vektoruhren gibt.
"""
self.assertEqual(self.sp.is_local, False)
self.client.force_authenticate(self.idp_user)
self._run_test_update_with_result(4, 3, 200, 5, 2, 'rejected')
@override_settings(SERVER_REALM="b.edu")
def test_too_old_as_idp(self):
"""
Dieses Update muss fehlschlagen, weil der IDP Nutzer auf der IDP Instanz
versucht, einen Wert zu aktualisieren, obwohl der mitgeschickte vec_idp
Zähler zu alt ist
"""
self.assertEqual(self.sp.is_local, False)
self.client.force_authenticate(self.idp_user)
self._run_test_update_with_result(5, 1, 200, 5, 2, 'rejected')
def test_update_idp_must_not_incement_sp(self):
"""
Dieses Update muss fehlschlagen, weil der IDP den Zähler vom SP nicht erhöhen darf.
"""
self.assertEqual(self.sp.is_local, True)
self.client.force_authenticate(self.idp_user)
self._run_test_update_with_result(6, 3, 200, 5, 2, 'rejected')
self._run_test_update_with_result(6, 2, 200, 5, 2, 'rejected')
@override_settings(SERVER_REALM="b.edu")
def test_ok_sync_from_sp_side(self):
# Hier testen wir, ob die Vektoruhr richtig gesetzt wird, wenn ein sync
# update vin der Seite des SPs beim IdP aufgerufen wird, also der SP ein
# Attribut geändert hat
self.assertEqual(self.sp.is_local, False)
self.client.force_authenticate(self.sync_user)
self._run_test_update(6, 2)
@override_settings(SERVER_REALM="b.edu")
def test_conflict_sync_from_sp_side(self):
self.assertEqual(self.sp.is_local, False)
self.client.force_authenticate(self.sync_user)
# nebenläufig
self._run_test_update_with_result(6, 1, 200, 5, 2, 'rejected')
# IdP Wert geändert
self._run_test_update_with_result(6, 3, 200, 5, 2, 'rejected')
# SP Wert Lokal schon neuer
self._run_test_update_with_result(4, 1, 200, 5, 2, 'rejected')
# IdP Wert geändert, SP Wert lokal schon neuer
self._run_test_update_with_result(4, 3, 200, 5, 2, 'rejected')
def test_ok_sync_from_idp_side(self):
"""
hier testen wir, ob die Vektoruhr richtig gesetzt wird, wenn ein sync
update von der Seite des IdPs beim SP aufgerufen wird, also der IdP
ein Attribut geändert hat und dass es beim SP richtig aktualisiert wird
"""
self.assertEqual(self.sp.is_local, True)
self.client.force_authenticate(self.sync_user)
self._run_test_update(5, 3)
def test_conflict_sync_from_idp_side(self):
"""
Das muss fehlschlagen, weil es hier eine Nebenläufigkeit der Vektoruhren
gibt.
"""
self.assertEqual(self.sp.is_local, True)
self.client.force_authenticate(self.sync_user)
self._run_test_update_with_result(4, 3, 200, 5, 2, 'rejected')
self._run_test_update_with_result(6, 3, 200, 5, 2, 'rejected')
self._run_test_update_with_result(4, 2, 200, 5, 2, 'rejected')
self._run_test_update_with_result(6, 2, 200, 5, 2, 'rejected')
class AttributesTest(APITestCase):
def setUp(self):
self.local_sp = ServiceProvider.objects.create(
......
......@@ -24,7 +24,7 @@ class VectorClock(object):
return found_one
else:
raise NotImplementedError
raise NotImplementedError # pragma: no cover
def concurrent_to(self, other):
if isinstance(other, VectorClock) and len(self.comp) == len(self.comp):
......@@ -33,7 +33,7 @@ class VectorClock(object):
return False
else:
raise NotImplementedError
raise NotImplementedError # pragma: no cover
def merge(self, other): # Side effect func
if isinstance(other, VectorClock) and len(self.comp) == len(self.comp):
......@@ -48,7 +48,7 @@ class VectorClock(object):
return self.comp
else:
raise NotImplementedError
raise NotImplementedError # pragma: no cover
def __str__(self):
return str(self.comp)
......@@ -62,4 +62,11 @@ class VersionVector(VectorClock):
Since the only difference relies in how VV's are updated,
no implementation changes are necessary at this place.
"""
pass
@property
def sp(self):
return self.comp[0]
@property
def idp(self):
return self.comp[1]
FROM debian:buster
RUN apt-get update && apt-get -y upgrade
RUN apt-get install -y uwsgi python3.7 uwsgi-plugin-python3 python3-venv git libpq-dev libmariadb-dev
RUN apt-get install -y uwsgi python3.7 uwsgi-plugin-python3 python3-venv git libpq-dev libmariadb-dev libev-dev
COPY install.sh /tmp/install.sh
COPY frms.ini /etc/uwsgi/apps-enabled
COPY startsync.sh /var/www/django/frms/startsync.sh
......
......@@ -32,3 +32,13 @@ Im Apache reicht dann folgende Konfiguration im passenden Virtualhost:
ProxyPass /static uwsgi://127.0.0.1:8000/frms/static
```
Testen
------
Die Container können gleich mit zum Testen der Funktionalität genutzt werden. Dazu muss lokal ein passender Container gebaut werden und die Tests gestartet werden.
Zur Ausführung der Tests wird docker-compose genutzt.
~~~bash
./buildimage.sh
./test.sh
~~~
version: "3"
services:
db1:
image: postgres
environment:
POSTGRES_PASSWORD: frms1
POSTGRES_USER: frms1
db2:
image: postgres
environment:
POSTGRES_PASSWORD: frms2
POSTGRES_USER: frms2
frms1:
#build: .
image: frms:latest
entrypoint: /root/prepare_and_run_frms1.sh
volumes:
- ./tests/config/frms1/:/var/www/django/frms/private/
- ./tests/prepare_and_run_frms1.sh:/root/prepare_and_run_frms1.sh
depends_on:
- db1
frms1-web:
image: httpd:2.4
volumes:
- ./tests/config/httpd1.conf:/usr/local/apache2/conf/httpd.conf
depends_on:
- frms1
ports:
- "8000:80"
frms2:
#build: .
image: frms:latest
entrypoint: /root/prepare_and_run_frms2.sh
volumes:
- ./tests/config/frms2/:/var/www/django/frms/private/
- ./tests/prepare_and_run_frms2.sh:/root/prepare_and_run_frms2.sh
depends_on:
- db2
frms2-web:
image: httpd:2.4
volumes:
- ./tests/config/httpd2.conf:/usr/local/apache2/conf/httpd.conf
depends_on:
- frms2
ports:
- "8001:80"
......@@ -3,7 +3,7 @@ TARGET=/var/www/django/frms
mkdir -p /var/www/django/frms/logs
git clone https://gitlab.hrz.tu-chemnitz.de/saxid-federated-resource-management/frms.git $TARGET/app
cd $TARGET/app
git checkout docker
#git checkout django22_vektorfix
python3 -mvenv $TARGET/env
source $TARGET/env/bin/activate
cd $TARGET/app
......
......@@ -22,5 +22,5 @@ fi
chown -R www-data:www-data "${FRMS_DIR}/logs"
su www-data -s /bin/bash -c "${FRMS_DIR}/env/bin/python ${FRMS_DIR}/app/manage.py migrate"
su www-data -s /bin/bash -c "${FRMS_DIR}/env/bin/python ${FRMS_DIR}/app/manage.py collectstatic"
su www-data -s /bin/bash -c "${FRMS_DIR}/env/bin/python ${FRMS_DIR}/app/manage.py collectstatic --noinput"
/usr/bin/uwsgi --ini /etc/uwsgi/apps-enabled/frms.ini
#!/usr/bin/env bash
docker-compose up -d
sleep 20
python tests/test.py
success=$?
docker-compose down
exit $success
:{z58^K~|F0CCpbk5B&gm(App}.=N1q#VjI7lO271g-BI^+`5@Y|RX_x,&ex
[
{
"model": "api.serviceprovider",
"pk": "5ebc3b5b-f9c3-4be1-a4aa-d9171c3af6ec",
"fields": {
"name": "test-sp",
"description": "",
"url": "",
"realm": "frms1.edu",
"expiry_date": "2099-12-31T22:59:59Z",
"default_delete_after_days": 90,
"default_purge_api_data_after_days": 7
}
},
{
"model": "api.tokenauthuser",
"pk": 1,
"fields": {
"password": "pbkdf2_sha256$150000$APNEEBzLoc2v$xat6AcMwpgOT5YHHhmb9CmECBeveunpNEhY6TOl6vok=",
"last_login": "2020-06-25T14:31:44.074Z",
"is_superuser": true,
"username": "admin",
"first_name": "",
"last_name": "",
"email": "",
"is_staff": true,
"is_active": true,
"date_joined": "2020-06-25T14:07:18.299Z",
"user_type": "",
"sp": null,
"realm": "",
"api_url": "",
"groups": [],
"user_permissions": []
}
},
{
"model": "api.tokenauthuser",
"pk": 2,
"fields": {
"password": "1234",
"last_login": null,
"is_superuser": false,
"username": "sync_2",
"first_name": "",
"last_name": "",
"email": "",
"is_staff": false,
"is_active": true,
"date_joined": "2020-06-25T14:07:36Z",
"user_type": "sync",
"sp": null,
"realm": "frms2.edu",
"api_url": "http://frms2-web/api/",
"groups": [],
"user_permissions": []
}
},
{
"model": "api.tokenauthuser",
"pk": 3,
"fields": {
"password": "1234",
"last_login": null,
"is_superuser": false,
"username": "test-sp",
"first_name": "",
"last_name": "",
"email": "",
"is_staff": false,
"is_active": true,
"date_joined": "2020-06-25T14:19:02Z",
"user_type": "sp",
"sp": "5ebc3b5b-f9c3-4be1-a4aa-d9171c3af6ec",
"realm": "",
"api_url": "",
"groups": [],
"user_permissions": []
}
},
{
"model": "authtoken.token",
"pk": "565f70c158116cbabb6d93649605cead18f52ac9",
"fields": {
"user": 2,
"created": "2020-06-25T14:10:31.710Z"
}
},
{
"model": "authtoken.token",
"pk": "5ed7aa7aad88935836b6dea38d6a73e9e1d10527",
"fields": {
"user": 1,
"created": "2020-06-25T14:07:18.394Z"
}
},
{
"model": "authtoken.token",
"pk": "b7bc73430378e67a79a9ca1caf1e39f15944c4d0",
"fields": {
"user": 3,
"created": "2020-06-25T14:19:26.328Z"
}
}
]
# -*- coding: utf-8 -*-
from __future__ import unicode_literals, print_function
SERVER_REALM="frms1.edu" # hs-mittweida.de
HTTP_SERVER_NAME="http://frms1-web" # https://saxid-api.hs-mittweida.de
ALLOWED_HOSTS = ["*"] # saxid-api.hs-mittweida.de
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'frms1',
'USER': 'frms1',
'PASSWORD': 'frms1', # @UndefinedVariable
'HOST': 'db1',
}
}
o,9^|A5HAf]A|urZscmo@06rF|2tUf4(SGOcLvrb^g4G69,4NgI_}DG)~F3k
[
{
"model": "api.tokenauthuser",
"pk": 1,
"fields": {
"password": "pbkdf2_sha256$150000$APNEEBzLoc2v$xat6AcMwpgOT5YHHhmb9CmECBeveunpNEhY6TOl6vok=",
"last_login": "2020-06-25T14:07:27.815Z",
"is_superuser": true,
"username": "admin",
"first_name": "",
"last_name": "",
"email": "",
"is_staff": true,
"is_active": true,
"date_joined": "2020-06-25T14:07:18.299Z",
"user_type": "",
"sp": null,
"realm": "",
"api_url": "",
"groups": [],
"user_permissions": []
}
},
{
"model": "api.tokenauthuser",
"pk": 2,
"fields": {
"password": "1234",
"last_login": null,
"is_superuser": false,
"username": "sync_1",
"first_name": "",
"last_name": "",
"email": "",
"is_staff": false,
"is_active": true,
"date_joined": "2020-06-25T14:07:36Z",
"user_type": "sync",
"sp": null,
"realm": "frms1.edu",
"api_url": "http://frms1-web/api/",
"groups": [],
"user_permissions": []
}
},
{
"model": "api.tokenauthuser",
"pk": 3,
"fields": {
"password": "1234",
"last_login": null,
"is_superuser": false,
"username": "test-idm",
"first_name": "",
"last_name": "",
"email": "",
"is_staff": false,
"is_active": true,
"date_joined": "2020-06-25T14:19:02Z",
"user_type": "idp",
"sp": null,