From 67c5cdea4016405483d493d1efb3765a58587d1c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Sun, 7 Mar 2021 07:06:56 +0100
Subject: [PATCH] Fix some ignored brakeman warnings (#15829)
---
app/views/admin/accounts/index.html.haml | 2 +-
app/views/admin/action_logs/index.html.haml | 2 +-
.../admin/email_domain_blocks/index.html.haml | 2 +-
app/views/admin/instances/index.html.haml | 2 +-
config/brakeman.ignore | 124 ------------------
5 files changed, 4 insertions(+), 128 deletions(-)
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 8eac226e08..398ab4bb46 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -51,6 +51,6 @@
%th= t('admin.accounts.most_recent_activity')
%th
%tbody
- = render @accounts
+ = render partial: 'account', collection: @accounts
= paginate @accounts
diff --git a/app/views/admin/action_logs/index.html.haml b/app/views/admin/action_logs/index.html.haml
index e7d9054d9f..f7f73150b4 100644
--- a/app/views/admin/action_logs/index.html.haml
+++ b/app/views/admin/action_logs/index.html.haml
@@ -23,6 +23,6 @@
= t 'admin.action_logs.empty'
- else
.announcements-list
- = render @action_logs
+ = render partial: 'action_log', collection: @action_logs
= paginate @action_logs
diff --git a/app/views/admin/email_domain_blocks/index.html.haml b/app/views/admin/email_domain_blocks/index.html.haml
index 6015cfac0a..fa5d86b67a 100644
--- a/app/views/admin/email_domain_blocks/index.html.haml
+++ b/app/views/admin/email_domain_blocks/index.html.haml
@@ -14,6 +14,6 @@
%th= t('admin.email_domain_blocks.domain')
%th
%tbody
- = render @email_domain_blocks
+ = render partial: 'email_domain_block', collection: @email_domain_blocks
= paginate @email_domain_blocks
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
index 5f20e7ec04..7c7958786d 100644
--- a/app/views/admin/instances/index.html.haml
+++ b/app/views/admin/instances/index.html.haml
@@ -36,6 +36,6 @@
%div.muted-hint.center-text
= t 'admin.instances.empty'
- else
- = render @instances
+ = render partial: 'instance', collection: @instances
= paginate @instances
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index dcbfd02b4e..2d47a9aaf0 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -40,99 +40,6 @@
"confidence": "Weak",
"note": ""
},
- {
- "warning_type": "Dynamic Render Path",
- "warning_code": 15,
- "fingerprint": "20a660939f2bbf8c665e69f2844031c0564524689a9570a0091ed94846212020",
- "check_name": "Render",
- "message": "Render path contains parameter value",
- "file": "app/views/admin/action_logs/index.html.haml",
- "line": 26,
- "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
- "code": "render(action => Admin::ActionLogFilter.new(filter_params).results.page(params[:page]), {})",
- "render_path": [
- {
- "type": "controller",
- "class": "Admin::ActionLogsController",
- "method": "index",
- "line": 8,
- "file": "app/controllers/admin/action_logs_controller.rb",
- "rendered": {
- "name": "admin/action_logs/index",
- "file": "app/views/admin/action_logs/index.html.haml"
- }
- }
- ],
- "location": {
- "type": "template",
- "template": "admin/action_logs/index"
- },
- "user_input": "params[:page]",
- "confidence": "Weak",
- "note": ""
- },
- {
- "warning_type": "Dynamic Render Path",
- "warning_code": 15,
- "fingerprint": "371fe16dc4c9d6ab08a20437d65be4825776107a67c38f6d4780a9c703cd44a5",
- "check_name": "Render",
- "message": "Render path contains parameter value",
- "file": "app/views/admin/email_domain_blocks/index.html.haml",
- "line": 17,
- "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
- "code": "render(action => EmailDomainBlock.where(:parent_id => nil).includes(:children).order(:id => :desc).page(params[:page]), {})",
- "render_path": [
- {
- "type": "controller",
- "class": "Admin::EmailDomainBlocksController",
- "method": "index",
- "line": 10,
- "file": "app/controllers/admin/email_domain_blocks_controller.rb",
- "rendered": {
- "name": "admin/email_domain_blocks/index",
- "file": "app/views/admin/email_domain_blocks/index.html.haml"
- }
- }
- ],
- "location": {
- "type": "template",
- "template": "admin/email_domain_blocks/index"
- },
- "user_input": "params[:page]",
- "confidence": "Weak",
- "note": ""
- },
- {
- "warning_type": "Dynamic Render Path",
- "warning_code": 15,
- "fingerprint": "4704e8093e3e0561bf705f892e8fc6780419f8255f4440b1c0afd09339bd6446",
- "check_name": "Render",
- "message": "Render path contains parameter value",
- "file": "app/views/admin/instances/index.html.haml",
- "line": 39,
- "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
- "code": "render(action => filtered_instances.page(params[:page]), {})",
- "render_path": [
- {
- "type": "controller",
- "class": "Admin::InstancesController",
- "method": "index",
- "line": 10,
- "file": "app/controllers/admin/instances_controller.rb",
- "rendered": {
- "name": "admin/instances/index",
- "file": "app/views/admin/instances/index.html.haml"
- }
- }
- ],
- "location": {
- "type": "template",
- "template": "admin/instances/index"
- },
- "user_input": "params[:page]",
- "confidence": "Weak",
- "note": ""
- },
{
"warning_type": "Redirect",
"warning_code": 18,
@@ -253,37 +160,6 @@
"confidence": "Medium",
"note": ""
},
- {
- "warning_type": "Dynamic Render Path",
- "warning_code": 15,
- "fingerprint": "9f31d941f3910dba2e9bfcd81aef4513249bd24c02d0f98e13ad44fdeeccd0e8",
- "check_name": "Render",
- "message": "Render path contains parameter value",
- "file": "app/views/admin/accounts/index.html.haml",
- "line": 54,
- "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
- "code": "render(action => filtered_accounts.page(params[:page]), {})",
- "render_path": [
- {
- "type": "controller",
- "class": "Admin::AccountsController",
- "method": "index",
- "line": 12,
- "file": "app/controllers/admin/accounts_controller.rb",
- "rendered": {
- "name": "admin/accounts/index",
- "file": "app/views/admin/accounts/index.html.haml"
- }
- }
- ],
- "location": {
- "type": "template",
- "template": "admin/accounts/index"
- },
- "user_input": "params[:page]",
- "confidence": "Weak",
- "note": ""
- },
{
"warning_type": "Redirect",
"warning_code": 18,