mirror of
https://github.com/django/django.git
synced 2025-11-07 07:15:35 +00:00
[1.7.x] Fixed #23431 -- Allowed inline and hidden references to admin fields.
This fixes a regression introduced by the53ff096982security fix. Thanks to @a1tus for the report and Tim for the review. refs #23329. Backport of342ccbddc1from master
This commit is contained in:
@@ -36,7 +36,8 @@ from .models import (Article, Chapter, Child, Parent, Picture, Widget,
|
||||
FilteredManager, EmptyModelHidden, EmptyModelVisible, EmptyModelMixin,
|
||||
State, City, Restaurant, Worker, ParentWithDependentChildren,
|
||||
DependentChild, StumpJoke, FieldOverridePost, FunkyTag,
|
||||
ReferencedByParent, ChildOfReferer, M2MReference)
|
||||
ReferencedByParent, ChildOfReferer, M2MReference, ReferencedByInline,
|
||||
InlineReference, InlineReferer)
|
||||
|
||||
|
||||
def callable_year(dt_value):
|
||||
@@ -826,6 +827,14 @@ class FunkyTagAdmin(admin.ModelAdmin):
|
||||
list_display = ('name', 'content_object')
|
||||
|
||||
|
||||
class InlineReferenceInline(admin.TabularInline):
|
||||
model = InlineReference
|
||||
|
||||
|
||||
class InlineRefererAdmin(admin.ModelAdmin):
|
||||
inlines = [InlineReferenceInline]
|
||||
|
||||
|
||||
site = admin.AdminSite(name="admin")
|
||||
site.register(Article, ArticleAdmin)
|
||||
site.register(CustomArticle, CustomArticleAdmin)
|
||||
@@ -885,6 +894,8 @@ site.register(FunkyTag, FunkyTagAdmin)
|
||||
site.register(ReferencedByParent)
|
||||
site.register(ChildOfReferer)
|
||||
site.register(M2MReference)
|
||||
site.register(ReferencedByInline)
|
||||
site.register(InlineReferer, InlineRefererAdmin)
|
||||
|
||||
# We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2.
|
||||
# That way we cover all four cases:
|
||||
|
||||
@@ -839,3 +839,16 @@ class ChildOfReferer(ParentWithFK):
|
||||
|
||||
class M2MReference(models.Model):
|
||||
ref = models.ManyToManyField('self')
|
||||
|
||||
|
||||
# Models for #23431
|
||||
class ReferencedByInline(models.Model):
|
||||
pass
|
||||
|
||||
|
||||
class InlineReference(models.Model):
|
||||
fk = models.ForeignKey(ReferencedByInline, related_name='hidden+')
|
||||
|
||||
|
||||
class InlineReferer(models.Model):
|
||||
refs = models.ManyToManyField(InlineReference)
|
||||
|
||||
@@ -621,11 +621,16 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
|
||||
response = self.client.get("/test_admin/admin/admin_views/m2mreference/", {TO_FIELD_VAR: 'id'})
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
# Specifying a field that is not refered by any other model directly registered
|
||||
# #23329 - Specifying a field that is not refered by any other model directly registered
|
||||
# to this admin site but registered through inheritance should be allowed.
|
||||
response = self.client.get("/test_admin/admin/admin_views/referencedbyparent/", {TO_FIELD_VAR: 'id'})
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
# #23431 - Specifying a field that is only refered to by a inline of a registered
|
||||
# model should be allowed.
|
||||
response = self.client.get("/test_admin/admin/admin_views/referencedbyinline/", {TO_FIELD_VAR: 'id'})
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
# We also want to prevent the add and change view from leaking a
|
||||
# disallowed field value.
|
||||
with patch_logger('django.security.DisallowedModelAdminToField', 'error') as calls:
|
||||
|
||||
Reference in New Issue
Block a user