Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add some ownership checks to the log
Roland Geiderf958a9500131
diff --git a/wger/manager/fixtures/test-routine-data.json b/wger/manager/fixtures/test-routine-data.jsonindex 6d7bf10f7..a43a8e936 100644--- a/wger/manager/fixtures/test-routine-data.json+++ b/wger/manager/fixtures/test-routine-data.json@@ -3,7 +3,7 @@"pk": 1,"model": "manager.routine","fields": {- "user": 2,+ "user": 1,"name": "A test routine","description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna","created": "2024-03-01T23:34:30",@@ -23,6 +23,18 @@"end": "2024-03-01"}},+ {+ "pk": 3,+ "model": "manager.routine",+ "fields": {+ "user": 2,+ "name": "Another empty routine",+ "description": "",+ "created": "2024-03-01T23:34:30",+ "start": "2024-03-01",+ "end": "2024-03-01"+ }+ },{"pk": 1,"model": "manager.dayng",diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.jsonindex e9c4dcffd..77001ef6f 100644--- a/wger/manager/fixtures/test-workout-data.json+++ b/wger/manager/fixtures/test-workout-data.json@@ -29,42 +29,6 @@"description": ""}},- {- "pk": 1,- "model": "manager.routine",- "fields": {- "name": "A test workout",- "user": 1,- "created": "2024-06-01",- "start": "2024-06-01",- "end": "2024-09-01",- "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna"- }- },- {- "pk": 2,- "model": "manager.routine",- "fields": {- "name": "Another test workout",- "user": 1,- "created": "2024-06-01",- "start": "2024-06-01",- "end": "2024-09-01",- "description": "The wild boar (Sus scrofa), also known as the \"wild swine\", \"common wild pig\", or simply \"wild pig\", is a suid native to much of Eurasia and North Africa"- }- },- {- "pk": 3,- "model": "manager.routine",- "fields": {- "name": "My test workout",- "user": 2,- "created": "2024-06-01",- "start": "2024-06-01",- "end": "2024-09-01",- "description": ""- }- },{"pk": 1,"model": "manager.day",diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex 98b6b778c..654aa5d85 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -175,14 +175,26 @@ class WorkoutLog(models.Model):# Reset cachereset_workout_log(self.user_id, self.date.year, self.date.month, self.date.day)+ # If the routine does not belong to this user, do not save+ if self.routine and self.routine.user != self.user:+ return++ # If the user of session is not this user, remove foreign key+ if self.session and self.session.user != self.user:+ self.session = None+# If there is no session for this date and routine, create one- if not self.session_id:+ if not self.session:self.session = WorkoutSession.objects.get_or_create(user=self.user,date=self.date,routine=self.routine,)[0]+ # If the user of next_log is not this user, remove foreign key+ if self.next_log and self.next_log.user != self.user:+ self.next_log = None+# If the user selected "Until Failure", do only 1 "repetition",# anything else doesn't make sense.if self.repetition_unit == 2:diff --git a/wger/manager/tests/test_log_model.py b/wger/manager/tests/test_log_model.pyindex ec641770d..2b9840912 100644--- a/wger/manager/tests/test_log_model.py+++ b/wger/manager/tests/test_log_model.py@@ -60,3 +60,65 @@ class LogModelTestCase(WgerTestCase):log.session_id = 1self.assertEqual(WorkoutSession.objects.count(), 4)++ def test_session_ownership(self):+ """+ Test that the session foreign key checks ownership+ """+ session1 = WorkoutSession.objects.get(pk=1)+ session4 = WorkoutSession.objects.get(pk=4)++ self.assertEqual(session1.user_id, 1)+ self.assertEqual(session4.user_id, 2)++ log = WorkoutLog.objects.get(pk=1)+ log.session = session4+ log.save()++ self.assertNotEquals(log.session_id, 4)++ def test_routine_ownership(self):+ """+ Test that the routine foreign key checks ownership+ """++ log = WorkoutLog.objects.get(pk=1)+ log.routine_id = 3+ log.save()++ # Reload from db+ log = WorkoutLog.objects.get(pk=1)++ self.assertEqual(log.routine_id, 1)++ def test_next_log_user_check_fail(self):+ """+ Test that the next log foreign key checks ownership+ """++ log2 = WorkoutLog.objects.get(pk=2)+ log2.user_id = 2+ log2.save()++ log1 = WorkoutLog.objects.get(pk=1)+ log1.user_id = 1+ log1.next_log = log2+ log1.save()++ self.assertEqual(log1.next_log, None)++ def test_next_log_user_check_success(self):+ """+ Test that the next log foreign key checks ownership+ """++ log1 = WorkoutLog.objects.get(pk=1)+ log2 = WorkoutLog.objects.get(pk=2)++ self.assertEqual(log1.user_id, 1)+ self.assertEqual(log2.user_id, 1)++ log1.next_log = log2+ log1.save()++ self.assertEqual(log1.next_log, log2)