Skip to content

Changing default CSRF cookie name setting #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 27, 2025
Merged

Changing default CSRF cookie name setting #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04d3648
Changing default CSRF cookie name setting
lprokein Oct 24, 2025
d096e20
Handling setting not present
lprokein Oct 24, 2025
6f7dc54
Cleanup
lprokein Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions martor/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,3 +233,9 @@
)
# Disable admin style when using custom admin interface e.g django-grappelli
MARTOR_ENABLE_ADMIN_CSS = getattr(settings, "MARTOR_ENABLE_ADMIN_CSS", True)

MARTOR_CSRF_COOKIE_NAME = (
settings.MARTOR_CSRF_COOKIE_NAME
if hasattr(settings, "MARTOR_CSRF_COOKIE_NAME")
else "csrftoken"
)
6 changes: 3 additions & 3 deletions martor/static/martor/js/martor.bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
url: textareaId.data('search-users-url'),
data: {
'username': username,
'csrfmiddlewaretoken': getCookie('csrftoken')
'csrfmiddlewaretoken': getCookie(textareaId.data('csrf-cookie-name'))
},
success: function (data) {
if (data['status'] == 200) {
Expand Down Expand Up @@ -154,7 +154,7 @@
var value = textareaId.val();
var form = new FormData();
form.append('content', value);
form.append('csrfmiddlewaretoken', getCookie('csrftoken'));
form.append('csrfmiddlewaretoken', getCookie(textareaId.data('csrf-cookie-name')));
currentTab.addClass('martor-preview-stale');

$.ajax({
Expand Down Expand Up @@ -541,7 +541,7 @@
var firstForm = $('#' + editorId).closest('form').get(0);
var field_name = editor.container.id.replace('martor-', '');
var form = new FormData(firstForm);
form.append('csrfmiddlewaretoken', getCookie('csrftoken'));
form.append('csrfmiddlewaretoken', getCookie(textareaId.data('csrf-cookie-name')));

$.ajax({
url: textareaId.data('upload-url'),
Expand Down
2 changes: 1 addition & 1 deletion martor/static/martor/js/martor.bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions martor/static/martor/js/martor.semantic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
url: textareaId.data('search-users-url'),
data: {
'username': username,
'csrfmiddlewaretoken': getCookie('csrftoken')
'csrfmiddlewaretoken': getCookie(textareaId.data('csrf-cookie-name'))
},
success: function (data) {
if (data['status'] == 200) {
Expand Down Expand Up @@ -143,7 +143,7 @@
var value = textareaId.val();
var form = new FormData();
form.append('content', value);
form.append('csrfmiddlewaretoken', getCookie('csrftoken'));
form.append('csrfmiddlewaretoken', getCookie(textareaId.data('csrf-cookie-name')));
currentTab.addClass('martor-preview-stale');

$.ajax({
Expand Down Expand Up @@ -536,7 +536,7 @@
var firstForm = $('#' + editorId).closest('form').get(0);
var field_name = editor.container.id.replace('martor-', '');
var form = new FormData(firstForm);
form.append('csrfmiddlewaretoken', getCookie('csrftoken'));
form.append('csrfmiddlewaretoken', getCookie(textareaId.data('csrf-cookie-name')));

$.ajax({
url: textareaId.data('upload-url'),
Expand Down
2 changes: 1 addition & 1 deletion martor/static/martor/js/martor.semantic.min.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions martor/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
MARTOR_THEME,
MARTOR_TOOLBAR_BUTTONS,
MARTOR_UPLOAD_URL,
MARTOR_CSRF_COOKIE_NAME,
)


Expand All @@ -40,6 +41,7 @@ def render(self, name, value, attrs=None, renderer=None, **kwargs):
attributes_to_pass = {
"data-enable-configs": MARTOR_ENABLE_CONFIGS,
"data-markdownfy-url": reverse("martor_markdownfy"),
"data-csrf-cookie-name": MARTOR_CSRF_COOKIE_NAME,
}

if MARTOR_UPLOAD_URL:
Expand All @@ -51,6 +53,7 @@ def render(self, name, value, attrs=None, renderer=None, **kwargs):
if MARTOR_MARKDOWNIFY_TIMEOUT:
attributes_to_pass["data-save-timeout"] = MARTOR_MARKDOWNIFY_TIMEOUT


# Make sure that the martor value is in the class attr passed in
if "class" in attrs:
attrs["class"] += " martor"
Expand Down